diff --git a/_maps/voidcrew/RandomRuins/AnywhereRuins/golem_ship.dmm b/_maps/voidcrew/RandomRuins/AnywhereRuins/golem_ship.dmm
index ad9ae4130bb..cb1087d8db4 100644
--- a/_maps/voidcrew/RandomRuins/AnywhereRuins/golem_ship.dmm
+++ b/_maps/voidcrew/RandomRuins/AnywhereRuins/golem_ship.dmm
@@ -1,4 +1,10 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ad" = (
+/obj/machinery/vending/games{
+	contraband = list(/obj/item/dice/fudge = 9, /obj/item/clothing/shoes/wheelys/skishoes = 4, /obj/item/instrument/musicalmoth = 1, /obj/item/melee/baseball_bat = 1, /obj/item/skillchip/acrobatics = 1)
+	},
+/turf/open/floor/mineral/titanium/purple,
+/area/ruin/powered/golem_ship)
 "am" = (
 /obj/structure/table,
 /obj/item/tape{
@@ -481,10 +487,6 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/powered/golem_ship)
-"zN" = (
-/obj/machinery/vending/games,
-/turf/open/floor/mineral/titanium/purple,
-/area/ruin/powered/golem_ship)
 "At" = (
 /obj/effect/mob_spawn/ghost_role/human/golem/adamantine,
 /turf/open/floor/mineral/titanium/purple,
@@ -979,7 +981,7 @@ wN
 wN
 wN
 lF
-zN
+ad
 ed
 sS
 sS
diff --git a/_maps/voidcrew/RandomRuins/BeachRuins/push_it.dmm b/_maps/voidcrew/RandomRuins/BeachRuins/push_it.dmm
index d3422229636..611652c7469 100644
--- a/_maps/voidcrew/RandomRuins/BeachRuins/push_it.dmm
+++ b/_maps/voidcrew/RandomRuins/BeachRuins/push_it.dmm
@@ -2,6 +2,16 @@
 "aa" = (
 /turf/open/floor/carpet/neon/simple/violet/nodots,
 /area/ruin/powered)
+"ab" = (
+/obj/structure/table/wood,
+/obj/item/melee/baseball_bat,
+/obj/machinery/light/floor,
+/turf/open/floor/iron/dark,
+/area/ruin/powered)
+"ac" = (
+/obj/item/melee/baseball_bat,
+/turf/open/floor/light/colour_cycle/dancefloor_a,
+/area/ruin/powered)
 "ai" = (
 /obj/machinery/door/airlock/wood,
 /obj/effect/turf_decal/siding/thinplating_new/dark{
@@ -1173,12 +1183,6 @@
 	},
 /turf/open/misc/asteroid/sand/beach,
 /area/overmap_encounter/planetoid/beach)
-"Ti" = (
-/obj/structure/table/wood,
-/obj/item/gun/ballistic/revolver/golden,
-/obj/machinery/light/floor,
-/turf/open/floor/iron/dark,
-/area/ruin/powered)
 "Ty" = (
 /obj/item/kirbyplants/organic/plant22,
 /turf/open/floor/iron/dark,
@@ -1322,10 +1326,6 @@
 	},
 /turf/open/floor/carpet/neon/simple/violet,
 /area/ruin/powered)
-"Xs" = (
-/obj/item/gun/ballistic/automatic/pistol/deagle,
-/turf/open/floor/light/colour_cycle/dancefloor_a,
-/area/ruin/powered)
 "XC" = (
 /obj/structure/flora/deadgrass/tall,
 /obj/effect/turf_decal/weather/sand,
@@ -1653,7 +1653,7 @@ hh
 VO
 RJ
 Eb
-Ti
+ab
 Ld
 RS
 Io
@@ -1786,7 +1786,7 @@ hh
 ie
 Zo
 WU
-Xs
+ac
 aA
 hh
 RS
diff --git a/_maps/voidcrew/RandomRuins/BeachRuins/smuggler_cove.dmm b/_maps/voidcrew/RandomRuins/BeachRuins/smuggler_cove.dmm
index 8b3708009fe..d170da0d713 100644
--- a/_maps/voidcrew/RandomRuins/BeachRuins/smuggler_cove.dmm
+++ b/_maps/voidcrew/RandomRuins/BeachRuins/smuggler_cove.dmm
@@ -1,4 +1,12 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/structure/table/wood,
+/obj/item/melee/baseball_bat{
+	pixel_w = 1;
+	pixel_z = 11
+	},
+/turf/open/floor/wood,
+/area/ruin/unpowered)
 "au" = (
 /obj/structure/fake_stairs/wood/directional/south,
 /obj/structure/railing{
@@ -918,14 +926,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/wood,
 /area/ruin/unpowered)
-"Oa" = (
-/obj/structure/table/wood,
-/obj/item/gun/ballistic/automatic/pistol/no_mag{
-	pixel_w = 1;
-	pixel_z = 11
-	},
-/turf/open/floor/wood,
-/area/ruin/unpowered)
 "OS" = (
 /obj/structure/flora/bush/sparsegrass/style_random{
 	pixel_w = -2;
@@ -1538,7 +1538,7 @@ dk
 gN
 VB
 jD
-Oa
+aa
 NU
 NU
 tG
diff --git a/_maps/voidcrew/RandomRuins/IceRuins/icemoon_surface_lodge.dmm b/_maps/voidcrew/RandomRuins/IceRuins/icemoon_surface_lodge.dmm
index 1b29cd28909..4618ea2340b 100644
--- a/_maps/voidcrew/RandomRuins/IceRuins/icemoon_surface_lodge.dmm
+++ b/_maps/voidcrew/RandomRuins/IceRuins/icemoon_surface_lodge.dmm
@@ -1,7 +1,107 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 5
+	},
+/obj/item/ammo_casing/c45{
+	pixel_x = 2;
+	pixel_y = -4
+	},
+/obj/item/melee/baseball_bat,
+/obj/effect/decal/cleanable/blood/trail_holder{
+	dir = 5
+	},
+/turf/open/floor/carpet/red,
+/area/ruin/huntinglodge)
+"ab" = (
+/obj/structure/noticeboard/directional/north,
+/obj/item/melee/baseball_bat{
+	pixel_x = 1;
+	pixel_y = 27
+	},
+/obj/effect/turf_decal/siding/wood/end{
+	dir = 8
+	},
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green{
+	pixel_x = -1;
+	pixel_y = 5
+	},
+/turf/open/floor/stone,
+/area/ruin/huntinglodge)
 "ac" = (
 /turf/open/floor/stone/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
+"ad" = (
+/obj/effect/decal/cleanable/blood/tracks{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/ash,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4
+	},
+/obj/item/ammo_casing/shotgun/buckshot/spent{
+	pixel_x = -3;
+	pixel_y = -8
+	},
+/obj/item/melee/baseball_bat,
+/turf/open/floor/carpet/green,
+/area/ruin/huntinglodge)
+"ae" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/melee/baseball_bat,
+/turf/open/floor/iron/dark/herringbone,
+/area/ruin/huntinglodge)
+"af" = (
+/obj/item/ammo_casing/c45{
+	pixel_x = 2;
+	pixel_y = 4
+	},
+/obj/item/ammo_casing/c45{
+	pixel_x = 3;
+	pixel_y = -4
+	},
+/obj/item/ammo_casing/c45{
+	pixel_x = -5;
+	pixel_y = 0
+	},
+/obj/effect/decal/cleanable/blood/splatter,
+/obj/item/melee/baseball_bat,
+/turf/open/misc/asteroid/snow/icemoon/breathable,
+/area/icemoon/surface/outdoors/nospawn)
+"ag" = (
+/obj/item/ammo_casing/shotgun/buckshot/spent,
+/obj/effect/decal/cleanable/blood/trail_holder{
+	dir = 10
+	},
+/obj/item/melee/baseball_bat,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/wood,
+/area/ruin/huntinglodge)
+"ah" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/structure/chair/stool/directional/north,
+/obj/item/melee/baseball_bat,
+/turf/open/floor/wood/tile,
+/area/ruin/huntinglodge)
+"ai" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table,
+/obj/item/knife/butcher,
+/obj/item/knife/combat/survival{
+	pixel_x = 1;
+	pixel_y = 2
+	},
+/obj/item/knife,
+/turf/open/floor/iron/checker,
+/area/ruin/huntinglodge)
 "aE" = (
 /obj/item/shovel,
 /obj/structure/rack,
@@ -254,20 +354,6 @@
 /obj/machinery/light/small/dim/directional/north,
 /turf/open/floor/wood,
 /area/ruin/huntinglodge)
-"eH" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 5
-	},
-/obj/item/ammo_casing/c45{
-	pixel_x = 2;
-	pixel_y = -4
-	},
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
-/obj/effect/decal/cleanable/blood/trail_holder{
-	dir = 5
-	},
-/turf/open/floor/carpet/red,
-/area/ruin/huntinglodge)
 "eQ" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
@@ -432,22 +518,6 @@
 /obj/effect/decal/cleanable/blood/gibs/core,
 /turf/open/floor/carpet/lone/star,
 /area/ruin/huntinglodge)
-"hl" = (
-/obj/effect/decal/cleanable/blood/tracks{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/ash,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 4
-	},
-/obj/item/ammo_casing/shotgun/buckshot/spent{
-	pixel_x = -3;
-	pixel_y = -8
-	},
-/obj/item/gun/ballistic/shotgun/riot,
-/turf/open/floor/carpet/green,
-/area/ruin/huntinglodge)
 "hm" = (
 /turf/open/floor/iron/stairs/right{
 	color = "#5d341f";
@@ -820,14 +890,6 @@
 /obj/machinery/light/small/dim/directional/south,
 /turf/open/misc/asteroid/snow/icemoon/breathable,
 /area/ruin/huntinglodge)
-"mG" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
-	},
-/obj/structure/chair/stool/directional/north,
-/obj/item/gun/ballistic/shotgun/riot,
-/turf/open/floor/wood/tile,
-/area/ruin/huntinglodge)
 "mW" = (
 /obj/effect/decal/cleanable/blood/footprints{
 	dir = 4
@@ -1341,22 +1403,6 @@
 	},
 /turf/open/floor/carpet/lone/star,
 /area/ruin/huntinglodge)
-"wI" = (
-/obj/structure/noticeboard/directional/north,
-/obj/item/gun/ballistic/shotgun/riot{
-	pixel_x = 1;
-	pixel_y = 27
-	},
-/obj/effect/turf_decal/siding/wood/end{
-	dir = 8
-	},
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green{
-	pixel_x = -1;
-	pixel_y = 5
-	},
-/turf/open/floor/stone,
-/area/ruin/huntinglodge)
 "wO" = (
 /obj/effect/turf_decal/weather/snow/corner{
 	dir = 4
@@ -2150,23 +2196,6 @@
 	},
 /turf/open/misc/asteroid/snow/icemoon/breathable,
 /area/icemoon/surface/outdoors/nospawn)
-"GN" = (
-/obj/item/ammo_casing/c45{
-	pixel_x = 2;
-	pixel_y = 4
-	},
-/obj/item/ammo_casing/c45{
-	pixel_x = 3;
-	pixel_y = -4
-	},
-/obj/item/ammo_casing/c45{
-	pixel_x = -5;
-	pixel_y = 0
-	},
-/obj/effect/decal/cleanable/blood/splatter,
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
-/turf/open/misc/asteroid/snow/icemoon/breathable,
-/area/icemoon/surface/outdoors/nospawn)
 "GU" = (
 /obj/effect/turf_decal/weather/snow/corner{
 	dir = 8
@@ -2921,15 +2950,6 @@
 	},
 /turf/open/floor/wood,
 /area/ruin/huntinglodge)
-"TI" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/gun/ballistic/shotgun/doublebarrel,
-/turf/open/floor/iron/dark/herringbone,
-/area/ruin/huntinglodge)
 "TN" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 9
@@ -2953,17 +2973,6 @@
 	},
 /turf/open/floor/carpet/green,
 /area/ruin/huntinglodge)
-"Ux" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/item/knife/butcher,
-/obj/item/chainsaw{
-	pixel_x = 1;
-	pixel_y = 2
-	},
-/obj/item/knife,
-/turf/open/floor/iron/checker,
-/area/ruin/huntinglodge)
 "UB" = (
 /obj/structure/bed{
 	dir = 4
@@ -3060,15 +3069,6 @@
 	color = "#5d341f"
 	},
 /area/ruin/huntinglodge)
-"VF" = (
-/obj/item/ammo_casing/shotgun/buckshot/spent,
-/obj/effect/decal/cleanable/blood/trail_holder{
-	dir = 10
-	},
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/wood,
-/area/ruin/huntinglodge)
 "VO" = (
 /obj/effect/turf_decal/weather/snow/corner,
 /obj/effect/turf_decal/weather/snow/corner{
@@ -3536,7 +3536,7 @@ fK
 mA
 Jb
 mX
-eH
+aa
 KB
 oF
 Jb
@@ -3718,7 +3718,7 @@ EJ
 EJ
 mA
 Jb
-wI
+ab
 Ei
 yt
 wC
@@ -3841,7 +3841,7 @@ Jb
 Jb
 Jb
 qp
-hl
+ad
 WX
 Pi
 Jb
@@ -3986,7 +3986,7 @@ PS
 Oz
 US
 xE
-TI
+ae
 Gp
 Hw
 JV
@@ -4066,7 +4066,7 @@ Xk
 mW
 kl
 hV
-GN
+af
 Zk
 UH
 Vx
@@ -4328,7 +4328,7 @@ mw
 pr
 hK
 CD
-VF
+ag
 Nj
 iq
 ic
@@ -4398,7 +4398,7 @@ Eq
 cC
 gu
 ZT
-mG
+ah
 eh
 Jb
 Jb
@@ -4549,7 +4549,7 @@ Gp
 Gp
 Jb
 Jb
-Ux
+ai
 jQ
 Ws
 Jb
diff --git a/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
index 23ffacba62a..555a6f1615a 100644
--- a/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
+++ b/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
@@ -1,4 +1,10 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ac" = (
+/obj/structure/sacrificealtar,
+/obj/effect/decal/cleanable/blood/old,
+/obj/item/spear,
+/turf/open/floor/engine/cult,
+/area/ruin/powered)
 "ay" = (
 /turf/open/floor/carpet,
 /area/ruin/powered)
@@ -334,12 +340,6 @@
 	},
 /turf/open/floor/carpet,
 /area/ruin/powered)
-"Cl" = (
-/obj/structure/sacrificealtar,
-/obj/effect/decal/cleanable/blood/old,
-/obj/item/knife/bloodletter,
-/turf/open/floor/engine/cult,
-/area/ruin/powered)
 "Dm" = (
 /obj/structure/flora/grass/brown/style_random,
 /turf/open/misc/asteroid/snow/icemoon/breathable,
@@ -1052,7 +1052,7 @@ tN
 Og
 Ei
 Vn
-Cl
+ac
 PQ
 Ed
 jk
diff --git a/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_comms_agent.dmm b/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_comms_agent.dmm
index 57dabb5c165..5bb774f791b 100644
--- a/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_comms_agent.dmm
+++ b/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_comms_agent.dmm
@@ -1,4 +1,11 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ab" = (
+/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms/icemoon{
+	dir = 1;
+	outfit_override = list("r_pocket" = null, "r_hand" = /obj/item/spear)
+	},
+/turf/open/floor/iron/white,
+/area/ruin/comms_agent)
 "ag" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
@@ -66,12 +73,6 @@
 /obj/structure/cable,
 /turf/open/floor/wood,
 /area/ruin/comms_agent)
-"eT" = (
-/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms/icemoon{
-	dir = 1
-	},
-/turf/open/floor/iron/white,
-/area/ruin/comms_agent)
 "fk" = (
 /obj/structure/rack,
 /obj/structure/cable,
@@ -2026,7 +2027,7 @@ pV
 WR
 BZ
 WL
-eT
+ab
 YI
 rA
 uk
diff --git a/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm b/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm
index 433fdc6d33f..8045ec5db4a 100644
--- a/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm
+++ b/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm
@@ -1,4 +1,14 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ac" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/rack,
+/obj/item/wrench,
+/obj/item/knife/combat/survival,
+/obj/machinery/light/small/built/directional/south,
+/turf/open/floor/plating/icemoon,
+/area/ruin/powered/shuttle)
 "aD" = (
 /obj/structure/fence/cut/medium,
 /turf/open/misc/asteroid/snow/icemoon/breathable,
@@ -317,16 +327,6 @@
 /obj/effect/decal/cleanable/glass,
 /turf/open/floor/plating/icemoon,
 /area/ruin/powered/shuttle)
-"Kh" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/structure/rack,
-/obj/item/wrench,
-/obj/item/crowbar/large/twenty_force,
-/obj/machinery/light/small/built/directional/south,
-/turf/open/floor/plating/icemoon,
-/area/ruin/powered/shuttle)
 "Kr" = (
 /obj/machinery/light/small/broken/directional/north,
 /turf/open/floor/plating/snowed/smoothed,
@@ -679,7 +679,7 @@ gz
 gz
 OM
 yW
-Kh
+ac
 gz
 FK
 wP
diff --git a/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_hermit.dmm b/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_hermit.dmm
index 460ac1b98ef..f39701a051d 100644
--- a/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_hermit.dmm
+++ b/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_hermit.dmm
@@ -1,4 +1,16 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ab" = (
+/obj/item/melee/baseball_bat,
+/obj/structure/table/wood,
+/obj/item/flashlight/lantern,
+/turf/open/floor/wood,
+/area/ruin/powered/hermit)
+"ac" = (
+/obj/item/pickaxe/improvised,
+/obj/structure/table/wood,
+/obj/item/knife/combat/survival,
+/turf/open/floor/grass/fairy,
+/area/ruin/powered/hermit)
 "aM" = (
 /turf/open/misc/asteroid/snow/icemoon/breathable,
 /area/icemoon/underground/explored)
@@ -74,18 +86,6 @@
 /obj/item/cultivator,
 /turf/open/floor/grass/fairy,
 /area/ruin/powered/hermit)
-"wf" = (
-/obj/item/gun/energy/laser/musket/prime,
-/obj/structure/table/wood,
-/obj/item/flashlight/lantern,
-/turf/open/floor/wood,
-/area/ruin/powered/hermit)
-"zd" = (
-/obj/item/pickaxe/improvised,
-/obj/structure/table/wood,
-/obj/item/knife/combat,
-/turf/open/floor/grass/fairy,
-/area/ruin/powered/hermit)
 "CR" = (
 /obj/item/flashlight/lantern,
 /turf/open/misc/asteroid/snow/icemoon/breathable,
@@ -304,7 +304,7 @@ dY
 JI
 JI
 sC
-wf
+ab
 TL
 aM
 aM
@@ -353,7 +353,7 @@ ph
 ph
 ph
 ph
-zd
+ac
 io
 jG
 ph
diff --git a/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_syndidome.dmm b/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_syndidome.dmm
index f794a64dc8c..02ae83148fa 100644
--- a/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_syndidome.dmm
+++ b/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_syndidome.dmm
@@ -33,6 +33,45 @@
 	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/syndibiodome)
+"ad" = (
+/obj/effect/turf_decal/siding/wideplating/dark{
+	dir = 10
+	},
+/obj/structure/closet/syndicate,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/storage/belt/security/webbing,
+/obj/item/storage/toolbox/syndicate,
+/obj/item/melee/baseball_bat,
+/obj/item/ammo_box/magazine/m9mm,
+/obj/item/ammo_box/magazine/m9mm,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/syndibiodome)
+"ae" = (
+/obj/effect/turf_decal/siding/wideplating/dark{
+	dir = 9
+	},
+/obj/structure/closet/syndicate,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/warm/directional/east,
+/obj/item/storage/belt/security/webbing,
+/obj/item/melee/baseball_bat,
+/obj/item/ammo_box/magazine/m9mm,
+/obj/item/ammo_box/magazine/m9mm,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/syndibiodome)
+"af" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 9
+	},
+/obj/structure/closet/syndicate,
+/obj/item/clothing/mask/gas/syndicate,
+/obj/machinery/light/small/dim/directional/west,
+/obj/item/polymorph_belt/functioning,
+/obj/item/knife/combat/survival,
+/obj/item/clothing/under/costume/seifuku/red,
+/obj/structure/sign/poster/contraband/communist_state/directional/west,
+/turf/open/floor/carpet/green,
+/area/ruin/syndibiodome)
 "ag" = (
 /obj/effect/turf_decal/siding/wideplating/dark{
 	dir = 9
@@ -2271,19 +2310,6 @@
 	},
 /turf/open/misc/asteroid/snow/icemoon/breathable,
 /area/icemoon/surface/outdoors/noteleport)
-"AV" = (
-/obj/effect/turf_decal/siding/wideplating/dark{
-	dir = 10
-	},
-/obj/structure/closet/syndicate,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/storage/belt/security/webbing,
-/obj/item/storage/toolbox/syndicate,
-/obj/item/gun/ballistic/automatic/pistol,
-/obj/item/ammo_box/magazine/m9mm,
-/obj/item/ammo_box/magazine/m9mm,
-/turf/open/floor/mineral/plastitanium/red,
-/area/ruin/syndibiodome)
 "Ba" = (
 /obj/effect/turf_decal/siding/wideplating/dark{
 	dir = 6
@@ -3079,19 +3105,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/ruin/syndibiodome)
-"Lg" = (
-/obj/effect/turf_decal/siding/wood{
-	dir = 9
-	},
-/obj/structure/closet/syndicate,
-/obj/item/clothing/mask/gas/syndicate,
-/obj/machinery/light/small/dim/directional/west,
-/obj/item/polymorph_belt/functioning,
-/obj/item/pen/edagger,
-/obj/item/clothing/under/costume/seifuku/red,
-/obj/structure/sign/poster/contraband/communist_state/directional/west,
-/turf/open/floor/carpet/green,
-/area/ruin/syndibiodome)
 "Lm" = (
 /obj/effect/turf_decal/siding/wideplating/dark{
 	dir = 5
@@ -3445,19 +3458,6 @@
 /obj/effect/turf_decal/siding/wood,
 /turf/open/floor/wood,
 /area/ruin/syndibiodome)
-"OL" = (
-/obj/effect/turf_decal/siding/wideplating/dark{
-	dir = 9
-	},
-/obj/structure/closet/syndicate,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/warm/directional/east,
-/obj/item/storage/belt/security/webbing,
-/obj/item/gun/ballistic/automatic/pistol,
-/obj/item/ammo_box/magazine/m9mm,
-/obj/item/ammo_box/magazine/m9mm,
-/turf/open/floor/mineral/plastitanium/red,
-/area/ruin/syndibiodome)
 "OM" = (
 /obj/effect/turf_decal/trimline/dark_blue/line{
 	dir = 9
@@ -5107,8 +5107,8 @@ Tx
 vO
 qN
 zM
-OL
-AV
+ae
+ad
 zM
 zM
 ys
@@ -5981,7 +5981,7 @@ mZ
 ys
 ys
 zM
-Lg
+af
 xZ
 yt
 zM
diff --git a/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_syndielab.dmm b/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_syndielab.dmm
index 9b3558c7b63..384d19ad3bf 100644
--- a/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_syndielab.dmm
+++ b/_maps/voidcrew/RandomRuins/IceRuins/icemoon_underground_syndielab.dmm
@@ -17,6 +17,30 @@
 	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/syndielab)
+"ae" = (
+/mob/living/basic/trooper/syndicate/ranged,
+/obj/structure/cable/layer1,
+/turf/open/floor/iron/dark/textured,
+/area/ruin/syndielab)
+"af" = (
+/obj/structure/chair/sofa/corp/right,
+/mob/living/basic/trooper/syndicate/ranged,
+/obj/machinery/light/warm/directional/north,
+/obj/structure/cable/layer1,
+/turf/open/floor/iron/dark/textured,
+/area/ruin/syndielab)
+"ag" = (
+/obj/structure/table/wood,
+/obj/item/ammo_casing/shotgun/flechette/donk{
+	pixel_y = 6
+	},
+/obj/item/ammo_casing/shotgun/flechette/donk{
+	pixel_x = 8;
+	pixel_y = 6
+	},
+/obj/item/melee/baseball_bat,
+/turf/open/floor/carpet/red,
+/area/ruin/syndielab)
 "aP" = (
 /obj/item/reagent_containers/condiment/milk,
 /obj/item/reagent_containers/cup/soda_cans/beer{
@@ -96,11 +120,6 @@
 /obj/structure/cable/layer1,
 /turf/open/floor/iron/dark/textured,
 /area/ruin/syndielab)
-"cM" = (
-/mob/living/basic/trooper/syndicate/ranged/shotgun,
-/obj/structure/cable/layer1,
-/turf/open/floor/iron/dark/textured,
-/area/ruin/syndielab)
 "cP" = (
 /obj/effect/mapping_helpers/bombable_wall,
 /turf/closed/wall/r_wall/plastitanium/syndicate/nodiagonal{
@@ -822,18 +841,6 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/syndielab)
-"Wo" = (
-/obj/structure/table/wood,
-/obj/item/ammo_casing/shotgun/flechette/donk{
-	pixel_y = 6
-	},
-/obj/item/ammo_casing/shotgun/flechette/donk{
-	pixel_x = 8;
-	pixel_y = 6
-	},
-/obj/item/gun/ballistic/shotgun/musket,
-/turf/open/floor/carpet/red,
-/area/ruin/syndielab)
 "WO" = (
 /obj/item/trash/boritos/red{
 	pixel_y = -9;
@@ -902,13 +909,6 @@
 /obj/structure/cable/layer1,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/syndielab)
-"ZW" = (
-/obj/structure/chair/sofa/corp/right,
-/mob/living/basic/trooper/syndicate/ranged/shotgun,
-/obj/machinery/light/warm/directional/north,
-/obj/structure/cable/layer1,
-/turf/open/floor/iron/dark/textured,
-/area/ruin/syndielab)
 
 (1,1,1) = {"
 MW
@@ -1066,7 +1066,7 @@ ex
 qC
 el
 Sq
-cM
+ae
 Hs
 AR
 AR
@@ -1154,7 +1154,7 @@ qC
 qC
 qC
 AR
-ZW
+af
 uT
 yW
 Vu
@@ -1173,7 +1173,7 @@ dD
 Co
 AR
 cd
-Wo
+ag
 yW
 Dd
 AR
diff --git a/_maps/voidcrew/RandomRuins/JungleRuins/jungle_botany.dmm b/_maps/voidcrew/RandomRuins/JungleRuins/jungle_botany.dmm
index 73bfd039a0d..aa9e644a329 100644
--- a/_maps/voidcrew/RandomRuins/JungleRuins/jungle_botany.dmm
+++ b/_maps/voidcrew/RandomRuins/JungleRuins/jungle_botany.dmm
@@ -1,4 +1,11 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/gas/atmos/centcom;
+	storage_type = /obj/item/tank/jetpack/oxygen/captain
+	},
+/turf/open/floor/iron,
+/area/overmap_encounter/planet_ruin)
 "aM" = (
 /obj/structure/table,
 /obj/item/disk/data,
@@ -438,6 +445,13 @@
 /obj/item/stack/sheet/mineral/plasma/thirty,
 /turf/open/floor/iron,
 /area/overmap_encounter/planet_ruin)
+"RO" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/gas/atmos/centcom;
+	storage_type = /obj/item/tank/jetpack/oxygen/captain
+	},
+/turf/open/floor/iron,
+/area/overmap_encounter/planet_ruin)
 "Se" = (
 /obj/structure/closet/secure_closet/personal,
 /turf/open/floor/iron,
@@ -509,10 +523,6 @@
 /obj/item/toy/cards/deck/tarot,
 /turf/open/floor/iron,
 /area/overmap_encounter/planet_ruin)
-"Zq" = (
-/obj/machinery/suit_storage_unit/ert/engineer,
-/turf/open/floor/iron,
-/area/overmap_encounter/planet_ruin)
 "ZO" = (
 /obj/structure/bed,
 /obj/item/bedsheet/green,
@@ -547,10 +557,10 @@ Sh
 "}
 (2,1,1) = {"
 nF
-Zq
+aa
 Hu
 Hu
-Zq
+RO
 XO
 aM
 Vn
diff --git a/_maps/voidcrew/RandomRuins/JungleRuins/jungle_demon.dmm b/_maps/voidcrew/RandomRuins/JungleRuins/jungle_demon.dmm
index 425306a89c9..f333cd27a58 100644
--- a/_maps/voidcrew/RandomRuins/JungleRuins/jungle_demon.dmm
+++ b/_maps/voidcrew/RandomRuins/JungleRuins/jungle_demon.dmm
@@ -1,4 +1,9 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/structure/table/reinforced,
+/obj/item/melee/baseball_bat,
+/turf/open/floor/iron/dark,
+/area/ruin/powered)
 "bx" = (
 /obj/structure/reagent_dispensers/watertank,
 /obj/effect/decal/cleanable/dirt,
@@ -276,11 +281,6 @@
 /obj/structure/reagent_dispensers/watertank/high,
 /turf/open/floor/iron/dark,
 /area/ruin/powered)
-"yM" = (
-/obj/structure/table/reinforced,
-/obj/item/gun/ballistic/shotgun/bulldog/unrestricted,
-/turf/open/floor/iron/dark,
-/area/ruin/powered)
 "AF" = (
 /obj/vehicle/ridden/wheelchair,
 /turf/open/floor/iron/dark,
@@ -403,6 +403,14 @@
 /obj/structure/flora/junglebush,
 /turf/open/misc/dirt/jungle,
 /area/ruin/unpowered)
+"KM" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/gas/syndicate;
+	storage_type = /obj/item/tank/jetpack/oxygen/harness
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark,
+/area/ruin/powered)
 "KV" = (
 /obj/machinery/light/floor,
 /obj/effect/decal/cleanable/dirt,
@@ -487,11 +495,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/dark,
 /area/ruin/powered)
-"PA" = (
-/obj/machinery/suit_storage_unit/syndicate,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/ruin/powered)
 "QI" = (
 /obj/structure/rack,
 /obj/item/stack/spacecash/c1000,
@@ -737,7 +740,7 @@ iB
 (6,1,1) = {"
 iB
 Ed
-PA
+KM
 KV
 Wi
 Lu
@@ -1025,7 +1028,7 @@ iB
 Ed
 AU
 XX
-yM
+aa
 XS
 FR
 XS
diff --git a/_maps/voidcrew/RandomRuins/JungleRuins/jungle_nest.dmm b/_maps/voidcrew/RandomRuins/JungleRuins/jungle_nest.dmm
index 9a94c16006b..76d61094010 100644
--- a/_maps/voidcrew/RandomRuins/JungleRuins/jungle_nest.dmm
+++ b/_maps/voidcrew/RandomRuins/JungleRuins/jungle_nest.dmm
@@ -1,4 +1,11 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/structure/alien/weeds,
+/obj/structure/bed/nest,
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/knife/combat/survival,
+/turf/open/misc/dirt/jungle,
+/area/ruin/powered)
 "aH" = (
 /obj/structure/alien/weeds,
 /obj/structure/table/wood/fancy,
@@ -238,13 +245,6 @@
 /obj/structure/barricade/wooden/crude,
 /turf/open/misc/dirt/jungle,
 /area/ruin/powered)
-"AE" = (
-/obj/structure/alien/weeds,
-/obj/structure/bed/nest,
-/obj/item/clothing/head/helmet/toggleable/riot,
-/obj/item/shield/riot,
-/turf/open/misc/dirt/jungle,
-/area/ruin/powered)
 "AI" = (
 /obj/structure/alien/weeds,
 /obj/structure/alien/weeds/node,
@@ -526,7 +526,7 @@ yF
 Hh
 yF
 Gk
-AE
+aa
 zy
 mW
 oB
diff --git a/_maps/voidcrew/RandomRuins/JungleRuins/jungle_pirate.dmm b/_maps/voidcrew/RandomRuins/JungleRuins/jungle_pirate.dmm
index 166605166fc..c702a41efa4 100644
--- a/_maps/voidcrew/RandomRuins/JungleRuins/jungle_pirate.dmm
+++ b/_maps/voidcrew/RandomRuins/JungleRuins/jungle_pirate.dmm
@@ -1,4 +1,11 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/structure/closet/crate/secure/weapon,
+/obj/item/gun/ballistic/shotgun/doublebarrel,
+/obj/item/knife/combat/survival,
+/obj/item/knife/combat/survival,
+/turf/open/floor/wood,
+/area/ruin/unpowered)
 "ab" = (
 /obj/structure/closet/crate/zone_loot/plunder,
 /turf/open/floor/carpet/red,
@@ -21,6 +28,25 @@
 /obj/effect/zone_mobs/pirate,
 /turf/open/floor/pod/dark,
 /area/ruin/unpowered)
+"ag" = (
+/obj/structure/table/wood/poker,
+/obj/item/knife/combat/survival,
+/obj/item/spear,
+/turf/open/floor/carpet/red,
+/area/ruin/unpowered)
+"ah" = (
+/obj/structure/table/wood/poker,
+/obj/item/spear,
+/turf/open/floor/carpet/red,
+/area/ruin/unpowered)
+"ai" = (
+/obj/structure/safe,
+/obj/item/gun/energy/laser,
+/obj/item/spear,
+/obj/item/melee/baseball_bat,
+/obj/item/melee/baseball_bat,
+/turf/open/floor/wood,
+/area/ruin/unpowered)
 "ay" = (
 /obj/structure/statue/sandstone/venus{
 	dir = 1
@@ -144,11 +170,6 @@
 /mob/living/basic/trooper/pirate/ranged,
 /turf/open/floor/wood,
 /area/ruin/unpowered)
-"qL" = (
-/obj/structure/table/wood/poker,
-/obj/item/gun/energy/laser,
-/turf/open/floor/carpet/red,
-/area/ruin/unpowered)
 "rc" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood,
@@ -302,13 +323,6 @@
 /obj/structure/fluff/oldturret,
 /turf/open/floor/wood,
 /area/ruin/unpowered)
-"PI" = (
-/obj/structure/closet/crate/secure/weapon,
-/obj/item/gun/energy/laser,
-/obj/item/gun/energy/laser,
-/obj/item/gun/energy/laser,
-/turf/open/floor/wood,
-/area/ruin/unpowered)
 "Qq" = (
 /turf/template_noop,
 /area/template_noop)
@@ -316,14 +330,6 @@
 /obj/effect/decal/cleanable/food/flour,
 /turf/open/floor/wood,
 /area/ruin/unpowered)
-"Sk" = (
-/obj/structure/safe,
-/obj/item/gun/ballistic/shotgun/lethal,
-/obj/item/gun/ballistic/shotgun/lethal,
-/obj/item/gun/ballistic/shotgun/lethal,
-/obj/item/gun/grenadelauncher,
-/turf/open/floor/wood,
-/area/ruin/unpowered)
 "SA" = (
 /obj/structure/railing,
 /turf/open/floor/wood,
@@ -389,12 +395,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/carpet/red,
 /area/ruin/unpowered)
-"Xt" = (
-/obj/structure/table/wood/poker,
-/obj/item/nullrod/claymore/saber/pirate,
-/obj/item/melee/energy/sword/pirate,
-/turf/open/floor/carpet/red,
-/area/ruin/unpowered)
 "XA" = (
 /mob/living/basic/trooper/pirate/melee,
 /obj/effect/decal/cleanable/dirt,
@@ -547,7 +547,7 @@ DV
 Kl
 "}
 (9,1,1) = {"
-PI
+aa
 ej
 tG
 tG
@@ -623,8 +623,8 @@ DV
 kh
 Er
 Xb
-qL
-Xt
+ah
+ag
 ad
 pd
 kh
@@ -659,7 +659,7 @@ kh
 Ew
 sH
 sH
-Sk
+ai
 kh
 kh
 tG
diff --git a/_maps/voidcrew/RandomRuins/JungleRuins/jungle_skeleton.dmm b/_maps/voidcrew/RandomRuins/JungleRuins/jungle_skeleton.dmm
index 1249fa16143..5ba603f5887 100644
--- a/_maps/voidcrew/RandomRuins/JungleRuins/jungle_skeleton.dmm
+++ b/_maps/voidcrew/RandomRuins/JungleRuins/jungle_skeleton.dmm
@@ -5,6 +5,12 @@
 	},
 /turf/open/misc/dirt/jungle,
 /area/ruin/unpowered)
+"b" = (
+/obj/effect/decal/cleanable/blood/tracks,
+/obj/item/knife/combat/survival,
+/obj/item/storage/box/holy/follower,
+/turf/open/misc/dirt/jungle,
+/area/ruin/unpowered)
 "d" = (
 /obj/effect/mob_spawn/ghost_role/human/skeleton/jungle,
 /turf/open/misc/dirt/jungle,
@@ -59,12 +65,6 @@
 /obj/structure/fluff/drake_statue,
 /turf/open/misc/dirt/jungle/dark,
 /area/ruin/unpowered)
-"t" = (
-/obj/effect/decal/cleanable/blood/tracks,
-/obj/item/nullrod/claymore/darkblade,
-/obj/item/storage/box/holy/follower,
-/turf/open/misc/dirt/jungle,
-/area/ruin/unpowered)
 "v" = (
 /obj/item/stack/sheet/bone,
 /turf/open/misc/dirt/jungle/dark,
@@ -223,7 +223,7 @@ o
 Y
 k
 T
-t
+b
 E
 h
 M
diff --git a/_maps/voidcrew/RandomRuins/JungleRuins/jungle_surface_coffinpirate.dmm b/_maps/voidcrew/RandomRuins/JungleRuins/jungle_surface_coffinpirate.dmm
index ae2b182c675..7e150e1898e 100644
--- a/_maps/voidcrew/RandomRuins/JungleRuins/jungle_surface_coffinpirate.dmm
+++ b/_maps/voidcrew/RandomRuins/JungleRuins/jungle_surface_coffinpirate.dmm
@@ -25,6 +25,18 @@
 "h" = (
 /turf/open/misc/grass/jungle,
 /area/overmap_encounter/planet_ruin)
+"i" = (
+/obj/structure/table/wood,
+/obj/item/spear{
+	pixel_x = 2;
+	pixel_y = 3
+	},
+/obj/item/flashlight/lamp/bananalamp{
+	pixel_x = 3;
+	pixel_y = 9
+	},
+/turf/open/floor/wood,
+/area/ruin/unpowered)
 "j" = (
 /obj/structure/table/wood,
 /obj/item/storage/toolbox/mechanical{
@@ -119,18 +131,6 @@
 	},
 /turf/open/floor/wood,
 /area/ruin/unpowered)
-"I" = (
-/obj/structure/table/wood,
-/obj/item/melee/energy/sword/pirate{
-	pixel_x = 2;
-	pixel_y = 3
-	},
-/obj/item/flashlight/lamp/bananalamp{
-	pixel_x = 3;
-	pixel_y = 9
-	},
-/turf/open/floor/wood,
-/area/ruin/unpowered)
 "J" = (
 /obj/structure/closet/crate/coffin{
 	desc = "It's a burial receptacle for some fruit.";
@@ -251,7 +251,7 @@ E
 l
 l
 U
-I
+i
 l
 l
 M
diff --git a/_maps/voidcrew/RandomRuins/JungleRuins/jungle_surface_loggingcamp.dmm b/_maps/voidcrew/RandomRuins/JungleRuins/jungle_surface_loggingcamp.dmm
index 4054a52f2ec..77d08c25aa1 100644
--- a/_maps/voidcrew/RandomRuins/JungleRuins/jungle_surface_loggingcamp.dmm
+++ b/_maps/voidcrew/RandomRuins/JungleRuins/jungle_surface_loggingcamp.dmm
@@ -1,4 +1,22 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/item/hatchet,
+/turf/open/floor/carpet/royalblack,
+/area/ruin/powered)
+"ab" = (
+/obj/item/hatchet,
+/obj/machinery/light/dim,
+/obj/item/clothing/suit/space/syndicate/black{
+	name = "Lumberjack Powersuit"
+	},
+/obj/structure/safe/floor,
+/obj/item/grenade/frag,
+/obj/item/grenade/frag,
+/turf/open/floor/plating,
+/area/ruin/powered)
 "aq" = (
 /obj/effect/decal/cleanable/blood,
 /obj/effect/mob_spawn/corpse/human/cargo_tech,
@@ -78,20 +96,6 @@
 	},
 /turf/open/floor/plating,
 /area/ruin/unpowered)
-"iS" = (
-/obj/machinery/light/dim,
-/obj/item/chainsaw/doomslayer{
-	force_on = 35;
-	name = "THE GREAT TREEFELLER"
-	},
-/obj/item/clothing/suit/space/syndicate/black{
-	name = "Lumberjack Powersuit"
-	},
-/obj/structure/safe/floor,
-/obj/item/grenade/frag,
-/obj/item/grenade/frag,
-/turf/open/floor/plating,
-/area/ruin/powered)
 "jz" = (
 /obj/structure/flora/rock/jungle,
 /turf/open/misc/grass/jungle,
@@ -620,13 +624,6 @@
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/plating,
 /area/ruin/powered)
-"VR" = (
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/item/fireaxe,
-/turf/open/floor/carpet/royalblack,
-/area/ruin/powered)
 "VT" = (
 /obj/effect/decal/cleanable/blood/gibs/limb,
 /turf/open/floor/carpet/royalblack,
@@ -663,7 +660,6 @@
 /obj/structure/rack,
 /turf/open/floor/plating,
 /area/ruin/powered)
-
 "za" = (
 /obj/effect/decal/cleanable/blood/gibs,
 /obj/structure/chair/comfy/shuttle{
@@ -690,6 +686,7 @@
 /obj/effect/zone_mobs/wildlife,
 /turf/open/floor/plating,
 /area/ruin/powered)
+
 (1,1,1) = {"
 Cc
 Cc
@@ -983,7 +980,7 @@ gd
 UJ
 UJ
 Pb
-VR
+aa
 zu
 AR
 SJ
@@ -1077,7 +1074,7 @@ Yo
 AR
 wP
 Nr
-iS
+ab
 wP
 Ds
 Ta
diff --git a/_maps/voidcrew/RandomRuins/JungleRuins/jungle_syndicate.dmm b/_maps/voidcrew/RandomRuins/JungleRuins/jungle_syndicate.dmm
index e9701dd3932..22c2ce8c137 100644
--- a/_maps/voidcrew/RandomRuins/JungleRuins/jungle_syndicate.dmm
+++ b/_maps/voidcrew/RandomRuins/JungleRuins/jungle_syndicate.dmm
@@ -11,10 +11,22 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/ruin/powered)
+"d" = (
+/obj/structure/table,
+/obj/item/knife/combat/survival,
+/turf/open/floor/plating,
+/area/ruin/powered)
 "e" = (
 /obj/structure/sign/poster/contraband/revolver,
 /turf/closed/wall,
 /area/ruin/powered)
+"f" = (
+/obj/structure/rack,
+/obj/item/storage/toolbox/syndicate,
+/obj/item/stack/sheet/mineral/plasma,
+/obj/item/melee/baseball_bat,
+/turf/open/floor/plating,
+/area/ruin/powered)
 "g" = (
 /obj/structure/punji_sticks,
 /obj/structure/flora/grass/jungle,
@@ -27,18 +39,6 @@
 /obj/effect/decal/remains/human,
 /turf/open/misc/dirt/jungle,
 /area/ruin/unpowered)
-"i" = (
-/obj/structure/table,
-/obj/item/knife/combat,
-/turf/open/floor/plating,
-/area/ruin/powered)
-"j" = (
-/obj/structure/rack,
-/obj/item/storage/toolbox/syndicate,
-/obj/item/stack/sheet/mineral/plasma,
-/obj/item/gun/ballistic/automatic/pistol,
-/turf/open/floor/plating,
-/area/ruin/powered)
 "k" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable,
@@ -223,7 +223,7 @@ I
 c
 k
 F
-i
+d
 M
 b
 a
@@ -231,7 +231,7 @@ a
 (4,1,1) = {"
 W
 b
-j
+f
 l
 V
 p
diff --git a/_maps/voidcrew/RandomRuins/JungleRuins/jungle_witch.dmm b/_maps/voidcrew/RandomRuins/JungleRuins/jungle_witch.dmm
index 482d8bcbcb0..02f4d84ffb1 100644
--- a/_maps/voidcrew/RandomRuins/JungleRuins/jungle_witch.dmm
+++ b/_maps/voidcrew/RandomRuins/JungleRuins/jungle_witch.dmm
@@ -23,6 +23,14 @@
 /obj/item/book/codex_gigas,
 /turf/open/floor/wood,
 /area/ruin/unpowered)
+"h" = (
+/obj/item/clothing/suit/chaplainsuit/armor/witchhunter,
+/obj/item/clothing/head/helmet/chaplain/witchunter_hat,
+/obj/item/knife/combat/survival,
+/obj/item/bodypart/head,
+/obj/effect/decal/cleanable/blood/gibs/bubblegum,
+/turf/open/water/jungle,
+/area/ruin/unpowered)
 "l" = (
 /obj/structure/table/wood,
 /obj/item/slimepotion/lovepotion,
@@ -100,14 +108,6 @@
 /obj/structure/flora/junglebush,
 /turf/open/water/jungle,
 /area/ruin/unpowered)
-"M" = (
-/obj/item/clothing/suit/chaplainsuit/armor/witchhunter,
-/obj/item/clothing/head/helmet/chaplain/witchunter_hat,
-/obj/item/claymore/weak,
-/obj/item/bodypart/head,
-/obj/effect/decal/cleanable/blood/gibs/bubblegum,
-/turf/open/water/jungle,
-/area/ruin/unpowered)
 "N" = (
 /obj/structure/barricade/wooden/crude,
 /obj/structure/curtain/bounty,
@@ -262,7 +262,7 @@ S
 A
 f
 f
-M
+h
 o
 a
 f
diff --git a/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_battle_site.dmm b/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_battle_site.dmm
index 28ba666986d..e03b5fde8c2 100644
--- a/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_battle_site.dmm
+++ b/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_battle_site.dmm
@@ -2,6 +2,11 @@
 "a" = (
 /turf/closed/mineral/strong/wasteland,
 /area/lavaland/surface/outdoors)
+"e" = (
+/obj/effect/mob_spawn/corpse/human/skeleton,
+/obj/item/knife/combat/survival,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/lavaland/surface/outdoors)
 "f" = (
 /obj/effect/mob_spawn/corpse/human/skeleton,
 /obj/item/clothing/head/costume/crown{
@@ -16,11 +21,6 @@
 /obj/structure/water_source/puddle,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)
-"h" = (
-/obj/effect/mob_spawn/corpse/human/skeleton,
-/obj/item/shield/buckler,
-/turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
 "j" = (
 /turf/template_noop,
 /area/template_noop)
@@ -372,7 +372,7 @@ j
 j
 j
 q
-h
+e
 G
 d
 G
diff --git a/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
index a4c3ce18357..23cc9e4a938 100644
--- a/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
+++ b/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm
@@ -7,6 +7,11 @@
 /obj/effect/mapping_helpers/no_lava,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/ruin/powered/clownplanet)
+"af" = (
+/obj/structure/table/glass,
+/obj/item/melee/baseball_bat,
+/turf/open/floor/carpet,
+/area/ruin/powered/clownplanet)
 "aj" = (
 /obj/structure/disposalpipe/segment{
 	dir = 6
@@ -325,11 +330,6 @@
 /obj/item/bikehorn/airhorn,
 /turf/open/floor/carpet,
 /area/ruin/powered/clownplanet)
-"bV" = (
-/obj/structure/table/glass,
-/obj/item/gun/magic/staff/honk,
-/turf/open/floor/carpet,
-/area/ruin/powered/clownplanet)
 "bW" = (
 /obj/item/bikehorn,
 /turf/open/indestructible/honk,
@@ -1301,7 +1301,7 @@ th
 cc
 bM
 bR
-bV
+af
 bM
 cc
 bB
diff --git a/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm b/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
index 3b17bd098db..c49b2edbec6 100644
--- a/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
+++ b/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
@@ -200,6 +200,12 @@
 /obj/structure/flora/tree/pine/xmas,
 /turf/open/misc/asteroid/snow/atmosphere,
 /area/ruin/powered/snow_biodome)
+"aU" = (
+/obj/item/knife/combat/survival,
+/obj/structure/closet,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/pod/dark,
+/area/ruin/powered/snow_biodome)
 "bl" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
@@ -396,12 +402,6 @@
 /obj/machinery/microwave,
 /turf/open/floor/pod/dark,
 /area/ruin/powered/snow_biodome)
-"KS" = (
-/obj/item/chainsaw,
-/obj/structure/closet,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/pod/dark,
-/area/ruin/powered/snow_biodome)
 "Mp" = (
 /obj/item/clothing/mask/balaclava,
 /turf/open/floor/pod/dark,
@@ -1391,7 +1391,7 @@ eb
 gz
 Oj
 JZ
-KS
+aU
 Ef
 Wg
 Wg
diff --git a/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm b/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm
index 80908cf0881..98db01097de 100644
--- a/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm
+++ b/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm
@@ -64,11 +64,6 @@
 /obj/effect/turf_decal/box/white,
 /turf/open/floor/mineral/titanium/purple,
 /area/ruin/powered/graveyard_shuttle)
-"bA" = (
-/obj/machinery/suit_storage_unit/mining/eva,
-/obj/effect/turf_decal/box/white,
-/turf/open/floor/mineral/titanium/purple,
-/area/ruin/powered/graveyard_shuttle)
 "bE" = (
 /obj/machinery/power/shuttle_engine/heater,
 /obj/structure/window/spawner/directional/north,
@@ -278,6 +273,13 @@
 	icon_state = "wasteland_dug"
 	},
 /area/ruin/unpowered/elephant_graveyard)
+"tC" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/breath
+	},
+/obj/effect/turf_decal/box/white,
+/turf/open/floor/mineral/titanium/purple,
+/area/ruin/powered/graveyard_shuttle)
 "uj" = (
 /obj/structure/bed,
 /obj/item/flashlight/lantern,
@@ -1619,7 +1621,7 @@ aW
 cm
 bq
 bS
-bA
+tC
 aH
 aH
 jx
diff --git a/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_surface_greed.dmm b/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_surface_greed.dmm
index ac6b73a2479..7dbbdd9267a 100644
--- a/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_surface_greed.dmm
+++ b/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_surface_greed.dmm
@@ -8,11 +8,6 @@
 "c" = (
 /turf/open/lava/smooth/lava_land_surface,
 /area/lavaland/surface/outdoors)
-"e" = (
-/obj/structure/table/wood/poker,
-/obj/item/gun/ballistic/revolver/russian/soul,
-/turf/open/floor/carpet,
-/area/ruin/powered/greed)
 "f" = (
 /obj/structure/cursed_slot_machine,
 /turf/open/floor/carpet,
@@ -116,6 +111,11 @@
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/engine/cult,
 /area/ruin/powered/greed)
+"y" = (
+/obj/structure/table/wood/poker,
+/obj/item/melee/baseball_bat,
+/turf/open/floor/carpet,
+/area/ruin/powered/greed)
 "J" = (
 /obj/machinery/door/airlock/gold,
 /obj/structure/fans/tiny/invisible,
@@ -308,7 +308,7 @@ b
 a
 c
 W
-e
+y
 h
 t
 m
diff --git a/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
index 3505f0c3a99..2b20ca8a72c 100644
--- a/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+++ b/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
@@ -9,9 +9,58 @@
 /obj/effect/zone_mobs/syndicate/boss,
 /turf/open/floor/wood,
 /area/ruin/syndicate_lava_base/bar)
+"ad" = (
+/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate{
+	dir = 4;
+	outfit_override = list("r_pocket" = null, "r_hand" = null)
+	},
+/obj/machinery/airalarm/directional/north,
+/obj/item/bedsheet/syndie{
+	dir = 4
+	},
+/obj/structure/bed{
+	dir = 4
+	},
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/turf/open/floor/carpet/red,
+/area/ruin/syndicate_lava_base/dormitories)
 "ae" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ruin/syndicate_lava_base/testlab)
+"af" = (
+/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate{
+	dir = 4;
+	outfit_override = list("r_pocket" = null, "r_hand" = null)
+	},
+/obj/item/bedsheet/syndie{
+	dir = 4
+	},
+/obj/structure/bed{
+	dir = 4
+	},
+/turf/open/floor/carpet/red,
+/area/ruin/syndicate_lava_base/dormitories)
+"ag" = (
+/obj/structure/table,
+/obj/item/storage/box/syringes,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/melee/baseball_bat,
+/turf/open/floor/iron/white/side{
+	dir = 8
+	},
+/area/ruin/syndicate_lava_base/medbay)
+"ah" = (
+/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate{
+	dir = 8;
+	outfit_override = list("r_pocket" = null, "r_hand" = null)
+	},
+/obj/machinery/airalarm/directional/north,
+/obj/item/bedsheet/syndie,
+/obj/structure/bed,
+/obj/effect/mapping_helpers/airalarm/syndicate_access,
+/turf/open/floor/carpet/red,
+/area/ruin/syndicate_lava_base/dormitories)
 "ai" = (
 /obj/structure/table/wood,
 /obj/machinery/chem_dispenser/drinks/fullupgrade{
@@ -37,6 +86,15 @@
 /obj/machinery/vending/medical/syndicate,
 /turf/open/floor/iron/white,
 /area/ruin/syndicate_lava_base/medbay)
+"am" = (
+/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms{
+	dir = 8;
+	outfit_override = list("r_pocket" = null, "r_hand" = /obj/item/spear)
+	},
+/obj/item/bedsheet/syndie,
+/obj/structure/bed,
+/turf/open/floor/carpet/red,
+/area/ruin/syndicate_lava_base/dormitories)
 "ap" = (
 /obj/machinery/light/small/directional/east,
 /obj/machinery/smartfridge/organ,
@@ -85,26 +143,6 @@
 	},
 /turf/open/floor/iron,
 /area/ruin/syndicate_lava_base/engineering)
-"aU" = (
-/obj/structure/table,
-/obj/item/storage/box/syringes,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/gun/syringe/syndicate,
-/turf/open/floor/iron/white/side{
-	dir = 8
-	},
-/area/ruin/syndicate_lava_base/medbay)
-"aV" = (
-/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate{
-	dir = 8
-	},
-/obj/machinery/airalarm/directional/north,
-/obj/item/bedsheet/syndie,
-/obj/structure/bed,
-/obj/effect/mapping_helpers/airalarm/syndicate_access,
-/turf/open/floor/carpet/red,
-/area/ruin/syndicate_lava_base/dormitories)
 "aW" = (
 /obj/machinery/button/door{
 	id = "lavalandsyndi_arrivals";
@@ -132,20 +170,6 @@
 /obj/effect/turf_decal/sand/plating/volcanic,
 /turf/open/floor/plating/lavaland_atmos,
 /area/lavaland/surface/outdoors)
-"bB" = (
-/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate{
-	dir = 4
-	},
-/obj/machinery/airalarm/directional/north,
-/obj/item/bedsheet/syndie{
-	dir = 4
-	},
-/obj/structure/bed{
-	dir = 4
-	},
-/obj/effect/mapping_helpers/airalarm/syndicate_access,
-/turf/open/floor/carpet/red,
-/area/ruin/syndicate_lava_base/dormitories)
 "bC" = (
 /obj/machinery/light/small/directional/north,
 /obj/structure/table,
@@ -2336,6 +2360,16 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/dark,
 /area/ruin/syndicate_lava_base/bar)
+"vd" = (
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/gas/syndicate;
+	storage_type = /obj/item/tank/jetpack/oxygen/harness
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/ruin/syndicate_lava_base/engineering)
 "vo" = (
 /obj/machinery/light/small/directional/east,
 /obj/machinery/duct,
@@ -2896,14 +2930,6 @@
 /obj/effect/mapping_helpers/airalarm/syndicate_access,
 /turf/open/floor/wood,
 /area/ruin/syndicate_lava_base/dormitories)
-"CC" = (
-/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms{
-	dir = 8
-	},
-/obj/item/bedsheet/syndie,
-/obj/structure/bed,
-/turf/open/floor/carpet/red,
-/area/ruin/syndicate_lava_base/dormitories)
 "CE" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/medical/glass{
@@ -3714,13 +3740,6 @@
 /obj/structure/tank_dispenser/oxygen,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/syndicate_lava_base/arrivals)
-"OZ" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/suit_storage_unit/syndicate/lavaland,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/ruin/syndicate_lava_base/engineering)
 "Pn" = (
 /obj/structure/extinguisher_cabinet/directional/east,
 /obj/structure/cable,
@@ -4306,18 +4325,6 @@
 /obj/machinery/atmospherics/components/unary/thermomachine/freezer,
 /turf/open/floor/iron,
 /area/ruin/syndicate_lava_base/engineering)
-"Xi" = (
-/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate{
-	dir = 4
-	},
-/obj/item/bedsheet/syndie{
-	dir = 4
-	},
-/obj/structure/bed{
-	dir = 4
-	},
-/turf/open/floor/carpet/red,
-/area/ruin/syndicate_lava_base/dormitories)
 "Xv" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -5728,7 +5735,7 @@ hz
 ce
 lj
 hz
-bB
+ad
 Zu
 jy
 jy
@@ -5773,7 +5780,7 @@ IX
 he
 hz
 UX
-Xi
+af
 hz
 wV
 tP
@@ -6028,14 +6035,14 @@ BX
 OF
 Jr
 hz
-aV
+ah
 Zu
 hz
 hJ
 zm
 kQ
 lm
-aU
+ag
 ey
 mA
 bQ
@@ -6073,7 +6080,7 @@ ze
 he
 hz
 Jj
-CC
+am
 hz
 KT
 TE
@@ -6378,7 +6385,7 @@ vV
 Gm
 yv
 XV
-OZ
+vd
 yq
 CV
 ju
diff --git a/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm b/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm
index c00ab0bc1f1..6a002691e55 100644
--- a/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm
+++ b/_maps/voidcrew/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm
@@ -32,6 +32,13 @@
 /obj/structure/alien/weeds,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
+"h" = (
+/obj/structure/alien/weeds,
+/obj/structure/bed/nest,
+/obj/effect/decal/cleanable/blood/gibs,
+/obj/item/melee/baseball_bat,
+/turf/open/misc/asteroid/basalt/lava_land_surface,
+/area/ruin/unpowered/xenonest)
 "i" = (
 /obj/structure/alien/weeds,
 /obj/structure/bed/nest,
@@ -51,13 +58,6 @@
 /obj/structure/alien/weeds/node,
 /turf/open/misc/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/xenonest)
-"o" = (
-/obj/structure/alien/weeds,
-/obj/structure/bed/nest,
-/obj/effect/decal/cleanable/blood/gibs,
-/obj/item/gun/ballistic/automatic/pistol,
-/turf/open/misc/asteroid/basalt/lava_land_surface,
-/area/ruin/unpowered/xenonest)
 "r" = (
 /obj/structure/alien/weeds,
 /obj/structure/alien/resin/wall,
@@ -447,7 +447,7 @@ a
 a
 G
 b
-o
+h
 v
 g
 b
diff --git a/_maps/voidcrew/RandomRuins/ReebeRuins/reebe_arena.dmm b/_maps/voidcrew/RandomRuins/ReebeRuins/reebe_arena.dmm
index 1deeff5cb8d..ed8996a3efa 100644
--- a/_maps/voidcrew/RandomRuins/ReebeRuins/reebe_arena.dmm
+++ b/_maps/voidcrew/RandomRuins/ReebeRuins/reebe_arena.dmm
@@ -11,6 +11,10 @@
 /obj/structure/closet/crate/zone_loot/armory,
 /turf/open/floor/bronze/reebe,
 /area/ruin/reebe)
+"ad" = (
+/obj/item/melee/baseball_bat,
+/turf/open/floor/bronze/reebe,
+/area/ruin/reebe)
 "ai" = (
 /obj/structure/lattice/catwalk/clockwork,
 /turf/template_noop,
@@ -126,10 +130,6 @@
 /obj/effect/decal/remains/human,
 /turf/open/floor/bronze/reebe,
 /area/ruin/reebe)
-"Em" = (
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
-/turf/open/floor/bronze/reebe,
-/area/ruin/reebe)
 "Ep" = (
 /obj/structure/table/bronze,
 /obj/item/toy/clockwork_watch,
@@ -600,7 +600,7 @@ vP
 pm
 pm
 XX
-Em
+ad
 pm
 pm
 pm
@@ -1096,7 +1096,7 @@ IC
 De
 De
 pm
-Em
+ad
 pm
 De
 De
@@ -2731,7 +2731,7 @@ pm
 aa
 AT
 pm
-Em
+ad
 XX
 pm
 pm
@@ -3896,7 +3896,7 @@ Ij
 pm
 pm
 pm
-Em
+ad
 pm
 pm
 Cj
@@ -4879,7 +4879,7 @@ pm
 pm
 pm
 DY
-Em
+ad
 pm
 pm
 FK
diff --git a/_maps/voidcrew/RandomRuins/ReebeRuins/reebe_floating_island.dmm b/_maps/voidcrew/RandomRuins/ReebeRuins/reebe_floating_island.dmm
index 8f72c14bbc7..9f318a1fcf6 100644
--- a/_maps/voidcrew/RandomRuins/ReebeRuins/reebe_floating_island.dmm
+++ b/_maps/voidcrew/RandomRuins/ReebeRuins/reebe_floating_island.dmm
@@ -14,6 +14,14 @@
 /obj/structure/closet/crate/zone_loot/occult,
 /turf/open/floor/grass/fairy,
 /area/ruin/reebe)
+"e" = (
+/obj/item/melee/baseball_bat,
+/obj/item/clothing/suit/costume/bronze,
+/obj/item/clothing/head/costume/bronze,
+/obj/item/clothing/shoes/bronze,
+/mob/living/basic/mining/goliath/ancient,
+/turf/open/floor/bronze,
+/area/ruin/reebe)
 "f" = (
 /turf/closed/mineral/random/reebe,
 /area/ruin/reebe)
@@ -27,14 +35,6 @@
 "I" = (
 /turf/open/floor/grass/fairy/reebe,
 /area/ruin/reebe)
-"O" = (
-/obj/item/gun/ballistic/bow,
-/obj/item/clothing/suit/costume/bronze,
-/obj/item/clothing/head/costume/bronze,
-/obj/item/clothing/shoes/bronze,
-/mob/living/basic/mining/goliath/ancient,
-/turf/open/floor/bronze,
-/area/ruin/reebe)
 "R" = (
 /mob/living/basic/mining/goliath/ancient,
 /turf/open/floor/grass/fairy,
@@ -258,7 +258,7 @@ f
 f
 f
 Z
-O
+e
 Z
 f
 f
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/abandonedzoo.dmm
index 84c73a422c7..cc7e8b68615 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/abandonedzoo.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/abandonedzoo.dmm
@@ -7,6 +7,12 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/abandonedzoo)
+"af" = (
+/obj/structure/rack,
+/obj/item/crowbar,
+/obj/item/knife/combat/survival,
+/turf/open/floor/iron/dark/side,
+/area/ruin/space/has_grav/abandonedzoo)
 "ag" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
@@ -14,6 +20,11 @@
 "ah" = (
 /turf/closed/mineral/random,
 /area/ruin/space/has_grav/abandonedzoo)
+"ai" = (
+/obj/structure/table/reinforced,
+/obj/item/melee/baseball_bat,
+/turf/open/floor/iron/dark/side,
+/area/ruin/space/has_grav/abandonedzoo)
 "al" = (
 /obj/structure/flora/bush/generic/style_random,
 /turf/open/floor/grass,
@@ -98,13 +109,6 @@
 /obj/item/gun/syringe,
 /turf/open/floor/iron/dark/side,
 /area/ruin/space/has_grav/abandonedzoo)
-"aY" = (
-/obj/structure/table/reinforced,
-/obj/item/gun/energy/temperature{
-	pin = /obj/item/firing_pin
-	},
-/turf/open/floor/iron/dark/side,
-/area/ruin/space/has_grav/abandonedzoo)
 "bf" = (
 /obj/structure/cable,
 /obj/machinery/power/terminal{
@@ -496,12 +500,6 @@
 /obj/effect/turf_decal/tile/green/fourcorners,
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/abandonedzoo)
-"TQ" = (
-/obj/structure/rack,
-/obj/item/crowbar,
-/obj/item/shield/riot,
-/turf/open/floor/iron/dark/side,
-/area/ruin/space/has_grav/abandonedzoo)
 "Ua" = (
 /turf/open/misc/asteroid,
 /area/ruin/space/has_grav/abandonedzoo)
@@ -684,7 +682,7 @@ at
 at
 at
 at
-TQ
+af
 oS
 Ni
 Bh
@@ -810,7 +808,7 @@ ac
 ac
 qX
 at
-aY
+ai
 oS
 Ni
 bk
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/atmosasteroidruin.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/atmosasteroidruin.dmm
index 9c2b4c35bc8..a199b42dee5 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/atmosasteroidruin.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/atmosasteroidruin.dmm
@@ -282,16 +282,6 @@
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/engine/air,
 /area/ruin/space/has_grav/atmosasteroid)
-"rg" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/obj/effect/turf_decal/tile/yellow/anticorner{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
-	},
-/turf/open/floor/iron/co2_pressurized,
-/area/ruin/space/has_grav/atmosasteroid)
 "rp" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/siphon{
 	dir = 8
@@ -675,6 +665,18 @@
 /obj/machinery/light/small/broken/directional/east,
 /turf/open/floor/engine/co2/equalized_with_regular_air,
 /area/ruin/space/has_grav/atmosasteroid)
+"SS" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/breath
+	},
+/obj/effect/turf_decal/tile/yellow/anticorner{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
+/turf/open/floor/iron/co2_pressurized,
+/area/ruin/space/has_grav/atmosasteroid)
 "TP" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/siphon{
 	dir = 8
@@ -856,7 +858,7 @@ pU
 hN
 fm
 gG
-rg
+SS
 gU
 kJ
 Uz
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/bigderelict1.dmm
index 65e0788a702..66f3ef6fae1 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/bigderelict1.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/bigderelict1.dmm
@@ -128,6 +128,22 @@
 	},
 /turf/open/floor/mineral/titanium/yellow,
 /area/ruin/space/has_grav/derelictoutpost/dockedship)
+"aE" = (
+/obj/item/melee/baseball_bat,
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/derelictoutpost/powerstorage)
+"aF" = (
+/obj/item/melee/baseball_bat,
+/obj/structure/alien/weeds/creature,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/derelictoutpost/cargobay)
+"aG" = (
+/obj/structure/alien/weeds/creature,
+/obj/item/melee/baseball_bat,
+/obj/item/ammo_box/magazine/m45,
+/turf/open/misc/asteroid,
+/area/ruin/space/has_grav/derelictoutpost)
 "aH" = (
 /obj/structure/closet/crate/engineering,
 /obj/item/storage/toolbox/mechanical,
@@ -401,12 +417,6 @@
 /obj/machinery/light/directional/west,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/derelictoutpost/powerstorage)
-"bI" = (
-/obj/item/gun/ballistic/automatic/pistol/m1911{
-	spawnwithmagazine = 0
-	},
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/derelictoutpost/powerstorage)
 "bJ" = (
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/derelictoutpost/powerstorage)
@@ -823,14 +833,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/derelictoutpost)
-"dJ" = (
-/obj/item/gun/ballistic/automatic/pistol/m1911{
-	spawnwithmagazine = 0
-	},
-/obj/structure/alien/weeds/creature,
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/derelictoutpost/cargobay)
 "dL" = (
 /turf/closed/wall,
 /area/ruin/space/has_grav/derelictoutpost/cargostorage)
@@ -883,15 +885,6 @@
 	},
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/derelictoutpost/cargobay)
-"dT" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/derelictoutpost/cargostorage)
-"dU" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/derelictoutpost/cargostorage)
 "dV" = (
 /obj/structure/closet/crate,
 /obj/item/stack/sheet/glass/fifty,
@@ -1233,14 +1226,6 @@
 /obj/structure/alien/weeds/creature,
 /turf/open/misc/asteroid,
 /area/ruin/space/has_grav/derelictoutpost)
-"wh" = (
-/obj/structure/alien/weeds/creature,
-/obj/item/gun/ballistic/automatic/pistol/m1911{
-	spawnwithmagazine = 0
-	},
-/obj/item/ammo_box/magazine/m45,
-/turf/open/misc/asteroid,
-/area/ruin/space/has_grav/derelictoutpost)
 "xT" = (
 /obj/structure/alien/weeds/creature,
 /obj/structure/glowshroom/single,
@@ -1285,6 +1270,12 @@
 /obj/structure/alien/weeds/creature,
 /turf/closed/wall/mineral/iron,
 /area/ruin/space/has_grav/derelictoutpost/dockedship)
+"BB" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/breath
+	},
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/derelictoutpost/cargostorage)
 "BI" = (
 /obj/structure/closet/crate/medical,
 /obj/item/storage/medkit/brute,
@@ -1292,6 +1283,13 @@
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/derelictoutpost/cargostorage)
+"BZ" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/breath
+	},
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/derelictoutpost/cargostorage)
 "Cr" = (
 /obj/structure/alien/weeds/creature,
 /obj/structure/alien/weeds/creature,
@@ -1633,7 +1631,7 @@ aA
 aA
 bb
 br
-bI
+aE
 bY
 co
 aS
@@ -1678,7 +1676,7 @@ ak
 ak
 cT
 bx
-dJ
+aF
 bx
 bx
 ak
@@ -1787,7 +1785,7 @@ ab
 ZN
 dm
 dL
-dT
+BB
 dW
 dW
 ex
@@ -1823,7 +1821,7 @@ ab
 Hc
 Cr
 dL
-dU
+BZ
 dW
 dW
 ex
@@ -2863,7 +2861,7 @@ Hw
 vr
 au
 oU
-wh
+aG
 vr
 xT
 vr
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/caravanambush.dmm
index a2e92af2254..0189b72e62b 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/caravanambush.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/caravanambush.dmm
@@ -14,16 +14,19 @@
 /obj/item/wallframe/camera,
 /turf/template_noop,
 /area/template_noop)
+"ae" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/secure/weapon,
+/obj/item/melee/baseball_bat,
+/turf/open/floor/iron/dark/airless,
+/area/shuttle/ruin/caravan/freighter2)
 "af" = (
 /obj/structure/lattice/catwalk,
 /turf/template_noop,
 /area/template_noop)
-"ag" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/closet/crate/secure/weapon,
-/obj/item/gun/energy/e_gun/mini,
-/turf/template_noop,
-/area/template_noop)
 "ah" = (
 /obj/structure/lattice/catwalk,
 /mob/living/basic/trooper/pirate/ranged/space{
@@ -31,6 +34,12 @@
 	},
 /turf/template_noop,
 /area/template_noop)
+"ai" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/closet/crate/secure/weapon,
+/obj/item/melee/baseball_bat,
+/turf/template_noop,
+/area/template_noop)
 "aj" = (
 /obj/docking_port/stationary{
 	dir = 2;
@@ -43,10 +52,42 @@
 	},
 /turf/template_noop,
 /area/template_noop)
+"ak" = (
+/obj/effect/turf_decal/box/white/corners,
+/obj/structure/closet/crate/secure/weapon,
+/obj/item/knife/combat/survival,
+/turf/open/floor/iron/dark/airless,
+/area/shuttle/ruin/caravan/freighter2)
+"al" = (
+/obj/effect/decal/cleanable/dirt,
+/mob/living/basic/trooper/syndicate/ranged/space,
+/turf/open/floor/iron/airless,
+/area/shuttle/ruin/caravan/freighter3)
+"am" = (
+/obj/effect/turf_decal/bot_white,
+/obj/structure/closet/crate/secure/weapon,
+/obj/item/melee/baseball_bat,
+/turf/open/floor/iron/dark/airless,
+/area/shuttle/ruin/caravan/freighter3)
+"an" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/mob/living/basic/trooper/syndicate/ranged/space,
+/turf/open/floor/iron/airless,
+/area/shuttle/ruin/caravan/freighter3)
 "ao" = (
 /obj/item/stack/sheet/mineral/titanium,
 /turf/template_noop,
 /area/template_noop)
+"ap" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 4
+	},
+/mob/living/basic/trooper/syndicate/ranged/space,
+/turf/open/floor/iron/dark/airless,
+/area/shuttle/ruin/caravan/freighter3)
 "aD" = (
 /obj/item/stack/rods,
 /turf/template_noop,
@@ -209,12 +250,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating/airless,
 /area/shuttle/ruin/caravan/freighter2)
-"fm" = (
-/obj/effect/turf_decal/bot_white,
-/obj/structure/closet/crate/secure/weapon,
-/obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted,
-/turf/open/floor/iron/dark/airless,
-/area/shuttle/ruin/caravan/freighter3)
 "fy" = (
 /obj/effect/turf_decal/bot_white,
 /obj/machinery/light/small/directional/south,
@@ -658,15 +693,6 @@
 /obj/structure/broken_flooring/singular/directional/south,
 /turf/template_noop,
 /area/template_noop)
-"AA" = (
-/obj/effect/turf_decal/box/white/corners{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate/secure/weapon,
-/obj/item/gun/energy/laser/retro,
-/turf/open/floor/iron/dark/airless,
-/area/shuttle/ruin/caravan/freighter2)
 "AP" = (
 /obj/structure/rack,
 /obj/item/weldingtool,
@@ -703,14 +729,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/dark/airless,
 /area/shuttle/ruin/caravan/freighter3)
-"BY" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/mob/living/basic/trooper/syndicate/ranged/smg/space,
-/turf/open/floor/iron/airless,
-/area/shuttle/ruin/caravan/freighter3)
 "Cj" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/ruin/caravan/freighter2)
@@ -913,12 +931,6 @@
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/plating/airless,
 /area/shuttle/ruin/caravan/freighter2)
-"MG" = (
-/obj/effect/turf_decal/box/white/corners,
-/obj/structure/closet/crate/secure/weapon,
-/obj/item/knife/combat,
-/turf/open/floor/iron/dark/airless,
-/area/shuttle/ruin/caravan/freighter2)
 "MI" = (
 /obj/machinery/door/firedoor,
 /obj/effect/decal/cleanable/dirt,
@@ -979,11 +991,6 @@
 	},
 /turf/open/floor/iron/airless,
 /area/shuttle/ruin/caravan/freighter3)
-"PF" = (
-/obj/effect/decal/cleanable/dirt,
-/mob/living/basic/trooper/syndicate/ranged/smg/space,
-/turf/open/floor/iron/airless,
-/area/shuttle/ruin/caravan/freighter3)
 "PY" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/broken_floor,
@@ -1133,13 +1140,6 @@
 	},
 /turf/open/floor/iron/dark/airless,
 /area/shuttle/ruin/caravan/freighter2)
-"YY" = (
-/obj/effect/turf_decal/box/white/corners{
-	dir = 4
-	},
-/mob/living/basic/trooper/syndicate/ranged/shotgun/space/stormtrooper,
-/turf/open/floor/iron/dark/airless,
-/area/shuttle/ruin/caravan/freighter3)
 "Zz" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
 	dir = 4
@@ -3529,7 +3529,7 @@ oa
 uY
 Wb
 mN
-AA
+ae
 Zz
 sx
 cF
@@ -3572,7 +3572,7 @@ aa
 af
 af
 af
-ag
+ai
 ah
 af
 af
@@ -3633,7 +3633,7 @@ GY
 Gu
 kX
 FU
-MG
+ak
 wB
 Bz
 cF
@@ -5240,7 +5240,7 @@ aa
 aa
 Ab
 nt
-PF
+al
 sR
 wC
 Je
@@ -5291,7 +5291,7 @@ aa
 aa
 aa
 Ab
-fm
+am
 Ek
 ZS
 qV
@@ -5345,9 +5345,9 @@ aa
 Ab
 zR
 tO
-YY
+ap
 Hw
-BY
+an
 BU
 vG
 aa
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/clericden.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/clericden.dmm
index 03beb3dc7b6..8a178e39c9b 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/clericden.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/clericden.dmm
@@ -63,11 +63,6 @@
 /obj/item/reagent_containers/cup/glass/bottle/holywater,
 /turf/open/floor/carpet/airless,
 /area/ruin/space)
-"p" = (
-/obj/structure/table/wood/fancy,
-/obj/item/melee/cleric_mace,
-/turf/open/floor/carpet/airless,
-/area/ruin/space)
 "q" = (
 /obj/effect/zone_mobs/cult/boss,
 /obj/effect/decal/cleanable/shreds,
@@ -208,6 +203,11 @@
 /obj/item/paper/fluff/ruins/clericsden/warning,
 /turf/open/misc/asteroid/airless,
 /area/ruin/space)
+"V" = (
+/obj/structure/table/wood/fancy,
+/obj/item/knife/combat/survival,
+/turf/open/floor/carpet/airless,
+/area/ruin/space)
 
 (1,1,1) = {"
 a
@@ -374,7 +374,7 @@ a
 b
 g
 m
-p
+V
 r
 v
 y
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/crashedship.dmm
index b808f812038..23aa7740c2b 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/crashedship.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/crashedship.dmm
@@ -1,4 +1,46 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ab" = (
+/obj/machinery/porta_turret/ruin{
+	dir = 8
+	},
+/obj/effect/mapping_helpers/atom_injector/obj_flag{
+	inject_flags = 1;
+	target_type = /obj/machinery/porta_turret
+	},
+/obj/effect/turf_decal/trimline/brown/filled/warning{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/brown/line,
+/turf/open/floor/plating/airless,
+/area/ruin/space/has_grav/crashedship/aft)
+"ac" = (
+/obj/effect/turf_decal/trimline/brown/filled/warning{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/brown/line,
+/obj/machinery/porta_turret/ruin{
+	dir = 8
+	},
+/obj/effect/mapping_helpers/atom_injector/obj_flag{
+	inject_flags = 1;
+	target_type = /obj/machinery/porta_turret
+	},
+/turf/open/floor/plating/airless,
+/area/ruin/space/has_grav/crashedship/midship)
+"ad" = (
+/obj/effect/turf_decal/trimline/brown/filled/warning,
+/obj/effect/turf_decal/trimline/brown/line{
+	dir = 1
+	},
+/obj/machinery/porta_turret/ruin{
+	dir = 8
+	},
+/obj/effect/mapping_helpers/atom_injector/obj_flag{
+	inject_flags = 1;
+	target_type = /obj/machinery/porta_turret
+	},
+/turf/open/floor/plating/airless,
+/area/ruin/space/has_grav/crashedship/midship)
 "am" = (
 /obj/machinery/power/port_gen/pacman/super,
 /turf/open/floor/plating/airless,
@@ -96,6 +138,15 @@
 	},
 /turf/open/floor/pod/light,
 /area/ruin/space/has_grav/crashedship/aft)
+"et" = (
+/obj/effect/turf_decal/siding/thinplating_new/light{
+	dir = 8
+	},
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/breath
+	},
+/turf/open/floor/engine,
+/area/ruin/space/has_grav/crashedship/midship)
 "eC" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -368,21 +419,6 @@
 	},
 /turf/open/floor/plating/airless,
 /area/ruin/space/has_grav/crashedship/midship)
-"pP" = (
-/obj/machinery/porta_turret{
-	dir = 8;
-	installation = /obj/item/gun/energy/lasercannon
-	},
-/obj/effect/mapping_helpers/atom_injector/obj_flag{
-	inject_flags = 1;
-	target_type = /obj/machinery/porta_turret
-	},
-/obj/effect/turf_decal/trimline/brown/filled/warning{
-	dir = 1
-	},
-/obj/effect/turf_decal/trimline/brown/line,
-/turf/open/floor/plating/airless,
-/area/ruin/space/has_grav/crashedship/aft)
 "pT" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 10
@@ -469,21 +505,6 @@
 /obj/item/kirbyplants,
 /turf/open/floor/wood/tile,
 /area/ruin/space/has_grav/crashedship/fore)
-"tm" = (
-/obj/effect/turf_decal/trimline/brown/filled/warning{
-	dir = 1
-	},
-/obj/effect/turf_decal/trimline/brown/line,
-/obj/machinery/porta_turret{
-	dir = 8;
-	installation = /obj/item/gun/energy/lasercannon
-	},
-/obj/effect/mapping_helpers/atom_injector/obj_flag{
-	inject_flags = 1;
-	target_type = /obj/machinery/porta_turret
-	},
-/turf/open/floor/plating/airless,
-/area/ruin/space/has_grav/crashedship/midship)
 "tn" = (
 /obj/structure/chair{
 	dir = 4
@@ -837,13 +858,6 @@
 /obj/structure/door_assembly/door_assembly_mhatch,
 /turf/open/floor/plating/airless,
 /area/ruin/space/has_grav/crashedship/aft)
-"EO" = (
-/obj/effect/turf_decal/siding/thinplating_new/light{
-	dir = 8
-	},
-/obj/machinery/suit_storage_unit/standard_unit,
-/turf/open/floor/engine,
-/area/ruin/space/has_grav/crashedship/midship)
 "EW" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible/layer2,
@@ -1040,21 +1054,6 @@
 /obj/item/light/tube/broken,
 /turf/template_noop,
 /area/template_noop)
-"Ln" = (
-/obj/effect/turf_decal/trimline/brown/filled/warning,
-/obj/effect/turf_decal/trimline/brown/line{
-	dir = 1
-	},
-/obj/machinery/porta_turret{
-	dir = 8;
-	installation = /obj/item/gun/energy/lasercannon
-	},
-/obj/effect/mapping_helpers/atom_injector/obj_flag{
-	inject_flags = 1;
-	target_type = /obj/machinery/porta_turret
-	},
-/turf/open/floor/plating/airless,
-/area/ruin/space/has_grav/crashedship/midship)
 "Lo" = (
 /obj/machinery/door/airlock/command{
 	emergency = 1;
@@ -1722,7 +1721,7 @@ kc
 kc
 kc
 rm
-pP
+ab
 uF
 Hb
 Hb
@@ -1778,7 +1777,7 @@ kc
 kc
 kc
 rm
-pP
+ab
 uF
 ip
 fQ
@@ -2171,7 +2170,7 @@ kc
 kc
 kc
 rm
-tm
+ac
 fp
 lx
 ck
@@ -2205,7 +2204,7 @@ Jv
 gH
 fp
 uf
-EO
+et
 fp
 xa
 uz
@@ -2214,7 +2213,7 @@ UC
 rb
 rb
 BS
-Ln
+ad
 kc
 kc
 kc
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/dangerous_research.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/dangerous_research.dmm
index b8737a3af21..b452c8e9e05 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/dangerous_research.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/dangerous_research.dmm
@@ -6,6 +6,23 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/white,
 /area/ruin/space/has_grav/dangerous_research)
+"ac" = (
+/obj/effect/decal/cleanable/blood/splatter,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/north,
+/obj/item/toy/plush/snakeplushie{
+	pixel_x = -14;
+	pixel_y = -9
+	},
+/obj/item/knife/combat/survival,
+/turf/open/floor/iron/white,
+/area/ruin/space/has_grav/dangerous_research/lab)
+"ad" = (
+/obj/effect/mapping_helpers/burnt_floor,
+/obj/item/melee/baseball_bat,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/white,
+/area/ruin/space/has_grav/dangerous_research/medical)
 "ae" = (
 /obj/structure/table,
 /obj/machinery/light/small/directional/west,
@@ -300,6 +317,14 @@
 /obj/effect/decal/cleanable/blood/gibs/robot_debris/up,
 /turf/open/floor/iron/white,
 /area/ruin/space/has_grav/dangerous_research/medical)
+"ei" = (
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/effect/turf_decal/tile/purple/diagonal_edge,
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/breath
+	},
+/turf/open/floor/iron/diagonal,
+/area/ruin/space/has_grav/dangerous_research)
 "eq" = (
 /obj/effect/turf_decal/tile/purple/anticorner/contrasted{
 	dir = 4
@@ -1187,15 +1212,6 @@
 /obj/effect/decal/cleanable/blood/bubblegum,
 /turf/open/floor/iron/white,
 /area/ruin/space/has_grav/dangerous_research/medical)
-"pR" = (
-/obj/effect/mapping_helpers/burnt_floor,
-/obj/item/gun/ballistic/revolver/c38{
-	name = "outpost revolver";
-	pin = /obj/item/firing_pin
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/ruin/space/has_grav/dangerous_research/medical)
 "qc" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/airlock/command{
@@ -1488,17 +1504,6 @@
 /obj/item/shard,
 /turf/open/floor/iron/white,
 /area/ruin/space/has_grav/dangerous_research/medical)
-"tq" = (
-/obj/effect/decal/cleanable/blood/splatter,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/north,
-/obj/item/toy/plush/snakeplushie{
-	pixel_x = -14;
-	pixel_y = -9
-	},
-/obj/item/switchblade/extended,
-/turf/open/floor/iron/white,
-/area/ruin/space/has_grav/dangerous_research/lab)
 "ts" = (
 /turf/closed/wall,
 /area/ruin/space/has_grav/dangerous_research/dorms)
@@ -3199,12 +3204,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/dark/diagonal,
 /area/ruin/space/has_grav/dangerous_research/dorms)
-"PL" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/effect/turf_decal/tile/purple/diagonal_edge,
-/obj/machinery/suit_storage_unit/standard_unit,
-/turf/open/floor/iron/diagonal,
-/area/ruin/space/has_grav/dangerous_research)
 "PM" = (
 /obj/item/stack/rods/ten,
 /obj/effect/decal/cleanable/blood/bubblegum,
@@ -4417,7 +4416,7 @@ Qv
 Bg
 Bg
 Tc
-tq
+ac
 La
 Tc
 dw
@@ -4650,7 +4649,7 @@ Hq
 Hq
 RD
 pk
-PL
+ei
 ax
 Cq
 Bq
@@ -5182,7 +5181,7 @@ Bg
 Zv
 Zv
 iw
-pR
+ad
 gN
 Lr
 Xy
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/deepstorage.dmm
index c65a6f3d683..31fbb944ac5 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -39,6 +39,18 @@
 /obj/structure/closet/secure_closet/freezer/meat/open,
 /turf/open/floor/iron/freezer,
 /area/ruin/space/has_grav/deepstorage/kitchen)
+"aj" = (
+/obj/structure/closet/cardboard,
+/obj/item/storage/box/mousetraps,
+/obj/item/storage/box/mousetraps,
+/obj/item/storage/box/drinkingglasses,
+/obj/item/storage/box/zipties,
+/obj/item/knife/combat/survival,
+/obj/effect/turf_decal/delivery,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/deepstorage/storage)
 "ak" = (
 /obj/machinery/conveyor{
 	dir = 4;
@@ -989,11 +1001,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/deepstorage/power)
-"fo" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/deepstorage/power)
 "fp" = (
 /turf/closed/wall/mineral/iron,
 /area/ruin/space/has_grav/deepstorage/power)
@@ -1699,6 +1706,13 @@
 /obj/item/storage/box/drinkingglasses,
 /turf/open/floor/iron/cafeteria,
 /area/ruin/space/has_grav/deepstorage/kitchen)
+"ty" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/breath
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/deepstorage/power)
 "tG" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
@@ -2734,18 +2748,6 @@
 	},
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/deepstorage/dorm)
-"YH" = (
-/obj/structure/closet/cardboard,
-/obj/item/storage/box/mousetraps,
-/obj/item/storage/box/mousetraps,
-/obj/item/storage/box/drinkingglasses,
-/obj/item/storage/box/zipties,
-/obj/item/switchblade,
-/obj/effect/turf_decal/delivery,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/deepstorage/storage)
 "Zv" = (
 /obj/machinery/door/airlock/highsecurity{
 	name = "Secure Storage"
@@ -3620,7 +3622,7 @@ ab
 ab
 ab
 hU
-YH
+aj
 aU
 DI
 DD
@@ -4414,7 +4416,7 @@ pq
 ev
 xY
 fb
-fo
+ty
 fA
 fJ
 gb
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/derelict9.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/derelict9.dmm
index 33b9e525581..64337a821da 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/derelict9.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/derelict9.dmm
@@ -12,6 +12,11 @@
 /obj/effect/spawner/random/maintenance/three,
 /turf/open/floor/plating/airless,
 /area/ruin/space)
+"g" = (
+/obj/item/melee/baseball_bat,
+/obj/effect/decal/cleanable/blood,
+/turf/open/misc/asteroid/airless,
+/area/ruin/space)
 "h" = (
 /obj/structure/closet/crate,
 /obj/item/weldingtool,
@@ -88,11 +93,6 @@
 /obj/machinery/porta_turret/syndicate/pod,
 /turf/closed/wall/r_wall,
 /area/ruin/space)
-"J" = (
-/obj/item/gun/energy/laser/musket,
-/obj/effect/decal/cleanable/blood,
-/turf/open/misc/asteroid/airless,
-/area/ruin/space)
 "K" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/airless,
@@ -359,7 +359,7 @@ a
 a
 a
 a
-J
+g
 a
 a
 a
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/derelict_sulaco.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/derelict_sulaco.dmm
index 9948834a270..424db1f6a27 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/derelict_sulaco.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/derelict_sulaco.dmm
@@ -1,4 +1,12 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/red/fourcorners,
+/obj/item/storage/lockbox,
+/obj/item/melee/baseball_bat,
+/obj/item/melee/baseball_bat,
+/turf/open/floor/iron/smooth_edge,
+/area/ruin/space/has_grav/derelictsulaco)
 "ag" = (
 /obj/effect/turf_decal/siding/wideplating/dark/corner{
 	dir = 8
@@ -1570,12 +1578,6 @@
 	},
 /turf/template_noop,
 /area/template_noop)
-"WQ" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/red/fourcorners,
-/obj/item/storage/lockbox/dueling,
-/turf/open/floor/iron/smooth_edge,
-/area/ruin/space/has_grav/derelictsulaco)
 "Xg" = (
 /obj/structure/cable,
 /obj/machinery/power/floodlight{
@@ -2150,7 +2152,7 @@ Hj
 lr
 rW
 SW
-WQ
+aa
 VT
 Ki
 lf
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/forgottenship.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/forgottenship.dmm
index af406d83afb..9e743c22eb0 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/forgottenship.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/forgottenship.dmm
@@ -127,10 +127,26 @@
 /obj/structure/cable,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
+"aA" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/gas/syndicate;
+	storage_type = /obj/item/tank/jetpack/oxygen/harness
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/syndicate_forgotten_ship)
 "aB" = (
 /obj/structure/chair/comfy/black,
 /turf/open/floor/carpet/royalblack,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
+"aC" = (
+/obj/effect/mob_spawn/ghost_role/human/syndicatespace/captain{
+	outfit_override = list("backpack_contents" = null)
+	},
+/obj/item/documents/syndicate/red,
+/obj/item/paper/fluff/ruins/forgottenship/password,
+/obj/machinery/light/directional/west,
+/turf/open/floor/carpet/royalblack,
+/area/ruin/space/has_grav/syndicate_forgotten_ship)
 "aD" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2,
 /obj/machinery/portable_atmospherics/scrubber{
@@ -138,6 +154,23 @@
 	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
+"aE" = (
+/obj/effect/mob_spawn/ghost_role/human/syndicatespace{
+	outfit_override = list("l_pocket" = null)
+	},
+/obj/machinery/light/directional/south,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/syndicate_forgotten_ship)
+"aF" = (
+/obj/effect/mob_spawn/ghost_role/human/syndicatespace{
+	outfit_override = list("l_pocket" = null)
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/syndicate_forgotten_ship)
+"aG" = (
+/mob/living/basic/trooper/nanotrasen/ranged,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/syndicate_forgotten_ship)
 "aH" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
@@ -145,6 +178,29 @@
 	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
+"aI" = (
+/obj/structure/displaycase{
+	req_access = list("syndicate");
+	start_showpiece_type = null
+	},
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/syndicate_forgotten_ship)
+"aJ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 10
+	},
+/obj/item/wrench,
+/mob/living/basic/trooper/nanotrasen/ranged,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/syndicate_forgotten_ship)
+"aK" = (
+/obj/structure/closet/crate/secure/gear{
+	req_access = list("syndicate")
+	},
+/obj/item/spear,
+/obj/machinery/light/directional/north,
+/turf/open/floor/pod/dark,
+/area/ruin/space/has_grav/powered/syndicate_forgotten_vault)
 "aL" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 1
@@ -156,6 +212,11 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/layer2,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
+"aN" = (
+/obj/machinery/light/directional/south,
+/mob/living/basic/trooper/nanotrasen/ranged,
+/turf/open/floor/iron/dark,
+/area/ruin/space/has_grav/syndicate_forgotten_ship)
 "aO" = (
 /obj/machinery/light/directional/south,
 /turf/open/floor/carpet/royalblack,
@@ -209,6 +270,13 @@
 /obj/item/toy/plush/nukeplushie,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
+"aX" = (
+/obj/structure/closet/crate/secure/gear{
+	req_access = list("syndicate")
+	},
+/obj/item/knife/combat/survival,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/syndicate_forgotten_cargopod)
 "aY" = (
 /turf/template_noop,
 /area/ruin/space)
@@ -221,6 +289,19 @@
 "bb" = (
 /turf/closed/wall/r_wall/plastitanium/syndicate,
 /area/ruin/space/has_grav/syndicate_forgotten_cargopod)
+"bc" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
+	dir = 4
+	},
+/mob/living/basic/trooper/nanotrasen/ranged,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/syndicate_forgotten_ship)
 "bd" = (
 /obj/structure/closet/crate/secure/gear{
 	req_access = list("syndicate")
@@ -273,6 +354,20 @@
 /obj/structure/cable,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/syndicate_forgotten_cargopod)
+"bi" = (
+/obj/structure/closet/syndicate{
+	anchored = 1;
+	desc = "A basic closet for all your villainous needs.";
+	locked = 1;
+	name = "Closet";
+	req_access = list("syndicate");
+	secure = 1
+	},
+/obj/effect/spawner/random/contraband/armory{
+	loot = list(/obj/item/knife/combat/survival, /obj/item/spear, /obj/item/hatchet, /obj/item/melee/baseball_bat)
+	},
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/syndicate_forgotten_ship)
 "bj" = (
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/syndicate_forgotten_cargopod)
@@ -409,10 +504,6 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
-"bE" = (
-/obj/effect/mob_spawn/ghost_role/human/syndicatespace,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/syndicate_forgotten_ship)
 "bF" = (
 /obj/machinery/door/airlock/external/ruin{
 	name = "Syndicate Ship Airlock"
@@ -434,13 +525,6 @@
 "bI" = (
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
-"bJ" = (
-/obj/machinery/suit_storage_unit/syndicate{
-	helmet_type = /obj/item/clothing/head/helmet/space/syndicate/black;
-	suit_type = /obj/item/clothing/suit/space/syndicate/black
-	},
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/syndicate_forgotten_ship)
 "bL" = (
 /obj/structure/tank_dispenser/oxygen,
 /turf/open/floor/mineral/plastitanium,
@@ -524,11 +608,6 @@
 /obj/structure/chair/comfy,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
-"cd" = (
-/obj/machinery/light/directional/south,
-/mob/living/basic/trooper/nanotrasen/ranged/assault,
-/turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/syndicate_forgotten_ship)
 "ce" = (
 /obj/structure/closet/syndicate{
 	anchored = 1;
@@ -541,13 +620,6 @@
 /obj/item/ammo_box/c9mm,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
-"cf" = (
-/obj/structure/displaycase{
-	req_access = list("syndicate");
-	start_showpiece_type = /obj/item/gun/ballistic/automatic/pistol/deagle/camo
-	},
-/turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/syndicate_forgotten_ship)
 "cg" = (
 /obj/structure/closet/syndicate{
 	anchored = 1;
@@ -646,13 +718,6 @@
 /obj/machinery/atmospherics/components/unary/vent_pump,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
-"cw" = (
-/obj/structure/closet/crate/secure/gear{
-	req_access = list("syndicate")
-	},
-/obj/item/switchblade,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/syndicate_forgotten_cargopod)
 "cx" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
@@ -791,19 +856,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
-"cQ" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/mob/living/basic/trooper/nanotrasen/ranged/elite,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/syndicate_forgotten_ship)
 "cR" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
 	dir = 4
@@ -845,11 +897,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
-"cY" = (
-/obj/effect/mob_spawn/ghost_role/human/syndicatespace,
-/obj/machinery/light/directional/south,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/syndicate_forgotten_ship)
 "cZ" = (
 /obj/machinery/door/airlock/grunge{
 	name = "Syndicate Ship Airlock"
@@ -1018,31 +1065,19 @@
 /obj/structure/closet/crate/solarpanel_small,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/syndicate_forgotten_cargopod)
-"kY" = (
-/obj/structure/closet/syndicate{
-	anchored = 1;
-	desc = "A basic closet for all your villainous needs.";
-	locked = 1;
-	name = "Closet";
-	req_access = list("syndicate");
-	secure = 1
+"ly" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/gas/syndicate;
+	storage_type = /obj/item/tank/jetpack/oxygen/harness
 	},
-/obj/effect/spawner/random/contraband/armory,
-/turf/open/floor/mineral/plastitanium/red,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
 "lQ" = (
 /obj/machinery/ore_silo,
 /obj/machinery/light/directional/west,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/syndicate_forgotten_cargopod)
-"ml" = (
-/obj/machinery/suit_storage_unit/syndicate{
-	helmet_type = /obj/item/clothing/head/helmet/space/syndicate/black;
-	suit_type = /obj/item/clothing/suit/space/syndicate/black
-	},
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/syndicate_forgotten_ship)
 "mm" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -1079,19 +1114,6 @@
 /obj/effect/mapping_helpers/airalarm/syndicate_access,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
-"sL" = (
-/obj/effect/mob_spawn/ghost_role/human/syndicatespace/captain,
-/obj/machinery/light/directional/west,
-/turf/open/floor/carpet/royalblack,
-/area/ruin/space/has_grav/syndicate_forgotten_ship)
-"tv" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 10
-	},
-/obj/item/wrench,
-/mob/living/basic/trooper/nanotrasen/ranged/assault,
-/turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/syndicate_forgotten_ship)
 "tO" = (
 /obj/structure/table/reinforced,
 /obj/machinery/light/small/directional/north,
@@ -1109,10 +1131,6 @@
 /obj/structure/table/reinforced,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
-"yf" = (
-/mob/living/basic/trooper/nanotrasen/ranged/assault,
-/turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/syndicate_forgotten_ship)
 "yv" = (
 /obj/item/storage/toolbox/mechanical,
 /obj/item/storage/toolbox/mechanical,
@@ -1159,14 +1177,6 @@
 /obj/effect/spawner/random/maintenance,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
-"Il" = (
-/obj/structure/closet/crate/secure/gear{
-	req_access = list("syndicate")
-	},
-/obj/item/melee/energy/sword/saber/red,
-/obj/machinery/light/directional/north,
-/turf/open/floor/pod/dark,
-/area/ruin/space/has_grav/powered/syndicate_forgotten_vault)
 "IP" = (
 /obj/structure/cable,
 /obj/machinery/light/directional/west,
@@ -1198,6 +1208,13 @@
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/syndicate_forgotten_ship)
+"PW" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/gas/syndicate;
+	storage_type = /obj/item/tank/jetpack/oxygen/harness
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/syndicate_forgotten_ship)
 "VF" = (
 /obj/structure/table/reinforced,
 /obj/machinery/button/door{
@@ -1838,7 +1855,7 @@ bZ
 bZ
 bV
 bZ
-sL
+aC
 bw
 bZ
 mZ
@@ -1890,13 +1907,13 @@ aO
 bZ
 vB
 cC
-yf
+aG
 bZ
 bY
-bE
+aF
 al
 al
-cY
+aE
 bZ
 aa
 aa
@@ -1929,7 +1946,7 @@ aa
 aa
 aa
 bZ
-cf
+aI
 aw
 ch
 ao
@@ -2029,15 +2046,15 @@ bZ
 aB
 bn
 bZ
-tv
+aJ
 cE
 aS
 bZ
 bY
-bE
+aF
 al
 al
-cY
+aE
 bZ
 aa
 aa
@@ -2094,7 +2111,7 @@ ba
 bq
 ba
 aZ
-Il
+aK
 ay
 de
 do
@@ -2222,7 +2239,7 @@ mm
 al
 bZ
 bH
-cd
+aN
 bZ
 bZ
 bZ
@@ -2366,7 +2383,7 @@ aP
 al
 bZ
 al
-bJ
+PW
 bZ
 aa
 aa
@@ -2413,7 +2430,7 @@ aP
 al
 bZ
 al
-ml
+ly
 bZ
 aa
 aa
@@ -2507,7 +2524,7 @@ aL
 al
 an
 al
-bJ
+aA
 bZ
 aa
 aa
@@ -2547,7 +2564,7 @@ al
 al
 al
 ah
-cQ
+bc
 ah
 al
 al
@@ -2566,7 +2583,7 @@ ba
 bb
 bb
 HM
-cw
+aX
 bb
 bb
 ba
@@ -2684,7 +2701,7 @@ aa
 aa
 aa
 aq
-kY
+bi
 ce
 aw
 aw
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/garbagetruck4.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/garbagetruck4.dmm
index 851406a580f..6b524ad4889 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/garbagetruck4.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/garbagetruck4.dmm
@@ -1,4 +1,16 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ab" = (
+/obj/item/stack/spacecash/c500,
+/obj/item/coin/plastic,
+/obj/structure/safe,
+/obj/structure/spider/stickyweb,
+/obj/item/tank/jetpack/oxygen{
+	desc = "A tank of compressed oxygen for use as propulsion in zero-gravity areas. It's blue, and has a triangle chiselled into the paint."
+	},
+/obj/item/knife/combat/survival,
+/obj/item/survivalcapsule/bathroom,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/garbagetruck/toystore)
 "aj" = (
 /obj/machinery/power/smes,
 /obj/structure/cable,
@@ -748,18 +760,6 @@
 /obj/effect/spawner/random/entertainment/toy,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/garbagetruck/toystore)
-"Rb" = (
-/obj/item/stack/spacecash/c500,
-/obj/item/coin/plastic,
-/obj/structure/safe,
-/obj/structure/spider/stickyweb,
-/obj/item/tank/jetpack/oxygen{
-	desc = "A tank of compressed oxygen for use as propulsion in zero-gravity areas. It's blue, and has a triangle chiselled into the paint."
-	},
-/obj/item/switchblade,
-/obj/item/survivalcapsule/bathroom,
-/turf/open/floor/plating,
-/area/ruin/space/has_grav/garbagetruck/toystore)
 "Rl" = (
 /obj/item/paper/crumpled,
 /obj/item/stock_parts/power_store/cell/hyper,
@@ -1042,7 +1042,7 @@ ld
 IS
 ld
 Sb
-Rb
+ab
 IQ
 Yz
 PJ
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/hauntedtradingpost.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/hauntedtradingpost.dmm
index 6802d01ee8a..4b9fc1fe87c 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/hauntedtradingpost.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/hauntedtradingpost.dmm
@@ -14,6 +14,32 @@
 	},
 /turf/open/floor/catwalk_floor/iron_dark,
 /area/ruin/space/has_grav/hauntedtradingpost/employees)
+"af" = (
+/obj/item/knife/combat/survival,
+/obj/item/grenade/barrier,
+/obj/effect/decal/cleanable/plastic,
+/obj/machinery/light/warm/dim/directional/west,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
+"ag" = (
+/obj/structure/closet/crate/large{
+	desc = "A hefty wooden crate labelled 'REJECT - DEFECTIVE'. You'll need a crowbar to get it open."
+	},
+/obj/item/ammo_casing/shotgun/ion{
+	pixel_y = 4;
+	pixel_x = -4
+	},
+/obj/item/ammo_casing/shotgun/ion,
+/obj/item/ammo_casing/shotgun/ion{
+	pixel_y = 4;
+	pixel_x = 4
+	},
+/obj/machinery/duct,
+/obj/item/melee/baseball_bat{
+	pixel_y = -7
+	},
+/turf/open/floor/carpet/donk,
+/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
 "ah" = (
 /obj/structure/cable/layer1,
 /obj/machinery/camera/xray/directional/north,
@@ -29,6 +55,27 @@
 	},
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/hauntedtradingpost/office)
+"ai" = (
+/obj/structure/cable/layer1,
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/effect/spawner/random/exotic/technology,
+/obj/effect/mapping_helpers/apc/syndicate_access,
+/obj/item/melee/baseball_bat,
+/obj/effect/mapping_helpers/apc/full_charge,
+/obj/machinery/power/apc/auto_name/directional/south{
+	cable_layer = 1
+	},
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/ruin/space/has_grav/hauntedtradingpost/aicore)
+"aj" = (
+/obj/structure/safe,
+/obj/item/pet_carrier,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/food/ready_donk/donkrange_chicken,
+/obj/item/melee/baseball_bat,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/turf/open/floor/wood/large,
+/area/ruin/space/has_grav/hauntedtradingpost/office)
 "am" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -2100,18 +2147,6 @@
 /obj/structure/cable/layer1,
 /turf/open/floor/catwalk_floor/iron_dark,
 /area/ruin/space/has_grav/hauntedtradingpost/aicore)
-"ss" = (
-/obj/structure/cable/layer1,
-/obj/structure/table/reinforced/plastitaniumglass,
-/obj/effect/spawner/random/exotic/technology,
-/obj/effect/mapping_helpers/apc/syndicate_access,
-/obj/item/gun/energy/laser/carbine/cybersun/unrestricted,
-/obj/effect/mapping_helpers/apc/full_charge,
-/obj/machinery/power/apc/auto_name/directional/south{
-	cable_layer = 1
-	},
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/ruin/space/has_grav/hauntedtradingpost/aicore)
 "su" = (
 /obj/structure/cable/layer1,
 /obj/effect/decal/cleanable/dirt,
@@ -2706,25 +2741,6 @@
 /obj/structure/frame/machine/secured,
 /turf/open/floor/catwalk_floor/iron_dark,
 /area/ruin/space/has_grav/hauntedtradingpost/aicore)
-"xr" = (
-/obj/structure/closet/crate/large{
-	desc = "A hefty wooden crate labelled 'REJECT - DEFECTIVE'. You'll need a crowbar to get it open."
-	},
-/obj/item/ammo_casing/shotgun/ion{
-	pixel_y = 4;
-	pixel_x = -4
-	},
-/obj/item/ammo_casing/shotgun/ion,
-/obj/item/ammo_casing/shotgun/ion{
-	pixel_y = 4;
-	pixel_x = 4
-	},
-/obj/machinery/duct,
-/obj/item/gun/ballistic/shotgun/musket{
-	pixel_y = -7
-	},
-/turf/open/floor/carpet/donk,
-/area/ruin/space/has_grav/hauntedtradingpost/employees/workstation)
 "xs" = (
 /obj/structure/cable/layer1,
 /obj/structure/table/wood,
@@ -4759,15 +4775,6 @@
 	},
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/hauntedtradingpost/maint/disposals)
-"Pg" = (
-/obj/structure/safe,
-/obj/item/pet_carrier,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/food/ready_donk/donkrange_chicken,
-/obj/item/gun/ballistic/rifle/boltaction/donkrifle,
-/obj/item/tank/internals/emergency_oxygen/engi,
-/turf/open/floor/wood/large,
-/area/ruin/space/has_grav/hauntedtradingpost/office)
 "Pk" = (
 /obj/structure/cable/layer1,
 /obj/machinery/vending/tool{
@@ -5023,13 +5030,6 @@
 	},
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/hauntedtradingpost/public)
-"RA" = (
-/obj/item/shield/buckler,
-/obj/item/grenade/barrier,
-/obj/effect/decal/cleanable/plastic,
-/obj/machinery/light/warm/dim/directional/west,
-/turf/open/floor/plating,
-/area/ruin/space/has_grav/hauntedtradingpost/maint/toolstorage)
 "RC" = (
 /obj/structure/cable/layer1,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4,
@@ -6123,7 +6123,7 @@ qP
 ZK
 wz
 yE
-RA
+af
 sM
 wn
 lQ
@@ -6396,7 +6396,7 @@ Rb
 rs
 Ls
 FO
-xr
+ag
 Vw
 OL
 iS
@@ -6851,7 +6851,7 @@ kl
 Gk
 iv
 PX
-ss
+ai
 MR
 tl
 Xe
@@ -7018,7 +7018,7 @@ Bi
 ur
 Wv
 Rj
-Pg
+aj
 Pq
 tL
 VJ
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
index 635181d4256..121c927b843 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
@@ -48,6 +48,15 @@
 "az" = (
 /turf/open/floor/carpet/black,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
+"aN" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/breath
+	},
+/obj/effect/turf_decal/stripes/end{
+	dir = 1
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "ba" = (
 /obj/structure/table/wood,
 /obj/item/plate,
@@ -471,13 +480,6 @@
 	},
 /turf/open/floor/engine,
 /area/ruin/space/has_grav/powered/hilbertresearchfacility)
-"lL" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/obj/effect/turf_decal/stripes/end{
-	dir = 1
-	},
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered/hilbertresearchfacility)
 "lY" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/mineral/titanium/tiled/purple,
@@ -3088,7 +3090,7 @@ PG
 Bo
 wG
 ko
-lL
+aN
 Ej
 rE
 Gl
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/infested_frigate.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/infested_frigate.dmm
index 744988ecb1f..fab4874e399 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/infested_frigate.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/infested_frigate.dmm
@@ -6,6 +6,37 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/infested_frigate)
+"ac" = (
+/obj/item/grenade/smokebomb{
+	pixel_x = 5
+	},
+/obj/item/grenade/smokebomb{
+	pixel_x = 5
+	},
+/obj/item/suppressor,
+/obj/item/melee/baseball_bat,
+/obj/structure/closet/crate/secure/weapon{
+	req_access = list("syndicate")
+	},
+/obj/item/grenade/c4,
+/obj/effect/turf_decal{
+	icon_state = "warningline_white";
+	dir = 1
+	},
+/obj/effect/spawner/random/exotic/antag_gear,
+/turf/open/floor/pod/dark,
+/area/ruin/space/has_grav/infested_frigate)
+"ad" = (
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood{
+	icon_state = "floor5-old"
+	},
+/obj/item/ammo_casing/spent,
+/obj/item/melee/baseball_bat,
+/obj/effect/mob_spawn/corpse/human/syndicatepilot,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/has_grav/infested_frigate)
 "af" = (
 /obj/structure/door_assembly/door_assembly_hatch{
 	anchored = 1
@@ -850,17 +881,6 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/infested_frigate)
-"nU" = (
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood{
-	icon_state = "floor5-old"
-	},
-/obj/item/ammo_casing/spent,
-/obj/item/gun/ballistic/automatic/smartgun,
-/obj/effect/mob_spawn/corpse/human/syndicatepilot,
-/turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/has_grav/infested_frigate)
 "oj" = (
 /obj/structure/fans/tiny,
 /obj/machinery/door/poddoor{
@@ -2433,26 +2453,6 @@
 /obj/machinery/light/small/red/dim/directional/east,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/infested_frigate)
-"ML" = (
-/obj/item/grenade/smokebomb{
-	pixel_x = 5
-	},
-/obj/item/grenade/smokebomb{
-	pixel_x = 5
-	},
-/obj/item/suppressor,
-/obj/item/gun/energy/e_gun/mini,
-/obj/structure/closet/crate/secure/weapon{
-	req_access = list("syndicate")
-	},
-/obj/item/grenade/c4,
-/obj/effect/turf_decal{
-	icon_state = "warningline_white";
-	dir = 1
-	},
-/obj/effect/spawner/random/exotic/antag_gear,
-/turf/open/floor/pod/dark,
-/area/ruin/space/has_grav/infested_frigate)
 "MW" = (
 /obj/effect/turf_decal{
 	icon_state = "arrows_red";
@@ -3868,8 +3868,8 @@ bM
 Ne
 wP
 bE
-nU
-ML
+ad
+ac
 wP
 UX
 Sr
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/listeningstation.dmm
index 0e8a9d05966..d5b1d2f32ee 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/listeningstation.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/listeningstation.dmm
@@ -1,4 +1,22 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ab" = (
+/obj/structure/cable,
+/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms/space{
+	dir = 4;
+	outfit_override = list("r_pocket" = null, "r_hand" = /obj/item/spear)
+	},
+/turf/open/floor/iron/grimy,
+/area/ruin/space/has_grav/listeningstation)
+"ac" = (
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/knife/combat/survival,
+/obj/item/reagent_containers/cup/glass/waterbottle{
+	pixel_x = 10;
+	pixel_y = 16
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/listeningstation)
 "ad" = (
 /obj/machinery/airalarm/directional/west,
 /obj/structure/closet/crate/secure/freezer/commsagent,
@@ -783,13 +801,6 @@
 /obj/item/paper/fluff/ruins/listeningstation/reports/august,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/listeningstation)
-"Oo" = (
-/obj/structure/cable,
-/obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms/space{
-	dir = 4
-	},
-/turf/open/floor/iron/grimy,
-/area/ruin/space/has_grav/listeningstation)
 "Or" = (
 /obj/structure/closet/crate/bin,
 /obj/effect/decal/cleanable/dirt,
@@ -903,16 +914,6 @@
 	},
 /turf/template_noop,
 /area/ruin/space)
-"VH" = (
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen/edagger,
-/obj/item/reagent_containers/cup/glass/waterbottle{
-	pixel_x = 10;
-	pixel_y = 16
-	},
-/turf/open/floor/plating,
-/area/ruin/space/has_grav/listeningstation)
 "VK" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/crate/freezer,
@@ -1154,7 +1155,7 @@ vI
 JB
 gJ
 bC
-Oo
+ab
 JB
 vI
 AV
@@ -1426,7 +1427,7 @@ rG
 MA
 wm
 Sz
-VH
+ac
 FV
 DC
 CU
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/meatderelict.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/meatderelict.dmm
index 633f77b9b30..3a12016af85 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/meatderelict.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/meatderelict.dmm
@@ -29,6 +29,15 @@
 /obj/effect/spawner/structure/window/reinforced/shuttle/indestructible,
 /turf/open/indestructible/plating,
 /area/ruin/space/has_grav/powered/biooutpost)
+"ag" = (
+/obj/effect/turf_decal/tile/neutral/opposingcorners,
+/obj/effect/turf_decal/stripes/end{
+	dir = 1
+	},
+/obj/structure/rack,
+/obj/item/melee/baseball_bat,
+/turf/open/indestructible/dark,
+/area/ruin/space/has_grav/powered/biooutpost)
 "aj" = (
 /obj/effect/turf_decal/siding/blue,
 /obj/structure/table,
@@ -356,6 +365,14 @@
 /obj/structure/sign/warning,
 /turf/closed/indestructible/reinforced,
 /area/ruin/space/has_grav/powered/biooutpost/vault)
+"hS" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/breath;
+	storage_type = /obj/item/tank/internals/oxygen
+	},
+/obj/machinery/light/small/dim/directional/south,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/powered/biooutpost)
 "hW" = (
 /obj/effect/turf_decal/siding/purple,
 /obj/effect/decal/cleanable/blood/splatter,
@@ -1083,11 +1100,6 @@
 /obj/effect/decal/cleanable/blood/tracks,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/powered/biooutpost)
-"us" = (
-/obj/machinery/suit_storage_unit/spaceruin,
-/obj/machinery/light/small/dim/directional/south,
-/turf/open/floor/plating,
-/area/ruin/space/has_grav/powered/biooutpost)
 "uC" = (
 /obj/effect/decal/cleanable/blood/tracks,
 /turf/open/indestructible/white,
@@ -1201,17 +1213,6 @@
 /obj/effect/decal/cleanable/glass,
 /turf/open/indestructible/meat,
 /area/ruin/space/has_grav/powered/biooutpost)
-"wH" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners,
-/obj/effect/turf_decal/stripes/end{
-	dir = 1
-	},
-/obj/structure/rack,
-/obj/item/gun/ballistic/automatic/wt550{
-	pin = /obj/item/firing_pin
-	},
-/turf/open/indestructible/dark,
-/area/ruin/space/has_grav/powered/biooutpost)
 "wJ" = (
 /obj/structure/grille/broken,
 /obj/effect/decal/cleanable/glass,
@@ -3550,7 +3551,7 @@ YD
 lm
 mU
 Jh
-us
+hS
 ij
 cQ
 tS
@@ -3623,7 +3624,7 @@ EN
 TU
 Yc
 UX
-wH
+ag
 jU
 ZG
 gK
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/mimesvsclowns.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/mimesvsclowns.dmm
index 666c323065d..f05fe768d35 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/mimesvsclowns.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/mimesvsclowns.dmm
@@ -47,6 +47,12 @@
 /obj/structure/tank_dispenser,
 /turf/open/floor/iron/checker/airless,
 /area/ruin)
+"kC" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/breath
+	},
+/turf/open/floor/iron/checker/airless,
+/area/ruin)
 "lS" = (
 /obj/structure/door_assembly,
 /turf/open/floor/iron/checker/airless,
@@ -103,10 +109,6 @@
 /obj/effect/decal/cleanable/blood/gibs/core,
 /turf/open/floor/iron/checker/airless,
 /area/ruin)
-"vj" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/turf/open/floor/iron/checker/airless,
-/area/ruin)
 "vs" = (
 /obj/structure/table,
 /obj/item/reagent_containers/cup/glass/bottle/bottleofnothing,
@@ -526,7 +528,7 @@ Qb
 Pq
 Ln
 aa
-vj
+kC
 gZ
 gZ
 gZ
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/old_infiltrator.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/old_infiltrator.dmm
index 93ac362b2cc..db67c3ed108 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/old_infiltrator.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/old_infiltrator.dmm
@@ -1,4 +1,12 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ad" = (
+/obj/effect/decal/cleanable/blood/old,
+/obj/item/knife/combat/survival{
+	pixel_y = 4;
+	pixel_x = 7
+	},
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/space/unpowered)
 "am" = (
 /obj/structure/frame/machine,
 /obj/item/stack/cable_coil/five,
@@ -238,11 +246,6 @@
 	},
 /turf/open/floor/mineral/plastitanium/red/airless,
 /area/ruin/space/unpowered)
-"pv" = (
-/obj/effect/turf_decal/bot_red,
-/obj/machinery/suit_storage_unit/nuke_med,
-/turf/open/floor/iron/dark/airless,
-/area/ruin/space/unpowered)
 "qL" = (
 /obj/machinery/door/window/brigdoor/left/directional/west{
 	req_access = list("syndicate");
@@ -424,6 +427,11 @@
 	},
 /turf/open/floor/mineral/plastitanium/red/airless,
 /area/ruin/space/unpowered)
+"Cj" = (
+/obj/effect/turf_decal/bot_red,
+/obj/machinery/suit_storage_unit/ruin_zone,
+/turf/open/floor/iron/dark/airless,
+/area/ruin/space/unpowered)
 "Cv" = (
 /obj/item/ammo_casing/c357/match,
 /turf/open/floor/mineral/plastitanium/red,
@@ -480,14 +488,6 @@
 /obj/structure/closet/cardboard/metal,
 /turf/open/floor/circuit/red/airless,
 /area/ruin/space/unpowered)
-"Fn" = (
-/obj/effect/decal/cleanable/blood/old,
-/obj/item/shield/riot{
-	pixel_y = 4;
-	pixel_x = 7
-	},
-/turf/open/floor/mineral/plastitanium/red,
-/area/ruin/space/unpowered)
 "FW" = (
 /obj/effect/decal/remains/human,
 /turf/open/floor/mineral/plastitanium/red/airless,
@@ -942,7 +942,7 @@ la
 Da
 LP
 Nv
-pv
+Cj
 Pq
 uE
 vK
@@ -1121,7 +1121,7 @@ la
 la
 NY
 gr
-Fn
+ad
 Cv
 Cv
 Pq
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/oldstation.dmm
index 67f30c57b23..df3955be0dc 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/oldstation.dmm
@@ -68,6 +68,16 @@
 /obj/effect/zone_mobs/bug/boss,
 /turf/open/floor/engine/airless,
 /area/ruin/space/ancientstation/beta/supermatter)
+"an" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/suit_storage_unit/ruin_zone{
+	storage_type = /obj/item/tank/internals/oxygen/yellow
+	},
+/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
+	dir = 4
+	},
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/charlie/engie)
 "ao" = (
 /obj/structure/alien/weeds,
 /mob/living/basic/alien/drone,
@@ -82,6 +92,20 @@
 /obj/structure/alien/weeds/node,
 /turf/open/floor/iron/dark,
 /area/ruin/space/ancientstation/delta/ai)
+"ar" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/rack,
+/obj/item/melee/baseball_bat{
+	pixel_x = -2;
+	pixel_y = -2
+	},
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/away_general_access,
+/obj/effect/turf_decal/tile/red/anticorner/contrasted{
+	dir = 8
+	},
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/charlie/sec)
 "as" = (
 /turf/closed/wall,
 /area/ruin/space/ancientstation/charlie/bridge)
@@ -92,6 +116,34 @@
 	},
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/charlie/bridge)
+"au" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/rack,
+/obj/item/melee/baseball_bat{
+	pixel_x = 2;
+	pixel_y = 2
+	},
+/obj/effect/turf_decal/tile/red/half/contrasted,
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/charlie/sec)
+"av" = (
+/obj/structure/table/reinforced,
+/obj/item/melee/baseball_bat,
+/turf/open/floor/iron/white/textured,
+/area/ruin/space/ancientstation/delta/proto)
+"aw" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/east,
+/obj/structure/closet/crate/secure/weapon{
+	req_access = list("away_sec")
+	},
+/obj/item/spess_knife,
+/obj/item/clothing/suit/armor/vest/old,
+/obj/item/melee/baseball_bat,
+/obj/item/ammo_box/strilka310,
+/obj/item/ammo_box/strilka310,
+/turf/open/floor/plating,
+/area/ruin/space/ancientstation/delta/hall)
 "ax" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/tile/blue{
@@ -803,6 +855,18 @@
 	},
 /turf/open/floor/iron/airless,
 /area/ruin/space/ancientstation/beta/medbay)
+"dG" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/suit_storage_unit/ruin_zone{
+	storage_type = /obj/item/tank/jetpack/void
+	},
+/obj/effect/turf_decal/tile/brown/half/contrasted{
+	dir = 8
+	},
+/obj/machinery/airalarm/directional/west,
+/obj/effect/mapping_helpers/airalarm/away_general_access,
+/turf/open/floor/iron,
+/area/ruin/space/ancientstation/beta/mining)
 "dH" = (
 /obj/structure/lattice/catwalk,
 /turf/template_noop,
@@ -1911,16 +1975,6 @@
 	},
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/beta/medbay)
-"iA" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/rack,
-/obj/item/gun/energy/laser/retro/old{
-	pixel_x = 2;
-	pixel_y = 2
-	},
-/obj/effect/turf_decal/tile/red/half/contrasted,
-/turf/open/floor/iron,
-/area/ruin/space/ancientstation/charlie/sec)
 "iB" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/rack,
@@ -2514,11 +2568,6 @@
 /obj/effect/spawner/random/trash/botanical_waste,
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/charlie/hydro)
-"lc" = (
-/obj/structure/table/reinforced,
-/obj/item/gun/energy/e_gun/old,
-/turf/open/floor/iron/white/textured,
-/area/ruin/space/ancientstation/delta/proto)
 "ld" = (
 /obj/structure/cable,
 /obj/effect/decal/cleanable/blood/tracks,
@@ -2645,14 +2694,6 @@
 /obj/item/shard/plasma,
 /turf/open/floor/engine/airless,
 /area/ruin/space/ancientstation/beta/supermatter)
-"lJ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/suit_storage_unit/void_old,
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
-	dir = 4
-	},
-/turf/open/floor/iron,
-/area/ruin/space/ancientstation/charlie/engie)
 "lO" = (
 /obj/machinery/door/poddoor{
 	id = "proto"
@@ -3799,20 +3840,6 @@
 	},
 /turf/open/floor/iron/white/textured,
 /area/ruin/space/ancientstation/delta/biolab)
-"sw" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/rack,
-/obj/item/gun/energy/laser/retro/old{
-	pixel_x = -2;
-	pixel_y = -2
-	},
-/obj/machinery/airalarm/directional/west,
-/obj/effect/mapping_helpers/airalarm/away_general_access,
-/obj/effect/turf_decal/tile/red/anticorner/contrasted{
-	dir = 8
-	},
-/turf/open/floor/iron,
-/area/ruin/space/ancientstation/charlie/sec)
 "sx" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -4039,16 +4066,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/ruin/space/ancientstation/charlie/hall)
-"ur" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/suit_storage_unit/void_old/jetpack,
-/obj/effect/turf_decal/tile/brown/half/contrasted{
-	dir = 8
-	},
-/obj/machinery/airalarm/directional/west,
-/obj/effect/mapping_helpers/airalarm/away_general_access,
-/turf/open/floor/iron,
-/area/ruin/space/ancientstation/beta/mining)
 "uv" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -5149,19 +5166,6 @@
 	},
 /turf/open/floor/pod/dark,
 /area/ruin/space/ancientstation/delta/biolab)
-"BS" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/east,
-/obj/structure/closet/crate/secure/weapon{
-	req_access = list("away_sec")
-	},
-/obj/item/spess_knife,
-/obj/item/clothing/suit/armor/vest/old,
-/obj/item/gun/ballistic/rifle/boltaction,
-/obj/item/ammo_box/strilka310,
-/obj/item/ammo_box/strilka310,
-/turf/open/floor/plating,
-/area/ruin/space/ancientstation/delta/hall)
 "BU" = (
 /obj/structure/alien/weeds,
 /obj/effect/decal/cleanable/blood/gibs/xeno/larva/body,
@@ -11113,7 +11117,7 @@ aa
 Hf
 jV
 ci
-ur
+dG
 pP
 WI
 mW
@@ -12043,7 +12047,7 @@ jE
 zJ
 mY
 kQ
-lJ
+an
 oP
 en
 zZ
@@ -13242,7 +13246,7 @@ ha
 Pn
 Bp
 hz
-sw
+ar
 eJ
 cW
 ia
@@ -13308,7 +13312,7 @@ hb
 hA
 eu
 eu
-iA
+au
 eJ
 FV
 ic
@@ -14968,7 +14972,7 @@ mm
 Oh
 uj
 Mx
-lc
+av
 uj
 aa
 aa
@@ -15357,7 +15361,7 @@ Km
 wV
 rp
 jg
-BS
+aw
 yx
 bE
 Jg
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/rare_armory.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/rare_armory.dmm
index 1c765bb5b23..310abd66b60 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/rare_armory.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/rare_armory.dmm
@@ -121,15 +121,6 @@
 /obj/machinery/light/small/red/directional/west,
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/powered)
-"as" = (
-/obj/structure/closet/crate/secure/weapon{
-	name = "deadstock crate"
-	},
-/obj/item/gun/ballistic/automatic/wt550,
-/obj/item/ammo_box/magazine/wt550m9,
-/obj/item/ammo_box/magazine/wt550m9,
-/turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/powered)
 "at" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
@@ -165,17 +156,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/powered)
-"az" = (
-/obj/structure/rack,
-/obj/item/gun/energy/e_gun{
-	pixel_y = 5
-	},
-/obj/item/gun/energy/e_gun{
-	pixel_y = -2
-	},
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/powered)
 "aA" = (
 /obj/structure/rack,
 /obj/item/gun/ballistic/shotgun/riot{
@@ -229,25 +209,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/powered)
-"aI" = (
-/obj/item/gun/energy/e_gun/mini{
-	pixel_x = 4;
-	pixel_y = -2
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/powered)
-"aJ" = (
-/obj/structure/rack,
-/obj/item/gun/energy/laser{
-	pixel_y = 5
-	},
-/obj/item/gun/energy/laser{
-	pixel_y = -2
-	},
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/powered)
 "aK" = (
 /obj/machinery/button/door/directional/west{
 	id = "bastion_vault";
@@ -332,6 +293,45 @@
 "aZ" = (
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/powered)
+"ba" = (
+/obj/item/melee/baseball_bat{
+	pixel_x = 4;
+	pixel_y = -2
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark,
+/area/ruin/space/has_grav/powered)
+"bb" = (
+/obj/structure/rack,
+/obj/item/gun/ballistic/automatic/pistol/m1911{
+	pixel_y = 5
+	},
+/obj/item/melee/baseball_bat{
+	pixel_y = -2
+	},
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark,
+/area/ruin/space/has_grav/powered)
+"bc" = (
+/obj/structure/rack,
+/obj/item/melee/baseball_bat{
+	pixel_y = 5
+	},
+/obj/item/melee/baseball_bat{
+	pixel_y = -2
+	},
+/obj/effect/turf_decal/bot,
+/turf/open/floor/iron/dark,
+/area/ruin/space/has_grav/powered)
+"bd" = (
+/obj/structure/closet/crate/secure/weapon{
+	name = "deadstock crate"
+	},
+/obj/item/melee/baseball_bat,
+/obj/item/ammo_box/magazine/wt550m9,
+/obj/item/ammo_box/magazine/wt550m9,
+/turf/open/floor/iron/dark,
+/area/ruin/space/has_grav/powered)
 "cq" = (
 /obj/machinery/door/airlock/external/ruin{
 	name = "External Airlock"
@@ -547,7 +547,7 @@ aB
 aR
 ab
 af
-aI
+ba
 PR
 at
 ao
@@ -959,7 +959,7 @@ aB
 (20,1,1) = {"
 aB
 aL
-az
+bb
 aT
 ax
 aH
@@ -985,7 +985,7 @@ aB
 (21,1,1) = {"
 aB
 aL
-aJ
+bc
 aT
 ax
 ax
@@ -1141,7 +1141,7 @@ aB
 (27,1,1) = {"
 aB
 aL
-as
+bd
 aT
 aG
 aS
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/rare_blacksite.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/rare_blacksite.dmm
index c179511f69b..54413aeba60 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/rare_blacksite.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/rare_blacksite.dmm
@@ -277,6 +277,20 @@
 	},
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/powered)
+"ba" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/gas/syndicate;
+	storage_type = /obj/item/tank/jetpack/oxygen/harness
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered)
+"bb" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/gas/syndicate;
+	storage_type = /obj/item/tank/jetpack/oxygen/harness
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered)
 "bo" = (
 /obj/machinery/light/small/red/directional/south,
 /turf/open/floor/iron/dark,
@@ -628,6 +642,13 @@
 	},
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/powered)
+"KR" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/gas/syndicate;
+	storage_type = /obj/item/tank/jetpack/oxygen/harness
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/space/has_grav/powered)
 "KV" = (
 /obj/effect/spawner/random/maintenance,
 /turf/open/floor/plating,
@@ -702,10 +723,6 @@
 	},
 /turf/open/floor/carpet,
 /area/ruin/space/has_grav/powered)
-"ST" = (
-/obj/machinery/suit_storage_unit/syndicate,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/space/has_grav/powered)
 "TB" = (
 /obj/structure/rack,
 /obj/item/target{
@@ -1107,7 +1124,7 @@ aE
 aP
 aF
 aE
-ST
+KR
 Bc
 FE
 ov
@@ -1135,7 +1152,7 @@ ag
 ax
 ae
 aE
-ST
+ba
 Bc
 cy
 ap
@@ -1478,7 +1495,7 @@ aS
 ap
 BR
 ap
-ST
+bb
 ap
 ah
 aC
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/rare_pirate_cove.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/rare_pirate_cove.dmm
index 2bd5c2e10fc..070986d9901 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/rare_pirate_cove.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/rare_pirate_cove.dmm
@@ -248,6 +248,32 @@
 "aZ" = (
 /turf/closed/wall,
 /area/ruin/space/has_grav/powered)
+"ba" = (
+/obj/effect/decal/remains/human,
+/obj/effect/decal/cleanable/blood/old,
+/obj/item/paper/crumpled/bloody{
+	name = "torn share-slip";
+	default_raw_text = "Harrow counts the take. Harrow keeps the book. Harrow says the split is fair. The book says the vault holds forty crews of plunder and we counted eleven crews at dock. Vote was called. Vote was guns."
+	},
+/obj/item/melee/baseball_bat{
+	pixel_x = 6;
+	pixel_y = -3
+	},
+/obj/item/ammo_casing/spent{
+	pixel_x = -5
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/powered)
+"bb" = (
+/obj/structure/table/wood,
+/obj/item/melee/baseball_bat{
+	pixel_y = 5
+	},
+/obj/item/storage/box/lethalshot{
+	pixel_y = -3
+	},
+/turf/open/floor/iron/dark,
+/area/ruin/space/has_grav/powered)
 "bs" = (
 /obj/machinery/light/small/red/directional/west,
 /turf/open/floor/plating,
@@ -469,16 +495,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/powered)
-"zx" = (
-/obj/structure/table/wood,
-/obj/item/gun/ballistic/shotgun/doublebarrel{
-	pixel_y = 5
-	},
-/obj/item/storage/box/lethalshot{
-	pixel_y = -3
-	},
-/turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/powered)
 "zD" = (
 /obj/structure/closet/crate/wooden,
 /obj/effect/spawner/random/entertainment/money_small,
@@ -502,22 +518,6 @@
 /obj/effect/spawner/random/food_or_drink/booze,
 /turf/open/floor/wood,
 /area/ruin/space/has_grav/powered)
-"Bt" = (
-/obj/effect/decal/remains/human,
-/obj/effect/decal/cleanable/blood/old,
-/obj/item/paper/crumpled/bloody{
-	name = "torn share-slip";
-	default_raw_text = "Harrow counts the take. Harrow keeps the book. Harrow says the split is fair. The book says the vault holds forty crews of plunder and we counted eleven crews at dock. Vote was called. Vote was guns."
-	},
-/obj/item/gun/ballistic/revolver{
-	pixel_x = 6;
-	pixel_y = -3
-	},
-/obj/item/ammo_casing/spent{
-	pixel_x = -5
-	},
-/turf/open/floor/wood,
-/area/ruin/space/has_grav/powered)
 "DK" = (
 /obj/machinery/jukebox,
 /turf/open/floor/wood,
@@ -1080,7 +1080,7 @@ av
 hg
 ay
 he
-Bt
+ba
 nD
 av
 aV
@@ -1563,7 +1563,7 @@ aV
 aH
 mX
 aQ
-zx
+bb
 VA
 aH
 aV
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/shuttlerelic.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/shuttlerelic.dmm
index 80c407cb425..08063e30e42 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/shuttlerelic.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/shuttlerelic.dmm
@@ -67,18 +67,18 @@
 	},
 /turf/open/floor/oldshuttle,
 /area/ruin/space/has_grav/powered)
-"n" = (
+"o" = (
 /obj/structure/chair/old{
 	dir = 1
 	},
-/obj/item/crowbar/large/twenty_force,
+/mob/living/basic/spaceman,
 /turf/open/floor/oldshuttle,
 /area/ruin/space/has_grav/powered)
-"o" = (
+"r" = (
 /obj/structure/chair/old{
 	dir = 1
 	},
-/mob/living/basic/spaceman,
+/obj/item/knife/combat/survival,
 /turf/open/floor/oldshuttle,
 /area/ruin/space/has_grav/powered)
 "t" = (
@@ -295,7 +295,7 @@ h
 i
 i
 c
-n
+r
 m
 m
 o
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/the_faceoff.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/the_faceoff.dmm
index ddc7a3af309..f2e9240f637 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/the_faceoff.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/the_faceoff.dmm
@@ -1,4 +1,18 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ab" = (
+/obj/effect/mapping_helpers/broken_floor,
+/obj/effect/mapping_helpers/burnt_floor,
+/obj/item/melee/baseball_bat,
+/turf/open/floor/iron/dark/airless,
+/area/ruin/space)
+"ac" = (
+/obj/effect/mapping_helpers/broken_floor,
+/obj/effect/mob_spawn/corpse/human/nanotrasensoldier,
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/gibs/limb,
+/obj/item/melee/baseball_bat,
+/turf/open/floor/iron/dark/smooth_large/airless,
+/area/ruin/space)
 "aj" = (
 /obj/item/ammo_casing/c357/spent{
 	pixel_x = 5;
@@ -240,12 +254,6 @@
 /obj/effect/zone_mobs/syndicate,
 /turf/open/floor/mineral/plastitanium/red/airless,
 /area/ruin/space)
-"hl" = (
-/obj/effect/mapping_helpers/broken_floor,
-/obj/effect/mapping_helpers/burnt_floor,
-/obj/item/gun/ballistic/rifle/boltaction/pipegun,
-/turf/open/floor/iron/dark/airless,
-/area/ruin/space)
 "ht" = (
 /obj/effect/mapping_helpers/burnt_floor,
 /obj/effect/decal/cleanable/blood,
@@ -608,14 +616,6 @@
 /obj/structure/sign/poster/contraband/syndicate_recruitment,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ruin/space)
-"xI" = (
-/obj/effect/mapping_helpers/broken_floor,
-/obj/effect/mob_spawn/corpse/human/nanotrasensoldier,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/blood/gibs/limb,
-/obj/item/gun/energy/e_gun/mini,
-/turf/open/floor/iron/dark/smooth_large/airless,
-/area/ruin/space)
 "xT" = (
 /obj/structure/sign/poster/contraband/soviet_propaganda,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
@@ -1894,7 +1894,7 @@ Qn
 yd
 Uy
 aj
-hl
+ab
 ds
 zx
 ED
@@ -2232,7 +2232,7 @@ ZC
 Lg
 Ef
 sa
-xI
+ac
 sa
 Ds
 eA
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/thelizardsgas.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/thelizardsgas.dmm
index 5a667e2bcf3..08982a5378f 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/thelizardsgas.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/thelizardsgas.dmm
@@ -399,14 +399,6 @@
 "LA" = (
 /turf/closed/wall/r_wall,
 /area/ruin/space/has_grav/thelizardsgas)
-"LT" = (
-/obj/structure/sign/warning/electric_shock/directional/north,
-/obj/machinery/suit_storage_unit/standard_unit,
-/obj/machinery/power/terminal{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/ruin/space/has_grav/thelizardsgas)
 "MB" = (
 /obj/structure/lattice/catwalk,
 /obj/machinery/atmospherics/pipe/smart/simple/yellow/hidden{
@@ -513,6 +505,16 @@
 	},
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/thelizardsgas)
+"VL" = (
+/obj/structure/sign/warning/electric_shock/directional/north,
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/breath
+	},
+/obj/machinery/power/terminal{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/thelizardsgas)
 "VP" = (
 /obj/structure/table/reinforced,
 /obj/item/gps/spaceruin,
@@ -948,7 +950,7 @@ CA
 CA
 Qg
 mR
-LT
+VL
 xy
 Kw
 mR
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/vestige_comb.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/vestige_comb.dmm
index e0b55189297..ea230518cc3 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/vestige_comb.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/vestige_comb.dmm
@@ -284,6 +284,12 @@
 /obj/structure/sign/warning/vacuum,
 /turf/closed/wall,
 /area/ruin/space/has_grav/vestige/comb)
+"ba" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/gas/explorer
+	},
+/turf/open/floor/plating/airless,
+/area/ruin/space/has_grav/vestige/comb)
 "bp" = (
 /obj/structure/table,
 /obj/item/storage/toolbox/mechanical{
@@ -620,6 +626,12 @@
 	},
 /turf/open/floor/plating/airless,
 /area/ruin/space/has_grav/vestige/comb)
+"TJ" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/gas/explorer
+	},
+/turf/open/floor/plating/airless,
+/area/ruin/space/has_grav/vestige/comb)
 "Va" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating/airless,
@@ -665,10 +677,6 @@
 /obj/effect/decal/cleanable/shreds,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/vestige/comb)
-"YC" = (
-/obj/machinery/suit_storage_unit/mining,
-/turf/open/floor/plating/airless,
-/area/ruin/space/has_grav/vestige/comb)
 "Zl" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
@@ -1046,8 +1054,8 @@ aV
 ae
 Va
 ar
-YC
-YC
+ba
+TJ
 fo
 Bx
 Va
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/vestige_roost.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/vestige_roost.dmm
index d073c29a2da..0b61fbc626c 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/vestige_roost.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/vestige_roost.dmm
@@ -244,17 +244,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/vestige/roost)
-"aP" = (
-/obj/item/gun/ballistic/automatic/pistol/no_mag{
-	pixel_x = 5;
-	pixel_y = -3
-	},
-/obj/item/ammo_casing/spent{
-	pixel_x = -4
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/vestige/roost)
 "aQ" = (
 /obj/machinery/door/airlock/wood{
 	name = "Master's Cabin"
@@ -308,6 +297,17 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/vestige/roost)
+"ba" = (
+/obj/item/melee/baseball_bat{
+	pixel_x = 5;
+	pixel_y = -3
+	},
+/obj/item/ammo_casing/spent{
+	pixel_x = -4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/vestige/roost)
 "bO" = (
 /obj/effect/decal/remains/human,
 /obj/effect/decal/cleanable/blood/old,
@@ -1265,7 +1265,7 @@ aU
 aU
 ab
 ad
-aP
+ba
 ai
 aF
 BQ
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/waystation.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/waystation.dmm
index 1eced19e892..6faae6d9085 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/waystation.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/waystation.dmm
@@ -17,6 +17,101 @@
 /obj/effect/zone_mobs/syndicate,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/waystation/cargobay)
+"ad" = (
+/mob/living/basic/trooper/syndicate/ranged/space,
+/obj/item/ammo_casing/shotgun/buckshot/spent{
+	pixel_x = 3;
+	pixel_y = 10
+	},
+/obj/item/ammo_casing/shotgun/buckshot/spent{
+	pixel_x = 6;
+	pixel_y = 1
+	},
+/obj/item/ammo_casing/shotgun/buckshot/spent{
+	pixel_x = -3;
+	pixel_y = 1
+	},
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/waystation/dorms)
+"ae" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/mob/living/basic/trooper/syndicate/ranged/space,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/waystation/cargooffice)
+"af" = (
+/obj/effect/turf_decal/loading_area/red,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/mob/living/basic/trooper/syndicate/ranged/space,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/waystation/cargobay)
+"ag" = (
+/obj/effect/decal/cleanable/blood,
+/obj/item/ammo_casing/c45/spent{
+	dir = 8;
+	pixel_y = -4
+	},
+/obj/item/ammo_casing/c45/spent{
+	dir = 8;
+	pixel_y = -4
+	},
+/obj/item/ammo_casing/c45/spent{
+	dir = 9;
+	pixel_x = 2;
+	pixel_y = -5
+	},
+/obj/item/ammo_casing/c45/spent{
+	dir = 9;
+	pixel_x = 6
+	},
+/obj/item/ammo_casing/c45/spent{
+	dir = 8;
+	pixel_x = 5;
+	pixel_y = -2
+	},
+/obj/item/ammo_casing/c45/spent{
+	dir = 8;
+	pixel_y = -4
+	},
+/obj/item/ammo_casing/c45/spent{
+	dir = 8
+	},
+/obj/item/ammo_casing/c45/spent{
+	pixel_x = -4
+	},
+/obj/item/ammo_casing/c45/spent{
+	dir = 8;
+	pixel_x = 4;
+	pixel_y = 3
+	},
+/obj/structure/chair/office,
+/obj/item/ammo_box/magazine/m45{
+	pixel_x = -10;
+	pixel_y = -6;
+	start_empty = 1
+	},
+/obj/item/melee/baseball_bat{
+	pixel_x = -4;
+	pixel_y = 10
+	},
+/turf/open/floor/iron/dark,
+/area/ruin/space/has_grav/waystation/securestorage)
+"ah" = (
+/mob/living/basic/trooper/syndicate/melee/space,
+/turf/open/floor/iron/dark,
+/area/ruin/space/has_grav/waystation/securestorage)
+"ai" = (
+/mob/living/basic/trooper/syndicate/ranged/space,
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/waystation/cargobay)
+"aj" = (
+/obj/effect/turf_decal/bot_red,
+/obj/structure/closet/crate/secure/weapon,
+/obj/item/melee/baseball_bat,
+/obj/item/ammo_box/magazine/wt550m9,
+/turf/open/floor/iron/dark,
+/area/ruin/space/has_grav/waystation/securestorage)
 "ar" = (
 /obj/machinery/vending/coffee,
 /obj/effect/turf_decal/siding/green,
@@ -38,6 +133,14 @@
 /obj/effect/mapping_helpers/airlock/access/all/away/security,
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/waystation/securestorage)
+"aQ" = (
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/breath
+	},
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/waystation)
 "be" = (
 /obj/structure/toilet{
 	dir = 8
@@ -61,10 +164,6 @@
 /obj/structure/closet/firecloset,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/waystation)
-"bA" = (
-/mob/living/basic/trooper/syndicate/melee/sword/space/stormtrooper,
-/turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/waystation/securestorage)
 "bG" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/cafeteria,
@@ -82,22 +181,6 @@
 /obj/structure/closet/secure_closet/freezer/meat/open,
 /turf/open/floor/iron/freezer,
 /area/ruin/space/has_grav/waystation/kitchen)
-"bR" = (
-/mob/living/basic/trooper/syndicate/ranged/shotgun/space,
-/obj/item/ammo_casing/shotgun/buckshot/spent{
-	pixel_x = 3;
-	pixel_y = 10
-	},
-/obj/item/ammo_casing/shotgun/buckshot/spent{
-	pixel_x = 6;
-	pixel_y = 1
-	},
-/obj/item/ammo_casing/shotgun/buckshot/spent{
-	pixel_x = -3;
-	pixel_y = 1
-	},
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/waystation/dorms)
 "bU" = (
 /obj/effect/turf_decal/tile/brown/half/contrasted{
 	dir = 8
@@ -540,15 +623,6 @@
 /obj/machinery/light/dim/directional/west,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/waystation/cargobay)
-"jN" = (
-/obj/effect/turf_decal/bot_red,
-/obj/structure/closet/crate/secure/weapon,
-/obj/item/gun/ballistic/automatic/wt550{
-	pin = /obj/item/firing_pin
-	},
-/obj/item/ammo_box/magazine/wt550m9,
-/turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/waystation/securestorage)
 "jV" = (
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/waystation/dorms)
@@ -1973,10 +2047,6 @@
 	},
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/waystation/cargobay)
-"JM" = (
-/mob/living/basic/trooper/syndicate/ranged/shotgun/space,
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/waystation/cargobay)
 "Kc" = (
 /obj/effect/turf_decal/tile/brown/half/contrasted{
 	dir = 1
@@ -2131,13 +2201,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/waystation/securestorage)
-"LW" = (
-/obj/effect/turf_decal/loading_area/red,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/mob/living/basic/trooper/syndicate/ranged/smg/space,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/waystation/cargobay)
 "Mi" = (
 /obj/machinery/vending/dinnerware,
 /obj/effect/decal/cleanable/dirt,
@@ -2610,12 +2673,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/waystation/dorms)
-"UC" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/mob/living/basic/trooper/syndicate/ranged/smg/space,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/ruin/space/has_grav/waystation/cargooffice)
 "UG" = (
 /turf/closed/wall,
 /area/ruin/space/has_grav/waystation/cargooffice)
@@ -2624,57 +2681,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/waystation/cargobay)
-"Va" = (
-/obj/effect/decal/cleanable/blood,
-/obj/item/ammo_casing/c45/spent{
-	dir = 8;
-	pixel_y = -4
-	},
-/obj/item/ammo_casing/c45/spent{
-	dir = 8;
-	pixel_y = -4
-	},
-/obj/item/ammo_casing/c45/spent{
-	dir = 9;
-	pixel_x = 2;
-	pixel_y = -5
-	},
-/obj/item/ammo_casing/c45/spent{
-	dir = 9;
-	pixel_x = 6
-	},
-/obj/item/ammo_casing/c45/spent{
-	dir = 8;
-	pixel_x = 5;
-	pixel_y = -2
-	},
-/obj/item/ammo_casing/c45/spent{
-	dir = 8;
-	pixel_y = -4
-	},
-/obj/item/ammo_casing/c45/spent{
-	dir = 8
-	},
-/obj/item/ammo_casing/c45/spent{
-	pixel_x = -4
-	},
-/obj/item/ammo_casing/c45/spent{
-	dir = 8;
-	pixel_x = 4;
-	pixel_y = 3
-	},
-/obj/structure/chair/office,
-/obj/item/ammo_box/magazine/m45{
-	pixel_x = -10;
-	pixel_y = -6;
-	start_empty = 1
-	},
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag{
-	pixel_x = -4;
-	pixel_y = 10
-	},
-/turf/open/floor/iron/dark,
-/area/ruin/space/has_grav/waystation/securestorage)
 "Vb" = (
 /obj/effect/turf_decal/tile/brown/half/contrasted{
 	dir = 8
@@ -2906,12 +2912,6 @@
 /obj/item/multitool,
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/waystation/power)
-"YD" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/suit_storage_unit/standard_unit,
-/turf/open/floor/plating,
-/area/ruin/space/has_grav/waystation)
 "YX" = (
 /obj/effect/turf_decal/tile/brown/half/contrasted{
 	dir = 8
@@ -4269,7 +4269,7 @@ Pj
 oa
 oa
 Id
-bR
+ad
 xw
 jV
 QN
@@ -4278,7 +4278,7 @@ dm
 QN
 QN
 TT
-YD
+aQ
 ym
 bN
 TT
@@ -4522,7 +4522,7 @@ xw
 xw
 Dx
 Sm
-UC
+ae
 HN
 Eh
 TT
@@ -5124,12 +5124,12 @@ pK
 pK
 yi
 Lt
-Va
+ag
 ZJ
 er
 hd
 aP
-LW
+af
 gu
 Xa
 Ko
@@ -5248,7 +5248,7 @@ pK
 pK
 yi
 qG
-bA
+ah
 er
 er
 ex
@@ -5393,7 +5393,7 @@ bW
 SD
 Xa
 rq
-JM
+ai
 SD
 bW
 SD
@@ -5434,7 +5434,7 @@ pK
 pK
 yi
 Ok
-jN
+aj
 er
 nD
 Ar
diff --git a/_maps/voidcrew/RandomRuins/SpaceRuins/whiteshipruin_box.dmm b/_maps/voidcrew/RandomRuins/SpaceRuins/whiteshipruin_box.dmm
index f85380196da..c61a1318145 100644
--- a/_maps/voidcrew/RandomRuins/SpaceRuins/whiteshipruin_box.dmm
+++ b/_maps/voidcrew/RandomRuins/SpaceRuins/whiteshipruin_box.dmm
@@ -1,4 +1,29 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ab" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/breath
+	},
+/turf/open/floor/mineral/titanium/tiled/white,
+/area/ruin/space/has_grav/whiteship/box)
+"ac" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/breath
+	},
+/turf/open/floor/mineral/titanium/tiled/white,
+/area/ruin/space/has_grav/whiteship/box)
+"ad" = (
+/obj/item/melee/baseball_bat{
+	pixel_y = -12
+	},
+/obj/machinery/light/broken/directional/east,
+/obj/effect/turf_decal/siding/wideplating{
+	dir = 4
+	},
+/obj/structure/rack,
+/turf/open/floor/iron/textured_edge{
+	dir = 4
+	},
+/area/ruin/space/has_grav/whiteship/box)
 "ag" = (
 /obj/machinery/power/shuttle_engine/huge{
 	dir = 8;
@@ -42,10 +67,6 @@
 /obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/floor/carpet,
 /area/ruin/space/has_grav/whiteship/box)
-"bN" = (
-/obj/machinery/suit_storage_unit/mining/eva,
-/turf/open/floor/mineral/titanium/tiled/white,
-/area/ruin/space/has_grav/whiteship/box)
 "bT" = (
 /obj/effect/turf_decal/trimline/yellow/arrow_ccw{
 	dir = 1
@@ -958,6 +979,12 @@
 /obj/machinery/atmospherics/components/unary/portables_connector/visible,
 /turf/open/floor/engine,
 /area/ruin/space/has_grav/whiteship/box)
+"Ez" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/breath
+	},
+/turf/open/floor/mineral/titanium/tiled/white,
+/area/ruin/space/has_grav/whiteship/box)
 "EA" = (
 /obj/effect/decal/cleanable/glass,
 /obj/structure/lattice,
@@ -1044,10 +1071,6 @@
 "HR" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ruin/space/has_grav/whiteship/box)
-"HT" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/turf/open/floor/mineral/titanium/tiled/white,
-/area/ruin/space/has_grav/whiteship/box)
 "HW" = (
 /obj/effect/turf_decal/tile/blue/half/contrasted{
 	dir = 1
@@ -1270,19 +1293,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/mineral/titanium/white/airless,
 /area/ruin/space/has_grav/whiteship/box)
-"OJ" = (
-/obj/item/gun/energy/laser/retro{
-	pixel_y = -12
-	},
-/obj/machinery/light/broken/directional/east,
-/obj/effect/turf_decal/siding/wideplating{
-	dir = 4
-	},
-/obj/structure/rack,
-/turf/open/floor/iron/textured_edge{
-	dir = 4
-	},
-/area/ruin/space/has_grav/whiteship/box)
 "OS" = (
 /obj/effect/decal/cleanable/glass,
 /obj/effect/decal/cleanable/dirt,
@@ -1971,7 +1981,7 @@ nH
 nH
 kK
 Pe
-OJ
+ad
 rp
 HR
 IA
@@ -2061,7 +2071,7 @@ HR
 Dl
 Ay
 HR
-bN
+Ez
 IA
 Ud
 kX
@@ -2083,7 +2093,7 @@ kK
 Ay
 Xk
 HR
-HT
+ab
 IA
 Qx
 Gp
@@ -2105,7 +2115,7 @@ kK
 sX
 kd
 HR
-HT
+ac
 IA
 Qx
 BG
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_crash_cult.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_crash_cult.dmm
index 045d859678a..294ea56114f 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_crash_cult.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_crash_cult.dmm
@@ -11,11 +11,26 @@
 /obj/effect/zone_mobs/cult,
 /turf/open/floor/cult,
 /area/ruin/unpowered)
+"ad" = (
+/obj/item/knife/combat/survival,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/plating,
+/area/ruin/unpowered)
 "ae" = (
 /obj/effect/decal/cleanable/blood/tracks,
 /obj/effect/zone_mobs/cult,
 /turf/open/floor/cult,
 /area/ruin/unpowered)
+"af" = (
+/obj/structure/table,
+/obj/machinery/recharger,
+/obj/item/melee/baseball_bat,
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ruin/unpowered)
 "as" = (
 /obj/effect/spawner/structure/window/reinforced/shuttle,
 /obj/machinery/door/poddoor{
@@ -117,6 +132,24 @@
 	},
 /turf/open/floor/plating,
 /area/ruin/unpowered)
+"dC" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/gas/atmos;
+	storage_type = /obj/item/watertank/atmos
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/tile/brown/anticorner{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/brown/anticorner{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/brown/anticorner{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/brown/anticorner,
+/turf/open/floor/plating,
+/area/ruin/unpowered)
 "ej" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/tile/green{
@@ -703,15 +736,6 @@
 	},
 /turf/open/floor/plating,
 /area/ruin/unpowered)
-"xT" = (
-/obj/structure/table,
-/obj/machinery/recharger,
-/obj/item/gun/energy/laser/retro,
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/ruin/unpowered)
 "xY" = (
 /obj/effect/decal/cleanable/blood/tracks{
 	dir = 5
@@ -803,21 +827,6 @@
 /obj/machinery/atmospherics/components/unary/vent_pump,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
-"BC" = (
-/obj/machinery/suit_storage_unit/atmos,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/tile/brown/anticorner{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/brown/anticorner{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/brown/anticorner{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/brown/anticorner,
-/turf/open/floor/plating,
-/area/ruin/unpowered)
 "BV" = (
 /obj/effect/decal/cleanable/blood,
 /obj/effect/decal/cleanable/blood/gibs/body,
@@ -1054,20 +1063,6 @@
 	},
 /turf/open/floor/cult,
 /area/ruin/unpowered)
-"IU" = (
-/obj/machinery/suit_storage_unit/atmos,
-/obj/effect/turf_decal/tile/brown/anticorner{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/brown/anticorner{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/brown/anticorner{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/brown/anticorner,
-/turf/open/floor/cult,
-/area/ruin/unpowered)
 "Jh" = (
 /turf/open/floor/cult,
 /area/ruin/unpowered)
@@ -1110,12 +1105,6 @@
 /obj/effect/decal/cleanable/blood/tracks,
 /turf/open/floor/cult,
 /area/ruin/unpowered)
-"KH" = (
-/obj/item/chainsaw,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/plating,
-/area/ruin/unpowered)
 "KV" = (
 /obj/effect/decal/cleanable/blood,
 /turf/open/floor/plating,
@@ -1363,6 +1352,23 @@
 /obj/effect/decal/cleanable/blood,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
+"XS" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/gas/atmos;
+	storage_type = /obj/item/watertank/atmos
+	},
+/obj/effect/turf_decal/tile/brown/anticorner{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/brown/anticorner{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/brown/anticorner{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/brown/anticorner,
+/turf/open/floor/cult,
+/area/ruin/unpowered)
 "XV" = (
 /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -1430,7 +1436,7 @@ Nt
 Yn
 EQ
 HE
-KH
+ad
 EQ
 Ju
 Nt
@@ -1662,7 +1668,7 @@ xD
 "}
 (14,1,1) = {"
 xD
-IU
+XS
 II
 mx
 qS
@@ -1742,7 +1748,7 @@ nv
 "}
 (18,1,1) = {"
 Nt
-BC
+dC
 my
 Fe
 cD
@@ -1890,7 +1896,7 @@ as
 as
 JX
 vT
-xT
+af
 GW
 xD
 xD
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_crash_kitchen.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_crash_kitchen.dmm
index 989f0fce6fa..58b34bc1d4a 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_crash_kitchen.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_crash_kitchen.dmm
@@ -1,4 +1,19 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/item/ammo_casing/spent{
+	dir = 1;
+	pixel_x = 7;
+	pixel_y = 4
+	},
+/obj/effect/decal/cleanable/blood/gibs,
+/obj/item/melee/baseball_bat{
+	pixel_y = 7
+	},
+/obj/effect/mob_spawn/corpse/human/assistant,
+/turf/open/floor/plating{
+	burnt = 1
+	},
+/area/ruin/unpowered)
 "aq" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/fancy/donut_box,
@@ -358,21 +373,6 @@
 "KR" = (
 /turf/open/floor/plating,
 /area/ruin/unpowered)
-"Lz" = (
-/obj/item/ammo_casing/spent{
-	dir = 1;
-	pixel_x = 7;
-	pixel_y = 4
-	},
-/obj/effect/decal/cleanable/blood/gibs,
-/obj/item/gun/ballistic/automatic/pistol/m1911{
-	pixel_y = 7
-	},
-/obj/effect/mob_spawn/corpse/human/assistant,
-/turf/open/floor/plating{
-	burnt = 1
-	},
-/area/ruin/unpowered)
 "Mi" = (
 /obj/structure/grille,
 /turf/open/floor/plating,
@@ -622,7 +622,7 @@ uM
 Rt
 me
 gg
-Lz
+aa
 aq
 zy
 gg
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_daniel.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_daniel.dmm
index 5e05f4abb70..f827a85781b 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_daniel.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_daniel.dmm
@@ -129,18 +129,6 @@
 /obj/structure/chair/office,
 /turf/open/floor/wood,
 /area/ruin/unpowered)
-"w" = (
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/blood/drip,
-/obj/effect/decal/cleanable/blood/gibs,
-/obj/effect/mob_spawn/corpse/human,
-/obj/item/gun/ballistic/automatic/pistol/m1911,
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/item/food/cakeslice/birthday,
-/turf/open/floor/carpet,
-/area/ruin/unpowered)
 "x" = (
 /obj/structure/bed,
 /obj/item/bedsheet/red,
@@ -186,6 +174,18 @@
 "E" = (
 /turf/closed/wall/mineral/wood,
 /area/ruin/unpowered)
+"F" = (
+/obj/effect/decal/cleanable/blood,
+/obj/effect/decal/cleanable/blood/drip,
+/obj/effect/decal/cleanable/blood/gibs,
+/obj/effect/mob_spawn/corpse/human,
+/obj/item/melee/baseball_bat,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/item/food/cakeslice/birthday,
+/turf/open/floor/carpet,
+/area/ruin/unpowered)
 "Q" = (
 /obj/structure/fans/tiny,
 /obj/structure/mineral_door/wood,
@@ -276,7 +276,7 @@ j
 j
 j
 E
-w
+F
 a
 E
 "}
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_fortress_of_solitide.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_fortress_of_solitide.dmm
index c9f49bdc1a2..7c2663ddb2e 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_fortress_of_solitide.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_fortress_of_solitide.dmm
@@ -65,6 +65,35 @@
 /obj/structure/closet/crate/zone_loot/armory,
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
+"ai" = (
+/obj/structure/table/wood/poker,
+/obj/item/melee/baseball_bat,
+/turf/open/floor/wood,
+/area/ruin/powered)
+"aj" = (
+/obj/structure/closet,
+/obj/item/melee/baseball_bat,
+/obj/item/ammo_box/magazine/m9mm,
+/obj/item/ammo_box/magazine/m9mm,
+/turf/open/floor/plating/rust,
+/area/ruin/powered)
+"ak" = (
+/obj/item/melee/baseball_bat,
+/turf/open/misc/dust/lit,
+/area/overmap_encounter/planetoid/wasteland)
+"al" = (
+/obj/structure/table/wood,
+/obj/item/knife/combat/survival{
+	pixel_x = -3;
+	pixel_y = 4
+	},
+/obj/item/coin/antagtoken{
+	pixel_x = 4;
+	pixel_y = -2
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating/rust,
+/area/ruin/powered)
 "am" = (
 /obj/structure/rack,
 /obj/effect/spawner/random/maintenance/three,
@@ -79,6 +108,47 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/ruin/powered)
+"an" = (
+/obj/item/melee/baseball_bat,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/plating,
+/area/ruin/powered)
+"ao" = (
+/obj/structure/table,
+/obj/item/melee/baseball_bat,
+/turf/open/floor/plating,
+/area/ruin/powered)
+"ap" = (
+/obj/structure/table,
+/obj/item/ammo_box/c9mm{
+	pixel_y = 6
+	},
+/obj/item/melee/baseball_bat,
+/obj/item/ammo_box/magazine/m9mm,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating/rust,
+/area/ruin/powered)
+"aq" = (
+/obj/item/knife/combat/survival,
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/decal/cleanable/generic,
+/obj/effect/spawner/random/maintenance,
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/ruin/powered)
+"ar" = (
+/obj/structure/table,
+/obj/item/spear,
+/obj/item/clothing/head/costume/delinquent,
+/turf/open/floor/plating,
+/area/ruin/powered)
 "as" = (
 /obj/effect/decal/cleanable/blood/oil,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
@@ -92,6 +162,13 @@
 /obj/structure/cable,
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
+"at" = (
+/obj/structure/table,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/under/color/grey/ancient,
+/obj/item/knife/combat/survival,
+/turf/open/floor/plating/rust,
+/area/ruin/powered)
 "av" = (
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
@@ -203,11 +280,6 @@
 /obj/structure/sign/poster/contraband/clown,
 /turf/closed/wall/r_wall/rust,
 /area/ruin/powered)
-"bF" = (
-/obj/item/gun/ballistic/shotgun/doublebarrel,
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/plating,
-/area/ruin/powered)
 "bG" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/closed/wall/r_wall/rust,
@@ -1145,11 +1217,6 @@
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /turf/open/floor/plating,
 /area/ruin/powered)
-"ls" = (
-/obj/structure/table,
-/obj/item/gun/energy/laser/retro,
-/turf/open/floor/plating,
-/area/ruin/powered)
 "lv" = (
 /obj/item/flashlight/lamp/bananalamp,
 /turf/open/floor/plating,
@@ -1631,17 +1698,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
-"pY" = (
-/obj/structure/table,
-/obj/item/ammo_box/c9mm{
-	pixel_y = 6
-	},
-/obj/item/gun/ballistic/rifle/boltaction/pipegun/pistol,
-/obj/item/ammo_box/magazine/m9mm,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plating/rust,
-/area/ruin/powered)
 "qi" = (
 /obj/structure/closet/body_bag,
 /obj/item/clothing/under/costume/pirate,
@@ -2017,19 +2073,6 @@
 /obj/effect/decal/cleanable/blood,
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
-"uB" = (
-/obj/structure/table/wood,
-/obj/item/switchblade{
-	pixel_x = -3;
-	pixel_y = 4
-	},
-/obj/item/coin/antagtoken{
-	pixel_x = 4;
-	pixel_y = -2
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/rust,
-/area/ruin/powered)
 "uD" = (
 /obj/structure/rack,
 /obj/effect/mob_spawn/ghost_role/drone,
@@ -2339,20 +2382,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/ruin/powered)
-"yb" = (
-/obj/item/nullrod/hypertool,
-/obj/effect/decal/cleanable/blood/old,
-/obj/effect/decal/cleanable/generic,
-/obj/effect/spawner/random/maintenance,
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/ruin/powered)
 "yd" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -2508,10 +2537,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating,
 /area/ruin/powered)
-"zG" = (
-/obj/item/gun/ballistic/automatic/pistol/m1911,
-/turf/open/misc/dust/lit,
-/area/overmap_encounter/planetoid/wasteland)
 "zK" = (
 /turf/closed/indestructible/reinforced,
 /area/ruin/powered)
@@ -3312,11 +3337,6 @@
 /obj/effect/decal/cleanable/ash,
 /turf/closed/wall/rust,
 /area/ruin/powered)
-"Ib" = (
-/obj/structure/table/wood/poker,
-/obj/item/gun/ballistic/revolver/russian,
-/turf/open/floor/wood,
-/area/ruin/powered)
 "Ie" = (
 /obj/structure/closet/cardboard,
 /mob/living/basic/snake,
@@ -3437,13 +3457,6 @@
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /turf/open/floor/plating,
 /area/ruin/powered)
-"IV" = (
-/obj/structure/table,
-/obj/item/clothing/mask/gas,
-/obj/item/clothing/under/color/grey/ancient,
-/obj/item/spear/grey_tide,
-/turf/open/floor/plating/rust,
-/area/ruin/powered)
 "IY" = (
 /mob/living/basic/mouse/rat,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -4013,13 +4026,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
-"OO" = (
-/obj/structure/closet,
-/obj/item/gun/ballistic/rifle/boltaction/pipegun/pistol,
-/obj/item/ammo_box/magazine/m9mm,
-/obj/item/ammo_box/magazine/m9mm,
-/turf/open/floor/plating/rust,
-/area/ruin/powered)
 "OQ" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -4763,12 +4769,6 @@
 /obj/structure/grille,
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
-"Wv" = (
-/obj/structure/table,
-/obj/item/melee/greykingsword,
-/obj/item/clothing/head/costume/delinquent,
-/turf/open/floor/plating,
-/area/ruin/powered)
 "WD" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/ash,
@@ -5892,7 +5892,7 @@ KN
 qF
 tf
 mx
-Ib
+ai
 xx
 in
 in
@@ -5979,7 +5979,7 @@ jy
 XF
 bb
 Pe
-Ib
+ai
 ET
 fi
 in
@@ -6099,7 +6099,7 @@ av
 nN
 Re
 RX
-OO
+aj
 xx
 CF
 xx
@@ -6154,7 +6154,7 @@ BP
 BU
 FH
 xx
-zG
+ak
 Ml
 in
 in
@@ -6306,7 +6306,7 @@ fi
 vD
 dI
 av
-uB
+al
 Ta
 xx
 zV
@@ -6369,7 +6369,7 @@ sU
 rJ
 mh
 pR
-bF
+an
 et
 Gw
 WL
@@ -6715,7 +6715,7 @@ iR
 av
 wb
 nH
-ls
+ao
 Xe
 Hp
 Zo
@@ -6785,7 +6785,7 @@ qI
 pR
 Gt
 qr
-pY
+ap
 XF
 av
 xx
@@ -6959,11 +6959,11 @@ zK
 xx
 fw
 ah
-IV
+at
 av
 XS
 OQ
-Wv
+ar
 bG
 zK
 xx
@@ -6974,7 +6974,7 @@ xx
 cm
 Oo
 Wt
-yb
+aq
 YT
 Wt
 as
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_house.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_house.dmm
index 64e5a5d7127..267828f6da2 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_house.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_house.dmm
@@ -10,19 +10,19 @@
 /obj/effect/zone_mobs/undead,
 /turf/open/floor/wood,
 /area/ruin/unpowered)
-"g" = (
-/obj/machinery/door/airlock/wood,
-/obj/structure/barricade/wooden,
-/turf/open/floor/wood,
-/area/ruin/unpowered)
-"h" = (
+"d" = (
 /obj/structure/table/wood,
-/obj/item/gun/ballistic/automatic/pistol/m1911,
+/obj/item/melee/baseball_bat,
 /obj/item/ammo_box/magazine/m45,
 /obj/effect/gibspawner/human/bodypartless,
 /obj/item/ammo_box/magazine/m45,
 /turf/open/floor/carpet/donk,
 /area/ruin/unpowered)
+"g" = (
+/obj/machinery/door/airlock/wood,
+/obj/structure/barricade/wooden,
+/turf/open/floor/wood,
+/area/ruin/unpowered)
 "m" = (
 /obj/structure/closet/secure_closet/freezer/fridge,
 /turf/open/floor/wood,
@@ -109,7 +109,7 @@ X
 "}
 (3,1,1) = {"
 A
-h
+d
 c
 H
 H
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_lab.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_lab.dmm
index 09c3e585d0a..6d101881f8d 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_lab.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_lab.dmm
@@ -4,6 +4,20 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
+"ab" = (
+/obj/structure/displaycase/noalert{
+	start_showpiece_type = null
+	},
+/turf/open/floor/iron/white,
+/area/ruin/powered)
+"ac" = (
+/obj/structure/closet/cardboard,
+/obj/structure/fluff/paper/stack,
+/obj/item/paper,
+/obj/item/melee/baseball_bat,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/dark,
+/area/ruin/powered)
 "av" = (
 /obj/effect/turf_decal/tile/purple/anticorner{
 	dir = 9
@@ -528,12 +542,6 @@
 	},
 /turf/open/floor/iron,
 /area/ruin/powered)
-"wp" = (
-/obj/structure/displaycase/noalert{
-	start_showpiece_type = /obj/item/gun/energy/laser/captain
-	},
-/turf/open/floor/iron/white,
-/area/ruin/powered)
 "ww" = (
 /obj/structure/table,
 /obj/effect/decal/cleanable/dirt,
@@ -757,14 +765,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/dark,
 /area/ruin/powered)
-"Kk" = (
-/obj/structure/closet/cardboard,
-/obj/structure/fluff/paper/stack,
-/obj/item/paper,
-/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/ruin/powered)
 "Kz" = (
 /obj/structure/window/reinforced,
 /obj/effect/turf_decal/tile/neutral/diagonal_edge,
@@ -1242,7 +1242,7 @@ Rw
 bG
 gw
 bz
-wp
+ab
 Bv
 GR
 bz
@@ -1573,7 +1573,7 @@ VP
 qZ
 EW
 Ea
-Kk
+ac
 Yv
 ZS
 CN
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_miningexpedition.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_miningexpedition.dmm
index e3f2f954f84..0ad5f9c4739 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_miningexpedition.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_miningexpedition.dmm
@@ -1,4 +1,22 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/gas/explorer
+	},
+/turf/open/floor/iron/smooth_large,
+/area/ruin/unpowered)
+"ab" = (
+/obj/item/chair,
+/obj/effect/decal/cleanable/blood,
+/obj/item/melee/baseball_bat,
+/turf/open/floor/iron/grimy,
+/area/ruin/unpowered)
+"jC" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/gas/explorer
+	},
+/turf/open/floor/iron/smooth_large,
+/area/ruin/unpowered)
 "AA" = (
 /obj/structure/closet/crate/zone_loot/expedition,
 /turf/open/floor/iron/smooth_half{
@@ -118,10 +136,6 @@
 	},
 /turf/open/floor/iron/smooth_large,
 /area/ruin/unpowered)
-"ug" = (
-/obj/machinery/suit_storage_unit/mining,
-/turf/open/floor/iron/smooth_large,
-/area/ruin/unpowered)
 "uq" = (
 /obj/machinery/suit_storage_unit/open,
 /turf/open/floor/iron/smooth_large,
@@ -284,12 +298,6 @@
 	},
 /turf/open/floor/iron/grimy,
 /area/ruin/unpowered)
-"TI" = (
-/obj/item/chair,
-/obj/effect/decal/cleanable/blood,
-/obj/item/gun/ballistic/automatic/pistol/m1911,
-/turf/open/floor/iron/grimy,
-/area/ruin/unpowered)
 "Uu" = (
 /obj/machinery/light/broken{
 	dir = 1
@@ -408,9 +416,9 @@ mk
 mk
 LZ
 Vw
-ug
+aa
 uq
-ug
+jC
 rr
 Wv
 oj
@@ -521,7 +529,7 @@ yZ
 oj
 yZ
 Vw
-TI
+ab
 Wz
 Vw
 yZ
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_moth.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_moth.dmm
index e94537a4b44..0face58bec0 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_moth.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_moth.dmm
@@ -89,10 +89,6 @@
 /obj/item/storage/toolbox/electrical,
 /turf/open/floor/iron,
 /area/ruin/unpowered)
-"w" = (
-/obj/machinery/suit_storage_unit/mining/eva,
-/turf/open/floor/plating/rust,
-/area/ruin/unpowered)
 "x" = (
 /obj/machinery/computer/order_console/mining,
 /turf/open/floor/iron,
@@ -125,6 +121,12 @@
 /obj/item/stack/sheet/mineral/plasma,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
+"E" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/breath
+	},
+/turf/open/floor/plating/rust,
+/area/ruin/unpowered)
 "F" = (
 /turf/closed/wall/rust,
 /area/ruin/unpowered)
@@ -145,6 +147,12 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/ruin/unpowered)
+"J" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/breath
+	},
+/turf/open/floor/plating/rust,
+/area/ruin/unpowered)
 "K" = (
 /obj/machinery/door/airlock,
 /turf/open/floor/iron,
@@ -160,6 +168,15 @@
 	},
 /turf/open/floor/plating/rust,
 /area/overmap_encounter/planetoid/wasteland)
+"N" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/breath
+	},
+/turf/open/floor/iron,
+/area/ruin/unpowered)
 "O" = (
 /obj/effect/turf_decal/caution{
 	dir = 1
@@ -172,13 +189,6 @@
 	},
 /turf/open/floor/iron,
 /area/ruin/unpowered)
-"Q" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/machinery/suit_storage_unit/mining/eva,
-/turf/open/floor/iron,
-/area/ruin/unpowered)
 "R" = (
 /obj/structure/girder/displaced,
 /turf/open/floor/plating/rust,
@@ -385,7 +395,7 @@ t
 s
 s
 l
-w
+E
 F
 "}
 (13,1,1) = {"
@@ -398,7 +408,7 @@ v
 l
 l
 t
-w
+J
 F
 "}
 (14,1,1) = {"
@@ -411,7 +421,7 @@ L
 L
 l
 l
-Q
+N
 F
 "}
 (15,1,1) = {"
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_ore_proccessing_facility.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_ore_proccessing_facility.dmm
index 4505e0dcaba..2ae4ac4fe04 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_ore_proccessing_facility.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_ore_proccessing_facility.dmm
@@ -1,4 +1,11 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/structure/closet/crate/secure/gear{
+	req_access_txt = "1"
+	},
+/obj/item/melee/baseball_bat,
+/turf/open/floor/plating/rust,
+/area/ruin/powered)
 "am" = (
 /obj/structure/table,
 /turf/open/floor/plating/rust,
@@ -389,13 +396,6 @@
 	smoothing_groups = null
 	},
 /area/ruin/powered)
-"xD" = (
-/obj/structure/closet/crate/secure/gear{
-	req_access_txt = "1"
-	},
-/obj/item/gun/ballistic/revolver/c38/detective,
-/turf/open/floor/plating/rust,
-/area/ruin/powered)
 "xO" = (
 /obj/machinery/conveyor/auto{
 	dir = 4;
@@ -972,7 +972,7 @@ wZ
 wW
 qk
 rx
-xD
+aa
 hv
 wB
 wB
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_pod.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_pod.dmm
index 73b30569a76..986dda90c83 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_pod.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_pod.dmm
@@ -7,6 +7,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/pod/dark,
 /area/overmap_encounter/planetoid/wasteland)
+"c" = (
+/obj/structure/closet/secure_closet/miner/unlocked,
+/obj/item/melee/baseball_bat,
+/obj/item/ammo_box/magazine/m9mm,
+/turf/open/floor/pod/dark,
+/area/overmap_encounter/planetoid/wasteland)
 "f" = (
 /obj/structure/closet/crate/grave,
 /turf/open/misc/wasteland/lit,
@@ -42,12 +48,6 @@
 /obj/effect/decal/fakelattice,
 /turf/open/misc/dust/lit,
 /area/overmap_encounter/planetoid/wasteland)
-"u" = (
-/obj/structure/closet/secure_closet/miner/unlocked,
-/obj/item/gun/ballistic/automatic/wt550,
-/obj/item/ammo_box/magazine/m9mm,
-/turf/open/floor/pod/dark,
-/area/overmap_encounter/planetoid/wasteland)
 "v" = (
 /obj/effect/decal/cleanable/blood/splatter,
 /turf/open/misc/wasteland/lit,
@@ -100,11 +100,6 @@
 /obj/machinery/microwave,
 /turf/open/floor/pod/dark,
 /area/overmap_encounter/planetoid/wasteland)
-"Y" = (
-/obj/effect/decal/cleanable/dirt,
-/mob/living/simple_animal/hostile/asteroid/hermit/ranged/gunslinger,
-/turf/open/floor/pod/dark,
-/area/overmap_encounter/planetoid/wasteland)
 "Z" = (
 /obj/structure/table/reinforced,
 /obj/item/t_scanner/adv_mining_scanner,
@@ -127,7 +122,7 @@ a
 Q
 l
 I
-u
+c
 n
 X
 Q
@@ -157,7 +152,7 @@ a
 Q
 j
 w
-Y
+K
 w
 r
 Q
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_rd_god.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_rd_god.dmm
index 3f21d47fbf5..4ba529af18a 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_rd_god.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_rd_god.dmm
@@ -10,6 +10,18 @@
 /obj/effect/zone_mobs/robot/boss,
 /turf/open/misc/dirt/jungle/wasteland,
 /area/overmap_encounter/planetoid/wasteland)
+"d" = (
+/mob/living/simple_animal/hostile/asteroid/elite/herald{
+	desc = "Director?";
+	name = "the research director"
+	},
+/obj/item/melee/baseball_bat,
+/obj/item/clothing/suit/toggle/labcoat,
+/obj/item/clothing/under/rank/rnd/research_director/skirt,
+/obj/item/clothing/shoes/sneakers/brown,
+/obj/item/clothing/neck/cloak/rd,
+/turf/open/misc/dirt/jungle/wasteland,
+/area/overmap_encounter/planetoid/wasteland)
 "e" = (
 /obj/effect/zone_mobs/robot,
 /turf/open/misc/dirt/jungle/wasteland,
@@ -21,18 +33,6 @@
 /obj/structure/girder/displaced,
 /turf/open/misc/dirt/jungle/wasteland,
 /area/overmap_encounter/planetoid/wasteland)
-"D" = (
-/mob/living/simple_animal/hostile/asteroid/elite/herald{
-	desc = "Director?";
-	name = "the research director"
-	},
-/obj/item/gun/energy/e_gun,
-/obj/item/clothing/suit/toggle/labcoat,
-/obj/item/clothing/under/rank/rnd/research_director/skirt,
-/obj/item/clothing/shoes/sneakers/brown,
-/obj/item/clothing/neck/cloak/rd,
-/turf/open/misc/dirt/jungle/wasteland,
-/area/overmap_encounter/planetoid/wasteland)
 "O" = (
 /obj/structure/girder,
 /turf/open/misc/dirt/jungle/wasteland,
@@ -336,7 +336,7 @@ k
 k
 k
 c
-D
+d
 k
 k
 k
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_soviet.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_soviet.dmm
index 6e3975e182a..0d6dae8b6c3 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_soviet.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_soviet.dmm
@@ -1,4 +1,12 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/structure/closet/gimmick/russian,
+/obj/item/melee/baseball_bat,
+/obj/item/storage/toolbox/ammobox/strilka310/surplus,
+/obj/item/knife/combat/survival,
+/obj/item/ammo_box/n762,
+/turf/open/floor/wood,
+/area/ruin)
 "aw" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
@@ -90,14 +98,6 @@
 	},
 /turf/open/misc/dust/lit,
 /area/overmap_encounter/planetoid/wasteland)
-"sf" = (
-/obj/structure/closet/gimmick/russian,
-/obj/item/gun/ballistic/rifle/boltaction,
-/obj/item/storage/toolbox/ammobox/strilka310/surplus,
-/obj/item/knife/combat/survival,
-/obj/item/ammo_box/n762,
-/turf/open/floor/wood,
-/area/ruin)
 "sr" = (
 /obj/effect/decal/cleanable/wrapping,
 /obj/structure/cable,
@@ -413,7 +413,7 @@ nP
 Mn
 jY
 nP
-sf
+aa
 Pg
 PI
 rW
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_assaultpodcrash.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_assaultpodcrash.dmm
index 6e4a1bf7379..597b8fdd29a 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_assaultpodcrash.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_assaultpodcrash.dmm
@@ -1,4 +1,12 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/structure/closet/crate/secure/weapon,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/melee/baseball_bat,
+/obj/item/ammo_box/magazine/smartgun,
+/obj/item/ammo_box/magazine/smartgun,
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/unpowered)
 "b" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/closet/crate/zone_loot/syndicate,
@@ -11,10 +19,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/unpowered)
-"d" = (
-/obj/item/gun/ballistic/automatic/pistol/no_mag,
-/turf/open/misc/wasteland/lit,
-/area/overmap_encounter/planetoid/wasteland)
 "e" = (
 /obj/structure/barricade/wooden,
 /obj/machinery/door/airlock/centcom{
@@ -24,6 +28,10 @@
 /obj/effect/mapping_helpers/airlock/access/all/syndicate/general,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
+"f" = (
+/obj/item/melee/baseball_bat,
+/turf/open/misc/wasteland/lit,
+/area/overmap_encounter/planetoid/wasteland)
 "h" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/ruin/unpowered)
@@ -165,14 +173,6 @@
 "O" = (
 /turf/template_noop,
 /area/template_noop)
-"P" = (
-/obj/structure/closet/crate/secure/weapon,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/gun/ballistic/automatic/smartgun,
-/obj/item/ammo_box/magazine/smartgun,
-/obj/item/ammo_box/magazine/smartgun,
-/turf/open/floor/mineral/plastitanium/red,
-/area/ruin/unpowered)
 "R" = (
 /obj/machinery/door/airlock/centcom{
 	name = "Assault Pod"
@@ -254,14 +254,14 @@ c
 F
 w
 r
-P
+a
 h
 "}
 (4,1,1) = {"
 O
 O
 z
-d
+f
 R
 p
 L
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_camp_adobe.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_camp_adobe.dmm
index 3d611d58d65..60616fa2f46 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_camp_adobe.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_camp_adobe.dmm
@@ -1,102 +1,109 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"a" = (
+"aa" = (
 /turf/template_noop,
 /area/template_noop)
-"b" = (
+"ab" = (
 /obj/effect/decal/cleanable/blood/old,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
-"c" = (
+"ac" = (
 /obj/machinery/hydroponics/soil,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"d" = (
+"ad" = (
 /obj/structure/barricade/sandbags,
 /turf/open/misc/wasteland/lit,
 /area/overmap_encounter/planetoid/wasteland)
-"e" = (
+"ae" = (
 /obj/structure/table,
 /obj/item/ammo_box/magazine/wt550m9,
 /obj/item/ammo_box/magazine/wt550m9,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"f" = (
+"af" = (
 /mob/living/simple_animal/hostile/asteroid/hermit/ranged/hunter{
 	faction = list("adobe")
 	},
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"g" = (
+"ag" = (
 /turf/closed/wall,
 /area/overmap_encounter/planetoid/wasteland)
-"h" = (
+"ah" = (
 /obj/structure/table,
 /obj/item/gun/ballistic/rifle/boltaction,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"i" = (
+"ai" = (
 /obj/item/stack/sheet/mineral/gold,
 /obj/structure/table,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"j" = (
+"aj" = (
 /obj/structure/bonfire/prelit,
 /obj/effect/decal/cleanable/ash,
 /turf/open/misc/wasteland/lit,
 /area/overmap_encounter/planetoid/wasteland)
-"k" = (
+"ak" = (
 /obj/machinery/hydroponics/soil,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
-"m" = (
+"al" = (
+/mob/living/simple_animal/hostile/asteroid/hermit/ranged/hunter{
+	dir = 4;
+	faction = list("adobe")
+	},
+/turf/open/floor/plating/rust,
+/area/ruin/unpowered)
+"am" = (
 /obj/structure/reagent_dispensers/watertank,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"n" = (
+"an" = (
 /obj/structure/table,
 /obj/item/gun/ballistic/automatic/wt550,
 /obj/item/ammo_box/magazine/m9mm,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"o" = (
+"ao" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"p" = (
+"ap" = (
 /obj/item/stack/sheet/mineral/plasma/thirty,
 /obj/structure/table,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"q" = (
+"aq" = (
 /obj/item/trash/can{
 	pixel_y = -6
 	},
 /turf/open/misc/wasteland/lit,
 /area/overmap_encounter/planetoid/wasteland)
-"r" = (
+"ar" = (
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"s" = (
+"as" = (
 /turf/open/floor/plating,
 /area/ruin/unpowered)
-"t" = (
+"at" = (
 /obj/structure/table,
 /obj/item/reagent_containers/cup/glass/bottle/sarsaparilla,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"u" = (
+"au" = (
 /obj/structure/tank_dispenser/oxygen,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"v" = (
+"av" = (
 /obj/item/stack/sheet/mineral/titanium/fifty,
 /obj/structure/table,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"w" = (
+"aw" = (
 /mob/living/simple_animal/hostile/asteroid/hermit/ranged/hunter{
 	dir = 4;
 	faction = list("adobe")
@@ -104,24 +111,24 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
-"x" = (
+"ax" = (
 /mob/living/simple_animal/hostile/asteroid/hermit/survivor{
 	dir = 4;
 	faction = list("adobe")
 	},
 /turf/open/misc/wasteland/lit,
 /area/overmap_encounter/planetoid/wasteland)
-"y" = (
+"ay" = (
 /obj/structure/table,
 /obj/item/clothing/glasses/meson/gar,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"z" = (
+"az" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/zone_mobs/wildlife,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
-"A" = (
+"aA" = (
 /obj/item/cigbutt{
 	pixel_x = -3;
 	pixel_y = -1
@@ -132,10 +139,10 @@
 	},
 /turf/open/misc/wasteland/lit,
 /area/overmap_encounter/planetoid/wasteland)
-"B" = (
+"aB" = (
 /turf/closed/wall,
 /area/ruin/unpowered)
-"C" = (
+"aC" = (
 /obj/structure/chair/plastic,
 /mob/living/simple_animal/hostile/asteroid/hermit/survivor{
 	faction = list("adobe")
@@ -143,14 +150,14 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/misc/wasteland/lit,
 /area/overmap_encounter/planetoid/wasteland)
-"D" = (
+"aD" = (
 /mob/living/simple_animal/hostile/asteroid/hermit/ranged/gunslinger{
 	dir = 4;
 	faction = list("adobe")
 	},
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"E" = (
+"aE" = (
 /mob/living/simple_animal/hostile/asteroid/hermit/survivor{
 	dir = 1;
 	faction = list("adobe")
@@ -159,7 +166,7 @@
 /obj/structure/closet/crate/zone_loot/wardrobe,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
-"F" = (
+"aF" = (
 /obj/effect/decal/cleanable/blood/old{
 	icon = 'voidcrew/icons/effects/legacy_blood.dmi';
 	icon_state = "floor5-old";
@@ -168,11 +175,11 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"G" = (
+"aG" = (
 /obj/structure/barricade/sandbags,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
-"H" = (
+"aH" = (
 /obj/effect/decal/cleanable/blood/old{
 	icon = 'voidcrew/icons/effects/legacy_blood.dmi';
 	icon_state = "floor3-old";
@@ -181,30 +188,30 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
-"I" = (
+"aI" = (
 /obj/structure/falsewall,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"J" = (
+"aJ" = (
 /obj/structure/sign/poster/contraband/communist_state,
 /turf/closed/wall/rust,
 /area/ruin/unpowered)
-"K" = (
+"aK" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/misc/wasteland/lit,
 /area/overmap_encounter/planetoid/wasteland)
-"L" = (
+"aL" = (
 /turf/closed/wall/rust,
 /area/overmap_encounter/planetoid/wasteland)
-"M" = (
+"aM" = (
 /turf/open/misc/wasteland/lit,
 /area/overmap_encounter/planetoid/wasteland)
-"N" = (
+"aN" = (
 /obj/item/stack/sheet/mineral/uranium/five,
 /obj/structure/table,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
-"O" = (
+"aO" = (
 /obj/structure/chair/plastic{
 	dir = 4
 	},
@@ -215,15 +222,15 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/misc/wasteland/lit,
 /area/overmap_encounter/planetoid/wasteland)
-"P" = (
+"aP" = (
 /obj/structure/barricade/sandbags,
 /turf/open/misc/dust/lit,
 /area/overmap_encounter/planetoid/wasteland)
-"Q" = (
+"aQ" = (
 /obj/structure/reagent_dispensers/watertank,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
-"R" = (
+"aR" = (
 /obj/effect/mob_spawn/corpse/human/damaged,
 /obj/effect/decal/cleanable/blood/old{
 	icon = 'voidcrew/icons/effects/legacy_blood.dmi';
@@ -232,264 +239,276 @@
 	},
 /turf/open/misc/wasteland/lit,
 /area/overmap_encounter/planetoid/wasteland)
-"S" = (
+"aS" = (
 /obj/machinery/door/airlock/wood/glass,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"T" = (
+"aT" = (
 /obj/structure/barricade/sandbags,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"U" = (
+"aU" = (
 /turf/closed/wall/rust,
 /area/ruin/unpowered)
-"V" = (
+"aV" = (
 /obj/structure/table,
 /obj/item/radio,
 /obj/item/radio,
 /obj/item/radio,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"W" = (
+"aW" = (
 /obj/structure/table,
 /obj/item/gun/ballistic/automatic/pistol/m1911,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"X" = (
+"aX" = (
 /turf/open/misc/dust/lit,
 /area/overmap_encounter/planetoid/wasteland)
-"Y" = (
+"aY" = (
 /obj/machinery/door/airlock/wood/glass,
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
-"Z" = (
+"aZ" = (
 /obj/structure/table,
 /obj/item/trash/can,
 /obj/item/ammo_box/c45,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
+"qZ" = (
+/obj/structure/table,
+/obj/item/melee/baseball_bat,
+/obj/item/ammo_box/magazine/m9mm,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating/rust,
+/area/ruin/unpowered)
+"zr" = (
+/obj/structure/table,
+/obj/item/melee/baseball_bat,
+/turf/open/floor/plating/rust,
+/area/ruin/unpowered)
 
 (1,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-M
-X
-X
-a
-a
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aM
+aX
+aX
+aa
+aa
 "}
 (2,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-M
-R
-X
-X
-a
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aM
+aR
+aX
+aX
+aa
 "}
 (3,1,1) = {"
-a
-U
-U
-U
-U
-B
-U
-U
-U
-U
-U
-U
-X
-a
+aa
+aU
+aU
+aU
+aU
+aB
+aU
+aU
+aU
+aU
+aU
+aU
+aX
+aa
 "}
 (4,1,1) = {"
-a
-B
-i
-y
-U
-V
-r
-t
-U
-r
-r
-U
-M
-a
+aa
+aB
+ai
+ay
+aU
+aV
+ar
+at
+aU
+ar
+ar
+aU
+aM
+aa
 "}
 (5,1,1) = {"
-a
-B
-p
-s
-B
-W
-z
-r
-Y
-r
-D
-B
-M
-a
+aa
+aB
+ap
+as
+aB
+zr
+az
+ar
+aY
+ar
+al
+aB
+aM
+aa
 "}
 (6,1,1) = {"
-a
-B
-N
-E
-B
-Z
-s
-o
-J
-s
-T
-B
-M
-a
+aa
+aB
+aN
+aE
+aB
+aZ
+as
+ao
+aJ
+as
+aT
+aB
+aM
+aa
 "}
 (7,1,1) = {"
-a
-U
-u
-s
-S
-s
-r
-e
-B
-w
-o
-U
-M
-a
+aa
+aU
+au
+as
+aS
+as
+ar
+ae
+aB
+aw
+ao
+aU
+aM
+aa
 "}
 (8,1,1) = {"
-a
-U
-v
-o
-U
-k
-f
-Q
-U
-G
-s
-U
-M
-a
+aa
+aU
+av
+ao
+aU
+ak
+af
+aQ
+aU
+aG
+as
+aU
+aM
+aa
 "}
 (9,1,1) = {"
-a
-U
-n
-o
-I
-c
-h
-m
-U
-o
-b
-U
-M
-a
+aa
+aU
+qZ
+ao
+aI
+ac
+zr
+am
+aU
+ao
+ab
+aU
+aM
+aa
 "}
 (10,1,1) = {"
-a
-L
-L
-L
-L
-g
-g
-g
-B
-F
-H
-U
-M
-a
+aa
+aL
+aL
+aL
+aL
+ag
+ag
+ag
+aB
+aF
+aH
+aU
+aM
+aa
 "}
 (11,1,1) = {"
-a
-a
-a
-M
-M
-K
-O
-q
-U
-U
-Y
-U
-M
-a
+aa
+aa
+aa
+aM
+aM
+aK
+aO
+aq
+aU
+aU
+aY
+aU
+aM
+aa
 "}
 (12,1,1) = {"
-a
-a
-a
-M
-M
-C
-j
-K
-M
-M
-M
-x
-M
-a
+aa
+aa
+aa
+aM
+aM
+aC
+aj
+aK
+aM
+aM
+aM
+ax
+aM
+aa
 "}
 (13,1,1) = {"
-a
-a
-a
-P
-X
-A
-K
-M
-d
-M
-M
-M
-M
-a
+aa
+aa
+aa
+aP
+aX
+aA
+aK
+aM
+ad
+aM
+aM
+aM
+aM
+aa
 "}
 (14,1,1) = {"
-a
-a
-a
-P
-X
-X
-M
-d
-d
-M
-M
-M
-M
-a
+aa
+aa
+aa
+aP
+aX
+aX
+aM
+ad
+ad
+aM
+aM
+aM
+aM
+aa
 "}
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_camp_farm.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_camp_farm.dmm
index fdc3ee44238..1487dbaac04 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_camp_farm.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_camp_farm.dmm
@@ -45,13 +45,6 @@
 /obj/machinery/hydroponics/soil,
 /turf/open/misc/dust/lit,
 /area/overmap_encounter/planetoid/wasteland)
-"h" = (
-/obj/structure/closet/secure_closet/hydroponics,
-/obj/item/circuitboard/machine/seed_extractor,
-/obj/item/gun/ballistic/rifle/sniper_rifle,
-/obj/item/ammo_box/magazine/sniper_rounds/marksman,
-/turf/open/floor/wood,
-/area/ruin/unpowered)
 "i" = (
 /obj/machinery/hydroponics/soil,
 /turf/open/misc/dirt/dry/lit,
@@ -129,6 +122,13 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood,
 /area/ruin/unpowered)
+"t" = (
+/obj/structure/closet/secure_closet/hydroponics,
+/obj/item/circuitboard/machine/seed_extractor,
+/obj/item/melee/baseball_bat,
+/obj/item/ammo_box/magazine/sniper_rounds/marksman,
+/turf/open/floor/wood,
+/area/ruin/unpowered)
 "u" = (
 /obj/structure/chair/plastic{
 	dir = 4
@@ -454,7 +454,7 @@ U
 "}
 (9,1,1) = {"
 L
-h
+t
 r
 C
 s
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_camp_saloon.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_camp_saloon.dmm
index b51d15db494..74e10504e99 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_camp_saloon.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_camp_saloon.dmm
@@ -1,4 +1,56 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/item/clothing/head/cowboy{
+	pixel_x = -17
+	},
+/obj/effect/decal/remains/human,
+/obj/item/clothing/mask/gas/clown_hat,
+/obj/effect/decal/cleanable/blood/old,
+/obj/item/ammo_casing/c357{
+	pixel_x = 9;
+	pixel_y = 5
+	},
+/obj/item/melee/baseball_bat{
+	pixel_y = -13
+	},
+/turf/template_noop,
+/area/overmap_encounter/planetoid/wasteland)
+"ab" = (
+/obj/structure/closet/cabinet,
+/obj/item/melee/baseball_bat,
+/obj/item/storage/box/lethalshot,
+/obj/item/storage/belt/bandolier,
+/obj/item/ammo_casing/shotgun/dragonsbreath,
+/obj/item/ammo_casing/shotgun/dragonsbreath,
+/obj/item/ammo_casing/shotgun/dragonsbreath,
+/turf/open/floor/wood,
+/area/ruin/unpowered)
+"ac" = (
+/obj/item/clothing/head/cowboy{
+	pixel_x = 13
+	},
+/obj/effect/decal/remains/human,
+/obj/item/clothing/mask/gas/mime,
+/obj/effect/decal/cleanable/blood/old,
+/obj/item/ammo_casing/c357{
+	dir = 10;
+	pixel_x = 4;
+	pixel_y = -1
+	},
+/obj/item/melee/baseball_bat{
+	pixel_y = -14
+	},
+/turf/template_noop,
+/area/overmap_encounter/planetoid/wasteland)
+"ad" = (
+/obj/structure/closet/cabinet,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_containers/cup/bottle/morphine,
+/obj/item/melee/baseball_bat,
+/obj/item/ammo_box/magazine/m9mm,
+/obj/item/ammo_box/magazine/m9mm,
+/turf/open/floor/wood,
+/area/ruin/unpowered)
 "aq" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood{
@@ -164,16 +216,6 @@
 /obj/item/toy/cards/deck/syndicate,
 /turf/open/floor/wood,
 /area/ruin/unpowered)
-"oA" = (
-/obj/structure/closet/cabinet,
-/obj/item/gun/ballistic/shotgun/riot,
-/obj/item/storage/box/lethalshot,
-/obj/item/storage/belt/bandolier,
-/obj/item/ammo_casing/shotgun/dragonsbreath,
-/obj/item/ammo_casing/shotgun/dragonsbreath,
-/obj/item/ammo_casing/shotgun/dragonsbreath,
-/turf/open/floor/wood,
-/area/ruin/unpowered)
 "oB" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/cup/glass/bottle/absinthe,
@@ -361,22 +403,6 @@
 /obj/item/toy/cards/deck,
 /turf/open/floor/wood,
 /area/ruin/unpowered)
-"Ig" = (
-/obj/item/clothing/head/cowboy{
-	pixel_x = -17
-	},
-/obj/effect/decal/remains/human,
-/obj/item/clothing/mask/gas/clown_hat,
-/obj/effect/decal/cleanable/blood/old,
-/obj/item/ammo_casing/c357{
-	pixel_x = 9;
-	pixel_y = 5
-	},
-/obj/item/gun/ballistic/automatic/pistol{
-	pixel_y = -13
-	},
-/turf/template_noop,
-/area/overmap_encounter/planetoid/wasteland)
 "Io" = (
 /obj/structure/table/wood,
 /obj/item/flashlight/flare/candle/infinite,
@@ -475,23 +501,6 @@
 	broken = 1
 	},
 /area/ruin/unpowered)
-"Qs" = (
-/obj/item/clothing/head/cowboy{
-	pixel_x = 13
-	},
-/obj/effect/decal/remains/human,
-/obj/item/clothing/mask/gas/mime,
-/obj/effect/decal/cleanable/blood/old,
-/obj/item/ammo_casing/c357{
-	dir = 10;
-	pixel_x = 4;
-	pixel_y = -1
-	},
-/obj/item/gun/ballistic/automatic/pistol{
-	pixel_y = -14
-	},
-/turf/template_noop,
-/area/overmap_encounter/planetoid/wasteland)
 "QQ" = (
 /obj/machinery/jukebox,
 /turf/open/floor/wood,
@@ -565,15 +574,6 @@
 /obj/structure/sign/poster/random,
 /turf/closed/wall/mineral/wood,
 /area/ruin/unpowered)
-"Yj" = (
-/obj/structure/closet/cabinet,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/reagent_containers/cup/bottle/morphine,
-/obj/item/gun/ballistic/automatic/wt550,
-/obj/item/ammo_box/magazine/m9mm,
-/obj/item/ammo_box/magazine/m9mm,
-/turf/open/floor/wood,
-/area/ruin/unpowered)
 "Yo" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
@@ -633,7 +633,7 @@ xr
 yt
 gF
 gF
-Ig
+aa
 gF
 "}
 (3,1,1) = {"
@@ -714,7 +714,7 @@ gF
 "}
 (7,1,1) = {"
 VF
-oA
+ab
 Px
 xr
 yt
@@ -880,12 +880,12 @@ gC
 Bp
 gF
 gF
-Qs
+ac
 gF
 "}
 (16,1,1) = {"
 VF
-Yj
+ad
 Px
 Px
 VF
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_chokepoint.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_chokepoint.dmm
index de7a4e23888..349d0f5e9f0 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_chokepoint.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_chokepoint.dmm
@@ -2,16 +2,24 @@
 "a" = (
 /turf/template_noop,
 /area/template_noop)
-"d" = (
+"b" = (
 /obj/structure/closet/secure_closet{
 	base_icon_state = "sec";
 	icon_state = "sec"
 	},
-/obj/item/gun/ballistic/automatic/pistol/m1911,
+/obj/item/melee/baseball_bat,
 /obj/item/ammo_box/magazine/m9mm,
 /obj/item/ammo_box/magazine/m9mm,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
+"c" = (
+/obj/structure/closet/cabinet,
+/obj/item/clothing/head/helmet/knight/blue,
+/obj/item/clothing/suit/armor/riot/knight/blue,
+/obj/item/spear,
+/obj/item/knife/combat/survival,
+/turf/open/floor/plating,
+/area/ruin/unpowered)
 "e" = (
 /obj/structure/sign/poster/official/here_for_your_safety,
 /turf/closed/wall/rust,
@@ -63,14 +71,6 @@
 /obj/effect/zone_mobs/syndicate,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
-"r" = (
-/obj/structure/closet/cabinet,
-/obj/item/clothing/head/helmet/knight/blue,
-/obj/item/clothing/suit/armor/riot/knight/blue,
-/obj/item/spear,
-/obj/item/shield/buckler,
-/turf/open/floor/plating,
-/area/ruin/unpowered)
 "u" = (
 /turf/open/misc/dust/lit,
 /area/overmap_encounter/planetoid/wasteland)
@@ -277,8 +277,8 @@ U
 v
 U
 e
-r
-d
+c
+b
 I
 a
 a
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_crash_bar.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_crash_bar.dmm
index f8120c30c98..28d2c66731e 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_crash_bar.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_crash_bar.dmm
@@ -1,4 +1,13 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/mob/living/simple_animal/hostile/asteroid/hermit/ranged/hunter{
+	desc = "One of the few survivors on the planet with working weaponry. Doesn't seem as friendly as the bartenders you're used to.";
+	faction = list("saloon")
+	},
+/turf/open/floor/wood{
+	broken = 1
+	},
+/area/ruin/unpowered)
 "ab" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/crate/zone_loot/plunder,
@@ -27,6 +36,44 @@
 /obj/effect/zone_mobs/pirate,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
+"af" = (
+/obj/structure/closet/secure_closet/bar{
+	req_access = null
+	},
+/obj/item/melee/baseball_bat,
+/obj/item/storage/box/lethalshot,
+/obj/item/storage/box/lethalshot,
+/turf/open/floor/wood{
+	broken = 1
+	},
+/area/ruin/unpowered)
+"ag" = (
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/mob/living/simple_animal/hostile/asteroid/hermit/ranged/hunter{
+	faction = list("saloon")
+	},
+/turf/open/floor/plating{
+	burnt = 1
+	},
+/area/ruin/unpowered)
+"ah" = (
+/obj/item/melee/baseball_bat,
+/obj/item/ammo_box/c45,
+/obj/item/ammo_box/magazine/m45,
+/obj/structure/table/wood/poker,
+/turf/open/floor/plating,
+/area/ruin/unpowered)
+"ai" = (
+/obj/item/melee/baseball_bat,
+/obj/item/ammo_box/magazine/wt550m9,
+/obj/item/ammo_box/magazine/wt550m9,
+/obj/item/ammo_box/magazine/wt550m9,
+/obj/item/ammo_box/magazine/wt550m9,
+/obj/structure/table/wood/poker,
+/turf/open/floor/plating,
+/area/ruin/unpowered)
 "aL" = (
 /obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer2{
 	dir = 1
@@ -248,13 +295,6 @@
 	broken = 1
 	},
 /area/ruin/unpowered)
-"lI" = (
-/obj/item/gun/ballistic/automatic/pistol/m1911,
-/obj/item/ammo_box/c45,
-/obj/item/ammo_box/magazine/m45,
-/obj/structure/table/wood/poker,
-/turf/open/floor/plating,
-/area/ruin/unpowered)
 "mp" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/food/flour,
@@ -275,15 +315,6 @@
 	},
 /turf/open/floor/carpet/executive,
 /area/ruin/unpowered)
-"oV" = (
-/mob/living/simple_animal/hostile/asteroid/hermit/ranged/gunslinger{
-	desc = "One of the few survivors on the planet with working weaponry. Doesn't seem as friendly as the bartenders you're used to.";
-	faction = list("saloon")
-	},
-/turf/open/floor/wood{
-	broken = 1
-	},
-/area/ruin/unpowered)
 "pa" = (
 /obj/item/toy/cards/deck/kotahi,
 /obj/item/storage/dice,
@@ -332,15 +363,6 @@
 	broken = 1
 	},
 /area/ruin/unpowered)
-"rY" = (
-/obj/item/gun/ballistic/rifle/boltaction,
-/obj/item/ammo_box/magazine/wt550m9,
-/obj/item/ammo_box/magazine/wt550m9,
-/obj/item/ammo_box/magazine/wt550m9,
-/obj/item/ammo_box/magazine/wt550m9,
-/obj/structure/table/wood/poker,
-/turf/open/floor/plating,
-/area/ruin/unpowered)
 "sn" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
@@ -426,17 +448,6 @@
 	},
 /turf/open/floor/plating,
 /area/ruin/unpowered)
-"xh" = (
-/obj/structure/closet/secure_closet/bar{
-	req_access = null
-	},
-/obj/item/gun/ballistic/shotgun/doublebarrel,
-/obj/item/storage/box/lethalshot,
-/obj/item/storage/box/lethalshot,
-/turf/open/floor/wood{
-	broken = 1
-	},
-/area/ruin/unpowered)
 "xX" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{
@@ -581,17 +592,6 @@
 	burnt = 1
 	},
 /area/ruin/unpowered)
-"FV" = (
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer4{
-	dir = 10
-	},
-/mob/living/simple_animal/hostile/asteroid/hermit/ranged/gunslinger{
-	faction = list("saloon")
-	},
-/turf/open/floor/plating{
-	burnt = 1
-	},
-/area/ruin/unpowered)
 "Ha" = (
 /obj/machinery/power/terminal{
 	dir = 8
@@ -1225,7 +1225,7 @@ sN
 Ka
 dl
 JT
-oV
+aa
 Eg
 ad
 OY
@@ -1245,7 +1245,7 @@ OK
 iu
 uD
 MO
-xh
+af
 XT
 Np
 Wv
@@ -1310,7 +1310,7 @@ Hc
 Bn
 Ko
 ae
-FV
+ag
 qW
 ud
 wy
@@ -1324,7 +1324,7 @@ Wv
 Np
 Ar
 OZ
-lI
+ah
 mp
 tV
 cP
@@ -1360,7 +1360,7 @@ Ar
 OZ
 OZ
 PG
-rY
+ai
 wy
 Nr
 OZ
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_crash_cargo.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_crash_cargo.dmm
index cb4812662bd..473b45b1284 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_crash_cargo.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_crash_cargo.dmm
@@ -1,4 +1,12 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/closet/crate/secure/weapon,
+/obj/item/melee/baseball_bat,
+/obj/item/spear,
+/obj/item/melee/baseball_bat,
+/turf/open/floor/iron/dark,
+/area/ruin/unpowered)
 "bT" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/door/poddoor{
@@ -614,14 +622,6 @@
 /obj/machinery/autolathe,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
-"Pz" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/crate/secure/weapon,
-/obj/item/gun/energy/laser/retro,
-/obj/item/melee/energy/sword/pirate,
-/obj/item/gun/energy/laser/retro,
-/turf/open/floor/iron/dark,
-/area/ruin/unpowered)
 "PW" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -900,7 +900,7 @@ qb
 NI
 QX
 kO
-Pz
+aa
 NI
 dy
 Iv
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_hermit.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_hermit.dmm
index e974fa8f53d..03dcdcdd7ee 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_hermit.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_hermit.dmm
@@ -2,6 +2,13 @@
 "a" = (
 /turf/open/floor/wood,
 /area/ruin/powered)
+"b" = (
+/obj/item/clothing/suit/space/orange,
+/obj/item/clothing/head/helmet/space/orange,
+/obj/structure/rack,
+/obj/item/melee/baseball_bat,
+/turf/open/floor/plating,
+/area/ruin/powered)
 "e" = (
 /obj/machinery/door/airlock/wood/glass,
 /turf/open/misc/wasteland/lit,
@@ -110,13 +117,6 @@
 /obj/item/shovel,
 /turf/open/floor/plating,
 /area/ruin/powered)
-"K" = (
-/obj/item/clothing/suit/space/orange,
-/obj/item/clothing/head/helmet/space/orange,
-/obj/structure/rack,
-/obj/item/gun/ballistic/rifle/boltaction,
-/turf/open/floor/plating,
-/area/ruin/powered)
 "L" = (
 /turf/open/misc/wasteland/lit,
 /area/ruin/powered)
@@ -324,7 +324,7 @@ S
 M
 M
 v
-K
+b
 M
 S
 S
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_onlyaspoonful.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_onlyaspoonful.dmm
index 25ad09da39e..729906e4db5 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_onlyaspoonful.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_onlyaspoonful.dmm
@@ -5,6 +5,38 @@
 	},
 /turf/open/floor/plastic,
 /area/ruin/powered)
+"ab" = (
+/obj/item/melee/baseball_bat,
+/turf/open/floor/plastic,
+/area/ruin/powered)
+"ac" = (
+/obj/effect/decal/cleanable/blood/gibs/core,
+/obj/item/knife/combat/survival,
+/turf/open/floor/plastic,
+/area/ruin/powered)
+"ad" = (
+/obj/item/ammo_casing/spent{
+	dir = 5;
+	pixel_x = -5;
+	pixel_y = -6
+	},
+/obj/item/ammo_casing/spent{
+	dir = 4;
+	pixel_x = 8;
+	pixel_y = 9
+	},
+/obj/effect/decal/cleanable/blood/tracks,
+/mob/living/simple_animal/hostile/asteroid/hermit/ranged/hunter,
+/turf/open/floor/plastic,
+/area/ruin/powered)
+"ae" = (
+/obj/item/melee/baseball_bat,
+/obj/effect/decal/cleanable/blood/tracks{
+	dir = 5
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plastic,
+/area/ruin/powered)
 "aU" = (
 /obj/effect/decal/cleanable/blood/splatter,
 /turf/open/floor/plastic,
@@ -28,11 +60,6 @@
 /obj/structure/filingcabinet/security,
 /turf/open/floor/plastic,
 /area/ruin/powered)
-"bo" = (
-/obj/effect/decal/cleanable/blood/gibs/core,
-/obj/item/knife/combat,
-/turf/open/floor/plastic,
-/area/ruin/powered)
 "bz" = (
 /obj/item/ammo_casing/spent{
 	dir = 8;
@@ -321,21 +348,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plastic,
 /area/ruin/powered)
-"vZ" = (
-/obj/item/ammo_casing/spent{
-	dir = 5;
-	pixel_x = -5;
-	pixel_y = -6
-	},
-/obj/item/ammo_casing/spent{
-	dir = 4;
-	pixel_x = 8;
-	pixel_y = 9
-	},
-/obj/effect/decal/cleanable/blood/tracks,
-/mob/living/simple_animal/hostile/asteroid/hermit/ranged/gunslinger,
-/turf/open/floor/plastic,
-/area/ruin/powered)
 "wr" = (
 /obj/structure/rack,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -544,14 +556,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plastic,
 /area/ruin/powered)
-"Lm" = (
-/obj/item/gun/ballistic/automatic/pistol,
-/obj/effect/decal/cleanable/blood/tracks{
-	dir = 5
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plastic,
-/area/ruin/powered)
 "Lz" = (
 /turf/open/misc/dust/lit,
 /area/overmap_encounter/planetoid/wasteland)
@@ -701,10 +705,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plastic,
 /area/ruin/powered)
-"Tt" = (
-/obj/item/gun/ballistic/automatic/pistol/m1911,
-/turf/open/floor/plastic,
-/area/ruin/powered)
 "TA" = (
 /obj/structure/fluff/paper/stack{
 	dir = 4;
@@ -903,7 +903,7 @@ HA
 ud
 Pi
 sw
-Tt
+ab
 Me
 Ze
 KY
@@ -1005,7 +1005,7 @@ Ij
 bz
 pl
 OJ
-bo
+ac
 HS
 VR
 dk
@@ -1018,11 +1018,11 @@ ct
 ct
 dl
 XL
-Lm
+ae
 YY
 Hi
 ga
-vZ
+ad
 Mu
 pZ
 gG
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_saltmine.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_saltmine.dmm
index 77c1e36a11f..a0129e80e39 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_saltmine.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_saltmine.dmm
@@ -1,4 +1,52 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/structure/safe,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/reagent_containers/cup/beaker/bluespace{
+	list_reagents = list(/datum/reagent/consumable/salt = 300)
+	},
+/obj/item/storage/box/slugs,
+/obj/item/storage/bag/money,
+/obj/item/circuitboard/computer/arcade/amputation,
+/obj/item/coin/gold,
+/obj/item/coin/gold,
+/obj/item/coin/gold,
+/obj/item/coin/gold,
+/obj/item/coin/gold,
+/obj/item/coin/silver,
+/obj/item/coin/silver,
+/obj/item/coin/silver,
+/obj/item/coin/silver,
+/obj/item/coin/silver,
+/obj/item/coin/silver,
+/obj/item/coin/silver,
+/obj/item/coin/silver,
+/obj/item/coin/silver,
+/obj/item/coin/silver,
+/obj/item/coin/silver,
+/obj/item/coin/iron,
+/obj/item/coin/iron,
+/obj/item/coin/iron,
+/obj/item/coin/iron,
+/obj/item/coin/iron,
+/obj/item/coin/iron,
+/obj/item/coin/iron,
+/obj/item/coin/iron,
+/obj/item/coin/iron,
+/obj/item/coin/iron,
+/obj/item/coin/iron,
+/obj/item/coin/iron,
+/obj/item/coin/iron,
+/obj/item/coin/iron,
+/obj/item/coin/iron,
+/obj/item/coin/iron,
+/obj/item/coin/iron,
+/obj/item/coin/diamond,
+/obj/item/coin/diamond,
+/obj/machinery/light,
+/obj/item/melee/baseball_bat,
+/turf/open/indestructible,
+/area/ruin/powered)
 "ao" = (
 /obj/effect/decal/cleanable/food/salt,
 /obj/structure/chair/stool/bar,
@@ -327,54 +375,6 @@
 /obj/item/cigbutt/cigarbutt,
 /turf/open/floor/carpet/royalblack,
 /area/ruin/powered)
-"yv" = (
-/obj/structure/safe,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/reagent_containers/cup/beaker/bluespace{
-	list_reagents = list(/datum/reagent/consumable/salt = 300)
-	},
-/obj/item/storage/box/slugs,
-/obj/item/storage/bag/money,
-/obj/item/circuitboard/computer/arcade/amputation,
-/obj/item/coin/gold,
-/obj/item/coin/gold,
-/obj/item/coin/gold,
-/obj/item/coin/gold,
-/obj/item/coin/gold,
-/obj/item/coin/silver,
-/obj/item/coin/silver,
-/obj/item/coin/silver,
-/obj/item/coin/silver,
-/obj/item/coin/silver,
-/obj/item/coin/silver,
-/obj/item/coin/silver,
-/obj/item/coin/silver,
-/obj/item/coin/silver,
-/obj/item/coin/silver,
-/obj/item/coin/silver,
-/obj/item/coin/iron,
-/obj/item/coin/iron,
-/obj/item/coin/iron,
-/obj/item/coin/iron,
-/obj/item/coin/iron,
-/obj/item/coin/iron,
-/obj/item/coin/iron,
-/obj/item/coin/iron,
-/obj/item/coin/iron,
-/obj/item/coin/iron,
-/obj/item/coin/iron,
-/obj/item/coin/iron,
-/obj/item/coin/iron,
-/obj/item/coin/iron,
-/obj/item/coin/iron,
-/obj/item/coin/iron,
-/obj/item/coin/iron,
-/obj/item/coin/diamond,
-/obj/item/coin/diamond,
-/obj/machinery/light,
-/obj/item/gun/ballistic/shotgun/riot,
-/turf/open/indestructible,
-/area/ruin/powered)
 "yw" = (
 /obj/effect/decal/cleanable/food/salt,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -1037,7 +1037,7 @@ xD
 Jh
 uY
 yw
-yv
+aa
 uY
 Jh
 YG
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_solgovcrash.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_solgovcrash.dmm
index 272c3db10d5..c192f8fa057 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_solgovcrash.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_solgovcrash.dmm
@@ -45,13 +45,13 @@
 /obj/effect/zone_mobs/syndicate,
 /turf/open/floor/mineral/titanium/yellow,
 /area/ruin/unpowered)
-"i" = (
+"j" = (
 /obj/item/stack/rods,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
 /obj/item/clothing/head/helmet/solgov,
-/obj/item/gun/energy/laser,
+/obj/item/melee/baseball_bat,
 /obj/item/clothing/under/solgov/elite,
 /obj/effect/gibspawner/human,
 /obj/effect/zone_mobs/syndicate,
@@ -272,7 +272,7 @@ a
 D
 N
 K
-i
+j
 P
 c
 Z
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_starfurycrash.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_starfurycrash.dmm
index 89d949b1623..6e0af1a52f6 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_starfurycrash.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_surface_starfurycrash.dmm
@@ -26,6 +26,29 @@
 /obj/effect/zone_mobs/syndicate,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
+"ag" = (
+/mob/living/basic/trooper/syndicate/ranged/space,
+/turf/open/floor/iron/dark,
+/area/ruin/unpowered)
+"ah" = (
+/obj/structure/safe/floor,
+/obj/item/melee/baseball_bat,
+/obj/item/implantcase/weapons_auth,
+/obj/item/implanter,
+/obj/item/ammo_box/magazine/smgm45,
+/obj/item/ammo_box/magazine/smgm45,
+/obj/effect/mapping_helpers/burnt_floor,
+/turf/open/floor/plating{
+	},
+/area/ruin/unpowered)
+"ai" = (
+/mob/living/basic/trooper/syndicate/ranged/space,
+/turf/open/misc/dust/lit,
+/area/overmap_encounter/planetoid/wasteland)
+"aj" = (
+/obj/item/melee/baseball_bat,
+/turf/open/misc/wasteland/lit,
+/area/overmap_encounter/planetoid/wasteland)
 "bl" = (
 /turf/open/misc/wasteland/lit,
 /area/overmap_encounter/planetoid/wasteland)
@@ -39,20 +62,10 @@
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
-"dX" = (
-/obj/item/gun/ballistic/automatic/pistol{
-	spawnwithmagazine = 0
-	},
-/turf/open/misc/wasteland/lit,
-/area/overmap_encounter/planetoid/wasteland)
 "eO" = (
 /obj/item/clothing/gloves/combat,
 /turf/open/misc/dust/lit,
 /area/overmap_encounter/planetoid/wasteland)
-"eS" = (
-/mob/living/basic/trooper/syndicate/ranged/smg/space/stormtrooper,
-/turf/open/floor/iron/dark,
-/area/ruin/unpowered)
 "fw" = (
 /obj/structure/frame/machine,
 /turf/open/floor/mineral/plastitanium/red,
@@ -120,23 +133,12 @@
 "oT" = (
 /turf/open/misc/dust/lit,
 /area/ruin/unpowered)
-"pL" = (
-/mob/living/basic/trooper/syndicate/ranged/shotgun/space,
-/turf/open/misc/dust/lit,
-/area/overmap_encounter/planetoid/wasteland)
 "qe" = (
 /obj/machinery/atmospherics/components/binary/circulator{
 	dir = 4
 	},
 /turf/open/floor/engine,
 /area/ruin/unpowered)
-"rp" = (
-/obj/machinery/suit_storage_unit{
-	mask_type = /obj/item/clothing/mask/gas/syndicate;
-	suit_type = /obj/item/clothing/suit/space/syndicate
-	},
-/turf/open/floor/plating,
-/area/ruin/unpowered)
 "rE" = (
 /obj/machinery/power/smes,
 /turf/open/floor/plating,
@@ -158,6 +160,12 @@
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
+"xD" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/gas/syndicate
+	},
+/turf/open/floor/mineral/plastitanium/red,
+/area/ruin/unpowered)
 "yj" = (
 /obj/machinery/door/airlock/hatch,
 /turf/open/floor/iron/dark,
@@ -186,10 +194,6 @@
 /mob/living/basic/trooper/syndicate/ranged/space,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
-"CX" = (
-/mob/living/basic/trooper/syndicate/ranged/smg/space,
-/turf/open/floor/iron/dark,
-/area/ruin/unpowered)
 "Dz" = (
 /obj/machinery/atmospherics/components/binary/circulator/cold{
 	dir = 8
@@ -231,7 +235,6 @@
 "IY" = (
 /obj/machinery/power/smes,
 /turf/open/floor/plating{
-	
 	})
 "Jn" = (
 /turf/open/floor/pod/dark,
@@ -241,18 +244,6 @@
 /obj/item/storage/medkit/advanced,
 /turf/open/misc/dust/lit,
 /area/ruin/unpowered)
-"KT" = (
-/obj/structure/safe/floor,
-/obj/item/gun/ballistic/automatic/c20r/unrestricted,
-/obj/item/implantcase/weapons_auth,
-/obj/item/implanter,
-/obj/item/ammo_box/magazine/smgm45,
-/obj/item/ammo_box/magazine/smgm45,
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating{
-	
-	},
-/area/ruin/unpowered)
 "NA" = (
 /obj/structure/frame/machine,
 /turf/open/floor/engine,
@@ -287,6 +278,12 @@
 "Sx" = (
 /turf/open/misc/wasteland/lit,
 /area/ruin/unpowered)
+"SQ" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/gas/syndicate
+	},
+/turf/open/floor/plating,
+/area/ruin/unpowered)
 "Ts" = (
 /obj/effect/decal/cleanable/ash,
 /obj/effect/decal/cleanable/ash{
@@ -336,14 +333,6 @@
 /obj/machinery/portable_atmospherics/scrubber,
 /turf/open/misc/wasteland/lit,
 /area/overmap_encounter/planetoid/wasteland)
-"ZX" = (
-/obj/machinery/suit_storage_unit{
-	helmet_type = /obj/item/clothing/head/helmet/space/syndicate;
-	mask_type = /obj/item/clothing/mask/gas/syndicate;
-	suit_type = /obj/item/clothing/suit/armor/vest
-	},
-/turf/open/floor/mineral/plastitanium/red,
-/area/ruin/unpowered)
 
 (1,1,1) = {"
 RJ
@@ -623,7 +612,7 @@ Wh
 kZ
 CM
 kZ
-eS
+ag
 CM
 Eu
 Eu
@@ -652,7 +641,7 @@ CM
 BW
 BW
 CM
-KT
+ah
 AB
 CM
 CM
@@ -705,8 +694,8 @@ RJ
 RJ
 af
 kZ
-ZX
-rp
+xD
+SQ
 fw
 CM
 CM
@@ -769,7 +758,7 @@ Sx
 kZ
 WX
 kZ
-CX
+ag
 cS
 kZ
 kZ
@@ -811,9 +800,9 @@ RJ
 RJ
 RJ
 bl
-dX
+aj
 gK
-pL
+ai
 bl
 bl
 RJ
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_tradepost.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_tradepost.dmm
index 7ba3e1c1ce7..e57bc376d46 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_tradepost.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_tradepost.dmm
@@ -1,4 +1,36 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/obj/structure/rack,
+/obj/item/stack/wrapping_paper,
+/obj/effect/spawner/random/entertainment/gambling{
+	loot = list(/obj/item/melee/baseball_bat = 5, /obj/item/clothing/head/costume/ushanka = 3, /obj/effect/spawner/random/entertainment/coin = 3, /obj/effect/spawner/random/entertainment/money = 3, /obj/item/dice/d6 = 3, /obj/item/storage/box/syndie_kit/throwing_weapons = 1, /obj/item/reagent_containers/cup/glass/bottle/vodka/badminka = 1)
+	},
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/floor/plating/rust,
+/area/ruin/unpowered)
+"ab" = (
+/obj/structure/rack,
+/obj/effect/spawner/random/entertainment/gambling{
+	loot = list(/obj/item/melee/baseball_bat = 5, /obj/item/clothing/head/costume/ushanka = 3, /obj/effect/spawner/random/entertainment/coin = 3, /obj/effect/spawner/random/entertainment/money = 3, /obj/item/dice/d6 = 3, /obj/item/storage/box/syndie_kit/throwing_weapons = 1, /obj/item/reagent_containers/cup/glass/bottle/vodka/badminka = 1)
+	},
+/obj/effect/decal/cleanable/garbage,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/wrench,
+/turf/open/floor/plating,
+/area/ruin/unpowered)
+"ac" = (
+/obj/structure/rack,
+/obj/effect/spawner/random/entertainment/gambling{
+	loot = list(/obj/item/melee/baseball_bat = 5, /obj/item/clothing/head/costume/ushanka = 3, /obj/effect/spawner/random/entertainment/coin = 3, /obj/effect/spawner/random/entertainment/money = 3, /obj/item/dice/d6 = 3, /obj/item/storage/box/syndie_kit/throwing_weapons = 1, /obj/item/reagent_containers/cup/glass/bottle/vodka/badminka = 1)
+	},
+/obj/effect/decal/cleanable/garbage,
+/turf/open/floor/plating,
+/area/ruin/unpowered)
+"ad" = (
+/obj/structure/table/reinforced,
+/obj/item/melee/baseball_bat,
+/turf/open/floor/pod/light,
+/area/ruin/unpowered)
 "aj" = (
 /obj/structure/rack,
 /obj/effect/spawner/random/aimodule/harmless,
@@ -27,19 +59,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
-"fC" = (
-/obj/structure/rack,
-/obj/item/stack/wrapping_paper,
-/obj/effect/spawner/random/entertainment/gambling,
-/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/plating/rust,
-/area/ruin/unpowered)
-"gy" = (
-/obj/machinery/suit_storage_unit/mining/eva,
-/obj/effect/decal/cleanable/cobweb,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plating/rust,
-/area/ruin/unpowered)
 "gA" = (
 /obj/effect/decal/cleanable/glass,
 /turf/open/misc/wasteland/lit,
@@ -56,6 +75,14 @@
 /obj/structure/statue/sandstone/assistant,
 /turf/open/misc/wasteland/lit,
 /area/overmap_encounter/planetoid/wasteland)
+"ke" = (
+/obj/machinery/suit_storage_unit/ruin_zone{
+	mask_type = /obj/item/clothing/mask/breath
+	},
+/obj/effect/decal/cleanable/cobweb,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating/rust,
+/area/ruin/unpowered)
 "kf" = (
 /obj/structure/ore_box,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -67,11 +94,6 @@
 /obj/structure/closet/crate/bin,
 /turf/open/floor/plating,
 /area/ruin/unpowered)
-"kU" = (
-/obj/structure/table/reinforced,
-/obj/item/gun/energy/laser/retro,
-/turf/open/floor/pod/light,
-/area/ruin/unpowered)
 "kW" = (
 /obj/machinery/power/shuttle_engine/propulsion{
 	dir = 8
@@ -122,12 +144,6 @@
 /obj/item/stack/wrapping_paper,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"sW" = (
-/obj/structure/rack,
-/obj/effect/spawner/random/entertainment/gambling,
-/obj/effect/decal/cleanable/garbage,
-/turf/open/floor/plating,
-/area/ruin/unpowered)
 "tl" = (
 /obj/structure/barricade/wooden/crude,
 /obj/structure/window/fulltile,
@@ -320,14 +336,6 @@
 "Qt" = (
 /turf/open/floor/plating/rust,
 /area/overmap_encounter/planetoid/wasteland)
-"QD" = (
-/obj/structure/rack,
-/obj/effect/spawner/random/entertainment/gambling,
-/obj/effect/decal/cleanable/garbage,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/wrench,
-/turf/open/floor/plating,
-/area/ruin/unpowered)
 "Rn" = (
 /obj/structure/closet/crate,
 /obj/effect/turf_decal/stripes/full,
@@ -420,7 +428,7 @@ De
 "}
 (2,1,1) = {"
 Ue
-fC
+aa
 ch
 im
 Ga
@@ -439,7 +447,7 @@ De
 Ue
 sT
 wB
-QD
+ab
 Sn
 tl
 wM
@@ -454,7 +462,7 @@ De
 "}
 (4,1,1) = {"
 Ue
-sW
+ac
 Ga
 Cf
 CC
@@ -531,7 +539,7 @@ Hm
 Hm
 Qt
 Lm
-kU
+ad
 wA
 Lm
 Qt
@@ -573,7 +581,7 @@ De
 "}
 (11,1,1) = {"
 Ue
-gy
+ke
 Sn
 RE
 en
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_unhonorable.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_unhonorable.dmm
index d1be9ca4dda..be2631fb99c 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_unhonorable.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_unhonorable.dmm
@@ -18,6 +18,11 @@
 /obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
+"f" = (
+/obj/structure/table/reinforced,
+/obj/item/melee/baseball_bat,
+/turf/open/floor/plating/rust,
+/area/ruin/unpowered)
 "i" = (
 /obj/effect/gibspawner,
 /turf/open/floor/plating/rust,
@@ -57,11 +62,6 @@
 /obj/effect/mine/shrapnel,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"q" = (
-/obj/structure/table/reinforced,
-/obj/item/gun/ballistic/automatic/wt550,
-/turf/open/floor/plating/rust,
-/area/ruin/unpowered)
 "r" = (
 /obj/item/stack/sheet/mineral/uranium/five,
 /turf/open/floor/plating/rust,
@@ -91,11 +91,6 @@
 /obj/structure/radioactive,
 /turf/open/floor/plating/rust,
 /area/ruin/unpowered)
-"y" = (
-/obj/structure/table/reinforced,
-/obj/item/gun/energy/e_gun/nuclear,
-/turf/open/floor/plating/rust,
-/area/ruin/unpowered)
 "z" = (
 /obj/structure/sign/warning/radiation,
 /turf/closed/wall/r_wall/rust,
@@ -269,7 +264,7 @@ a
 (5,1,1) = {"
 F
 F
-y
+f
 n
 p
 b
@@ -288,7 +283,7 @@ a
 (6,1,1) = {"
 F
 B
-q
+f
 A
 u
 b
diff --git a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_wizard.dmm b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_wizard.dmm
index 955e66001e7..f98f4f9d7ea 100644
--- a/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_wizard.dmm
+++ b/_maps/voidcrew/RandomRuins/WastelandRuins/wasteland_wizard.dmm
@@ -2,6 +2,11 @@
 "a" = (
 /turf/template_noop,
 /area/template_noop)
+"b" = (
+/obj/structure/table/wood,
+/obj/item/spear,
+/turf/open/floor/mineral/plastitanium,
+/area/ruin/unpowered)
 "c" = (
 /obj/structure/window/reinforced/tinted{
 	dir = 8
@@ -83,11 +88,6 @@
 /obj/structure/closet/crate/zone_loot/occult,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/unpowered)
-"B" = (
-/obj/structure/table/wood,
-/obj/item/knife/bloodletter,
-/turf/open/floor/mineral/plastitanium,
-/area/ruin/unpowered)
 "C" = (
 /obj/effect/decal/cleanable/crayon,
 /turf/open/floor/mineral/plastitanium,
@@ -222,7 +222,7 @@ a
 "}
 (4,1,1) = {"
 r
-B
+b
 s
 T
 D
diff --git a/_maps/voidcrew/ship_modules/bogatyr/workshop/engineering_and_classic_armory.dmm b/_maps/voidcrew/ship_modules/bogatyr/workshop/engineering_and_classic_armory.dmm
index 7b64a04d84b..f60d11729a6 100644
--- a/_maps/voidcrew/ship_modules/bogatyr/workshop/engineering_and_classic_armory.dmm
+++ b/_maps/voidcrew/ship_modules/bogatyr/workshop/engineering_and_classic_armory.dmm
@@ -67,6 +67,14 @@
 /obj/item/melee/chainofcommand,
 /turf/open/floor/mineral/plastitanium/red,
 /area/template_noop)
+"hSb" = (
+/obj/structure/rack,
+/obj/item/gun/ballistic/shotgun/doublebarrel{
+	name = "\improper TOZ-1"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/mineral/plastitanium/red,
+/area/template_noop)
 "icz" = (
 /obj/machinery/door/airlock/vault{
 	name = "Armory"
@@ -135,6 +143,15 @@
 	},
 /turf/closed/wall/r_wall,
 /area/template_noop)
+"mqQ" = (
+/obj/structure/rack,
+/obj/item/gun/ballistic/rifle/boltaction{
+	pixel_x = -7;
+	pixel_y = 2
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/mineral/plastitanium/red,
+/area/template_noop)
 "oOM" = (
 /obj/structure/sign/poster/random,
 /turf/closed/wall/r_wall,
@@ -161,14 +178,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/mineral/plastitanium/red,
 /area/template_noop)
-"ssG" = (
-/obj/structure/rack,
-/obj/item/gun/ballistic/shotgun/doublebarrel{
-	name = "\improper TOZ-1"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/mineral/plastitanium/red,
-/area/template_noop)
 "sTI" = (
 /obj/machinery/power/port_gen/pacman/pre_loaded,
 /obj/effect/turf_decal/box,
@@ -190,15 +199,6 @@
 /obj/structure/cable,
 /turf/open/floor/mineral/plastitanium/red,
 /area/template_noop)
-"wKM" = (
-/obj/structure/rack,
-/obj/item/gun/ballistic/rifle/boltaction{
-	pixel_x = -7;
-	pixel_y = 2
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/mineral/plastitanium/red,
-/area/template_noop)
 
 (1,1,1) = {"
 imp
@@ -213,8 +213,8 @@ jNA
 "}
 (2,1,1) = {"
 imp
-ssG
-wKM
+hSb
+mqQ
 jOk
 imp
 lxr
diff --git a/_maps/voidcrew/ship_modules/bogatyr/workshop/engineering_and_classic_armory_freshen_up.dmm b/_maps/voidcrew/ship_modules/bogatyr/workshop/engineering_and_classic_armory_freshen_up.dmm
index 17493e1ca72..63c725b5d1e 100644
--- a/_maps/voidcrew/ship_modules/bogatyr/workshop/engineering_and_classic_armory_freshen_up.dmm
+++ b/_maps/voidcrew/ship_modules/bogatyr/workshop/engineering_and_classic_armory_freshen_up.dmm
@@ -30,13 +30,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/template_noop)
-"cES" = (
-/obj/structure/rack,
-/obj/item/gun/ballistic/shotgun/doublebarrel{
-	name = "\improper TOZ-1"
-	},
-/turf/open/floor/mineral/plastitanium/red,
-/area/template_noop)
 "eaq" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -75,6 +68,13 @@
 /obj/structure/cable,
 /turf/open/floor/mineral/plastitanium/red,
 /area/template_noop)
+"pbw" = (
+/obj/structure/rack,
+/obj/item/gun/ballistic/shotgun/doublebarrel{
+	name = "\improper TOZ-1"
+	},
+/turf/open/floor/mineral/plastitanium/red,
+/area/template_noop)
 "pcJ" = (
 /obj/structure/sign/poster/random,
 /turf/closed/wall/r_wall,
@@ -140,6 +140,14 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/template_noop)
+"tsB" = (
+/obj/structure/rack,
+/obj/item/gun/ballistic/rifle/boltaction{
+	pixel_x = -7;
+	pixel_y = 2
+	},
+/turf/open/floor/mineral/plastitanium/red,
+/area/template_noop)
 "tzo" = (
 /turf/template_noop,
 /area/template_noop)
@@ -157,14 +165,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/closed/wall/r_wall,
 /area/template_noop)
-"vXz" = (
-/obj/structure/rack,
-/obj/item/gun/ballistic/rifle/boltaction{
-	pixel_x = -7;
-	pixel_y = 2
-	},
-/turf/open/floor/mineral/plastitanium/red,
-/area/template_noop)
 "xbn" = (
 /obj/structure/cable,
 /obj/machinery/power/shuttle_engine/ship/electric{
@@ -195,8 +195,8 @@ aNK
 "}
 (2,1,1) = {"
 tVN
-cES
-vXz
+pbw
+tsB
 pju
 tVN
 toY
diff --git a/_maps/voidcrew/ship_modules/bogatyr/workshop/engineering_and_classic_armory_nightclub.dmm b/_maps/voidcrew/ship_modules/bogatyr/workshop/engineering_and_classic_armory_nightclub.dmm
index 70a691f1aa0..0b48ce72c51 100644
--- a/_maps/voidcrew/ship_modules/bogatyr/workshop/engineering_and_classic_armory_nightclub.dmm
+++ b/_maps/voidcrew/ship_modules/bogatyr/workshop/engineering_and_classic_armory_nightclub.dmm
@@ -1,4 +1,46 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"akJ" = (
+/obj/item/knife/hunting{
+	pixel_y = -1
+	},
+/obj/item/knife/hunting{
+	pixel_y = 7
+	},
+/obj/item/knife/hunting{
+	pixel_y = -9
+	},
+/obj/structure/closet{
+	anchored = 1
+	},
+/obj/item/melee/chainofcommand,
+/obj/item/gun/ballistic/rifle/boltaction{
+	pixel_x = -7;
+	pixel_y = 2
+	},
+/obj/item/clothing/suit/armor/vest/russian{
+	pixel_x = -7
+	},
+/obj/item/clothing/suit/armor/vest/russian{
+	pixel_x = 1
+	},
+/obj/item/clothing/suit/armor/vest/russian{
+	pixel_x = 8
+	},
+/obj/effect/spawner/costume/wizard,
+/obj/effect/spawner/costume/plaguedoctor,
+/obj/effect/spawner/costume/imperium_monk,
+/obj/effect/spawner/costume/nyangirl,
+/obj/item/clothing/under/costume/soviet{
+	pixel_x = 2
+	},
+/obj/item/clothing/under/costume/soviet{
+	pixel_x = 2
+	},
+/obj/item/clothing/under/costume/soviet{
+	pixel_x = 2
+	},
+/turf/open/floor/glass/reinforced/plasma,
+/area/template_noop)
 "bgp" = (
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable,
@@ -36,6 +78,13 @@
 	},
 /turf/open/floor/glass/reinforced/plasma,
 /area/template_noop)
+"gvU" = (
+/obj/structure/table/reinforced/plasmarglass,
+/obj/item/gun/ballistic/automatic/pistol/m1911,
+/obj/item/storage/bag/money,
+/obj/item/reagent_containers/hypospray/medipen/methamphetamine,
+/turf/open/floor/light/colour_cycle,
+/area/template_noop)
 "hjS" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2{
 	dir = 1
@@ -95,13 +144,6 @@
 	},
 /turf/closed/wall/r_wall,
 /area/template_noop)
-"rGS" = (
-/obj/structure/table/reinforced/plasmarglass,
-/obj/item/gun/ballistic/automatic/pistol/m1911,
-/obj/item/storage/bag/money,
-/obj/item/reagent_containers/hypospray/medipen/methamphetamine,
-/turf/open/floor/light/colour_cycle,
-/area/template_noop)
 "smh" = (
 /obj/machinery/suit_storage_unit/security,
 /turf/open/floor/glass/reinforced/plasma,
@@ -136,48 +178,6 @@
 	},
 /turf/open/floor/glass/reinforced/plasma,
 /area/template_noop)
-"wva" = (
-/obj/item/knife/hunting{
-	pixel_y = -1
-	},
-/obj/item/knife/hunting{
-	pixel_y = 7
-	},
-/obj/item/knife/hunting{
-	pixel_y = -9
-	},
-/obj/structure/closet{
-	anchored = 1
-	},
-/obj/item/melee/chainofcommand,
-/obj/item/gun/ballistic/rifle/boltaction{
-	pixel_x = -7;
-	pixel_y = 2
-	},
-/obj/item/clothing/suit/armor/vest/russian{
-	pixel_x = -7
-	},
-/obj/item/clothing/suit/armor/vest/russian{
-	pixel_x = 1
-	},
-/obj/item/clothing/suit/armor/vest/russian{
-	pixel_x = 8
-	},
-/obj/effect/spawner/costume/wizard,
-/obj/effect/spawner/costume/plaguedoctor,
-/obj/effect/spawner/costume/imperium_monk,
-/obj/effect/spawner/costume/nyangirl,
-/obj/item/clothing/under/costume/soviet{
-	pixel_x = 2
-	},
-/obj/item/clothing/under/costume/soviet{
-	pixel_x = 2
-	},
-/obj/item/clothing/under/costume/soviet{
-	pixel_x = 2
-	},
-/turf/open/floor/glass/reinforced/plasma,
-/area/template_noop)
 "xZI" = (
 /obj/structure/sign/poster/random,
 /turf/closed/wall/r_wall,
@@ -198,7 +198,7 @@ hjS
 nif
 vux
 mlm
-wva
+akJ
 nif
 bEX
 kxA
@@ -208,7 +208,7 @@ eEk
 (3,1,1) = {"
 qeh
 mlC
-rGS
+gvU
 ubj
 xZI
 svQ
diff --git a/_maps/voidcrew/ship_modules/bogatyr/workshop/enhanced_armory.dmm b/_maps/voidcrew/ship_modules/bogatyr/workshop/enhanced_armory.dmm
index 21c39f0affe..84435c0c3af 100644
--- a/_maps/voidcrew/ship_modules/bogatyr/workshop/enhanced_armory.dmm
+++ b/_maps/voidcrew/ship_modules/bogatyr/workshop/enhanced_armory.dmm
@@ -7,6 +7,12 @@
 /obj/machinery/suit_storage_unit/security,
 /turf/open/floor/mineral/plastitanium/red,
 /area/template_noop)
+"dNe" = (
+/obj/structure/table/reinforced,
+/obj/item/gun/ballistic/automatic/pistol,
+/obj/machinery/recharger,
+/turf/open/floor/mineral/plastitanium/red,
+/area/template_noop)
 "dQO" = (
 /obj/structure/rack,
 /obj/item/clothing/suit/armor/vest/russian{
@@ -58,26 +64,6 @@
 /obj/structure/cable,
 /turf/open/floor/mineral/plastitanium/red,
 /area/template_noop)
-"kZr" = (
-/obj/structure/table/reinforced,
-/obj/item/gun/ballistic/rifle/boltaction{
-	pixel_x = -6;
-	pixel_y = -2
-	},
-/obj/item/knife/combat/survival{
-	pixel_x = -5;
-	pixel_y = 5
-	},
-/obj/item/ammo_box/strilka310{
-	pixel_x = 7;
-	pixel_y = 10
-	},
-/obj/item/ammo_box/strilka310{
-	pixel_x = 7;
-	pixel_y = 8
-	},
-/turf/open/floor/mineral/plastitanium/red,
-/area/template_noop)
 "mxD" = (
 /obj/item/storage/toolbox/mechanical{
 	pixel_x = -1
@@ -97,21 +83,6 @@
 	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/template_noop)
-"mSL" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/structure/rack,
-/obj/structure/rack,
-/obj/item/ammo_box/c9mm{
-	pixel_x = 1;
-	pixel_y = 0
-	},
-/obj/item/ammo_box/magazine/smgm45,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
-/turf/open/floor/mineral/plastitanium/red,
-/area/template_noop)
 "pom" = (
 /obj/machinery/light/small{
 	dir = 4
@@ -169,10 +140,19 @@
 	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/template_noop)
-"sge" = (
-/obj/structure/table/reinforced,
-/obj/item/gun/ballistic/automatic/pistol,
-/obj/machinery/recharger,
+"tWi" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/structure/rack,
+/obj/structure/rack,
+/obj/item/ammo_box/c9mm{
+	pixel_x = 1;
+	pixel_y = 0
+	},
+/obj/item/ammo_box/magazine/smgm45,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
 /turf/open/floor/mineral/plastitanium/red,
 /area/template_noop)
 "usR" = (
@@ -199,6 +179,26 @@
 "vIw" = (
 /turf/template_noop,
 /area/template_noop)
+"xQK" = (
+/obj/structure/table/reinforced,
+/obj/item/gun/ballistic/rifle/boltaction{
+	pixel_x = -6;
+	pixel_y = -2
+	},
+/obj/item/knife/combat/survival{
+	pixel_x = -5;
+	pixel_y = 5
+	},
+/obj/item/ammo_box/strilka310{
+	pixel_x = 7;
+	pixel_y = 10
+	},
+/obj/item/ammo_box/strilka310{
+	pixel_x = 7;
+	pixel_y = 8
+	},
+/turf/open/floor/mineral/plastitanium/red,
+/area/template_noop)
 
 (1,1,1) = {"
 iRc
@@ -215,9 +215,9 @@ usR
 iRc
 dQO
 pDR
-kZr
-sge
-mSL
+xQK
+dNe
+tWi
 kbJ
 mxD
 gJF
diff --git a/_maps/voidcrew/ship_modules/bogatyr/workshop/enhanced_armory_nightclub.dmm b/_maps/voidcrew/ship_modules/bogatyr/workshop/enhanced_armory_nightclub.dmm
index 17c164bcdc8..35422affe07 100644
--- a/_maps/voidcrew/ship_modules/bogatyr/workshop/enhanced_armory_nightclub.dmm
+++ b/_maps/voidcrew/ship_modules/bogatyr/workshop/enhanced_armory_nightclub.dmm
@@ -12,27 +12,7 @@
 	},
 /turf/closed/wall/r_wall,
 /area/template_noop)
-"cAP" = (
-/obj/item/gun/ballistic/rifle/boltaction{
-	pixel_x = -6;
-	pixel_y = -2
-	},
-/obj/item/knife/combat/survival{
-	pixel_x = -5;
-	pixel_y = 5
-	},
-/obj/item/ammo_box/strilka310{
-	pixel_x = 7;
-	pixel_y = 10
-	},
-/obj/item/ammo_box/strilka310{
-	pixel_x = 7;
-	pixel_y = 8
-	},
-/obj/structure/table/reinforced/plasmarglass,
-/turf/open/floor/glass/reinforced/plasma,
-/area/template_noop)
-"elB" = (
+"eRh" = (
 /obj/machinery/light/small{
 	dir = 8
 	},
@@ -165,6 +145,26 @@
 	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/template_noop)
+"srG" = (
+/obj/item/gun/ballistic/rifle/boltaction{
+	pixel_x = -6;
+	pixel_y = -2
+	},
+/obj/item/knife/combat/survival{
+	pixel_x = -5;
+	pixel_y = 5
+	},
+/obj/item/ammo_box/strilka310{
+	pixel_x = 7;
+	pixel_y = 10
+	},
+/obj/item/ammo_box/strilka310{
+	pixel_x = 7;
+	pixel_y = 8
+	},
+/obj/structure/table/reinforced/plasmarglass,
+/turf/open/floor/glass/reinforced/plasma,
+/area/template_noop)
 "sGv" = (
 /obj/machinery/door/airlock/vault{
 	name = "Armory"
@@ -172,12 +172,6 @@
 /obj/structure/cable,
 /turf/open/floor/mineral/plastitanium/red,
 /area/template_noop)
-"sWY" = (
-/obj/item/gun/ballistic/automatic/pistol,
-/obj/machinery/recharger,
-/obj/structure/table/reinforced/plasmarglass,
-/turf/open/floor/glass/reinforced/plasma,
-/area/template_noop)
 "vpz" = (
 /obj/structure/closet/secure_closet/security,
 /obj/machinery/light/blacklight/directional/east,
@@ -200,6 +194,12 @@
 /obj/structure/cable,
 /turf/open/floor/glass/reinforced/plasma,
 /area/template_noop)
+"yld" = (
+/obj/item/gun/ballistic/automatic/pistol,
+/obj/machinery/recharger,
+/obj/structure/table/reinforced/plasmarglass,
+/turf/open/floor/glass/reinforced/plasma,
+/area/template_noop)
 
 (1,1,1) = {"
 gAx
@@ -216,9 +216,9 @@ pTu
 gAx
 nHL
 wAG
-cAP
-sWY
-elB
+srG
+yld
+eRh
 wUb
 pyD
 kde
diff --git a/_maps/voidcrew/ship_modules/delta/delta_cargo_gundeck.dmm b/_maps/voidcrew/ship_modules/delta/delta_cargo_gundeck.dmm
index 49abfb2c1da..dfb616ab3d8 100644
--- a/_maps/voidcrew/ship_modules/delta/delta_cargo_gundeck.dmm
+++ b/_maps/voidcrew/ship_modules/delta/delta_cargo_gundeck.dmm
@@ -1,7 +1,4 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"a" = (
-/turf/open/floor/iron/dark,
-/area/template_noop)
 "c" = (
 /obj/structure/chair{
 	dir = 4
@@ -15,13 +12,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"f" = (
-/obj/structure/rack,
-/obj/item/gun/energy/e_gun/mini,
-/obj/item/gun/energy/e_gun/mini,
-/obj/item/gun/energy/disabler,
-/turf/open/floor/iron/dark,
-/area/template_noop)
 "j" = (
 /obj/modular_map_connector,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -40,8 +30,11 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"s" = (
-/obj/structure/closet/secure_closet/armory1,
+"q" = (
+/obj/structure/rack,
+/obj/item/gun/energy/e_gun/mini,
+/obj/item/gun/energy/e_gun/mini,
+/obj/item/gun/energy/disabler,
 /turf/open/floor/iron/dark,
 /area/template_noop)
 "v" = (
@@ -169,7 +162,7 @@ U
 c
 "}
 (4,1,1) = {"
-f
+q
 J
 v
 e
diff --git a/_maps/voidcrew/ship_modules/delta/delta_cargo_gundeck_cult.dmm b/_maps/voidcrew/ship_modules/delta/delta_cargo_gundeck_cult.dmm
index 3f561c359ad..09bb1f129af 100644
--- a/_maps/voidcrew/ship_modules/delta/delta_cargo_gundeck_cult.dmm
+++ b/_maps/voidcrew/ship_modules/delta/delta_cargo_gundeck_cult.dmm
@@ -63,10 +63,6 @@
 /obj/machinery/light/small/red/directional/west,
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"s" = (
-/obj/structure/closet/secure_closet/armory1,
-/turf/open/floor/iron/dark,
-/area/template_noop)
 "t" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/rack,
diff --git a/_maps/voidcrew/ship_modules/delta/delta_cargo_gundeck_lightship.dmm b/_maps/voidcrew/ship_modules/delta/delta_cargo_gundeck_lightship.dmm
index 0ce4e06a888..8eefe95f333 100644
--- a/_maps/voidcrew/ship_modules/delta/delta_cargo_gundeck_lightship.dmm
+++ b/_maps/voidcrew/ship_modules/delta/delta_cargo_gundeck_lightship.dmm
@@ -20,7 +20,7 @@
 /obj/item/stack/cable_coil,
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"f" = (
+"m" = (
 /obj/structure/rack,
 /obj/item/gun/energy/e_gun/mini,
 /obj/item/gun/energy/e_gun/mini,
@@ -49,10 +49,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"s" = (
-/obj/structure/closet/secure_closet/armory1,
-/turf/open/floor/iron/dark,
-/area/template_noop)
 "t" = (
 /obj/structure/rack,
 /obj/item/storage/box/zipties,
@@ -138,9 +134,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"Y" = (
-/turf/open/floor/iron/dark,
-/area/template_noop)
 
 (1,1,1) = {"
 b
@@ -164,7 +157,7 @@ U
 c
 "}
 (4,1,1) = {"
-f
+m
 J
 H
 U
diff --git a/_maps/voidcrew/ship_modules/delta/delta_cargo_gundeck_syndicate.dmm b/_maps/voidcrew/ship_modules/delta/delta_cargo_gundeck_syndicate.dmm
index 575eed04c41..cf6a9a6168e 100644
--- a/_maps/voidcrew/ship_modules/delta/delta_cargo_gundeck_syndicate.dmm
+++ b/_maps/voidcrew/ship_modules/delta/delta_cargo_gundeck_syndicate.dmm
@@ -16,10 +16,6 @@
 /obj/structure/sign/warning/secure_area/directional/south,
 /turf/open/floor/mineral/plastitanium,
 /area/template_noop)
-"h" = (
-/obj/structure/closet/secure_closet/armory1,
-/turf/open/floor/mineral/plastitanium,
-/area/template_noop)
 "i" = (
 /obj/structure/closet/secure_closet/security,
 /turf/open/floor/mineral/plastitanium,
@@ -40,14 +36,6 @@
 	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/template_noop)
-"o" = (
-/obj/structure/rack,
-/obj/item/gun/energy/e_gun/mini,
-/obj/item/gun/energy/e_gun/mini,
-/obj/item/gun/energy/disabler,
-/obj/structure/sign/poster/contraband/c20r/directional/north,
-/turf/open/floor/mineral/plastitanium,
-/area/template_noop)
 "p" = (
 /obj/effect/turf_decal/trimline/red/filled/line{
 	dir = 2
@@ -74,9 +62,6 @@
 /obj/structure/sign/poster/contraband/energy_swords/directional/south,
 /turf/open/floor/mineral/plastitanium,
 /area/template_noop)
-"t" = (
-/turf/open/floor/mineral/plastitanium,
-/area/template_noop)
 "u" = (
 /obj/structure/closet/secure_closet/security,
 /obj/machinery/light/small/red/directional/west,
@@ -116,19 +101,18 @@
 /obj/machinery/light/small/red/directional/south,
 /turf/open/floor/mineral/plastitanium,
 /area/template_noop)
-"H" = (
+"I" = (
 /obj/effect/turf_decal/trimline/red/filled/line{
 	dir = 2
 	},
-/obj/structure/closet/syndicate,
-/obj/item/clothing/under/syndicate,
-/obj/item/clothing/under/syndicate,
 /turf/open/floor/mineral/plastitanium,
 /area/template_noop)
-"I" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
-	dir = 2
-	},
+"M" = (
+/obj/structure/rack,
+/obj/item/gun/energy/e_gun/mini,
+/obj/item/gun/energy/e_gun/mini,
+/obj/item/gun/energy/disabler,
+/obj/structure/sign/poster/contraband/c20r/directional/north,
 /turf/open/floor/mineral/plastitanium,
 /area/template_noop)
 "O" = (
@@ -192,7 +176,7 @@ I
 g
 "}
 (4,1,1) = {"
-o
+M
 q
 Q
 p
diff --git a/_maps/voidcrew/ship_modules/delta/delta_cargo_salvage.dmm b/_maps/voidcrew/ship_modules/delta/delta_cargo_salvage.dmm
index 4205630a7b5..121a9cac815 100644
--- a/_maps/voidcrew/ship_modules/delta/delta_cargo_salvage.dmm
+++ b/_maps/voidcrew/ship_modules/delta/delta_cargo_salvage.dmm
@@ -95,16 +95,6 @@
 /obj/item/storage/bag/ore,
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"w" = (
-/obj/effect/turf_decal/box/corners{
-	dir = 1
-	},
-/obj/structure/closet/crate/secure/weapon,
-/obj/item/gun/ballistic/rifle/boltaction,
-/obj/item/ammo_box/strilka310/surplus,
-/obj/item/flashlight/seclite,
-/turf/open/floor/iron/dark,
-/area/template_noop)
 "C" = (
 /obj/effect/turf_decal/box/corners{
 	dir = 1
@@ -138,6 +128,16 @@
 /obj/machinery/light/small/directional/north,
 /turf/open/floor/iron/dark,
 /area/template_noop)
+"G" = (
+/obj/effect/turf_decal/box/corners{
+	dir = 1
+	},
+/obj/structure/closet/crate/secure/weapon,
+/obj/item/gun/ballistic/rifle/boltaction,
+/obj/item/ammo_box/strilka310/surplus,
+/obj/item/flashlight/seclite,
+/turf/open/floor/iron/dark,
+/area/template_noop)
 "I" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/rack,
@@ -214,7 +214,7 @@ R
 U
 "}
 (5,1,1) = {"
-w
+G
 W
 X
 K
diff --git a/_maps/voidcrew/ship_modules/delta/delta_cargo_salvage_cult.dmm b/_maps/voidcrew/ship_modules/delta/delta_cargo_salvage_cult.dmm
index 84e9b8ff9f8..cf1c6679dcd 100644
--- a/_maps/voidcrew/ship_modules/delta/delta_cargo_salvage_cult.dmm
+++ b/_maps/voidcrew/ship_modules/delta/delta_cargo_salvage_cult.dmm
@@ -1,4 +1,14 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"b" = (
+/obj/effect/turf_decal/box/corners{
+	dir = 8
+	},
+/obj/structure/closet/crate/secure/weapon,
+/obj/item/gun/ballistic/rifle/boltaction,
+/obj/item/ammo_box/strilka310/surplus,
+/obj/item/flashlight/seclite,
+/turf/open/floor/iron/dark,
+/area/template_noop)
 "c" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt,
@@ -62,11 +72,11 @@
 /obj/structure/rack,
 /obj/item/stack/sheet/runed_metal{
 	amount = 10;
-	 pixel_y = 3
+	pixel_y = 3
 	},
 /obj/item/storage/fancy/candle_box{
 	pixel_x = 6;
-	 pixel_y = -4
+	pixel_y = -4
 	},
 /turf/open/floor/iron/dark,
 /area/template_noop)
@@ -87,17 +97,17 @@
 /obj/structure/table/reinforced,
 /obj/item/clipboard{
 	pixel_x = -4;
-	 pixel_y = 4
+	pixel_y = 4
 	},
 /obj/item/hand_labeler{
 	pixel_x = 5;
-	 pixel_y = -2
+	pixel_y = -2
 	},
 /obj/item/paper{
 	default_raw_text = "Log every load before it goes in a crate. Weight, which wreck it came off, who carried it. Chalk the crate lid so it matches the book.";
-	 name = "hold log";
-	 pixel_x = 4;
-	 pixel_y = 8
+	name = "hold log";
+	pixel_x = 4;
+	pixel_y = 8
 	},
 /obj/machinery/light/small/red/directional/west,
 /turf/open/floor/iron/dark,
@@ -109,38 +119,28 @@
 	},
 /obj/item/weldingtool/largetank{
 	pixel_x = 6;
-	 pixel_y = -3
+	pixel_y = -3
 	},
 /obj/item/crowbar/large{
 	pixel_x = -6;
-	 pixel_y = -3
+	pixel_y = -3
 	},
 /obj/machinery/light/small/red/directional/south,
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"B" = (
-/obj/effect/turf_decal/box/corners{
-	dir = 8
-	},
-/obj/structure/closet/crate/secure/weapon,
-/obj/item/gun/ballistic/rifle/boltaction,
-/obj/item/ammo_box/strilka310/surplus,
-/obj/item/flashlight/seclite,
-/turf/open/floor/iron/dark,
-/area/template_noop)
 "G" = (
 /obj/structure/table/reinforced,
 /obj/item/paper_bin{
 	pixel_x = -5;
-	 pixel_y = 4
+	pixel_y = 4
 	},
 /obj/item/pen{
 	pixel_x = -5;
-	 pixel_y = 6
+	pixel_y = 6
 	},
 /obj/item/folder{
 	pixel_x = 6;
-	 pixel_y = -3
+	pixel_y = -3
 	},
 /turf/open/floor/iron/dark,
 /area/template_noop)
@@ -177,11 +177,11 @@
 /obj/structure/rack,
 /obj/item/stack/sheet/runed_metal{
 	amount = 20;
-	 pixel_y = 2
+	pixel_y = 2
 	},
 /obj/item/flashlight/flare/candle/infinite{
 	pixel_x = 7;
-	 pixel_y = 7
+	pixel_y = 7
 	},
 /turf/open/floor/iron/dark,
 /area/template_noop)
@@ -189,7 +189,7 @@
 /obj/effect/decal/cleanable/blood/old,
 /obj/item/flashlight/flare/candle/infinite{
 	pixel_x = -3;
-	 pixel_y = -5
+	pixel_y = -5
 	},
 /obj/effect/turf_decal/siding/red{
 	dir = 2
@@ -243,7 +243,7 @@
 /obj/structure/noticeboard/directional/west,
 /obj/item/paper{
 	default_raw_text = "Hold watch rotates at every undock. Keep the blast-hatch lane swept and the candle by the desk lit. If the hatch cycles while you are on watch, call it before you open it.";
-	 name = "hold watch bill"
+	name = "hold watch bill"
 	},
 /obj/effect/turf_decal/siding/red{
 	dir = 2
@@ -314,7 +314,7 @@ U
 O
 M
 Y
-B
+b
 z
 "}
 (6,1,1) = {"
diff --git a/_maps/voidcrew/ship_modules/delta/delta_cargo_salvage_lightship.dmm b/_maps/voidcrew/ship_modules/delta/delta_cargo_salvage_lightship.dmm
index ce2e5798db5..c1a5e4c2a49 100644
--- a/_maps/voidcrew/ship_modules/delta/delta_cargo_salvage_lightship.dmm
+++ b/_maps/voidcrew/ship_modules/delta/delta_cargo_salvage_lightship.dmm
@@ -17,9 +17,7 @@
 /area/template_noop)
 "d" = (
 /obj/item/storage/medkit/regular{
-	
 	pixel_y = 6
-	
 	},
 /obj/structure/table/reinforced,
 /obj/machinery/cell_charger,
@@ -41,11 +39,8 @@
 /area/template_noop)
 "o" = (
 /obj/item/radio/off{
-	
 	pixel_x = -6;
-	
 	pixel_y = 5
-	
 	},
 /obj/effect/turf_decal/box/corners{
 	dir = 1
@@ -55,14 +50,10 @@
 /area/template_noop)
 "p" = (
 /obj/effect/turf_decal/siding/red{
-	
 	dir = 2
-	
 	},
 /obj/effect/turf_decal/siding/red{
-	
 	dir = 1
-	
 	},
 /turf/open/floor/iron/white,
 /area/template_noop)
@@ -90,7 +81,7 @@
 	},
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"w" = (
+"x" = (
 /obj/effect/turf_decal/box/corners{
 	dir = 1
 	},
@@ -174,15 +165,10 @@
 /area/template_noop)
 "Y" = (
 /obj/item/paper{
-	
 	name = "stores list";
-	
 	default_raw_text = "Rescue stores, port rack: spare medkits, blankets, two crates of ration bars. Restock after every callout and tell the Storekeeper what you took, even if you put it back.";
-	
 	pixel_x = 6;
-	
 	pixel_y = -6
-	
 	},
 /obj/machinery/light/directional/north,
 /obj/structure/table/reinforced,
@@ -227,7 +213,7 @@ R
 d
 "}
 (5,1,1) = {"
-w
+x
 N
 p
 R
diff --git a/_maps/voidcrew/ship_modules/delta/delta_cargo_salvage_syndicate.dmm b/_maps/voidcrew/ship_modules/delta/delta_cargo_salvage_syndicate.dmm
index 3179d2833e1..12c7ed356f3 100644
--- a/_maps/voidcrew/ship_modules/delta/delta_cargo_salvage_syndicate.dmm
+++ b/_maps/voidcrew/ship_modules/delta/delta_cargo_salvage_syndicate.dmm
@@ -58,17 +58,6 @@
 /obj/structure/sign/poster/contraband/gorlex_recruitment/directional/north,
 /turf/open/floor/mineral/plastitanium,
 /area/template_noop)
-"o" = (
-/obj/effect/turf_decal/box/red/corners{
-	dir = 1
-	},
-/obj/structure/closet/crate/secure/weapon,
-/obj/item/gun/ballistic/rifle/boltaction,
-/obj/item/ammo_box/strilka310/surplus,
-/obj/item/flashlight/seclite,
-/obj/structure/sign/warning/secure_area/directional/north,
-/turf/open/floor/mineral/plastitanium,
-/area/template_noop)
 "p" = (
 /obj/structure/table/reinforced,
 /obj/item/clipboard{
@@ -140,6 +129,17 @@
 /obj/effect/decal/cleanable/blood/oil,
 /turf/open/floor/mineral/plastitanium,
 /area/template_noop)
+"D" = (
+/obj/effect/turf_decal/box/red/corners{
+	dir = 1
+	},
+/obj/structure/closet/crate/secure/weapon,
+/obj/item/gun/ballistic/rifle/boltaction,
+/obj/item/ammo_box/strilka310/surplus,
+/obj/item/flashlight/seclite,
+/obj/structure/sign/warning/secure_area/directional/north,
+/turf/open/floor/mineral/plastitanium,
+/area/template_noop)
 "G" = (
 /obj/effect/decal/cleanable/blood/oil,
 /turf/open/floor/mineral/plastitanium,
@@ -256,7 +256,7 @@ G
 g
 "}
 (4,1,1) = {"
-o
+D
 A
 L
 b
diff --git a/_maps/voidcrew/ship_modules/hiryu_class_carrier/bridge_pink.dmm b/_maps/voidcrew/ship_modules/hiryu_class_carrier/bridge_pink.dmm
index 1b0e00e1748..a09f4edebb6 100644
--- a/_maps/voidcrew/ship_modules/hiryu_class_carrier/bridge_pink.dmm
+++ b/_maps/voidcrew/ship_modules/hiryu_class_carrier/bridge_pink.dmm
@@ -73,14 +73,7 @@
 /obj/structure/window/reinforced/spawner/directional/south,
 /turf/open/floor/iron/dollhouse/checker,
 /area/template_noop)
-"tsh" = (
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/machinery/computer/communications{
-	dir = 8
-	},
-/turf/open/floor/iron/dollhouse,
-/area/template_noop)
-"usM" = (
+"swJ" = (
 /obj/structure/window/reinforced/spawner/directional/south,
 /obj/structure/table/reinforced,
 /obj/item/storage/medkit/regular{
@@ -97,6 +90,13 @@
 /obj/item/gun/energy/laser,
 /turf/open/floor/iron/dollhouse,
 /area/template_noop)
+"tsh" = (
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/machinery/computer/communications{
+	dir = 8
+	},
+/turf/open/floor/iron/dollhouse,
+/area/template_noop)
 "wnG" = (
 /obj/structure/window/reinforced/spawner/directional/north,
 /obj/machinery/computer/crew,
@@ -129,7 +129,7 @@ jVm
 msv
 nmr
 nmr
-usM
+swJ
 "}
 (4,1,1) = {"
 hdW
diff --git a/_maps/voidcrew/ship_modules/hiryu_class_carrier/bridge_standard.dmm b/_maps/voidcrew/ship_modules/hiryu_class_carrier/bridge_standard.dmm
index cfd009c6dca..c2eec68b031 100644
--- a/_maps/voidcrew/ship_modules/hiryu_class_carrier/bridge_standard.dmm
+++ b/_maps/voidcrew/ship_modules/hiryu_class_carrier/bridge_standard.dmm
@@ -5,6 +5,23 @@
 	},
 /turf/open/floor/mineral/titanium,
 /area/template_noop)
+"dhW" = (
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/structure/table/reinforced,
+/obj/item/storage/medkit/regular{
+	pixel_x = 0;
+	pixel_y = 3
+	},
+/obj/item/storage/medkit/regular{
+	pixel_x = 0;
+	pixel_y = 9
+	},
+/obj/item/binoculars,
+/obj/item/gun/energy/laser,
+/obj/item/gun/energy/laser,
+/obj/item/gun/energy/laser,
+/turf/open/floor/mineral/titanium,
+/area/template_noop)
 "dwQ" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
@@ -82,23 +99,6 @@
 	},
 /turf/open/floor/mineral/titanium,
 /area/template_noop)
-"wCS" = (
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/structure/table/reinforced,
-/obj/item/storage/medkit/regular{
-	pixel_x = 0;
-	pixel_y = 3
-	},
-/obj/item/storage/medkit/regular{
-	pixel_x = 0;
-	pixel_y = 9
-	},
-/obj/item/binoculars,
-/obj/item/gun/energy/laser,
-/obj/item/gun/energy/laser,
-/obj/item/gun/energy/laser,
-/turf/open/floor/mineral/titanium,
-/area/template_noop)
 "xnv" = (
 /obj/structure/window/reinforced/spawner/directional/south,
 /turf/open/floor/mineral/titanium/blue,
@@ -129,7 +129,7 @@ ixv
 dwQ
 njK
 njK
-wCS
+dhW
 "}
 (4,1,1) = {"
 jlZ
diff --git a/_maps/voidcrew/ship_modules/hiryu_class_carrier/bridge_syndicate.dmm b/_maps/voidcrew/ship_modules/hiryu_class_carrier/bridge_syndicate.dmm
index 2137a2b82a9..02cfab053ae 100644
--- a/_maps/voidcrew/ship_modules/hiryu_class_carrier/bridge_syndicate.dmm
+++ b/_maps/voidcrew/ship_modules/hiryu_class_carrier/bridge_syndicate.dmm
@@ -2,6 +2,23 @@
 "ahM" = (
 /turf/template_noop,
 /area/template_noop)
+"iyn" = (
+/obj/structure/window/reinforced/spawner/directional/south,
+/obj/item/storage/medkit/regular{
+	pixel_x = 0;
+	pixel_y = 3
+	},
+/obj/item/storage/medkit/regular{
+	pixel_x = 0;
+	pixel_y = 9
+	},
+/obj/structure/table/reinforced/plastitaniumglass,
+/obj/item/binoculars,
+/obj/item/gun/energy/laser,
+/obj/item/gun/energy/laser,
+/obj/item/gun/energy/laser,
+/turf/open/floor/mineral/plastitanium,
+/area/template_noop)
 "jgg" = (
 /turf/open/floor/mineral/titanium/blue,
 /area/template_noop)
@@ -48,23 +65,6 @@
 /obj/structure/table/reinforced/plastitaniumglass,
 /turf/open/floor/mineral/plastitanium,
 /area/template_noop)
-"nFH" = (
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/item/storage/medkit/regular{
-	pixel_x = 0;
-	pixel_y = 3
-	},
-/obj/item/storage/medkit/regular{
-	pixel_x = 0;
-	pixel_y = 9
-	},
-/obj/structure/table/reinforced/plastitaniumglass,
-/obj/item/binoculars,
-/obj/item/gun/energy/laser,
-/obj/item/gun/energy/laser,
-/obj/item/gun/energy/laser,
-/turf/open/floor/mineral/plastitanium,
-/area/template_noop)
 "ozd" = (
 /obj/machinery/mission_pad,
 /turf/open/floor/mineral/plastitanium,
@@ -129,7 +129,7 @@ ozd
 suh
 vuO
 vuO
-nFH
+iyn
 "}
 (4,1,1) = {"
 ahM
diff --git a/_maps/voidcrew/ship_modules/hiryu_class_carrier/captain_s_quarters_pink.dmm b/_maps/voidcrew/ship_modules/hiryu_class_carrier/captain_s_quarters_pink.dmm
index eeb5a5d0194..9d04c43e848 100644
--- a/_maps/voidcrew/ship_modules/hiryu_class_carrier/captain_s_quarters_pink.dmm
+++ b/_maps/voidcrew/ship_modules/hiryu_class_carrier/captain_s_quarters_pink.dmm
@@ -1,4 +1,13 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aab" = (
+/obj/structure/displaycase/captain{
+	start_showpiece_type = /obj/item/knife/combat/survival
+	},
+/obj/structure/plaque/static_plaque/golden/captain{
+	pixel_y = 29
+	},
+/turf/open/floor/wood/mahogany,
+/area/template_noop)
 "buH" = (
 /obj/structure/window/reinforced/spawner/directional/east,
 /obj/machinery/computer/bank_machine{
@@ -7,12 +16,6 @@
 /obj/effect/turf_decal/siding/purple,
 /turf/open/floor/carpet/purple,
 /area/template_noop)
-"bUj" = (
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/closet/secure_closet/captains,
-/obj/item/folder/documents,
-/turf/open/floor/wood/mahogany,
-/area/template_noop)
 "cjN" = (
 /obj/machinery/mission_pad,
 /obj/effect/turf_decal/siding/purple/inner_corner{
@@ -48,6 +51,12 @@
 "nXX" = (
 /turf/template_noop,
 /area/template_noop)
+"pIW" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/closet/secure_closet/captains,
+/obj/item/folder/documents,
+/turf/open/floor/wood/mahogany,
+/area/template_noop)
 "rIk" = (
 /obj/structure/window/reinforced/spawner/directional/south,
 /turf/open/floor/wood/mahogany,
@@ -93,15 +102,6 @@
 /obj/modular_map_connector,
 /turf/open/floor/iron/dollhouse,
 /area/template_noop)
-"xfu" = (
-/obj/structure/displaycase/captain{
-	start_showpiece_type = /obj/item/katana
-	},
-/obj/structure/plaque/static_plaque/golden/captain{
-	pixel_y = 29
-	},
-/turf/open/floor/wood/mahogany,
-/area/template_noop)
 
 (1,1,1) = {"
 sJk
@@ -122,7 +122,7 @@ kuP
 rIk
 "}
 (3,1,1) = {"
-bUj
+pIW
 kuP
 cjN
 ueZ
@@ -132,7 +132,7 @@ uhQ
 "}
 (4,1,1) = {"
 nXX
-xfu
+aab
 vTp
 ssU
 buH
diff --git a/_maps/voidcrew/ship_modules/hiryu_class_carrier/captain_s_quarters_standard.dmm b/_maps/voidcrew/ship_modules/hiryu_class_carrier/captain_s_quarters_standard.dmm
index 3df857dc0f3..ebeed52ea80 100644
--- a/_maps/voidcrew/ship_modules/hiryu_class_carrier/captain_s_quarters_standard.dmm
+++ b/_maps/voidcrew/ship_modules/hiryu_class_carrier/captain_s_quarters_standard.dmm
@@ -1,4 +1,13 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aab" = (
+/obj/structure/displaycase/captain{
+	start_showpiece_type = /obj/item/knife/combat/survival
+	},
+/obj/structure/plaque/static_plaque/golden/captain{
+	pixel_y = 29
+	},
+/turf/open/floor/wood,
+/area/template_noop)
 "drI" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
@@ -8,6 +17,12 @@
 	},
 /turf/open/floor/carpet/blue,
 /area/template_noop)
+"ecl" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/closet/secure_closet/captains,
+/obj/item/folder/documents,
+/turf/open/floor/wood,
+/area/template_noop)
 "jJY" = (
 /obj/structure/window/reinforced/spawner/directional/north,
 /turf/open/floor/wood,
@@ -20,21 +35,6 @@
 	},
 /turf/open/floor/carpet/blue,
 /area/template_noop)
-"qNH" = (
-/obj/structure/displaycase/captain{
-	start_showpiece_type = /obj/item/katana
-	},
-/obj/structure/plaque/static_plaque/golden/captain{
-	pixel_y = 29
-	},
-/turf/open/floor/wood,
-/area/template_noop)
-"rbk" = (
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/closet/secure_closet/captains,
-/obj/item/folder/documents,
-/turf/open/floor/wood,
-/area/template_noop)
 "rfX" = (
 /obj/structure/table/wood,
 /obj/machinery/recharger,
@@ -119,7 +119,7 @@ voR
 rBy
 "}
 (3,1,1) = {"
-rbk
+ecl
 voR
 vji
 drI
@@ -129,7 +129,7 @@ sxf
 "}
 (4,1,1) = {"
 yjK
-qNH
+aab
 vmU
 vbd
 rDl
diff --git a/_maps/voidcrew/ship_modules/hiryu_class_carrier/captain_s_quarters_syndicate.dmm b/_maps/voidcrew/ship_modules/hiryu_class_carrier/captain_s_quarters_syndicate.dmm
index 37333836bf6..34a49bd14d0 100644
--- a/_maps/voidcrew/ship_modules/hiryu_class_carrier/captain_s_quarters_syndicate.dmm
+++ b/_maps/voidcrew/ship_modules/hiryu_class_carrier/captain_s_quarters_syndicate.dmm
@@ -1,19 +1,19 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"eVG" = (
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/closet/secure_closet/captains,
-/obj/item/folder/syndicate/red,
-/turf/open/floor/wood/ebony,
-/area/template_noop)
-"hOd" = (
+"aab" = (
 /obj/structure/displaycase/captain{
-	start_showpiece_type = /obj/item/katana
+	start_showpiece_type = /obj/item/knife/combat/survival
 	},
 /obj/structure/plaque/static_plaque/golden/captain{
 	pixel_y = 29
 	},
 /turf/open/floor/wood/ebony,
 /area/template_noop)
+"aUy" = (
+/obj/structure/window/reinforced/spawner/directional/north,
+/obj/structure/closet/secure_closet/captains,
+/obj/item/folder/syndicate/red,
+/turf/open/floor/wood/ebony,
+/area/template_noop)
 "jJe" = (
 /obj/modular_map_connector,
 /turf/template_noop,
@@ -119,7 +119,7 @@ mxC
 qDi
 "}
 (3,1,1) = {"
-eVG
+aUy
 mxC
 pIl
 qKc
@@ -129,7 +129,7 @@ nTz
 "}
 (4,1,1) = {"
 oFg
-hOd
+aab
 xNq
 vEi
 pFb
diff --git a/_maps/voidcrew/ship_modules/nanobead/security_north_dark.dmm b/_maps/voidcrew/ship_modules/nanobead/security_north_dark.dmm
index c454f0051f2..1e9de72dc6b 100644
--- a/_maps/voidcrew/ship_modules/nanobead/security_north_dark.dmm
+++ b/_maps/voidcrew/ship_modules/nanobead/security_north_dark.dmm
@@ -10,9 +10,8 @@
 	dir = 1
 	},
 /area/template_noop)
-"bgz" = (
-/obj/structure/guncase/wt550,
-/obj/item/gun/ballistic/automatic/wt550,
+"aMj" = (
+/obj/structure/guncase/shotgun,
 /obj/effect/turf_decal/siding/thinplating_new/dark{
 	dir = 1
 	},
@@ -22,10 +21,11 @@
 /obj/effect/turf_decal/trimline/red/filled/mid_joiner{
 	dir = 1
 	},
-/obj/machinery/light/directional/south,
-/obj/item/ammo_box/magazine/wt550m9,
-/obj/item/ammo_box/magazine/wt550m9,
-/obj/item/ammo_box/magazine/wt550m9,
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/machinery/airalarm/directional/south,
+/obj/effect/spawner/random/armory/buckshot,
+/obj/effect/spawner/random/armory/buckshot,
+/obj/item/gun/ballistic/shotgun/riot,
 /turf/open/floor/iron/dark/smooth_large,
 /area/template_noop)
 "cgf" = (
@@ -119,6 +119,16 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/dark/smooth_edge,
 /area/template_noop)
+"iwj" = (
+/obj/structure/closet/secure_closet/contraband/armory,
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/effect/turf_decal/trimline/red/filled/line{
+	dir = 2
+	},
+/obj/effect/turf_decal/trimline/red/filled/mid_joiner,
+/obj/item/gun/energy/laser,
+/turf/open/floor/iron/dark/smooth_large,
+/area/template_noop)
 "iJw" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/box/flashbangs{
@@ -218,14 +228,22 @@
 	dir = 1
 	},
 /area/template_noop)
-"qpV" = (
-/obj/structure/closet/secure_closet/contraband/armory,
-/obj/effect/turf_decal/siding/thinplating_new/dark,
+"oKr" = (
+/obj/structure/guncase/wt550,
+/obj/item/gun/ballistic/automatic/wt550,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 1
+	},
 /obj/effect/turf_decal/trimline/red/filled/line{
-	dir = 2
+	dir = 1
 	},
-/obj/effect/turf_decal/trimline/red/filled/mid_joiner,
-/obj/item/gun/energy/laser,
+/obj/effect/turf_decal/trimline/red/filled/mid_joiner{
+	dir = 1
+	},
+/obj/machinery/light/directional/south,
+/obj/item/ammo_box/magazine/wt550m9,
+/obj/item/ammo_box/magazine/wt550m9,
+/obj/item/ammo_box/magazine/wt550m9,
 /turf/open/floor/iron/dark/smooth_large,
 /area/template_noop)
 "rER" = (
@@ -282,24 +300,6 @@
 	},
 /turf/open/floor/iron/dark/smooth_large,
 /area/template_noop)
-"ttc" = (
-/obj/structure/guncase/shotgun,
-/obj/effect/turf_decal/siding/thinplating_new/dark{
-	dir = 1
-	},
-/obj/effect/turf_decal/trimline/red/filled/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/trimline/red/filled/mid_joiner{
-	dir = 1
-	},
-/obj/structure/extinguisher_cabinet/directional/east,
-/obj/machinery/airalarm/directional/south,
-/obj/effect/spawner/random/armory/buckshot,
-/obj/effect/spawner/random/armory/buckshot,
-/obj/item/gun/ballistic/shotgun/riot,
-/turf/open/floor/iron/dark/smooth_large,
-/area/template_noop)
 "tua" = (
 /obj/structure/rack,
 /obj/effect/spawner/random/armory/riot_helmet,
@@ -398,18 +398,18 @@ fuX
 (4,1,1) = {"
 jLq
 lND
-qpV
+iwj
 dmo
 ihX
-bgz
+oKr
 "}
 (5,1,1) = {"
 jLq
 jLq
-qpV
+iwj
 xFc
 nTm
-ttc
+aMj
 "}
 (6,1,1) = {"
 jLq
diff --git a/_maps/voidcrew/ship_modules/nanobead/security_north_standard.dmm b/_maps/voidcrew/ship_modules/nanobead/security_north_standard.dmm
index 849e9b278c4..430a8a8e3f0 100644
--- a/_maps/voidcrew/ship_modules/nanobead/security_north_standard.dmm
+++ b/_maps/voidcrew/ship_modules/nanobead/security_north_standard.dmm
@@ -85,16 +85,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/dark/smooth_edge,
 /area/template_noop)
-"gyv" = (
-/obj/structure/closet/secure_closet/contraband/armory,
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/obj/effect/turf_decal/trimline/red/filled/line{
-	dir = 2
-	},
-/obj/effect/turf_decal/trimline/red/filled/mid_joiner,
-/obj/item/gun/energy/laser,
-/turf/open/floor/iron/dark/smooth_large,
-/area/template_noop)
 "hfd" = (
 /obj/structure/rack,
 /obj/effect/spawner/random/armory/riot_armor,
@@ -109,24 +99,6 @@
 	},
 /turf/open/floor/iron/dark/smooth_large,
 /area/template_noop)
-"hvx" = (
-/obj/structure/guncase/shotgun,
-/obj/effect/turf_decal/siding/thinplating_new/dark{
-	dir = 1
-	},
-/obj/effect/turf_decal/trimline/red/filled/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/trimline/red/filled/mid_joiner{
-	dir = 1
-	},
-/obj/structure/extinguisher_cabinet/directional/east,
-/obj/machinery/airalarm/directional/south,
-/obj/effect/spawner/random/armory/buckshot,
-/obj/effect/spawner/random/armory/buckshot,
-/obj/item/gun/ballistic/shotgun/riot,
-/turf/open/floor/iron/dark/smooth_large,
-/area/template_noop)
 "jfN" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/backpack/duffelbag/sec{
@@ -162,6 +134,16 @@
 	},
 /turf/open/floor/iron/large,
 /area/template_noop)
+"jvF" = (
+/obj/structure/closet/secure_closet/contraband/armory,
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/effect/turf_decal/trimline/red/filled/line{
+	dir = 2
+	},
+/obj/effect/turf_decal/trimline/red/filled/mid_joiner,
+/obj/item/gun/energy/laser,
+/turf/open/floor/iron/dark/smooth_large,
+/area/template_noop)
 "jMa" = (
 /obj/structure/table/reinforced,
 /obj/machinery/recharger{
@@ -234,6 +216,24 @@
 	dir = 4
 	},
 /area/template_noop)
+"ohc" = (
+/obj/structure/guncase/shotgun,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/red/filled/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/red/filled/mid_joiner{
+	dir = 1
+	},
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/machinery/airalarm/directional/south,
+/obj/effect/spawner/random/armory/buckshot,
+/obj/effect/spawner/random/armory/buckshot,
+/obj/item/gun/ballistic/shotgun/riot,
+/turf/open/floor/iron/dark/smooth_large,
+/area/template_noop)
 "osL" = (
 /obj/structure/rack,
 /obj/effect/spawner/random/armory/riot_helmet,
@@ -249,6 +249,24 @@
 /obj/machinery/camera/autoname/directional/east,
 /turf/open/floor/iron/dark/smooth_large,
 /area/template_noop)
+"pLe" = (
+/obj/structure/guncase/wt550,
+/obj/item/gun/ballistic/automatic/wt550,
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/red/filled/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/red/filled/mid_joiner{
+	dir = 1
+	},
+/obj/machinery/light/directional/south,
+/obj/item/ammo_box/magazine/wt550m9,
+/obj/item/ammo_box/magazine/wt550m9,
+/obj/item/ammo_box/magazine/wt550m9,
+/turf/open/floor/iron/dark/smooth_large,
+/area/template_noop)
 "pWB" = (
 /obj/structure/cable,
 /turf/open/floor/iron,
@@ -318,24 +336,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/template_noop)
-"uzn" = (
-/obj/structure/guncase/wt550,
-/obj/item/gun/ballistic/automatic/wt550,
-/obj/effect/turf_decal/siding/thinplating_new/dark{
-	dir = 1
-	},
-/obj/effect/turf_decal/trimline/red/filled/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/trimline/red/filled/mid_joiner{
-	dir = 1
-	},
-/obj/machinery/light/directional/south,
-/obj/item/ammo_box/magazine/wt550m9,
-/obj/item/ammo_box/magazine/wt550m9,
-/obj/item/ammo_box/magazine/wt550m9,
-/turf/open/floor/iron/dark/smooth_large,
-/area/template_noop)
 "wvs" = (
 /obj/effect/turf_decal/siding/thinplating_new/corner{
 	dir = 4
@@ -396,18 +396,18 @@ jkS
 (4,1,1) = {"
 ksK
 aDU
-gyv
+jvF
 ruD
 dPa
-uzn
+pLe
 "}
 (5,1,1) = {"
 ksK
 ksK
-gyv
+jvF
 cJP
 bCt
-hvx
+ohc
 "}
 (6,1,1) = {"
 ksK
diff --git a/_maps/voidcrew/ship_modules/nanobead/security_south_dark.dmm b/_maps/voidcrew/ship_modules/nanobead/security_south_dark.dmm
index ce07adc2e9a..527d99ecc88 100644
--- a/_maps/voidcrew/ship_modules/nanobead/security_south_dark.dmm
+++ b/_maps/voidcrew/ship_modules/nanobead/security_south_dark.dmm
@@ -111,6 +111,18 @@
 	dir = 8
 	},
 /area/template_noop)
+"dFx" = (
+/obj/structure/guncase/shotgun,
+/obj/effect/turf_decal/trimline/red/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/mid_joiner,
+/obj/machinery/airalarm/directional/north,
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/effect/spawner/random/armory/buckshot,
+/obj/effect/spawner/random/armory/buckshot,
+/obj/item/gun/ballistic/shotgun/riot,
+/turf/open/floor/iron/dark/smooth_large,
+/area/template_noop)
 "euJ" = (
 /obj/structure/rack,
 /obj/effect/spawner/random/armory/riot_armor,
@@ -125,18 +137,16 @@
 	},
 /turf/open/floor/iron/dark/smooth_large,
 /area/template_noop)
-"gpe" = (
-/obj/structure/closet/secure_closet/contraband/armory,
-/obj/effect/turf_decal/trimline/red/filled/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/trimline/red/filled/mid_joiner{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/thinplating_new/dark{
-	dir = 1
-	},
-/obj/item/gun/energy/laser,
+"eFk" = (
+/obj/structure/guncase/wt550,
+/obj/item/gun/ballistic/automatic/wt550,
+/obj/effect/turf_decal/trimline/red/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/mid_joiner,
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/item/ammo_box/magazine/wt550m9,
+/obj/item/ammo_box/magazine/wt550m9,
+/obj/item/ammo_box/magazine/wt550m9,
 /turf/open/floor/iron/dark/smooth_large,
 /area/template_noop)
 "hzs" = (
@@ -193,18 +203,6 @@
 	dir = 8
 	},
 /area/template_noop)
-"ndi" = (
-/obj/structure/guncase/shotgun,
-/obj/effect/turf_decal/trimline/red/filled/line,
-/obj/effect/turf_decal/trimline/red/filled/mid_joiner,
-/obj/machinery/airalarm/directional/north,
-/obj/structure/extinguisher_cabinet/directional/east,
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/obj/effect/spawner/random/armory/buckshot,
-/obj/effect/spawner/random/armory/buckshot,
-/obj/item/gun/ballistic/shotgun/riot,
-/turf/open/floor/iron/dark/smooth_large,
-/area/template_noop)
 "nIs" = (
 /obj/effect/turf_decal/trimline/red/filled/warning{
 	dir = 1
@@ -354,16 +352,18 @@
 	},
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"ydO" = (
-/obj/structure/guncase/wt550,
-/obj/item/gun/ballistic/automatic/wt550,
-/obj/effect/turf_decal/trimline/red/filled/line,
-/obj/effect/turf_decal/trimline/red/filled/mid_joiner,
-/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/obj/item/ammo_box/magazine/wt550m9,
-/obj/item/ammo_box/magazine/wt550m9,
-/obj/item/ammo_box/magazine/wt550m9,
+"xuY" = (
+/obj/structure/closet/secure_closet/contraband/armory,
+/obj/effect/turf_decal/trimline/red/filled/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/red/filled/mid_joiner{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 1
+	},
+/obj/item/gun/energy/laser,
 /turf/open/floor/iron/dark/smooth_large,
 /area/template_noop)
 
@@ -392,18 +392,18 @@ tCm
 kBh
 "}
 (4,1,1) = {"
-ydO
+eFk
 tck
 bZm
-gpe
+xuY
 pEK
 wgz
 "}
 (5,1,1) = {"
-ndi
+dFx
 lSM
 qOY
-gpe
+xuY
 wgz
 wgz
 "}
diff --git a/_maps/voidcrew/ship_modules/nanobead/security_south_standard.dmm b/_maps/voidcrew/ship_modules/nanobead/security_south_standard.dmm
index 2a791309f18..08d0d37dd27 100644
--- a/_maps/voidcrew/ship_modules/nanobead/security_south_standard.dmm
+++ b/_maps/voidcrew/ship_modules/nanobead/security_south_standard.dmm
@@ -78,6 +78,18 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
 /area/template_noop)
+"hOW" = (
+/obj/structure/guncase/wt550,
+/obj/item/gun/ballistic/automatic/wt550,
+/obj/effect/turf_decal/trimline/red/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/mid_joiner,
+/obj/machinery/light/directional/north,
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/item/ammo_box/magazine/wt550m9,
+/obj/item/ammo_box/magazine/wt550m9,
+/obj/item/ammo_box/magazine/wt550m9,
+/turf/open/floor/iron/dark/smooth_large,
+/area/template_noop)
 "iMp" = (
 /obj/structure/rack,
 /obj/item/storage/box/handcuffs{
@@ -128,20 +140,6 @@
 	},
 /turf/open/floor/iron/dark/smooth_large,
 /area/template_noop)
-"kmK" = (
-/obj/structure/closet/secure_closet/contraband/armory,
-/obj/effect/turf_decal/trimline/red/filled/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/trimline/red/filled/mid_joiner{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/thinplating_new/dark{
-	dir = 1
-	},
-/obj/item/gun/energy/laser,
-/turf/open/floor/iron/dark/smooth_large,
-/area/template_noop)
 "lmm" = (
 /obj/structure/cable,
 /turf/open/floor/iron,
@@ -221,30 +219,6 @@
 	dir = 1
 	},
 /area/template_noop)
-"oQx" = (
-/obj/structure/guncase/shotgun,
-/obj/effect/turf_decal/trimline/red/filled/line,
-/obj/effect/turf_decal/trimline/red/filled/mid_joiner,
-/obj/machinery/airalarm/directional/north,
-/obj/structure/extinguisher_cabinet/directional/east,
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/obj/effect/spawner/random/armory/buckshot,
-/obj/effect/spawner/random/armory/buckshot,
-/obj/item/gun/ballistic/shotgun/riot,
-/turf/open/floor/iron/dark/smooth_large,
-/area/template_noop)
-"qwk" = (
-/obj/structure/guncase/wt550,
-/obj/item/gun/ballistic/automatic/wt550,
-/obj/effect/turf_decal/trimline/red/filled/line,
-/obj/effect/turf_decal/trimline/red/filled/mid_joiner,
-/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/obj/item/ammo_box/magazine/wt550m9,
-/obj/item/ammo_box/magazine/wt550m9,
-/obj/item/ammo_box/magazine/wt550m9,
-/turf/open/floor/iron/dark/smooth_large,
-/area/template_noop)
 "rsQ" = (
 /obj/effect/turf_decal/trimline/red/filled/line{
 	dir = 1
@@ -310,6 +284,18 @@
 	},
 /turf/open/floor/iron/large,
 /area/template_noop)
+"uil" = (
+/obj/structure/guncase/shotgun,
+/obj/effect/turf_decal/trimline/red/filled/line,
+/obj/effect/turf_decal/trimline/red/filled/mid_joiner,
+/obj/machinery/airalarm/directional/north,
+/obj/structure/extinguisher_cabinet/directional/east,
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/effect/spawner/random/armory/buckshot,
+/obj/effect/spawner/random/armory/buckshot,
+/obj/item/gun/ballistic/shotgun/riot,
+/turf/open/floor/iron/dark/smooth_large,
+/area/template_noop)
 "uuH" = (
 /obj/structure/railing/corner{
 	dir = 4
@@ -345,6 +331,20 @@
 	dir = 8
 	},
 /area/template_noop)
+"vBI" = (
+/obj/structure/closet/secure_closet/contraband/armory,
+/obj/effect/turf_decal/trimline/red/filled/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/red/filled/mid_joiner{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 1
+	},
+/obj/item/gun/energy/laser,
+/turf/open/floor/iron/dark/smooth_large,
+/area/template_noop)
 "wcF" = (
 /obj/effect/turf_decal/siding/thinplating_new/corner,
 /obj/effect/turf_decal/trimline/red/filled/warning{
@@ -392,18 +392,18 @@ uuH
 aSa
 "}
 (4,1,1) = {"
-qwk
+hOW
 rsQ
 sdo
-kmK
+vBI
 tAn
 tlG
 "}
 (5,1,1) = {"
-oQx
+uil
 bhc
 ouJ
-kmK
+vBI
 tlG
 tlG
 "}
diff --git a/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_full.dmm b/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_full.dmm
index bba374f0fee..2eb6b0796a6 100644
--- a/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_full.dmm
+++ b/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_full.dmm
@@ -2,12 +2,26 @@
 "a" = (
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"c" = (
-/obj/machinery/airalarm/directional/south,
+"b" = (
+/obj/item/clothing/suit/hooded/ablative,
+/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/knife/combat/survival,
+/obj/item/knife/combat/survival,
+/obj/item/knife/combat/survival,
+/obj/structure/closet/secure_closet{
+	name = "armory armor locker";
+	icon_state = "armory";
+	req_access = list("armory")
+	},
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"g" = (
-/obj/structure/closet/secure_closet/armory2,
+"c" = (
+/obj/machinery/airalarm/directional/south,
 /turf/open/floor/iron/dark,
 /area/template_noop)
 "h" = (
@@ -39,10 +53,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"w" = (
-/obj/machinery/vending/security/marine/solgov,
-/turf/open/floor/iron/dark,
-/area/template_noop)
 "x" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/stripes{
@@ -65,6 +75,14 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/dark,
 /area/template_noop)
+"B" = (
+/obj/structure/closet/secure_closet/armory2,
+/turf/open/floor/iron/dark,
+/area/template_noop)
+"C" = (
+/obj/machinery/vending/security/marine/solgov,
+/turf/open/floor/iron/dark,
+/area/template_noop)
 "F" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/toolbox/mechanical{
@@ -98,10 +116,6 @@
 /obj/structure/closet/l3closet/security,
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"R" = (
-/obj/structure/closet/secure_closet/armory1,
-/turf/open/floor/iron/dark,
-/area/template_noop)
 "S" = (
 /obj/machinery/light/directional/north,
 /obj/effect/turf_decal/bot,
@@ -115,7 +129,7 @@
 /area/template_noop)
 
 (1,1,1) = {"
-R
+b
 h
 a
 M
@@ -145,8 +159,8 @@ a
 c
 "}
 (6,1,1) = {"
-g
-w
+B
+C
 m
 z
 "}
diff --git a/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_full_hearth.dmm b/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_full_hearth.dmm
index ae39531ca21..0a1c0c4c242 100644
--- a/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_full_hearth.dmm
+++ b/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_full_hearth.dmm
@@ -2,6 +2,24 @@
 "a" = (
 /turf/open/floor/iron/dark,
 /area/template_noop)
+"b" = (
+/obj/item/clothing/suit/hooded/ablative,
+/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/knife/combat/survival,
+/obj/item/knife/combat/survival,
+/obj/item/knife/combat/survival,
+/obj/structure/closet/secure_closet{
+	name = "armory armor locker";
+	icon_state = "armory";
+	req_access = list("armory")
+	},
+/turf/open/floor/iron/dark,
+/area/template_noop)
 "c" = (
 /obj/machinery/airalarm/directional/south,
 /turf/open/floor/iron/dark,
@@ -14,6 +32,10 @@
 /obj/structure/closet/bombcloset/security,
 /turf/open/floor/iron/dark,
 /area/template_noop)
+"j" = (
+/obj/machinery/vending/security/marine/solgov,
+/turf/open/floor/iron/dark,
+/area/template_noop)
 "k" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
@@ -49,10 +71,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"w" = (
-/obj/machinery/vending/security/marine/solgov,
-/turf/open/floor/iron/dark,
-/area/template_noop)
 "x" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/stripes{
@@ -112,10 +130,6 @@
 /obj/structure/closet/l3closet/security,
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"R" = (
-/obj/structure/closet/secure_closet/armory1,
-/turf/open/floor/iron/dark,
-/area/template_noop)
 "S" = (
 /obj/machinery/light/directional/north,
 /obj/effect/turf_decal/bot,
@@ -129,7 +143,7 @@
 /area/template_noop)
 
 (1,1,1) = {"
-R
+b
 h
 a
 M
@@ -160,7 +174,7 @@ c
 "}
 (6,1,1) = {"
 g
-w
+j
 m
 z
 "}
diff --git a/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_full_springs.dmm b/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_full_springs.dmm
index f61541fc544..bf249a70b48 100644
--- a/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_full_springs.dmm
+++ b/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_full_springs.dmm
@@ -2,18 +2,36 @@
 "a" = (
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"c" = (
-/obj/machinery/airalarm/directional/south,
+"b" = (
+/obj/item/clothing/suit/hooded/ablative,
+/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/knife/combat/survival,
+/obj/item/knife/combat/survival,
+/obj/item/knife/combat/survival,
+/obj/structure/closet/secure_closet{
+	name = "armory armor locker";
+	icon_state = "armory";
+	req_access = list("armory")
+	},
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"g" = (
-/obj/structure/closet/secure_closet/armory2,
+"c" = (
+/obj/machinery/airalarm/directional/south,
 /turf/open/floor/iron/dark,
 /area/template_noop)
 "h" = (
 /obj/structure/closet/bombcloset/security,
 /turf/open/floor/iron/dark,
 /area/template_noop)
+"j" = (
+/obj/structure/closet/secure_closet/armory2,
+/turf/open/floor/iron/dark,
+/area/template_noop)
 "k" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
@@ -33,6 +51,10 @@
 /obj/machinery/firealarm/directional/south,
 /turf/open/floor/iron/dark,
 /area/template_noop)
+"p" = (
+/obj/machinery/vending/security/marine/solgov,
+/turf/open/floor/iron/dark,
+/area/template_noop)
 "r" = (
 /obj/item/flashlight/lantern/on,
 /turf/open/floor/wood,
@@ -49,10 +71,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"w" = (
-/obj/machinery/vending/security/marine/solgov,
-/turf/open/floor/iron/dark,
-/area/template_noop)
 "x" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/stripes{
@@ -112,10 +130,6 @@
 /obj/structure/closet/l3closet/security,
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"R" = (
-/obj/structure/closet/secure_closet/armory1,
-/turf/open/floor/iron/dark,
-/area/template_noop)
 "S" = (
 /obj/machinery/light/directional/north,
 /obj/effect/turf_decal/bot,
@@ -129,7 +143,7 @@
 /area/template_noop)
 
 (1,1,1) = {"
-R
+b
 h
 a
 M
@@ -159,8 +173,8 @@ s
 c
 "}
 (6,1,1) = {"
-g
-w
+j
+p
 m
 z
 "}
diff --git a/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_full_verdant.dmm b/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_full_verdant.dmm
index 8b5dc9b3f4c..a1bc15d15d5 100644
--- a/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_full_verdant.dmm
+++ b/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_full_verdant.dmm
@@ -2,12 +2,26 @@
 "a" = (
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"c" = (
-/obj/machinery/airalarm/directional/south,
+"b" = (
+/obj/item/clothing/suit/hooded/ablative,
+/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/clothing/head/helmet/toggleable/riot,
+/obj/item/knife/combat/survival,
+/obj/item/knife/combat/survival,
+/obj/item/knife/combat/survival,
+/obj/structure/closet/secure_closet{
+	name = "armory armor locker";
+	icon_state = "armory";
+	req_access = list("armory")
+	},
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"g" = (
-/obj/structure/closet/secure_closet/armory2,
+"c" = (
+/obj/machinery/airalarm/directional/south,
 /turf/open/floor/iron/dark,
 /area/template_noop)
 "h" = (
@@ -43,10 +57,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"w" = (
-/obj/machinery/vending/security/marine/solgov,
-/turf/open/floor/iron/dark,
-/area/template_noop)
 "x" = (
 /obj/structure/cable,
 /obj/effect/turf_decal/stripes{
@@ -110,24 +120,28 @@
 /obj/structure/closet/l3closet/security,
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"R" = (
-/obj/structure/closet/secure_closet/armory1,
-/turf/open/floor/iron/dark,
-/area/template_noop)
 "S" = (
 /obj/machinery/light/directional/north,
 /obj/effect/turf_decal/bot,
 /turf/open/floor/iron/dark,
 /area/template_noop)
+"V" = (
+/obj/machinery/vending/security/marine/solgov,
+/turf/open/floor/iron/dark,
+/area/template_noop)
 "Y" = (
 /obj/effect/turf_decal/stripes{
 	dir = 1
 	},
 /turf/open/floor/iron/dark,
 /area/template_noop)
+"Z" = (
+/obj/structure/closet/secure_closet/armory2,
+/turf/open/floor/iron/dark,
+/area/template_noop)
 
 (1,1,1) = {"
-R
+b
 h
 a
 M
@@ -157,8 +171,8 @@ K
 c
 "}
 (6,1,1) = {"
-g
-w
+Z
+V
 m
 z
 "}
diff --git a/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_post.dmm b/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_post.dmm
index 8dcb7f48eda..84c484fd729 100644
--- a/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_post.dmm
+++ b/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_post.dmm
@@ -1,4 +1,21 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/structure/rack,
+/obj/item/gun/energy/disabler{
+	pixel_y = 4
+	},
+/obj/item/gun/energy/disabler,
+/obj/item/gun/energy/disabler{
+	pixel_y = -4
+	},
+/obj/item/knife/combat/survival{
+	pixel_x = -5
+	},
+/obj/item/knife/combat/survival{
+	pixel_x = -8
+	},
+/turf/open/floor/iron/dark,
+/area/template_noop)
 "e" = (
 /obj/structure/chair/office{
 	dir = 4
@@ -30,23 +47,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"m" = (
-/obj/structure/rack,
-/obj/item/gun/energy/disabler{
-	pixel_y = 4
-	},
-/obj/item/gun/energy/disabler,
-/obj/item/gun/energy/disabler{
-	pixel_y = -4
-	},
-/obj/item/shield/riot{
-	pixel_x = -5
-	},
-/obj/item/shield/riot{
-	pixel_x = -8
-	},
-/turf/open/floor/iron/dark,
-/area/template_noop)
 "n" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
@@ -143,7 +143,7 @@ D
 p
 E
 P
-m
+a
 "}
 (3,1,1) = {"
 k
diff --git a/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_post_hearth.dmm b/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_post_hearth.dmm
index 479988e5e05..f8a5bed2636 100644
--- a/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_post_hearth.dmm
+++ b/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_post_hearth.dmm
@@ -1,4 +1,21 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/structure/rack,
+/obj/item/gun/energy/disabler{
+	pixel_y = 4
+	},
+/obj/item/gun/energy/disabler,
+/obj/item/gun/energy/disabler{
+	pixel_y = -4
+	},
+/obj/item/knife/combat/survival{
+	pixel_x = -5
+	},
+/obj/item/knife/combat/survival{
+	pixel_x = -8
+	},
+/turf/open/floor/iron/dark,
+/area/template_noop)
 "e" = (
 /obj/structure/chair/wood{
 	dir = 4
@@ -30,23 +47,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"m" = (
-/obj/structure/rack,
-/obj/item/gun/energy/disabler{
-	pixel_y = 4
-	},
-/obj/item/gun/energy/disabler,
-/obj/item/gun/energy/disabler{
-	pixel_y = -4
-	},
-/obj/item/shield/riot{
-	pixel_x = -5
-	},
-/obj/item/shield/riot{
-	pixel_x = -8
-	},
-/turf/open/floor/iron/dark,
-/area/template_noop)
 "n" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
@@ -151,7 +151,7 @@ D
 p
 E
 P
-m
+a
 "}
 (3,1,1) = {"
 k
diff --git a/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_post_springs.dmm b/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_post_springs.dmm
index dad6ef73b5a..be4de961b6f 100644
--- a/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_post_springs.dmm
+++ b/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_post_springs.dmm
@@ -1,4 +1,21 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/structure/rack,
+/obj/item/gun/energy/disabler{
+	pixel_y = 4
+	},
+/obj/item/gun/energy/disabler,
+/obj/item/gun/energy/disabler{
+	pixel_y = -4
+	},
+/obj/item/knife/combat/survival{
+	pixel_x = -5
+	},
+/obj/item/knife/combat/survival{
+	pixel_x = -8
+	},
+/turf/open/floor/iron/dark,
+/area/template_noop)
 "e" = (
 /obj/structure/chair/stool/bamboo{
 	dir = 4
@@ -30,23 +47,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"m" = (
-/obj/structure/rack,
-/obj/item/gun/energy/disabler{
-	pixel_y = 4
-	},
-/obj/item/gun/energy/disabler,
-/obj/item/gun/energy/disabler{
-	pixel_y = -4
-	},
-/obj/item/shield/riot{
-	pixel_x = -5
-	},
-/obj/item/shield/riot{
-	pixel_x = -8
-	},
-/turf/open/floor/iron/dark,
-/area/template_noop)
 "n" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
@@ -151,7 +151,7 @@ D
 p
 E
 P
-m
+a
 "}
 (3,1,1) = {"
 k
diff --git a/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_post_verdant.dmm b/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_post_verdant.dmm
index 95988b715ba..7049b01c226 100644
--- a/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_post_verdant.dmm
+++ b/_maps/voidcrew/ship_modules/phalanx/phalanx_armory_post_verdant.dmm
@@ -1,4 +1,21 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/structure/rack,
+/obj/item/gun/energy/disabler{
+	pixel_y = 4
+	},
+/obj/item/gun/energy/disabler,
+/obj/item/gun/energy/disabler{
+	pixel_y = -4
+	},
+/obj/item/knife/combat/survival{
+	pixel_x = -5
+	},
+/obj/item/knife/combat/survival{
+	pixel_x = -8
+	},
+/turf/open/floor/iron/dark,
+/area/template_noop)
 "e" = (
 /obj/structure/chair/wood{
 	dir = 4
@@ -30,23 +47,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/dark,
 /area/template_noop)
-"m" = (
-/obj/structure/rack,
-/obj/item/gun/energy/disabler{
-	pixel_y = 4
-	},
-/obj/item/gun/energy/disabler,
-/obj/item/gun/energy/disabler{
-	pixel_y = -4
-	},
-/obj/item/shield/riot{
-	pixel_x = -5
-	},
-/obj/item/shield/riot{
-	pixel_x = -8
-	},
-/turf/open/floor/iron/dark,
-/area/template_noop)
 "n" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
@@ -151,7 +151,7 @@ D
 p
 E
 P
-m
+a
 "}
 (3,1,1) = {"
 k
diff --git a/_maps/voidcrew/ship_modules/pill/pill_extra_weapons.dmm b/_maps/voidcrew/ship_modules/pill/pill_extra_weapons.dmm
index 2cc44683fce..532dafae8ef 100644
--- a/_maps/voidcrew/ship_modules/pill/pill_extra_weapons.dmm
+++ b/_maps/voidcrew/ship_modules/pill/pill_extra_weapons.dmm
@@ -1,5 +1,5 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"J" = (
+"G" = (
 /obj/modular_map_connector,
 /obj/machinery/recharger{
 	pixel_x = 10;
@@ -21,5 +21,5 @@
 /area/template_noop)
 
 (1,1,1) = {"
-J
+G
 "}
diff --git a/_maps/voidcrew/ship_modules/squab/science_director.dmm b/_maps/voidcrew/ship_modules/squab/science_director.dmm
index 30a9746093e..5fbf0c9e748 100644
--- a/_maps/voidcrew/ship_modules/squab/science_director.dmm
+++ b/_maps/voidcrew/ship_modules/squab/science_director.dmm
@@ -15,15 +15,7 @@
 	},
 /turf/template_noop,
 /area/template_noop)
-"iRu" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/turf_decal/siding/wood{
-	color = "#543C30";
-	dir = 10
-	},
-/turf/template_noop,
-/area/template_noop)
-"jNm" = (
+"iFe" = (
 /obj/structure/table/reinforced{
 	color = "#8A9397"
 	},
@@ -46,6 +38,14 @@
 	},
 /turf/template_noop,
 /area/template_noop)
+"iRu" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood{
+	color = "#543C30";
+	dir = 10
+	},
+/turf/template_noop,
+/area/template_noop)
 "kpr" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 4;
@@ -88,6 +88,6 @@ oyT
 iRu
 "}
 (3,1,1) = {"
-jNm
+iFe
 gqD
 "}
diff --git a/_maps/voidcrew/ship_modules/squab/security_director.dmm b/_maps/voidcrew/ship_modules/squab/security_director.dmm
index 0da9297583d..bc1d1eb965e 100644
--- a/_maps/voidcrew/ship_modules/squab/security_director.dmm
+++ b/_maps/voidcrew/ship_modules/squab/security_director.dmm
@@ -1,4 +1,45 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aaa" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4;
+	layer = 2.5
+	},
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+	dir = 8
+	},
+/obj/modular_map_connector,
+/obj/structure/closet/secure_closet{
+	icon_state = "hos";
+	name = "security director's locker"
+	},
+/obj/item/computer_disk/command/hos,
+/obj/item/radio/headset/heads/hos,
+/obj/item/radio/headset/heads/hos/alt,
+/obj/item/storage/bag/garment/hos,
+/obj/item/storage/lockbox/medal/sec,
+/obj/item/megaphone/sec,
+/obj/item/holosign_creator/security,
+/obj/item/storage/lockbox/loyalty,
+/obj/item/storage/box/flashbangs,
+/obj/item/knife/combat/survival,
+/obj/item/storage/belt/security/full,
+/obj/item/storage/photo_album/hos,
+/turf/template_noop,
+/area/template_noop)
+"aGd" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4;
+	layer = 2.5
+	},
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+	dir = 8
+	},
+/obj/machinery/suit_storage_unit/base_tier{
+	mask_type = /obj/item/clothing/mask/gas/sechailer;
+	storage_type = /obj/item/tank/internals/oxygen
+	},
+/turf/template_noop,
+/area/template_noop)
 "aRZ" = (
 /obj/effect/turf_decal/siding/wood,
 /obj/effect/turf_decal/siding/wood{
@@ -7,7 +48,7 @@
 	},
 /turf/template_noop,
 /area/template_noop)
-"iaL" = (
+"hlx" = (
 /obj/effect/turf_decal/siding/wood{
 	color = "#543C30";
 	dir = 5
@@ -17,17 +58,6 @@
 	},
 /turf/template_noop,
 /area/template_noop)
-"mdF" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 4;
-	layer = 2.5
-	},
-/obj/effect/turf_decal/siding/wideplating_new/dark{
-	dir = 8
-	},
-/obj/machinery/suit_storage_unit/hos,
-/turf/template_noop,
-/area/template_noop)
 "ods" = (
 /obj/effect/turf_decal/siding/wood{
 	color = "#543C30";
@@ -51,43 +81,16 @@
 /obj/item/bedsheet/hos,
 /turf/template_noop,
 /area/template_noop)
-"tJR" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 4;
-	layer = 2.5
-	},
-/obj/effect/turf_decal/siding/wideplating_new/dark{
-	dir = 8
-	},
-/obj/modular_map_connector,
-/obj/structure/closet/secure_closet{
-	icon_state = "hos";
-	name = "security director's locker"
-	},
-/obj/item/computer_disk/command/hos,
-/obj/item/radio/headset/heads/hos,
-/obj/item/radio/headset/heads/hos/alt,
-/obj/item/storage/bag/garment/hos,
-/obj/item/storage/lockbox/medal/sec,
-/obj/item/megaphone/sec,
-/obj/item/holosign_creator/security,
-/obj/item/storage/lockbox/loyalty,
-/obj/item/storage/box/flashbangs,
-/obj/item/shield/riot/tele,
-/obj/item/storage/belt/security/full,
-/obj/item/storage/photo_album/hos,
-/turf/template_noop,
-/area/template_noop)
 
 (1,1,1) = {"
-mdF
-tJR
+aGd
+aaa
 "}
 (2,1,1) = {"
 ods
 aRZ
 "}
 (3,1,1) = {"
-iaL
+hlx
 qCd
 "}
diff --git a/_maps/voidcrew/ships/ship_bogatyr.dmm b/_maps/voidcrew/ships/ship_bogatyr.dmm
index c17a699324f..abc3dd57b0d 100644
--- a/_maps/voidcrew/ships/ship_bogatyr.dmm
+++ b/_maps/voidcrew/ships/ship_bogatyr.dmm
@@ -33,6 +33,17 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/voidcrew/bogatyr/central)
+"bt" = (
+/obj/structure/closet/secure_closet/captains,
+/obj/item/clothing/head/helmet/rus_ushanka,
+/obj/item/clothing/shoes/russian,
+/obj/item/clothing/under/costume/russian_officer,
+/obj/item/clothing/suit/jacket/officer/tan,
+/obj/item/reagent_containers/cup/glass/flask/gold{
+	list_reagents = list(/datum/reagent/consumable/ethanol/sbiten=30)
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/voidcrew/bogatyr/bridge)
 "by" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/power/apc/auto_name/directional/west,
@@ -148,17 +159,6 @@
 /obj/item/storage/backpack/satchel/flat,
 /turf/open/floor/mineral/plastitanium/red,
 /area/shuttle/voidcrew/bogatyr/central)
-"ol" = (
-/obj/structure/closet/secure_closet/captains,
-/obj/item/clothing/head/helmet/rus_ushanka,
-/obj/item/clothing/shoes/russian,
-/obj/item/clothing/under/costume/russian_officer,
-/obj/item/clothing/suit/jacket/officer/tan,
-/obj/item/reagent_containers/cup/glass/flask/gold{
-	list_reagents = list(/datum/reagent/consumable/ethanol/sbiten=30)
-	},
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/voidcrew/bogatyr/bridge)
 "oq" = (
 /obj/machinery/door/airlock/medical{
 	name = "Infirmary"
@@ -415,14 +415,6 @@
 /obj/structure/cable,
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/voidcrew/bogatyr/central)
-"CY" = (
-/obj/structure/table,
-/obj/item/gun/ballistic/revolver/russian,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/voidcrew/bogatyr/central)
 "Do" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -678,6 +670,14 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/voidcrew/bogatyr/bridge)
+"TC" = (
+/obj/structure/table,
+/obj/item/gun/ballistic/revolver/russian,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/voidcrew/bogatyr/central)
 "TD" = (
 /obj/modular_map_root/ship_upgrade{
 	key = "eva_bay"
@@ -905,7 +905,7 @@ lJ
 qo
 zf
 fA
-CY
+TC
 br
 Ho
 CP
@@ -966,7 +966,7 @@ Wv
 "}
 (8,1,1) = {"
 WR
-ol
+bt
 Kj
 qo
 xb
diff --git a/_maps/voidcrew/ships/ship_bogatyr_freshen_up.dmm b/_maps/voidcrew/ships/ship_bogatyr_freshen_up.dmm
index 954433ee9a7..1ad278f2cdd 100644
--- a/_maps/voidcrew/ships/ship_bogatyr_freshen_up.dmm
+++ b/_maps/voidcrew/ships/ship_bogatyr_freshen_up.dmm
@@ -115,17 +115,11 @@
 /obj/structure/cable,
 /turf/open/floor/mineral/plastitanium/red,
 /area/shuttle/voidcrew/bogatyr/central)
-"guf" = (
-/obj/structure/closet/secure_closet/captains,
-/obj/item/clothing/head/helmet/rus_ushanka,
-/obj/item/clothing/shoes/russian,
-/obj/item/clothing/under/costume/russian_officer,
-/obj/item/clothing/suit/jacket/officer/tan,
-/obj/item/reagent_containers/cup/glass/flask/gold{
-	list_reagents = list(/datum/reagent/consumable/ethanol/sbiten=30)
-	},
+"geI" = (
+/obj/structure/table,
+/obj/item/gun/ballistic/revolver/russian,
 /turf/open/floor/mineral/plastitanium,
-/area/shuttle/voidcrew/bogatyr/bridge)
+/area/shuttle/voidcrew/bogatyr/central)
 "gyy" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -156,11 +150,6 @@
 /obj/structure/cable,
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/voidcrew/bogatyr/dormitories)
-"hwj" = (
-/obj/structure/table,
-/obj/item/gun/ballistic/revolver/russian,
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/voidcrew/bogatyr/central)
 "hOd" = (
 /obj/machinery/light{
 	dir = 1
@@ -182,6 +171,17 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/template_noop,
 /area/shuttle/voidcrew/bogatyr/cargo)
+"iAy" = (
+/obj/structure/closet/secure_closet/captains,
+/obj/item/clothing/head/helmet/rus_ushanka,
+/obj/item/clothing/shoes/russian,
+/obj/item/clothing/under/costume/russian_officer,
+/obj/item/clothing/suit/jacket/officer/tan,
+/obj/item/reagent_containers/cup/glass/flask/gold{
+	list_reagents = list(/datum/reagent/consumable/ethanol/sbiten=30)
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/voidcrew/bogatyr/bridge)
 "iCu" = (
 /obj/structure/bed/dogbed{
 	name = "Anastasia's bed"
@@ -808,7 +808,7 @@ lgD
 eQO
 gdc
 xob
-hwj
+geI
 kXv
 ueU
 xoj
@@ -869,7 +869,7 @@ pmd
 "}
 (8,1,1) = {"
 njs
-guf
+iAy
 qov
 eQO
 xqi
diff --git a/_maps/voidcrew/ships/ship_bogatyr_nightclub.dmm b/_maps/voidcrew/ships/ship_bogatyr_nightclub.dmm
index 2294bbee70b..45c7ea45000 100644
--- a/_maps/voidcrew/ships/ship_bogatyr_nightclub.dmm
+++ b/_maps/voidcrew/ships/ship_bogatyr_nightclub.dmm
@@ -115,6 +115,18 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/template_noop,
 /area/shuttle/voidcrew/bogatyr/cargo)
+"fcF" = (
+/obj/structure/closet/secure_closet/captains,
+/obj/item/clothing/head/helmet/rus_ushanka,
+/obj/item/clothing/shoes/russian,
+/obj/item/clothing/under/costume/russian_officer,
+/obj/item/clothing/suit/jacket/officer/tan,
+/obj/item/reagent_containers/cup/glass/flask/gold{
+	list_reagents = list(/datum/reagent/consumable/ethanol/sbiten=30)
+	},
+/obj/effect/spawner/costume/waiter,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/voidcrew/bogatyr/bridge)
 "fhy" = (
 /obj/structure/table/reinforced/plasmarglass,
 /obj/item/reagent_containers/cup/glass/drinkingglass{
@@ -250,18 +262,6 @@
 	},
 /turf/template_noop,
 /area/shuttle/voidcrew/bogatyr/cargo)
-"iAV" = (
-/obj/structure/closet/secure_closet/captains,
-/obj/item/clothing/head/helmet/rus_ushanka,
-/obj/item/clothing/shoes/russian,
-/obj/item/clothing/under/costume/russian_officer,
-/obj/item/clothing/suit/jacket/officer/tan,
-/obj/item/reagent_containers/cup/glass/flask/gold{
-	list_reagents = list(/datum/reagent/consumable/ethanol/sbiten=30)
-	},
-/obj/effect/spawner/costume/waiter,
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/voidcrew/bogatyr/bridge)
 "iGV" = (
 /obj/machinery/door/poddoor{
 	id = "bogatyr_windows"
@@ -903,7 +903,7 @@ jWn
 "}
 (8,1,1) = {"
 xov
-iAV
+fcF
 bZP
 fGP
 cSN
diff --git a/_maps/voidcrew/ships/ship_box.dmm b/_maps/voidcrew/ships/ship_box.dmm
index 5be575c17c5..f1650072194 100644
--- a/_maps/voidcrew/ships/ship_box.dmm
+++ b/_maps/voidcrew/ships/ship_box.dmm
@@ -58,7 +58,7 @@
 /obj/item/storage/belt/medical,
 /obj/item/storage/belt/medical,
 /obj/item/reagent_containers/spray/cleaner,
-/obj/item/storage/backpack/duffelbag/med/surgery,
+/obj/item/storage/medkit/surgery,
 /obj/machinery/light/directional/west,
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/box/medbay)
@@ -657,17 +657,6 @@
 /obj/structure/closet/crate/freezer/blood,
 /turf/open/floor/iron/white,
 /area/shuttle/voidcrew/box/medbay)
-"cx" = (
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/structure/closet/secure_closet/chief_medical,
-/obj/item/gun/energy/e_gun/mini,
-/turf/open/floor/iron/dark,
-/area/shuttle/voidcrew/box/bridge)
 "cy" = (
 /obj/effect/turf_decal/bot,
 /obj/structure/rack,
@@ -1091,7 +1080,7 @@
 /area/shuttle/voidcrew/box/medbay)
 "mE" = (
 /obj/structure/table/glass,
-/obj/item/storage/backpack/duffelbag/med/surgery,
+/obj/item/storage/medkit/surgery,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -1302,6 +1291,17 @@
 	},
 /turf/open/floor/wood,
 /area/shuttle/voidcrew/box/crew_quarters)
+"EW" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 4
+	},
+/obj/structure/closet/secure_closet/chief_medical,
+/obj/item/gun/energy/e_gun/mini,
+/turf/open/floor/iron/dark,
+/area/shuttle/voidcrew/box/bridge)
 "FA" = (
 /obj/effect/turf_decal/tile/blue{
 	dir = 1
@@ -2008,7 +2008,7 @@ bx
 bJ
 ca
 cn
-cx
+EW
 be
 ot
 nQ
diff --git a/_maps/voidcrew/ships/ship_boyardee.dmm b/_maps/voidcrew/ships/ship_boyardee.dmm
index d926e214575..f99b345e112 100644
--- a/_maps/voidcrew/ships/ship_boyardee.dmm
+++ b/_maps/voidcrew/ships/ship_boyardee.dmm
@@ -252,6 +252,19 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/bogardee/service/hydroponics)
+"fx" = (
+/obj/structure/closet/secure_closet/bar{
+	req_access = null
+	},
+/obj/item/radio/intercom{
+	pixel_y = -28
+	},
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/stack/sheet/iron/twenty,
+/obj/item/gun/ballistic/shotgun/doublebarrel,
+/obj/item/storage/medkit/advanced,
+/turf/open/floor/iron/dark,
+/area/shuttle/voidcrew/bogardee/service/bar)
 "fG" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -923,19 +936,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/bogardee/service/kitchen)
-"xM" = (
-/obj/structure/closet/secure_closet/bar{
-	req_access = null
-	},
-/obj/item/radio/intercom{
-	pixel_y = -28
-	},
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/stack/sheet/iron/twenty,
-/obj/item/gun/ballistic/shotgun/doublebarrel,
-/obj/item/storage/medkit/advanced,
-/turf/open/floor/iron/dark,
-/area/shuttle/voidcrew/bogardee/service/bar)
 "xW" = (
 /obj/structure/chair/stool/bar/directional/south,
 /turf/open/floor/wood,
@@ -2529,7 +2529,7 @@ rr
 zw
 Nv
 BQ
-xM
+fx
 yB
 iB
 ma
diff --git a/_maps/voidcrew/ships/ship_boyardee_b.dmm b/_maps/voidcrew/ships/ship_boyardee_b.dmm
index f96c736a808..154271edba6 100644
--- a/_maps/voidcrew/ships/ship_boyardee_b.dmm
+++ b/_maps/voidcrew/ships/ship_boyardee_b.dmm
@@ -1,4 +1,8 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ab" = (
+/obj/machinery/vending/games,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/voidcrew/bogardee_b/cargo/vault)
 "as" = (
 /obj/machinery/atmospherics/components/unary/passive_vent/layer2,
 /turf/open/floor/plating/airless,
@@ -210,6 +214,40 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/bogardee_b/service/bar)
+"hJ" = (
+/obj/structure/closet/secure_closet/bar{
+	req_access = null
+	},
+/obj/item/radio/intercom{
+	pixel_y = -28
+	},
+/obj/item/storage/toolbox/mechanical,
+/obj/item/stack/cable_coil,
+/obj/item/stack/sheet/iron/twenty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/clothing/under/rank/civilian/bartender,
+/obj/item/clothing/under/rank/civilian/bartender/purple,
+/obj/item/clothing/under/rank/civilian/bartender/skirt,
+/obj/item/clothing/suit/apron/purple_bartender,
+/obj/item/toy/figure/bartender,
+/obj/item/storage/box/lethalshot,
+/obj/item/storage/box/lethalshot,
+/obj/item/storage/box/rubbershot,
+/obj/item/storage/box/rubbershot,
+/obj/item/card/emag,
+/obj/item/storage/belt/bandolier,
+/obj/item/gun/ballistic/shotgun/automatic,
+/turf/open/floor/wood,
+/area/shuttle/voidcrew/bogardee_b/service/bar)
+"hM" = (
+/obj/structure/rack,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/machinery/door/window/right/directional/north,
+/obj/item/gun/energy/laser/scatter,
+/obj/item/gun/energy/taser,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/voidcrew/bogardee_b/armory)
 "ie" = (
 /obj/structure/chair,
 /obj/item/radio/intercom{
@@ -314,15 +352,6 @@
 /obj/machinery/suit_storage_unit/syndicate,
 /turf/open/floor/mineral/plastitanium/red,
 /area/shuttle/voidcrew/bogardee_b/armory)
-"kD" = (
-/obj/structure/rack,
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/item/gun/energy/laser/retro,
-/obj/item/gun/energy/laser/retro,
-/obj/item/gun/energy/laser/retro,
-/obj/machinery/door/window/right/directional/north,
-/turf/open/floor/mineral/plastitanium/red,
-/area/shuttle/voidcrew/bogardee_b/armory)
 "kH" = (
 /obj/machinery/vending/clothing,
 /turf/open/floor/mineral/plastitanium/red,
@@ -691,6 +720,15 @@
 /obj/structure/curtain/bounty,
 /turf/open/floor/mineral/plastitanium/red,
 /area/shuttle/voidcrew/bogardee_b/service/quarters)
+"tH" = (
+/obj/structure/rack,
+/obj/structure/window/reinforced/spawner/directional/east,
+/obj/item/gun/energy/laser/retro,
+/obj/item/gun/energy/laser/retro,
+/obj/item/gun/energy/laser/retro,
+/obj/machinery/door/window/right/directional/north,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/voidcrew/bogardee_b/armory)
 "tM" = (
 /obj/machinery/door/airlock/external,
 /turf/open/floor/iron/dark,
@@ -823,6 +861,18 @@
 /obj/structure/window/reinforced/plasma/spawner/directional/east,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/bogardee_b/maintenance)
+"xo" = (
+/obj/structure/rack,
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/item/gun/ballistic/automatic/pistol,
+/obj/item/gun/ballistic/automatic/pistol,
+/obj/item/ammo_box/c38,
+/obj/item/ammo_box/c38,
+/obj/item/ammo_box/c38,
+/obj/item/ammo_box/c38,
+/obj/machinery/door/window/right/directional/north,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/voidcrew/bogardee_b/armory)
 "xO" = (
 /turf/open/floor/wood,
 /area/shuttle/voidcrew/bogardee_b/service/bar)
@@ -1187,43 +1237,6 @@
 /obj/machinery/airalarm/directional/south,
 /turf/open/floor/carpet/red,
 /area/shuttle/voidcrew/bogardee_b/service/bar)
-"Jt" = (
-/obj/structure/closet/secure_closet/bar{
-	req_access = null
-	},
-/obj/item/radio/intercom{
-	pixel_y = -28
-	},
-/obj/item/storage/toolbox/mechanical,
-/obj/item/stack/cable_coil,
-/obj/item/stack/sheet/iron/twenty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/clothing/under/rank/civilian/bartender,
-/obj/item/clothing/under/rank/civilian/bartender/purple,
-/obj/item/clothing/under/rank/civilian/bartender/skirt,
-/obj/item/clothing/suit/apron/purple_bartender,
-/obj/item/toy/figure/bartender,
-/obj/item/storage/box/lethalshot,
-/obj/item/storage/box/lethalshot,
-/obj/item/storage/box/rubbershot,
-/obj/item/storage/box/rubbershot,
-/obj/item/card/emag,
-/obj/item/storage/belt/bandolier,
-/obj/item/gun/ballistic/shotgun/automatic,
-/turf/open/floor/wood,
-/area/shuttle/voidcrew/bogardee_b/service/bar)
-"Jy" = (
-/obj/structure/rack,
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/item/gun/ballistic/automatic/pistol,
-/obj/item/gun/ballistic/automatic/pistol,
-/obj/item/ammo_box/c38,
-/obj/item/ammo_box/c38,
-/obj/item/ammo_box/c38,
-/obj/item/ammo_box/c38,
-/obj/machinery/door/window/right/directional/north,
-/turf/open/floor/mineral/plastitanium/red,
-/area/shuttle/voidcrew/bogardee_b/armory)
 "JF" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1368,15 +1381,6 @@
 /obj/structure/cable,
 /turf/open/floor/carpet/red,
 /area/shuttle/voidcrew/bogardee_b/service/bar)
-"Pd" = (
-/obj/structure/rack,
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/machinery/door/window/right/directional/north,
-/obj/item/gun/energy/laser/scatter,
-/obj/item/gun/energy/taser,
-/turf/open/floor/mineral/plastitanium/red,
-/area/shuttle/voidcrew/bogardee_b/armory)
 "Pk" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -1665,10 +1669,6 @@
 /obj/structure/desk_bell,
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/bogardee_b/service/entrance)
-"Vm" = (
-/obj/machinery/vending/games,
-/turf/open/floor/mineral/plastitanium/red,
-/area/shuttle/voidcrew/bogardee_b/cargo/vault)
 "VA" = (
 /obj/machinery/newscaster/directional/south,
 /obj/structure/chair/stool/directional/west,
@@ -2189,7 +2189,7 @@ rr
 zw
 xO
 jL
-Jt
+hJ
 Bd
 Rf
 EE
@@ -2212,7 +2212,7 @@ Dy
 iX
 iX
 Bd
-Vm
+ab
 sy
 ZI
 sy
@@ -2362,7 +2362,7 @@ Eu
 Ap
 kw
 SJ
-kD
+tH
 Ap
 vZ
 "}
@@ -2383,7 +2383,7 @@ km
 Ap
 kw
 FE
-Pd
+hM
 Ap
 vZ
 "}
@@ -2404,7 +2404,7 @@ Mp
 Ap
 rx
 ud
-Jy
+xo
 Ap
 vZ
 "}
diff --git a/_maps/voidcrew/ships/ship_delta_a.dmm b/_maps/voidcrew/ships/ship_delta_a.dmm
index 55fb57af2fb..8e9517b1d97 100644
--- a/_maps/voidcrew/ships/ship_delta_a.dmm
+++ b/_maps/voidcrew/ships/ship_delta_a.dmm
@@ -144,10 +144,6 @@
 "fF" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/voidcrew/delta/cargo/a)
-"gH" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/shuttle/voidcrew/delta/engineering/a)
 "hv" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -276,6 +272,15 @@
 /obj/item/clothing/head/utility/welding,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/delta/engineering/a)
+"kX" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable,
+/obj/item/gun/energy/laser/retro,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/shuttle/voidcrew/delta/bridge/a)
 "lf" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -586,20 +591,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/delta/medbay/a)
-"uP" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
-	},
-/obj/machinery/power/port_gen/pacman{
-	anchored = 1
-	},
-/obj/item/wrench,
-/obj/structure/cable,
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/plating,
-/area/shuttle/voidcrew/delta/engineering/a)
 "va" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
@@ -678,15 +669,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/delta/engineering/a)
-"wl" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable,
-/obj/item/gun/energy/laser/retro,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/shuttle/voidcrew/delta/bridge/a)
 "wx" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -809,14 +791,6 @@
 /obj/machinery/atmospherics/components/unary/portables_connector/visible,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/delta/engineering/a)
-"zG" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/shuttle/voidcrew/delta/engineering/a)
 "zJ" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable,
@@ -909,17 +883,6 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/delta/hallway/central/a)
-"De" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
-	},
-/obj/machinery/portable_atmospherics/scrubber,
-/obj/machinery/airalarm/directional/west,
-/obj/machinery/atmospherics/pipe/bridge_pipe/orange,
-/turf/open/floor/plating,
-/area/shuttle/voidcrew/delta/engineering/a)
 "Di" = (
 /obj/machinery/door/airlock/medical/glass{
 	name = "Medbay"
@@ -1146,16 +1109,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/white,
 /area/shuttle/voidcrew/delta/medbay/a)
-"Lv" = (
-/obj/effect/turf_decal/stripes{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
-/turf/open/floor/plating,
-/area/shuttle/voidcrew/delta/engineering/a)
 "Lx" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
@@ -1555,10 +1508,6 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/delta/cafe/a)
-"Zw" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/orange,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/shuttle/voidcrew/delta/engineering/a)
 "Zz" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/tile/blue/anticorner{
@@ -1720,7 +1669,7 @@ pB
 tP
 lj
 dy
-wl
+kX
 Ph
 Jn
 tP
diff --git a/_maps/voidcrew/ships/ship_delta_b.dmm b/_maps/voidcrew/ships/ship_delta_b.dmm
index 3946d67a5dc..6467ac027bd 100644
--- a/_maps/voidcrew/ships/ship_delta_b.dmm
+++ b/_maps/voidcrew/ships/ship_delta_b.dmm
@@ -172,22 +172,6 @@
 /obj/structure/sign/departments/medbay/alt,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/shuttle/voidcrew/delta/medbay/b)
-"ib" = (
-/obj/structure/rack,
-/obj/item/storage/belt/utility,
-/obj/item/radio/off{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/radio/off,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/machinery/airalarm/directional/north,
-/obj/structure/sign/warning/explosives/alt/directional/east,
-/obj/item/clothing/mask/gas/syndicate,
-/obj/item/clothing/mask/gas/syndicate,
-/obj/item/ammo_box/magazine/m10mm,
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/voidcrew/delta/airlock/starboard/b)
 "ik" = (
 /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
 /obj/machinery/door/poddoor{
@@ -229,14 +213,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/delta/cafe/b)
-"jt" = (
-/obj/structure/cable,
-/obj/item/gun/energy/laser/retro,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/voidcrew/delta/bridge/b)
 "jB" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
 /obj/machinery/airalarm/directional/west,
@@ -490,15 +466,6 @@
 /obj/machinery/light/directional/south,
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/voidcrew/delta/airlock/starboard/b)
-"vX" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 8
-	},
-/obj/structure/closet/crate/secure/weapon,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/clothing/mask/gas/syndicate,
-/turf/open/floor/iron/dark,
-/area/shuttle/voidcrew/delta/engineering/b)
 "wo" = (
 /obj/structure/cable,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -862,6 +829,15 @@
 /obj/machinery/light/directional/south,
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/voidcrew/delta/bridge/b)
+"GN" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
+/obj/structure/closet/crate/secure/weapon,
+/obj/item/ammo_box/magazine/m10mm,
+/obj/item/clothing/mask/gas/syndicate,
+/turf/open/floor/iron/dark,
+/area/shuttle/voidcrew/delta/engineering/b)
 "HI" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/shuttle/voidcrew/delta/hallway/central/b)
@@ -991,6 +967,14 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/delta/cafe/b)
+"LG" = (
+/obj/structure/cable,
+/obj/item/gun/energy/laser/retro,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/voidcrew/delta/bridge/b)
 "LJ" = (
 /obj/structure/sign/warning/electric_shock,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -1045,6 +1029,22 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/delta/engineering/b)
+"MV" = (
+/obj/structure/rack,
+/obj/item/storage/belt/utility,
+/obj/item/radio/off{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/radio/off,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/machinery/airalarm/directional/north,
+/obj/structure/sign/warning/explosives/alt/directional/east,
+/obj/item/clothing/mask/gas/syndicate,
+/obj/item/clothing/mask/gas/syndicate,
+/obj/item/ammo_box/magazine/m10mm,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/voidcrew/delta/airlock/starboard/b)
 "MW" = (
 /obj/effect/turf_decal/tile/red,
 /obj/machinery/mission_pad,
@@ -1629,7 +1629,7 @@ aa
 Yw
 TZ
 lt
-vX
+GN
 Ll
 Zb
 Zb
@@ -1671,7 +1671,7 @@ cE
 IK
 GI
 lm
-jt
+LG
 lm
 xa
 kc
@@ -1865,7 +1865,7 @@ aa
 aa
 aa
 cW
-ib
+MV
 NO
 VJ
 VJ
diff --git a/_maps/voidcrew/ships/ship_delta_c.dmm b/_maps/voidcrew/ships/ship_delta_c.dmm
index 971531a69ce..95e85d8c0c6 100644
--- a/_maps/voidcrew/ships/ship_delta_c.dmm
+++ b/_maps/voidcrew/ships/ship_delta_c.dmm
@@ -221,15 +221,6 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/delta/engineering/c)
-"gZ" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable,
-/obj/item/gun/energy/laser/retro,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/engine/cult/ship,
-/area/shuttle/voidcrew/delta/bridge/c)
 "hU" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1465,6 +1456,15 @@
 /obj/machinery/light/directional/east,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/delta/engineering/c)
+"SC" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable,
+/obj/item/gun/energy/laser/retro,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/engine/cult/ship,
+/area/shuttle/voidcrew/delta/bridge/c)
 "SU" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1802,7 +1802,7 @@ Bf
 aR
 cF
 BN
-gZ
+SC
 GD
 rV
 JD
diff --git a/_maps/voidcrew/ships/ship_delta_d.dmm b/_maps/voidcrew/ships/ship_delta_d.dmm
index 8d7b5268e7a..64691b9aeec 100644
--- a/_maps/voidcrew/ships/ship_delta_d.dmm
+++ b/_maps/voidcrew/ships/ship_delta_d.dmm
@@ -156,15 +156,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/shuttle/voidcrew/delta/bridge/d)
-"jL" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
-/turf/open/floor/plating,
-/area/shuttle/voidcrew/delta/engineering/d)
 "jQ" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -223,20 +214,6 @@
 /obj/effect/turf_decal/bot,
 /turf/open/floor/circuit,
 /area/shuttle/voidcrew/delta/engineering/d)
-"lX" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
-	},
-/obj/machinery/power/port_gen/pacman{
-	anchored = 1
-	},
-/obj/item/wrench,
-/obj/structure/cable,
-/obj/machinery/airalarm/directional/west,
-/obj/effect/turf_decal/caution,
-/turf/open/floor/plating,
-/area/shuttle/voidcrew/delta/engineering/d)
 "mx" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -637,13 +614,6 @@
 "xL" = (
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/delta/medbay/d)
-"yc" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/shuttle/voidcrew/delta/engineering/d)
 "yg" = (
 /obj/structure/closet/wardrobe/mixed,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -901,16 +871,6 @@
 	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/voidcrew/delta/airlock/port/d)
-"Dm" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
-	},
-/obj/machinery/portable_atmospherics/scrubber,
-/obj/machinery/airalarm/directional/west,
-/obj/machinery/atmospherics/pipe/bridge_pipe/orange,
-/turf/open/floor/plating,
-/area/shuttle/voidcrew/delta/engineering/d)
 "DI" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -998,10 +958,6 @@
 /obj/effect/turf_decal/box/red/corners,
 /turf/open/floor/iron/white,
 /area/shuttle/voidcrew/delta/airlock/port/d)
-"FF" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/shuttle/voidcrew/delta/engineering/d)
 "FT" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -1497,20 +1453,6 @@
 	},
 /turf/open/floor/carpet/blue,
 /area/shuttle/voidcrew/delta/bridge/d)
-"QD" = (
-/obj/structure/cable,
-/obj/item/gun/energy/laser/retro,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/siding/red{
-	dir = 4
-	},
-/obj/effect/turf_decal/siding/red{
-	dir = 8
-	},
-/turf/open/floor/iron/white,
-/area/shuttle/voidcrew/delta/bridge/d)
 "RF" = (
 /obj/machinery/light/directional/south,
 /obj/structure/cable,
@@ -1606,6 +1548,20 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/delta/engineering/d)
+"UO" = (
+/obj/structure/cable,
+/obj/item/gun/energy/laser/retro,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/holopad,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/siding/red{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/red{
+	dir = 8
+	},
+/turf/open/floor/iron/white,
+/area/shuttle/voidcrew/delta/bridge/d)
 "UR" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/voidcrew/delta/airlock/starboard/d)
@@ -1692,10 +1648,6 @@
 /obj/machinery/mission_pad,
 /turf/open/floor/iron/white,
 /area/shuttle/voidcrew/delta/bridge/d)
-"XM" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/orange,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/shuttle/voidcrew/delta/engineering/d)
 "Yb" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -1924,7 +1876,7 @@ Ji
 Qc
 Ab
 Yb
-QD
+UO
 Qj
 jp
 Qc
diff --git a/_maps/voidcrew/ships/ship_dwayne.dmm b/_maps/voidcrew/ships/ship_dwayne.dmm
index 9cb63908af5..86d6dacc075 100644
--- a/_maps/voidcrew/ships/ship_dwayne.dmm
+++ b/_maps/voidcrew/ships/ship_dwayne.dmm
@@ -165,18 +165,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/catwalk_floor,
 /area/shuttle/voidcrew/dwayne/engineering)
-"gr" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/yellow/anticorner{
-	dir = 4
-	},
-/obj/structure/guncase/shotgun,
-/obj/item/gun/ballistic/shotgun,
-/obj/item/gun/ballistic/shotgun,
-/obj/item/gun/ballistic/shotgun,
-/obj/item/pai_card,
-/turf/open/floor/iron,
-/area/shuttle/voidcrew/dwayne/cargo_bay)
 "gs" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/turf_decal/tile/neutral/diagonal_edge,
@@ -316,13 +304,6 @@
 /obj/effect/turf_decal/tile/blue/half,
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/dwayne/bridge)
-"iO" = (
-/obj/effect/turf_decal/tile/blue/half{
-	dir = 4
-	},
-/obj/structure/closet/secure_closet/captains,
-/turf/open/floor/iron/dark,
-/area/shuttle/voidcrew/dwayne/bridge)
 "iZ" = (
 /obj/machinery/airalarm/directional/south,
 /turf/open/floor/iron/dark,
@@ -374,7 +355,7 @@
 	},
 /obj/structure/table,
 /obj/item/book/manual/wiki/surgery,
-/obj/item/storage/backpack/duffelbag/med/surgery,
+/obj/item/storage/medkit/surgery,
 /obj/item/clothing/mask/surgical,
 /obj/item/clothing/suit/apron/surgical,
 /obj/item/clothing/gloves/latex/nitrile,
@@ -789,6 +770,13 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/catwalk_floor,
 /area/shuttle/voidcrew/dwayne/crew)
+"xm" = (
+/obj/effect/turf_decal/tile/blue/half{
+	dir = 4
+	},
+/obj/structure/closet/secure_closet/captains,
+/turf/open/floor/iron/dark,
+/area/shuttle/voidcrew/dwayne/bridge)
 "xx" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/firealarm/directional/south,
@@ -939,6 +927,18 @@
 	},
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/dwayne/crew)
+"Cl" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/yellow/anticorner{
+	dir = 4
+	},
+/obj/structure/guncase/shotgun,
+/obj/item/gun/ballistic/shotgun,
+/obj/item/gun/ballistic/shotgun,
+/obj/item/gun/ballistic/shotgun,
+/obj/item/pai_card,
+/turf/open/floor/iron,
+/area/shuttle/voidcrew/dwayne/cargo_bay)
 "Cp" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -1781,7 +1781,7 @@ FP
 FP
 tX
 Pd
-gr
+Cl
 uc
 or
 bv
@@ -2032,7 +2032,7 @@ ms
 ms
 dl
 NK
-iO
+xm
 ms
 ms
 OJ
diff --git a/_maps/voidcrew/ships/ship_energia.dmm b/_maps/voidcrew/ships/ship_energia.dmm
index c7a65d57b8c..f157c9041ee 100644
--- a/_maps/voidcrew/ships/ship_energia.dmm
+++ b/_maps/voidcrew/ships/ship_energia.dmm
@@ -90,11 +90,6 @@
 	},
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/energia/cargo_bay)
-"et" = (
-/obj/structure/closet/secure_closet/captains,
-/obj/item/areaeditor/shuttle,
-/turf/open/floor/iron,
-/area/shuttle/voidcrew/energia/bridge)
 "eL" = (
 /obj/machinery/computer/crew,
 /turf/open/floor/iron,
@@ -130,6 +125,11 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/energia/maintenance)
+"hy" = (
+/obj/structure/closet/secure_closet/captains,
+/obj/item/areaeditor/shuttle,
+/turf/open/floor/iron,
+/area/shuttle/voidcrew/energia/bridge)
 "hP" = (
 /obj/effect/turf_decal/stripes{
 	dir = 9
@@ -254,6 +254,13 @@
 "qa" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/voidcrew/energia/cargo_bay)
+"qg" = (
+/obj/machinery/airalarm/directional/east,
+/obj/structure/displaycase/captain{
+	req_access = null
+	},
+/turf/open/floor/iron,
+/area/shuttle/voidcrew/energia/bridge)
 "qv" = (
 /obj/machinery/atmospherics/components/trinary/filter/flipped{
 	filter_type = "plasma"
@@ -637,7 +644,7 @@
 /area/shuttle/voidcrew/energia/maintenance)
 "IZ" = (
 /obj/structure/table/reinforced,
-/obj/item/storage/backpack/duffelbag/med/surgery,
+/obj/item/storage/medkit/surgery,
 /obj/effect/turf_decal/tile/blue,
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/energia/medbay)
@@ -784,13 +791,6 @@
 /obj/effect/turf_decal/stripes/full,
 /turf/open/floor/engine,
 /area/shuttle/voidcrew/energia/supermatter)
-"Pz" = (
-/obj/machinery/airalarm/directional/east,
-/obj/structure/displaycase/captain{
-	req_access = null
-	},
-/turf/open/floor/iron,
-/area/shuttle/voidcrew/energia/bridge)
 "PH" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
@@ -1410,7 +1410,7 @@ rF
 eL
 DE
 Es
-et
+hy
 JM
 rw
 Vj
@@ -1429,7 +1429,7 @@ vj
 vj
 vj
 rF
-Pz
+qg
 Gc
 Ea
 tP
diff --git a/_maps/voidcrew/ships/ship_goon_c.dmm b/_maps/voidcrew/ships/ship_goon_c.dmm
index 790a12aaf0f..02e0377cfca 100644
--- a/_maps/voidcrew/ships/ship_goon_c.dmm
+++ b/_maps/voidcrew/ships/ship_goon_c.dmm
@@ -178,21 +178,6 @@
 /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/goon/engineering/c)
-"kc" = (
-/obj/machinery/light/red,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/closet/syndicate{
-	name = "weapons locker";
-	desc = "Bolted down over the old shower drain."
-	},
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/clothing/suit/armor/vest,
-/obj/item/clothing/gloves/combat,
-/obj/item/knife/combat/survival,
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/voidcrew/goon/medbay/c)
 "lT" = (
 /obj/machinery/power/shuttle_engine/ship/fueled/plasma{
 	dir = 4
@@ -224,16 +209,6 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/voidcrew/goon/engineering/c)
-"om" = (
-/obj/machinery/door/airlock/hatch{
-	name = "Engine Room"
-	},
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/hidden,
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/voidcrew/goon/engineering/c)
 "pz" = (
 /obj/structure/fans/tiny,
 /obj/machinery/button/door{
@@ -256,9 +231,6 @@
 	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/shuttle/voidcrew/goon/commons/c)
-"qO" = (
-/turf/open/floor/mineral/plastitanium/red,
-/area/shuttle/voidcrew/goon/commons/c)
 "ri" = (
 /obj/machinery/camera/autoname/directional/west,
 /obj/effect/turf_decal/stripes/white/line{
@@ -333,6 +305,21 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/voidcrew/goon/bridge/c)
+"xT" = (
+/obj/machinery/light/red,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/closet/syndicate{
+	name = "weapons locker";
+	desc = "Bolted down over the old shower drain."
+	},
+/obj/item/ammo_box/magazine/m10mm,
+/obj/item/ammo_box/magazine/m10mm,
+/obj/item/clothing/suit/armor/vest,
+/obj/item/clothing/gloves/combat,
+/obj/item/knife/combat/survival,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/voidcrew/goon/medbay/c)
 "yC" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2,
 /turf/open/floor/plating,
@@ -467,16 +454,6 @@
 	},
 /turf/open/floor/mineral/plastitanium/red,
 /area/shuttle/voidcrew/goon/commons/c)
-"Lt" = (
-/obj/machinery/door/airlock/hatch{
-	name = "Port Compartment"
-	},
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/hidden,
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/voidcrew/goon/medbay/c)
 "LL" = (
 /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
 /turf/open/floor/plating,
@@ -644,15 +621,6 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/goon/commons/c)
-"Xi" = (
-/obj/machinery/door/airlock/hatch{
-	name = "Cockpit"
-	},
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/voidcrew/goon/bridge/c)
 "Ye" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Engine Room"
@@ -758,7 +726,7 @@ IZ
 VO
 Fs
 Og
-kc
+xT
 Pm
 bq
 NQ
diff --git a/_maps/voidcrew/ships/ship_high.dmm b/_maps/voidcrew/ships/ship_high.dmm
index c874c286b80..a467e34b3cd 100644
--- a/_maps/voidcrew/ships/ship_high.dmm
+++ b/_maps/voidcrew/ships/ship_high.dmm
@@ -7,6 +7,15 @@
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/high/cargo_bay)
+"ae" = (
+/obj/machinery/power/terminal,
+/obj/structure/cable,
+/obj/structure/fireaxecabinet/directional/east{
+	populate_contents = 0
+	},
+/obj/item/knife/combat/survival,
+/turf/open/floor/plating,
+/area/shuttle/voidcrew/high/engineering)
 "ar" = (
 /obj/item/storage/medkit,
 /turf/open/floor/bamboo,
@@ -129,10 +138,6 @@
 "cW" = (
 /turf/open/floor/wood,
 /area/shuttle/voidcrew/high/bridge/reception)
-"dq" = (
-/obj/structure/closet/secure_closet/captains,
-/turf/open/floor/wood,
-/area/shuttle/voidcrew/high/bridge/captain)
 "dr" = (
 /obj/effect/turf_decal/bot,
 /obj/structure/closet/cardboard,
@@ -612,6 +617,15 @@
 	},
 /turf/open/floor/carpet/neon/simple/blue,
 /area/shuttle/voidcrew/high/bridge)
+"mH" = (
+/obj/structure/table/wood,
+/obj/item/pen/blue{
+	pixel_x = 3;
+	pixel_y = 5
+	},
+/obj/item/gun/ballistic/revolver/russian,
+/turf/open/floor/carpet/stellar,
+/area/shuttle/voidcrew/high/bridge/boardroom)
 "mJ" = (
 /turf/closed/wall,
 /area/shuttle/voidcrew/high/bridge/reception)
@@ -903,12 +917,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/high/hallway)
-"sQ" = (
-/obj/machinery/power/terminal,
-/obj/structure/cable,
-/obj/structure/fireaxecabinet/directional/east,
-/turf/open/floor/plating,
-/area/shuttle/voidcrew/high/engineering)
 "tr" = (
 /obj/structure/table/reinforced,
 /obj/machinery/cell_charger,
@@ -1801,15 +1809,6 @@
 /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/high/engineering)
-"Kj" = (
-/obj/structure/table/wood,
-/obj/item/pen/blue{
-	pixel_x = 3;
-	pixel_y = 5
-	},
-/obj/item/gun/ballistic/revolver/russian,
-/turf/open/floor/carpet/stellar,
-/area/shuttle/voidcrew/high/bridge/boardroom)
 "Ko" = (
 /obj/effect/turf_decal/bot,
 /obj/machinery/mineral/ore_redemption,
@@ -2436,6 +2435,10 @@
 "WT" = (
 /turf/closed/wall/r_wall,
 /area/shuttle/voidcrew/high/bridge)
+"WX" = (
+/obj/structure/closet/secure_closet/captains,
+/turf/open/floor/wood,
+/area/shuttle/voidcrew/high/bridge/captain)
 "WZ" = (
 /obj/machinery/button/door{
 	id = "chwindow";
@@ -2747,7 +2750,7 @@ mB
 MF
 Zz
 zk
-dq
+WX
 lN
 pO
 fZ
@@ -2800,7 +2803,7 @@ lw
 DP
 cv
 NY
-Kj
+mH
 AF
 Kq
 IE
@@ -3235,7 +3238,7 @@ jq
 sk
 Kf
 Xh
-sQ
+ae
 Ti
 Kt
 "}
diff --git a/_maps/voidcrew/ships/ship_honk.dmm b/_maps/voidcrew/ships/ship_honk.dmm
index df7db29397a..bcc6737f3aa 100644
--- a/_maps/voidcrew/ships/ship_honk.dmm
+++ b/_maps/voidcrew/ships/ship_honk.dmm
@@ -424,20 +424,6 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/honk/supermatter)
-"Nj" = (
-/obj/structure/table/glass,
-/obj/item/storage/toolbox/mechanical,
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/item/pneumatic_cannon/pie/selfcharge,
-/obj/item/nullrod/clown,
-/obj/item/clothing/neck/petcollar,
-/obj/item/bikehorn/golden,
-/obj/item/gun/ballistic/revolver/russian/soul,
-/obj/item/clothing/head/chaplain/clownmitre,
-/turf/open/floor/mineral/bananium,
-/area/shuttle/voidcrew/honk)
 "NI" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/yellow,
@@ -517,6 +503,20 @@
 /obj/machinery/seed_extractor,
 /turf/open/floor/mineral/bananium,
 /area/shuttle/voidcrew/honk)
+"Tr" = (
+/obj/structure/table/glass,
+/obj/item/storage/toolbox/mechanical,
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/item/pneumatic_cannon/pie/selfcharge,
+/obj/item/nullrod/clown,
+/obj/item/clothing/neck/petcollar,
+/obj/item/bikehorn/golden,
+/obj/item/gun/ballistic/revolver/russian/soul,
+/obj/item/clothing/head/chaplain/clownmitre,
+/turf/open/floor/mineral/bananium,
+/area/shuttle/voidcrew/honk)
 "TK" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 1
@@ -866,7 +866,7 @@ YY
 YY
 YY
 ZT
-Nj
+Tr
 Uv
 Yd
 Xn
diff --git a/_maps/voidcrew/ships/ship_irish.dmm b/_maps/voidcrew/ships/ship_irish.dmm
index 61cb02c0019..5e101abf047 100644
--- a/_maps/voidcrew/ships/ship_irish.dmm
+++ b/_maps/voidcrew/ships/ship_irish.dmm
@@ -335,19 +335,6 @@
 /obj/machinery/suit_storage_unit/engine,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/resistance/maintenance)
-"wr" = (
-/obj/item/radio/intercom{
-	pixel_y = 28
-	},
-/obj/structure/rack,
-/obj/item/ammo_box/magazine/sniper_rounds,
-/obj/item/ammo_box/magazine/sniper_rounds,
-/obj/item/ammo_box/magazine/sniper_rounds/soporific,
-/obj/item/ammo_box/magazine/sniper_rounds/soporific,
-/obj/item/ammo_box/magazine/sniper_rounds/soporific,
-/obj/item/ammo_box/magazine/sniper_rounds/soporific,
-/turf/open/floor/iron,
-/area/shuttle/voidcrew/resistance/bridge)
 "xb" = (
 /turf/closed/wall,
 /area/shuttle/voidcrew/resistance/bridge)
@@ -428,12 +415,6 @@
 "Bh" = (
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/resistance/ordnance/chemistry)
-"BE" = (
-/obj/structure/rack,
-/obj/item/gun/ballistic/automatic/sniper_rifle,
-/obj/item/gun/ballistic/automatic/sniper_rifle,
-/turf/open/floor/iron,
-/area/shuttle/voidcrew/resistance/bridge)
 "BV" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron,
@@ -538,6 +519,19 @@
 	},
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/resistance/cargo)
+"IN" = (
+/obj/item/radio/intercom{
+	pixel_y = 28
+	},
+/obj/structure/rack,
+/obj/item/ammo_box/magazine/sniper_rounds,
+/obj/item/ammo_box/magazine/sniper_rounds,
+/obj/item/ammo_box/magazine/sniper_rounds/soporific,
+/obj/item/ammo_box/magazine/sniper_rounds/soporific,
+/obj/item/ammo_box/magazine/sniper_rounds/soporific,
+/obj/item/ammo_box/magazine/sniper_rounds/soporific,
+/turf/open/floor/iron,
+/area/shuttle/voidcrew/resistance/bridge)
 "KI" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
@@ -590,6 +584,12 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/closed/wall,
 /area/shuttle/voidcrew/resistance/maintenance)
+"LA" = (
+/obj/structure/rack,
+/obj/item/gun/ballistic/automatic/sniper_rifle,
+/obj/item/gun/ballistic/automatic/sniper_rifle,
+/turf/open/floor/iron,
+/area/shuttle/voidcrew/resistance/bridge)
 "LU" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -1113,8 +1113,8 @@ fo
 fo
 fo
 xb
-wr
-BE
+IN
+LA
 zm
 Ex
 nN
diff --git a/_maps/voidcrew/ships/ship_kilo_a.dmm b/_maps/voidcrew/ships/ship_kilo_a.dmm
index b7078ead099..85134951925 100644
--- a/_maps/voidcrew/ships/ship_kilo_a.dmm
+++ b/_maps/voidcrew/ships/ship_kilo_a.dmm
@@ -214,6 +214,20 @@
 "hv" = (
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/kilo/cargo/mining_dock/a)
+"hy" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/item/gun/energy/laser/retro,
+/obj/structure/plaque/static_plaque/golden/captain{
+	pixel_x = 32
+	},
+/obj/machinery/status_display/evac{
+	pixel_y = 32
+	},
+/obj/item/pai_card,
+/obj/item/clothing/shoes/cowboy/white,
+/obj/item/clothing/head/cowboy/red,
+/turf/open/floor/carpet,
+/area/shuttle/voidcrew/kilo/dorms/a)
 "hA" = (
 /obj/effect/turf_decal/stripes{
 	dir = 9
@@ -391,20 +405,6 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/kilo/cargo/mining_dock/a)
-"mu" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/item/gun/energy/laser/retro,
-/obj/structure/plaque/static_plaque/golden/captain{
-	pixel_x = 32
-	},
-/obj/machinery/status_display/evac{
-	pixel_y = 32
-	},
-/obj/item/pai_card,
-/obj/item/clothing/shoes/cowboy/white,
-/obj/item/clothing/head/cowboy/red,
-/turf/open/floor/carpet,
-/area/shuttle/voidcrew/kilo/dorms/a)
 "mz" = (
 /obj/effect/turf_decal/stripes{
 	dir = 8
@@ -571,6 +571,28 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/kilo/engineering/a)
+"uA" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/turf_decal/trimline/white/filled/line{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/greenglow,
+/obj/item/gun/energy/e_gun/mini,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
+	},
+/obj/item/clothing/suit/hooded/wintercoat/engineering,
+/obj/item/clothing/suit/hooded/wintercoat/engineering,
+/obj/item/clothing/suit/hooded/wintercoat/engineering,
+/obj/item/clothing/suit/hazardvest,
+/obj/item/clothing/suit/hazardvest,
+/obj/item/clothing/suit/hazardvest,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/voidcrew/kilo/dorms/a)
 "vM" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes{
@@ -670,28 +692,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/voidcrew/kilo/cargo/mining_dock/a)
-"xK" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/effect/turf_decal/trimline/white/filled/line{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/greenglow,
-/obj/item/gun/energy/e_gun/mini,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 1
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 1
-	},
-/obj/item/clothing/suit/hooded/wintercoat/engineering,
-/obj/item/clothing/suit/hooded/wintercoat/engineering,
-/obj/item/clothing/suit/hooded/wintercoat/engineering,
-/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/suit/hazardvest,
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/voidcrew/kilo/dorms/a)
 "xS" = (
 /obj/effect/turf_decal/stripes/corner{
 	dir = 4
@@ -975,33 +975,6 @@
 /obj/item/tank/internals/emergency_oxygen,
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/voidcrew/kilo/cargo/mining_dock/a)
-"HA" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/effect/turf_decal/trimline/white/filled/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
-	},
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/item/gun/energy/e_gun/mini,
-/obj/item/clothing/shoes/workboots,
-/obj/item/clothing/shoes/workboots,
-/obj/item/clothing/shoes/workboots,
-/obj/item/clothing/shoes/cowboy,
-/obj/item/clothing/shoes/cowboy,
-/obj/item/clothing/shoes/cowboy,
-/obj/machinery/firealarm/directional/west,
-/obj/item/clothing/head/cowboy/brown,
-/obj/item/clothing/head/cowboy/brown,
-/obj/item/clothing/head/cowboy/brown,
-/obj/item/clothing/head/cowboy/brown,
-/obj/item/clothing/head/cowboy/brown,
-/obj/item/clothing/head/cowboy/brown,
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/voidcrew/kilo/dorms/a)
 "HR" = (
 /obj/modular_map_root/ship_upgrade{
 	key = "kilo_dock"
@@ -1245,6 +1218,33 @@
 /obj/structure/cable,
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/voidcrew/kilo/bridge/a)
+"Ra" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/turf_decal/trimline/white/filled/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/item/gun/energy/e_gun/mini,
+/obj/item/clothing/shoes/workboots,
+/obj/item/clothing/shoes/workboots,
+/obj/item/clothing/shoes/workboots,
+/obj/item/clothing/shoes/cowboy,
+/obj/item/clothing/shoes/cowboy,
+/obj/item/clothing/shoes/cowboy,
+/obj/machinery/firealarm/directional/west,
+/obj/item/clothing/head/cowboy/brown,
+/obj/item/clothing/head/cowboy/brown,
+/obj/item/clothing/head/cowboy/brown,
+/obj/item/clothing/head/cowboy/brown,
+/obj/item/clothing/head/cowboy/brown,
+/obj/item/clothing/head/cowboy/brown,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/voidcrew/kilo/dorms/a)
 "Rm" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/voidcrew/kilo/cargo/a)
@@ -1782,7 +1782,7 @@ lW
 Qu
 wZ
 hA
-HA
+Ra
 DA
 aa
 "}
@@ -1797,7 +1797,7 @@ Wm
 pY
 Iq
 kD
-xK
+uA
 Iq
 aa
 "}
@@ -1855,7 +1855,7 @@ dD
 Ww
 aM
 Iq
-mu
+hy
 TO
 DA
 aa
diff --git a/_maps/voidcrew/ships/ship_kilo_b.dmm b/_maps/voidcrew/ships/ship_kilo_b.dmm
index e9f980e00d3..c6208f116a5 100644
--- a/_maps/voidcrew/ships/ship_kilo_b.dmm
+++ b/_maps/voidcrew/ships/ship_kilo_b.dmm
@@ -496,6 +496,20 @@
 "um" = (
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/kilo/cafe/b)
+"uq" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/item/gun/energy/laser/retro,
+/obj/structure/plaque/static_plaque/golden/captain{
+	pixel_x = 32
+	},
+/obj/machinery/status_display/evac{
+	pixel_y = 32
+	},
+/obj/item/pai_card,
+/obj/item/clothing/shoes/cowboy/white,
+/obj/item/clothing/head/cowboy/red,
+/turf/open/floor/carpet,
+/area/shuttle/voidcrew/kilo/dorms/b)
 "vo" = (
 /obj/effect/turf_decal/trimline/neutral/warning,
 /obj/machinery/door/airlock/shuttle{
@@ -715,20 +729,6 @@
 "Ar" = (
 /turf/closed/wall/mineral/wood/nonmetal,
 /area/shuttle/voidcrew/kilo/cargo/b)
-"Bn" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/item/gun/energy/laser/retro,
-/obj/structure/plaque/static_plaque/golden/captain{
-	pixel_x = 32
-	},
-/obj/machinery/status_display/evac{
-	pixel_y = 32
-	},
-/obj/item/pai_card,
-/obj/item/clothing/shoes/cowboy/white,
-/obj/item/clothing/head/cowboy/red,
-/turf/open/floor/carpet,
-/area/shuttle/voidcrew/kilo/dorms/b)
 "BH" = (
 /obj/effect/turf_decal/stripes{
 	dir = 4
@@ -773,33 +773,6 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/kilo/engineering/b)
-"CE" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/effect/turf_decal/trimline/white/filled/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
-	},
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/item/gun/energy/e_gun/mini,
-/obj/item/clothing/shoes/workboots,
-/obj/item/clothing/shoes/workboots,
-/obj/item/clothing/shoes/workboots,
-/obj/item/clothing/shoes/cowboy,
-/obj/item/clothing/shoes/cowboy,
-/obj/item/clothing/shoes/cowboy,
-/obj/machinery/firealarm/directional/west,
-/obj/item/clothing/head/cowboy/brown,
-/obj/item/clothing/head/cowboy/brown,
-/obj/item/clothing/head/cowboy/brown,
-/obj/item/clothing/head/cowboy/brown,
-/obj/item/clothing/head/cowboy/brown,
-/obj/item/clothing/head/cowboy/brown,
-/turf/open/floor/wood,
-/area/shuttle/voidcrew/kilo/dorms/b)
 "Dc" = (
 /obj/effect/turf_decal/stripes{
 	dir = 5
@@ -867,27 +840,6 @@
 /obj/machinery/power/apc/auto_name/directional/south,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/kilo/engineering/b)
-"Fb" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/effect/turf_decal/trimline/white/filled/line{
-	dir = 1
-	},
-/obj/item/gun/energy/e_gun/mini,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 1
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 1
-	},
-/obj/item/clothing/suit/hooded/wintercoat/engineering,
-/obj/item/clothing/suit/hooded/wintercoat/engineering,
-/obj/item/clothing/suit/hooded/wintercoat/engineering,
-/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/suit/hazardvest,
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/wood,
-/area/shuttle/voidcrew/kilo/dorms/b)
 "Gn" = (
 /obj/effect/turf_decal/stripes{
 	dir = 5
@@ -1475,6 +1427,27 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/kilo/engineering/b)
+"Xe" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/turf_decal/trimline/white/filled/line{
+	dir = 1
+	},
+/obj/item/gun/energy/e_gun/mini,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
+	},
+/obj/item/clothing/suit/hooded/wintercoat/engineering,
+/obj/item/clothing/suit/hooded/wintercoat/engineering,
+/obj/item/clothing/suit/hooded/wintercoat/engineering,
+/obj/item/clothing/suit/hazardvest,
+/obj/item/clothing/suit/hazardvest,
+/obj/item/clothing/suit/hazardvest,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/wood,
+/area/shuttle/voidcrew/kilo/dorms/b)
 "Xf" = (
 /obj/structure/reagent_dispensers/fueltank,
 /obj/item/weldingtool/largetank,
@@ -1485,6 +1458,33 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/kilo/engineering/b)
+"Xh" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/turf_decal/trimline/white/filled/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/item/gun/energy/e_gun/mini,
+/obj/item/clothing/shoes/workboots,
+/obj/item/clothing/shoes/workboots,
+/obj/item/clothing/shoes/workboots,
+/obj/item/clothing/shoes/cowboy,
+/obj/item/clothing/shoes/cowboy,
+/obj/item/clothing/shoes/cowboy,
+/obj/machinery/firealarm/directional/west,
+/obj/item/clothing/head/cowboy/brown,
+/obj/item/clothing/head/cowboy/brown,
+/obj/item/clothing/head/cowboy/brown,
+/obj/item/clothing/head/cowboy/brown,
+/obj/item/clothing/head/cowboy/brown,
+/obj/item/clothing/head/cowboy/brown,
+/turf/open/floor/wood,
+/area/shuttle/voidcrew/kilo/dorms/b)
 "XS" = (
 /obj/effect/decal/cleanable/blood/oil,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1727,7 +1727,7 @@ xk
 Qh
 zf
 Re
-CE
+Xh
 Mh
 aa
 "}
@@ -1742,7 +1742,7 @@ Kh
 ro
 Tl
 rx
-Fb
+Xe
 Tl
 aa
 "}
@@ -1800,7 +1800,7 @@ kV
 Sc
 Rg
 Tl
-Bn
+uq
 Nx
 Mh
 aa
diff --git a/_maps/voidcrew/ships/ship_kilo_c.dmm b/_maps/voidcrew/ships/ship_kilo_c.dmm
index 52c73c0da07..960981b76b5 100644
--- a/_maps/voidcrew/ships/ship_kilo_c.dmm
+++ b/_maps/voidcrew/ships/ship_kilo_c.dmm
@@ -36,6 +36,56 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/kilo/engineering/c)
+"bW" = (
+/obj/structure/closet/secure_closet/personal{
+	name = "bestie wardrobe"
+	},
+/obj/effect/turf_decal/trimline/white/filled/line{
+	color = "#ff9ecd";
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/item/gun/energy/e_gun/mini,
+/obj/item/clothing/shoes/sneakers/white,
+/obj/item/clothing/shoes/sneakers/white,
+/obj/item/clothing/shoes/sneakers/white,
+/obj/machinery/firealarm/directional/west,
+/obj/item/clothing/head/costume/kitty,
+/obj/item/clothing/head/costume/kitty,
+/obj/item/toy/plush/carpplushie,
+/turf/open/floor/iron/dollhouse/white,
+/area/shuttle/voidcrew/kilo/dorms/c)
+"cN" = (
+/obj/structure/closet/secure_closet/personal{
+	name = "glitter wardrobe"
+	},
+/obj/effect/turf_decal/trimline/white/filled/line{
+	color = "#ff9ecd";
+	dir = 1
+	},
+/obj/item/gun/energy/e_gun/mini,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
+	},
+/obj/item/clothing/suit/hooded/wintercoat/engineering,
+/obj/item/clothing/suit/hooded/wintercoat/engineering,
+/obj/item/clothing/suit/hooded/wintercoat/engineering,
+/obj/item/clothing/suit/hazardvest,
+/obj/item/clothing/suit/hazardvest,
+/obj/item/clothing/suit/hazardvest,
+/obj/item/clothing/head/costume/kitty/genuine,
+/obj/item/toy/plush/moth,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/iron/dollhouse/white,
+/area/shuttle/voidcrew/kilo/dorms/c)
 "cT" = (
 /obj/machinery/door/airlock/external{
 	name = "External Freight Airlock"
@@ -91,30 +141,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/dollhouse/white,
 /area/shuttle/voidcrew/kilo/dorms/c)
-"er" = (
-/obj/structure/closet/secure_closet/personal{
-	name = "bestie wardrobe"
-	},
-/obj/effect/turf_decal/trimline/white/filled/line{
-	color = "#ff9ecd";
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
-	},
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/item/gun/energy/e_gun/mini,
-/obj/item/clothing/shoes/sneakers/white,
-/obj/item/clothing/shoes/sneakers/white,
-/obj/item/clothing/shoes/sneakers/white,
-/obj/machinery/firealarm/directional/west,
-/obj/item/clothing/head/costume/kitty,
-/obj/item/clothing/head/costume/kitty,
-/obj/item/toy/plush/carpplushie,
-/turf/open/floor/iron/dollhouse/white,
-/area/shuttle/voidcrew/kilo/dorms/c)
 "fa" = (
 /obj/effect/turf_decal/trimline/neutral/warning,
 /obj/machinery/door/airlock/shuttle{
@@ -440,6 +466,22 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/kilo/cargo/c)
+"rw" = (
+/obj/structure/closet/secure_closet/personal{
+	name = "captain's wardrobe"
+	},
+/obj/item/gun/energy/laser/retro,
+/obj/item/lipstick/random,
+/obj/item/storage/fancy/heart_box,
+/obj/structure/plaque/static_plaque/golden/captain{
+	pixel_x = 32
+	},
+/obj/machinery/status_display/evac{
+	pixel_y = 32
+	},
+/obj/item/pai_card,
+/turf/open/floor/carpet/neon/simple/pink/nodots,
+/area/shuttle/voidcrew/kilo/dorms/c)
 "rB" = (
 /obj/effect/turf_decal/stripes{
 	dir = 4
@@ -623,32 +665,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/kilo/engineering/c)
-"yB" = (
-/obj/structure/closet/secure_closet/personal{
-	name = "glitter wardrobe"
-	},
-/obj/effect/turf_decal/trimline/white/filled/line{
-	color = "#ff9ecd";
-	dir = 1
-	},
-/obj/item/gun/energy/e_gun/mini,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 1
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 1
-	},
-/obj/item/clothing/suit/hooded/wintercoat/engineering,
-/obj/item/clothing/suit/hooded/wintercoat/engineering,
-/obj/item/clothing/suit/hooded/wintercoat/engineering,
-/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/head/costume/kitty/genuine,
-/obj/item/toy/plush/moth,
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/iron/dollhouse/white,
-/area/shuttle/voidcrew/kilo/dorms/c)
 "yM" = (
 /obj/effect/turf_decal/box/corners,
 /obj/effect/turf_decal/box/corners{
@@ -1057,22 +1073,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/kilo/engineering/c)
-"Pb" = (
-/obj/structure/closet/secure_closet/personal{
-	name = "captain's wardrobe"
-	},
-/obj/item/gun/energy/laser/retro,
-/obj/item/lipstick/random,
-/obj/item/storage/fancy/heart_box,
-/obj/structure/plaque/static_plaque/golden/captain{
-	pixel_x = 32
-	},
-/obj/machinery/status_display/evac{
-	pixel_y = 32
-	},
-/obj/item/pai_card,
-/turf/open/floor/carpet/neon/simple/pink/nodots,
-/area/shuttle/voidcrew/kilo/dorms/c)
 "Pk" = (
 /obj/modular_map_root/ship_upgrade{
 	key = "kilo_service"
@@ -1627,7 +1627,7 @@ Uf
 iJ
 dY
 Rf
-er
+bW
 BI
 aa
 "}
@@ -1642,7 +1642,7 @@ AJ
 Zf
 Qs
 oT
-yB
+cN
 Qs
 aa
 "}
@@ -1700,7 +1700,7 @@ gO
 Qb
 dE
 Qs
-Pb
+rw
 KK
 BI
 aa
diff --git a/_maps/voidcrew/ships/ship_kilo_d.dmm b/_maps/voidcrew/ships/ship_kilo_d.dmm
index 81492020b27..1551719ebdf 100644
--- a/_maps/voidcrew/ships/ship_kilo_d.dmm
+++ b/_maps/voidcrew/ships/ship_kilo_d.dmm
@@ -246,27 +246,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron/white,
 /area/shuttle/voidcrew/kilo/cargo/d)
-"nc" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/effect/turf_decal/trimline/white/filled/line{
-	dir = 1
-	},
-/obj/item/gun/energy/e_gun/mini,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 1
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 1
-	},
-/obj/item/clothing/suit/hooded/wintercoat/engineering,
-/obj/item/clothing/suit/hooded/wintercoat/engineering,
-/obj/item/clothing/suit/hooded/wintercoat/engineering,
-/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/suit/hazardvest,
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/iron/white/smooth_large,
-/area/shuttle/voidcrew/kilo/dorms/d)
 "nT" = (
 /obj/structure/tank_dispenser/oxygen,
 /obj/effect/turf_decal/trimline/neutral/warning,
@@ -628,6 +607,27 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/kilo/engineering/d)
+"zJ" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/turf_decal/trimline/white/filled/line{
+	dir = 1
+	},
+/obj/item/gun/energy/e_gun/mini,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
+	},
+/obj/item/clothing/suit/hooded/wintercoat/engineering,
+/obj/item/clothing/suit/hooded/wintercoat/engineering,
+/obj/item/clothing/suit/hooded/wintercoat/engineering,
+/obj/item/clothing/suit/hazardvest,
+/obj/item/clothing/suit/hazardvest,
+/obj/item/clothing/suit/hazardvest,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/iron/white/smooth_large,
+/area/shuttle/voidcrew/kilo/dorms/d)
 "zV" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/voidcrew/kilo/cafe/d)
@@ -842,27 +842,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron/white,
 /area/shuttle/voidcrew/kilo/cargo/mining_dock/d)
-"GC" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/effect/turf_decal/trimline/white/filled/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
-	},
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/item/gun/energy/e_gun/mini,
-/obj/item/clothing/shoes/workboots,
-/obj/item/clothing/shoes/workboots,
-/obj/item/clothing/shoes/workboots,
-/obj/machinery/firealarm/directional/west,
-/obj/item/clothing/shoes/laceup,
-/obj/item/clothing/shoes/laceup,
-/obj/item/clothing/shoes/laceup,
-/turf/open/floor/iron/white/smooth_large,
-/area/shuttle/voidcrew/kilo/dorms/d)
 "Ic" = (
 /obj/machinery/light{
 	dir = 4
@@ -934,6 +913,27 @@
 /obj/machinery/power/apc/auto_name/directional/north,
 /turf/open/floor/iron/white/smooth_large,
 /area/shuttle/voidcrew/kilo/bridge/d)
+"Li" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/effect/turf_decal/trimline/white/filled/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/item/gun/energy/e_gun/mini,
+/obj/item/clothing/shoes/workboots,
+/obj/item/clothing/shoes/workboots,
+/obj/item/clothing/shoes/workboots,
+/obj/machinery/firealarm/directional/west,
+/obj/item/clothing/shoes/laceup,
+/obj/item/clothing/shoes/laceup,
+/obj/item/clothing/shoes/laceup,
+/turf/open/floor/iron/white/smooth_large,
+/area/shuttle/voidcrew/kilo/dorms/d)
 "LN" = (
 /obj/effect/turf_decal/stripes,
 /obj/structure/cable,
@@ -972,6 +972,18 @@
 	},
 /turf/open/floor/iron/white/smooth_large,
 /area/shuttle/voidcrew/kilo/bridge/d)
+"NL" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/item/gun/energy/laser/retro,
+/obj/structure/plaque/static_plaque/golden/captain{
+	pixel_x = 32
+	},
+/obj/machinery/status_display/evac{
+	pixel_y = 32
+	},
+/obj/item/pai_card,
+/turf/open/floor/carpet,
+/area/shuttle/voidcrew/kilo/dorms/d)
 "Oj" = (
 /obj/effect/turf_decal/stripes{
 	dir = 6
@@ -1002,18 +1014,6 @@
 	},
 /turf/open/floor/iron/white/smooth_large,
 /area/shuttle/voidcrew/kilo/bridge/d)
-"Pb" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/item/gun/energy/laser/retro,
-/obj/structure/plaque/static_plaque/golden/captain{
-	pixel_x = 32
-	},
-/obj/machinery/status_display/evac{
-	pixel_y = 32
-	},
-/obj/item/pai_card,
-/turf/open/floor/carpet,
-/area/shuttle/voidcrew/kilo/dorms/d)
 "Pk" = (
 /obj/modular_map_root/ship_upgrade{
 	key = "kilo_service"
@@ -1605,7 +1605,7 @@ PU
 yU
 UB
 vg
-GC
+Li
 BI
 aa
 "}
@@ -1620,7 +1620,7 @@ AJ
 Zf
 Qs
 ED
-nc
+zJ
 Qs
 aa
 "}
@@ -1678,7 +1678,7 @@ gO
 Qb
 dE
 Qs
-Pb
+NL
 KK
 BI
 aa
diff --git a/_maps/voidcrew/ships/ship_lamia.dmm b/_maps/voidcrew/ships/ship_lamia.dmm
index 14f9f47e76f..f2ad915c021 100644
--- a/_maps/voidcrew/ships/ship_lamia.dmm
+++ b/_maps/voidcrew/ships/ship_lamia.dmm
@@ -34,6 +34,10 @@
 /obj/machinery/airalarm/directional/east,
 /turf/open/floor/carpet/stellar,
 /area/shuttle/voidcrew/lamia/bridge)
+"ah" = (
+/obj/machinery/vending/games,
+/turf/open/floor/carpet/royalblack,
+/area/shuttle/voidcrew/lamia/game_room)
 "ai" = (
 /obj/structure/showcase/wizard,
 /turf/open/floor/carpet/stellar,
@@ -122,10 +126,6 @@
 /obj/structure/cable,
 /turf/open/floor/wood,
 /area/shuttle/voidcrew/lamia/hallway/fore)
-"aB" = (
-/obj/machinery/vending/games,
-/turf/open/floor/carpet/royalblack,
-/area/shuttle/voidcrew/lamia/game_room)
 "aC" = (
 /obj/structure/table/wood/poker,
 /obj/item/toy/cards/deck/tarot{
@@ -350,7 +350,7 @@
 /obj/item/storage/medkit/regular,
 /obj/item/storage/medkit/o2,
 /obj/item/storage/medkit/toxin,
-/obj/item/storage/backpack/duffelbag/med/surgery,
+/obj/item/storage/medkit/surgery,
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable,
 /turf/open/floor/iron,
@@ -998,6 +998,14 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/wood,
 /area/shuttle/voidcrew/lamia/bar)
+"yk" = (
+/obj/structure/table/wood/fancy/royalblue,
+/obj/item/gun/energy/e_gun/mini{
+	pixel_x = -2;
+	pixel_y = 2
+	},
+/turf/open/floor/carpet/stellar,
+/area/shuttle/voidcrew/lamia/bridge)
 "zn" = (
 /obj/machinery/processor,
 /turf/open/floor/wood,
@@ -1273,14 +1281,6 @@
 /obj/structure/sign/poster/contraband/random,
 /turf/closed/wall/mineral/iron,
 /area/shuttle/voidcrew/lamia/study)
-"Ma" = (
-/obj/structure/table/wood/fancy/royalblue,
-/obj/item/gun/energy/e_gun/mini{
-	pixel_x = -2;
-	pixel_y = 2
-	},
-/turf/open/floor/carpet/stellar,
-/area/shuttle/voidcrew/lamia/bridge)
 "Mb" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 4
@@ -1349,6 +1349,24 @@
 /obj/structure/bookcase/random,
 /turf/open/floor/carpet/orange,
 /area/shuttle/voidcrew/lamia/archive)
+"NO" = (
+/obj/structure/closet/cabinet,
+/obj/item/gun/ballistic/shotgun/doublebarrel{
+	desc = "Despite the fact you're on a ship meant for wizards, with spells and all that, a bartender is still never far from a double-barreled twelve-gauge shotgun.";
+	sawn_desc = "Gooblamaphous's coming!"
+	},
+/obj/item/storage/box/beanbag,
+/obj/item/clothing/suit/armor/vest/alt,
+/obj/item/clothing/glasses/sunglasses/reagent,
+/obj/item/clothing/head/wizard/black{
+	desc = "Strange-looking black hat-wear that most certainly belongs to a real bartender.";
+	name = "beer wizard hat"
+	},
+/obj/item/roulette_wheel_beacon,
+/obj/item/etherealballdeployer,
+/obj/item/storage/belt/bandolier,
+/turf/open/floor/carpet/purple,
+/area/shuttle/voidcrew/lamia/bar)
 "Ot" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/bookcase/random/religion,
@@ -1497,24 +1515,6 @@
 "Vy" = (
 /turf/open/floor/wood,
 /area/shuttle/voidcrew/lamia/hallway/aft)
-"VC" = (
-/obj/structure/closet/cabinet,
-/obj/item/gun/ballistic/shotgun/doublebarrel{
-	desc = "Despite the fact you're on a ship meant for wizards, with spells and all that, a bartender is still never far from a double-barreled twelve-gauge shotgun.";
-	sawn_desc = "Gooblamaphous's coming!"
-	},
-/obj/item/storage/box/beanbag,
-/obj/item/clothing/suit/armor/vest/alt,
-/obj/item/clothing/glasses/sunglasses/reagent,
-/obj/item/clothing/head/wizard/black{
-	desc = "Strange-looking black hat-wear that most certainly belongs to a real bartender.";
-	name = "beer wizard hat"
-	},
-/obj/item/roulette_wheel_beacon,
-/obj/item/etherealballdeployer,
-/obj/item/storage/belt/bandolier,
-/turf/open/floor/carpet/purple,
-/area/shuttle/voidcrew/lamia/bar)
 "VP" = (
 /obj/item/storage/dice{
 	icon_state = "magicdicebag";
@@ -1819,7 +1819,7 @@ MR
 Ql
 Fu
 vJ
-VC
+NO
 aW
 MA
 NF
@@ -1875,7 +1875,7 @@ No
 "}
 (9,1,1) = {"
 ab
-Ma
+yk
 io
 Mb
 ab
@@ -2014,7 +2014,7 @@ Vj
 an
 aq
 Ek
-aB
+ah
 VP
 VX
 aR
diff --git a/_maps/voidcrew/ships/ship_libertatia.dmm b/_maps/voidcrew/ships/ship_libertatia.dmm
index ba8fddfb33b..5fd491b2736 100644
--- a/_maps/voidcrew/ships/ship_libertatia.dmm
+++ b/_maps/voidcrew/ships/ship_libertatia.dmm
@@ -69,35 +69,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/iron/stairs,
 /area/shuttle/voidcrew/libertatia/bridge)
-"bG" = (
-/obj/structure/table/reinforced,
-/obj/item/areaeditor/shuttle{
-	pixel_y = 10
-	},
-/obj/item/megaphone/command{
-	pixel_x = 10;
-	pixel_y = 10
-	},
-/obj/item/storage/fancy/cigarettes/cigars{
-	pixel_y = 10
-	},
-/obj/machinery/button/massdriver{
-	id = "pirate_porttube";
-	name = "port launch tube button";
-	pixel_x = -5;
-	pixel_y = -5
-	},
-/obj/machinery/button/massdriver{
-	id = "pirate_stbdtube";
-	name = "starboard launch tube button";
-	pixel_x = 5;
-	pixel_y = -5
-	},
-/obj/item/storage/belt/sabre,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/gun/ballistic/revolver/c38,
-/turf/open/floor/pod/light,
-/area/shuttle/voidcrew/libertatia/bridge)
 "ci" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/shuttle/voidcrew/libertatia/armory)
@@ -129,25 +100,6 @@
 /obj/machinery/airalarm/directional/west,
 /turf/open/floor/pod/light,
 /area/shuttle/voidcrew/libertatia/bridge)
-"fp" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 1
-	},
-/obj/effect/landmark/start/head_of_personnel,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/status_display/shuttle{
-	pixel_y = -32
-	},
-/obj/item/gun/energy/e_gun/mini{
-	name = "first mate's derringer"
-	},
-/turf/open/floor/pod/light,
-/area/shuttle/voidcrew/libertatia/bridge)
 "fq" = (
 /turf/open/floor/engine/hull,
 /area/shuttle/voidcrew/libertatia/armory)
@@ -474,6 +426,35 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/voidcrew/libertatia/armory)
+"tk" = (
+/obj/structure/table/reinforced,
+/obj/item/areaeditor/shuttle{
+	pixel_y = 10
+	},
+/obj/item/megaphone/command{
+	pixel_x = 10;
+	pixel_y = 10
+	},
+/obj/item/storage/fancy/cigarettes/cigars{
+	pixel_y = 10
+	},
+/obj/machinery/button/massdriver{
+	id = "pirate_porttube";
+	name = "port launch tube button";
+	pixel_x = -5;
+	pixel_y = -5
+	},
+/obj/machinery/button/massdriver{
+	id = "pirate_stbdtube";
+	name = "starboard launch tube button";
+	pixel_x = 5;
+	pixel_y = -5
+	},
+/obj/item/storage/belt/sheath/sabre,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/gun/ballistic/revolver/c38,
+/turf/open/floor/pod/light,
+/area/shuttle/voidcrew/libertatia/bridge)
 "tT" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/shuttle/voidcrew/libertatia/cargo_bay)
@@ -529,6 +510,25 @@
 	},
 /turf/open/floor/pod/light,
 /area/shuttle/voidcrew/libertatia/crew_lounge)
+"vn" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/effect/landmark/start/head_of_personnel,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/status_display/shuttle{
+	pixel_y = -32
+	},
+/obj/item/gun/energy/e_gun/mini{
+	name = "first mate's derringer"
+	},
+/turf/open/floor/pod/light,
+/area/shuttle/voidcrew/libertatia/bridge)
 "vo" = (
 /obj/machinery/door/airlock/hatch,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -632,7 +632,7 @@
 /obj/machinery/vending/wallmed{
 	pixel_y = 30
 	},
-/obj/item/storage/backpack/duffelbag/med/surgery,
+/obj/item/storage/medkit/surgery,
 /obj/item/clothing/mask/surgical,
 /obj/item/clothing/suit/apron/surgical,
 /obj/structure/sign/departments/medbay/alt/directional/west,
@@ -1697,8 +1697,8 @@ fd
 DP
 az
 bb
-bG
-fp
+tk
+vn
 gm
 nv
 pH
diff --git a/_maps/voidcrew/ships/ship_luxembourg.dmm b/_maps/voidcrew/ships/ship_luxembourg.dmm
index ca2a4df136a..c26f2eaebfb 100644
--- a/_maps/voidcrew/ships/ship_luxembourg.dmm
+++ b/_maps/voidcrew/ships/ship_luxembourg.dmm
@@ -109,7 +109,7 @@
 /obj/item/storage/box/syndie_kit/chameleon,
 /obj/item/card/id/advanced/black/syndicate_command,
 /obj/item/card/emag,
-/obj/item/storage/belt/sabre,
+/obj/item/storage/belt/sheath/sabre,
 /obj/item/gun/energy/recharge/kinetic_accelerator,
 /obj/item/tank/internals/emergency_oxygen/double,
 /obj/item/clothing/under/syndicate,
@@ -296,7 +296,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/item/storage/backpack/duffelbag/med/surgery,
+/obj/item/storage/medkit/surgery,
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/luxembourg/medbay)
 "gM" = (
diff --git a/_maps/voidcrew/ships/ship_mechaton.dmm b/_maps/voidcrew/ships/ship_mechaton.dmm
index fe807ebf90f..c7a4e4a2b44 100644
--- a/_maps/voidcrew/ships/ship_mechaton.dmm
+++ b/_maps/voidcrew/ships/ship_mechaton.dmm
@@ -213,6 +213,13 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/mechaton/engineering)
+"lk" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/table/reinforced,
+/obj/item/storage/box/lethalshot,
+/obj/item/gun/ballistic/shotgun/riot,
+/turf/open/floor/carpet/neon/simple/purple,
+/area/shuttle/voidcrew/mechaton/bridge)
 "lp" = (
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -327,13 +334,6 @@
 /obj/machinery/computer/mech_bay_power_console,
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/mechaton/concourse)
-"qn" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/table/reinforced,
-/obj/item/storage/box/lethalshot,
-/obj/item/gun/ballistic/shotgun/riot,
-/turf/open/floor/carpet/neon/simple/purple,
-/area/shuttle/voidcrew/mechaton/bridge)
 "rQ" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -642,7 +642,7 @@
 /obj/structure/cable,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/table/reinforced,
-/obj/item/storage/backpack/duffelbag/med/surgery,
+/obj/item/storage/medkit/surgery,
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/mechaton/robotics)
 "Dc" = (
@@ -1692,7 +1692,7 @@ Us
 Us
 Dc
 KB
-qn
+lk
 vc
 Ok
 iZ
diff --git a/_maps/voidcrew/ships/ship_meta.dmm b/_maps/voidcrew/ships/ship_meta.dmm
index 0bd18fbe627..353c833594c 100644
--- a/_maps/voidcrew/ships/ship_meta.dmm
+++ b/_maps/voidcrew/ships/ship_meta.dmm
@@ -118,15 +118,6 @@
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/meta/dorms)
-"au" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/item/gun/energy/e_gun/mini,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/iron/white,
-/area/shuttle/voidcrew/meta/dorms)
 "av" = (
 /obj/structure/bed,
 /obj/machinery/light/small/built{
@@ -739,15 +730,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/meta/engineering)
-"bV" = (
-/obj/structure/closet/secure_closet/personal,
-/obj/item/gun/energy/e_gun/mini,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/iron/white,
-/area/shuttle/voidcrew/meta/dorms)
 "bW" = (
 /obj/machinery/door/airlock/external,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -1236,12 +1218,6 @@
 /obj/machinery/airalarm/directional/west,
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/meta/cargo)
-"cQ" = (
-/obj/structure/closet/crate/secure/weapon,
-/obj/item/gun/energy/laser/retro,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/iron/dark,
-/area/shuttle/voidcrew/meta/cargo)
 "cR" = (
 /obj/effect/turf_decal/arrows{
 	dir = 1
@@ -1605,11 +1581,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/meta/kitchen)
-"dU" = (
-/obj/effect/turf_decal/tile/green,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/iron,
-/area/shuttle/voidcrew/meta/kitchen)
 "dV" = (
 /obj/structure/table,
 /obj/item/storage/bag/plants/portaseeder,
@@ -2012,6 +1983,21 @@
 "Ko" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/voidcrew/meta/engineering)
+"KQ" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/item/gun/energy/e_gun/mini,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/white,
+/area/shuttle/voidcrew/meta/dorms)
+"Ns" = (
+/obj/structure/closet/crate/secure/weapon,
+/obj/item/gun/energy/laser/retro,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/dark,
+/area/shuttle/voidcrew/meta/cargo)
 "Nu" = (
 /obj/effect/turf_decal/tile/neutral/diagonal_centre,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -2027,6 +2013,15 @@
 	},
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/meta/cargo)
+"Qs" = (
+/obj/structure/closet/secure_closet/personal,
+/obj/item/gun/energy/e_gun/mini,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/white,
+/area/shuttle/voidcrew/meta/dorms)
 "RG" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/iron/white,
@@ -2238,7 +2233,7 @@ dc
 RG
 ap
 ap
-cQ
+Ns
 dc
 aR
 em
@@ -2418,7 +2413,7 @@ Gj
 "}
 (20,1,1) = {"
 ai
-au
+Qs
 ai
 ba
 ai
@@ -2494,7 +2489,7 @@ Gj
 "}
 (24,1,1) = {"
 ai
-bV
+KQ
 ai
 be
 hr
diff --git a/_maps/voidcrew/ships/ship_metis.dmm b/_maps/voidcrew/ships/ship_metis.dmm
index 3171e26a159..6cd90f8e849 100644
--- a/_maps/voidcrew/ships/ship_metis.dmm
+++ b/_maps/voidcrew/ships/ship_metis.dmm
@@ -19,6 +19,11 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/mineral/titanium/tiled/white,
 /area/shuttle/voidcrew/metis/science/xenobiology)
+"ad" = (
+/obj/structure/cable,
+/obj/machinery/porta_turret/ai/ruin,
+/turf/open/floor/mineral/titanium/tiled/purple,
+/area/shuttle/voidcrew/metis/ai_core)
 "ag" = (
 /obj/structure/table/reinforced,
 /obj/machinery/button/door{
@@ -499,6 +504,10 @@
 /obj/item/bodypart/arm/right/robot,
 /turf/open/floor/mineral/titanium/tiled,
 /area/shuttle/voidcrew/metis/science/robotics)
+"kg" = (
+/obj/item/gun/energy/laser,
+/turf/open/floor/mineral/titanium/tiled/white,
+/area/shuttle/voidcrew/metis/science)
 "kj" = (
 /obj/effect/decal/cleanable/blood,
 /obj/machinery/light/broken,
@@ -527,11 +536,6 @@
 "kD" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/voidcrew/metis/maintenance)
-"kN" = (
-/obj/item/gun/energy/laser,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/mineral/titanium/tiled/white,
-/area/shuttle/voidcrew/metis/bridge)
 "kZ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -964,6 +968,11 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/mineral/titanium/tiled/white,
 /area/shuttle/voidcrew/metis/hallway/fore)
+"sP" = (
+/obj/item/gun/energy/laser,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/mineral/titanium/tiled/white,
+/area/shuttle/voidcrew/metis/bridge)
 "sQ" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/mineral/titanium/tiled,
@@ -1391,11 +1400,6 @@
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/mineral/titanium/tiled/white,
 /area/shuttle/voidcrew/metis/hallway/aft)
-"Cn" = (
-/obj/structure/cable,
-/obj/machinery/porta_turret/ai,
-/turf/open/floor/mineral/titanium/tiled/purple,
-/area/shuttle/voidcrew/metis/ai_core)
 "Co" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
@@ -1473,10 +1477,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/mineral/titanium/tiled/white,
 /area/shuttle/voidcrew/metis/hallway/aft)
-"Dx" = (
-/obj/item/gun/energy/laser,
-/turf/open/floor/mineral/titanium/tiled/white,
-/area/shuttle/voidcrew/metis/science)
 "DM" = (
 /obj/structure/sink/directional/north,
 /obj/effect/decal/cleanable/dirt,
@@ -3187,7 +3187,7 @@ ND
 Sd
 lk
 nr
-Cn
+ad
 SA
 nr
 fo
@@ -3232,7 +3232,7 @@ Lo
 sj
 VA
 MR
-kN
+sP
 sj
 Qu
 Wi
@@ -3355,7 +3355,7 @@ NW
 TH
 lk
 nr
-Cn
+ad
 QT
 nr
 fo
@@ -3515,7 +3515,7 @@ hr
 lJ
 yD
 BM
-Dx
+kg
 fa
 sE
 eI
diff --git a/_maps/voidcrew/ships/ship_midway.dmm b/_maps/voidcrew/ships/ship_midway.dmm
index 0c6eb416de0..dc6ddb73f17 100644
--- a/_maps/voidcrew/ships/ship_midway.dmm
+++ b/_maps/voidcrew/ships/ship_midway.dmm
@@ -557,13 +557,6 @@
 	},
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/midway/bridge)
-"rC" = (
-/obj/structure/closet/secure_closet/captains,
-/obj/effect/turf_decal/tile/blue{
-	dir = 5
-	},
-/turf/open/floor/iron,
-/area/shuttle/voidcrew/midway/bridge)
 "rJ" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/voidcrew/midway/cargo)
@@ -1496,6 +1489,13 @@
 	},
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/midway/medbay)
+"Vs" = (
+/obj/structure/closet/secure_closet/captains,
+/obj/effect/turf_decal/tile/blue{
+	dir = 5
+	},
+/turf/open/floor/iron,
+/area/shuttle/voidcrew/midway/bridge)
 "Vv" = (
 /obj/structure/sink/directional/south,
 /obj/effect/turf_decal/tile/green{
@@ -2243,7 +2243,7 @@ Zn
 Zn
 Zn
 kH
-rC
+Vs
 Ch
 vF
 Kr
diff --git a/_maps/voidcrew/ships/ship_nano_bead.dmm b/_maps/voidcrew/ships/ship_nano_bead.dmm
index d7c861a068b..75c60a93b62 100644
--- a/_maps/voidcrew/ships/ship_nano_bead.dmm
+++ b/_maps/voidcrew/ships/ship_nano_bead.dmm
@@ -4,6 +4,20 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/bead/maintenance/starboard)
+"ac" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/bot_red,
+/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/suit/armor/riot,
+/obj/item/clothing/suit/armor/riot,
+/obj/item/knife/combat/survival,
+/obj/item/knife/combat/survival,
+/obj/item/knife/combat/survival,
+/obj/item/clothing/mask/gas/sechailer/swat,
+/obj/item/clothing/mask/gas/sechailer/swat,
+/obj/item/clothing/mask/gas/sechailer/swat,
+/turf/open/floor/iron/dark,
+/area/shuttle/voidcrew/bead/armory)
 "an" = (
 /obj/effect/turf_decal/siding/thinplating_new{
 	dir = 1
@@ -146,6 +160,11 @@
 /obj/structure/cable,
 /turf/open/floor/iron/diagonal,
 /area/shuttle/voidcrew/bead/bridge)
+"hk" = (
+/obj/machinery/vending/security/marine/solgov,
+/obj/effect/turf_decal/bot_red,
+/turf/open/floor/iron/dark,
+/area/shuttle/voidcrew/bead/armory)
 "hT" = (
 /obj/structure/table/reinforced,
 /obj/machinery/fax{
@@ -294,20 +313,6 @@
 	},
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/bead/hallway)
-"nD" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/bot_red,
-/obj/item/clothing/suit/armor/riot,
-/obj/item/clothing/suit/armor/riot,
-/obj/item/clothing/suit/armor/riot,
-/obj/item/shield/riot,
-/obj/item/shield/riot,
-/obj/item/shield/riot,
-/obj/item/clothing/mask/gas/sechailer/swat,
-/obj/item/clothing/mask/gas/sechailer/swat,
-/obj/item/clothing/mask/gas/sechailer/swat,
-/turf/open/floor/iron/dark,
-/area/shuttle/voidcrew/bead/armory)
 "nJ" = (
 /obj/machinery/door/airlock/security,
 /obj/structure/cable,
@@ -409,6 +414,20 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/bead/maintenance/starboard)
+"qJ" = (
+/obj/structure/closet/secure_closet/captains,
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating_new{
+	dir = 8
+	},
+/obj/item/ammo_box/a357,
+/obj/item/ammo_box/a357,
+/obj/item/gun/ballistic/revolver/mateba,
+/obj/item/areaeditor/shuttle,
+/turf/open/floor/iron/dark,
+/area/shuttle/voidcrew/bead/bridge)
 "rb" = (
 /obj/effect/turf_decal/tile/dark_red{
 	dir = 4
@@ -811,11 +830,6 @@
 	},
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/bead/brig)
-"Ih" = (
-/obj/machinery/vending/security/marine/solgov,
-/obj/effect/turf_decal/bot_red,
-/turf/open/floor/iron/dark,
-/area/shuttle/voidcrew/bead/armory)
 "It" = (
 /obj/structure/rack,
 /obj/item/storage/bag/ore,
@@ -932,20 +946,6 @@
 	},
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/bead/maintenance/port)
-"PG" = (
-/obj/structure/closet/secure_closet/captains,
-/obj/structure/railing{
-	dir = 8
-	},
-/obj/effect/turf_decal/siding/thinplating_new{
-	dir = 8
-	},
-/obj/item/ammo_box/a357,
-/obj/item/ammo_box/a357,
-/obj/item/gun/ballistic/revolver/mateba,
-/obj/item/areaeditor/shuttle,
-/turf/open/floor/iron/dark,
-/area/shuttle/voidcrew/bead/bridge)
 "PZ" = (
 /obj/machinery/door/airlock/engineering/glass,
 /obj/structure/cable,
@@ -979,7 +979,7 @@
 /obj/structure/cable,
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/table/reinforced/rglass,
-/obj/item/storage/backpack/duffelbag/med/surgery{
+/obj/item/storage/medkit/surgery{
 	pixel_y = 14
 	},
 /obj/item/storage/medkit{
@@ -1337,7 +1337,7 @@ ku
 pC
 FP
 kB
-Ih
+hk
 ku
 lX
 QT
@@ -1379,7 +1379,7 @@ ku
 wm
 Kg
 gk
-nD
+ac
 ku
 rb
 ss
@@ -1590,7 +1590,7 @@ IQ
 IQ
 GX
 jM
-PG
+qJ
 Yb
 pB
 Yb
diff --git a/_maps/voidcrew/ships/ship_nano_phalanx_a.dmm b/_maps/voidcrew/ships/ship_nano_phalanx_a.dmm
index 8bcd7b532f8..6dc66b37397 100644
--- a/_maps/voidcrew/ships/ship_nano_phalanx_a.dmm
+++ b/_maps/voidcrew/ships/ship_nano_phalanx_a.dmm
@@ -13,6 +13,14 @@
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/carpet/executive,
 /area/shuttle/voidcrew/phalanx/bridge/a)
+"ac" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/orange,
+/obj/structure/fireaxecabinet/directional/east{
+	populate_contents = 0
+	},
+/obj/item/knife/combat/survival,
+/turf/open/floor/plating,
+/area/shuttle/voidcrew/phalanx/engineering/a)
 "ad" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/plating,
@@ -225,6 +233,19 @@
 	},
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/phalanx/hallway/aft/a)
+"ep" = (
+/obj/structure/closet/secure_closet/personal/cabinet,
+/obj/item/soulstone/anybody/chaplain,
+/obj/effect/spawner/random/modsuit/base_tier,
+/obj/item/book/granter/action/spell/smoke/lesser,
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4
+	},
+/obj/structure/sign/poster/official/bless_this_spess{
+	pixel_y = 32
+	},
+/turf/open/floor/carpet/black,
+/area/shuttle/voidcrew/phalanx/chapel/office/a)
 "ew" = (
 /obj/item/kirbyplants/random,
 /obj/machinery/light/small{
@@ -687,16 +708,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/voidcrew/phalanx/medbay/storage/a)
-"lQ" = (
-/obj/structure/closet/secure_closet/captains,
-/obj/effect/turf_decal/siding/wood{
-	dir = 2
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/shuttle/voidcrew/phalanx/bridge/captain/a)
 "lT" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
@@ -1318,6 +1329,16 @@
 "tZ" = (
 /turf/open/floor/carpet/red,
 /area/shuttle/voidcrew/phalanx/chapel/a)
+"ut" = (
+/obj/structure/closet/secure_closet/captains,
+/obj/effect/turf_decal/siding/wood{
+	dir = 2
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/shuttle/voidcrew/phalanx/bridge/captain/a)
 "uF" = (
 /obj/structure/chair/stool/directional/west,
 /obj/machinery/airalarm/directional/west,
@@ -1427,6 +1448,14 @@
 /obj/machinery/airalarm/directional/west,
 /turf/open/floor/carpet/executive,
 /area/shuttle/voidcrew/phalanx/bridge/a)
+"vW" = (
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/displaycase/captain,
+/obj/effect/turf_decal/siding/wood{
+	dir = 2
+	},
+/turf/open/floor/wood,
+/area/shuttle/voidcrew/phalanx/bridge/captain/a)
 "vX" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
 /obj/structure/cable,
@@ -2264,6 +2293,20 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/phalanx/hallway/central/a)
+"IK" = (
+/obj/structure/window/reinforced/tinted{
+	dir = 8
+	},
+/obj/item/kirbyplants/random,
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/item/gun/ballistic/shotgun/doublebarrel,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/shuttle/voidcrew/phalanx/dorms/a)
 "IR" = (
 /obj/machinery/cryopod{
 	dir = 8
@@ -2312,14 +2355,6 @@
 "Ju" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/voidcrew/phalanx/engineering/storage/a)
-"Jx" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/displaycase/captain,
-/obj/effect/turf_decal/siding/wood{
-	dir = 2
-	},
-/turf/open/floor/wood,
-/area/shuttle/voidcrew/phalanx/bridge/captain/a)
 "JB" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/iron,
@@ -2338,11 +2373,6 @@
 /obj/effect/turf_decal/trimline/white/filled/corner,
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/phalanx/medbay/morgue/a)
-"JJ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/orange,
-/obj/structure/fireaxecabinet/directional/east,
-/turf/open/floor/plating,
-/area/shuttle/voidcrew/phalanx/engineering/a)
 "Ka" = (
 /obj/modular_map_root/ship_upgrade{
 	key = "phalanx_bay_north"
@@ -2483,20 +2513,6 @@
 /obj/structure/window/reinforced/spawner/directional/east,
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/voidcrew/phalanx/medbay/storage/a)
-"LA" = (
-/obj/structure/window/reinforced/tinted{
-	dir = 8
-	},
-/obj/item/kirbyplants/random,
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/item/gun/ballistic/shotgun/doublebarrel,
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
-	},
-/turf/open/floor/wood,
-/area/shuttle/voidcrew/phalanx/dorms/a)
 "LB" = (
 /obj/machinery/griddle,
 /obj/machinery/airalarm/directional/north,
@@ -2779,19 +2795,6 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/nitrogen_output,
 /turf/open/floor/engine/n2,
 /area/shuttle/voidcrew/phalanx/engineering/atmospherics/a)
-"Os" = (
-/obj/structure/closet/secure_closet/personal/cabinet,
-/obj/item/soulstone/anybody/chaplain,
-/obj/item/mod/control/pre_equipped/responsory/inquisitory,
-/obj/item/book/granter/action/spell/smoke/lesser,
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 4
-	},
-/obj/structure/sign/poster/official/bless_this_spess{
-	pixel_y = 32
-	},
-/turf/open/floor/carpet/black,
-/area/shuttle/voidcrew/phalanx/chapel/office/a)
 "Ov" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/voidcrew/phalanx/kitchen/a)
@@ -2875,6 +2878,19 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/mineral/titanium/tiled/purple,
 /area/shuttle/voidcrew/phalanx/hallway/central/a)
+"Py" = (
+/obj/machinery/suit_storage_unit/base_tier{
+	mask_type = /obj/item/clothing/mask/gas/atmos/captain;
+	storage_type = /obj/item/tank/jetpack/oxygen/captain
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 2
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/shuttle/voidcrew/phalanx/bridge/captain/a)
 "PA" = (
 /obj/structure/rack,
 /obj/item/pickaxe,
@@ -3177,16 +3193,6 @@
 /obj/structure/table/wood,
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/phalanx/cafeteria/a)
-"TS" = (
-/obj/machinery/suit_storage_unit/captain,
-/obj/effect/turf_decal/siding/wood{
-	dir = 2
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
-	},
-/turf/open/floor/wood,
-/area/shuttle/voidcrew/phalanx/bridge/captain/a)
 "TX" = (
 /obj/machinery/atmospherics/components/binary/pump{
 	dir = 8;
@@ -3779,7 +3785,7 @@ oy
 Mo
 dj
 Gd
-JJ
+ac
 PS
 MU
 oG
@@ -4648,7 +4654,7 @@ jK
 Pd
 jK
 CO
-Os
+ep
 xU
 Gh
 CO
@@ -4985,7 +4991,7 @@ oZ
 oZ
 oZ
 iD
-LA
+IK
 Kc
 xp
 dQ
@@ -5084,7 +5090,7 @@ oZ
 YY
 LL
 Ta
-TS
+Py
 KT
 FQ
 lI
@@ -5212,7 +5218,7 @@ oZ
 KT
 vE
 kO
-Jx
+vW
 KT
 sn
 Gz
@@ -5244,7 +5250,7 @@ oZ
 KT
 mY
 KM
-lQ
+ut
 KT
 Tg
 EJ
diff --git a/_maps/voidcrew/ships/ship_nano_phalanx_b.dmm b/_maps/voidcrew/ships/ship_nano_phalanx_b.dmm
index 0f6fa3dc275..25547e8a612 100644
--- a/_maps/voidcrew/ships/ship_nano_phalanx_b.dmm
+++ b/_maps/voidcrew/ships/ship_nano_phalanx_b.dmm
@@ -30,6 +30,14 @@
 	},
 /turf/open/floor/wood,
 /area/shuttle/voidcrew/phalanx/bridge/captain/b)
+"ae" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/orange,
+/obj/structure/fireaxecabinet/directional/east{
+	populate_contents = 0
+	},
+/obj/item/knife/combat/survival,
+/turf/open/floor/plating,
+/area/shuttle/voidcrew/phalanx/engineering/b)
 "aq" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
@@ -386,11 +394,6 @@
 	},
 /turf/open/floor/wood/large,
 /area/shuttle/voidcrew/phalanx/hallway/central/b)
-"dt" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/orange,
-/obj/structure/fireaxecabinet/directional/east,
-/turf/open/floor/plating,
-/area/shuttle/voidcrew/phalanx/engineering/b)
 "du" = (
 /obj/machinery/porta_turret/ship_defense{
 	dir = 2
@@ -935,6 +938,19 @@
 	},
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/phalanx/cargo/mining/b)
+"jo" = (
+/obj/machinery/suit_storage_unit/base_tier{
+	mask_type = /obj/item/clothing/mask/gas/atmos/captain;
+	storage_type = /obj/item/tank/jetpack/oxygen/captain
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 2
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/shuttle/voidcrew/phalanx/bridge/captain/b)
 "jp" = (
 /obj/item/kirbyplants/random,
 /obj/effect/turf_decal/siding/wood{
@@ -1152,20 +1168,6 @@
 /obj/machinery/washing_machine,
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/phalanx/cargo/b)
-"lQ" = (
-/obj/structure/window/reinforced/tinted{
-	dir = 8
-	},
-/obj/item/kirbyplants/random,
-/obj/machinery/light/warm{
-	dir = 1
-	},
-/obj/item/gun/ballistic/shotgun/doublebarrel,
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
-	},
-/turf/open/floor/wood,
-/area/shuttle/voidcrew/phalanx/dorms/b)
 "lU" = (
 /obj/machinery/door/airlock/medical,
 /obj/machinery/door/firedoor,
@@ -1885,16 +1887,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/phalanx/cargo/b)
-"vE" = (
-/obj/structure/closet/secure_closet/captains,
-/obj/effect/turf_decal/siding/wood{
-	dir = 2
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/shuttle/voidcrew/phalanx/bridge/captain/b)
 "vF" = (
 /obj/machinery/power/terminal{
 	dir = 8
@@ -2146,6 +2138,20 @@
 /obj/machinery/door/firedoor/heavy,
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/phalanx/cargo/mining/b)
+"yC" = (
+/obj/structure/window/reinforced/tinted{
+	dir = 8
+	},
+/obj/item/kirbyplants/random,
+/obj/machinery/light/warm{
+	dir = 1
+	},
+/obj/item/gun/ballistic/shotgun/doublebarrel,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/shuttle/voidcrew/phalanx/dorms/b)
 "zb" = (
 /obj/structure/chair/sofa/middle{
 	dir = 8
@@ -2474,6 +2480,14 @@
 /obj/machinery/light/directional/north,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/phalanx/engineering/b)
+"DF" = (
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/displaycase/captain,
+/obj/effect/turf_decal/siding/wood{
+	dir = 2
+	},
+/turf/open/floor/wood,
+/area/shuttle/voidcrew/phalanx/bridge/captain/b)
 "DJ" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /obj/effect/turf_decal/siding/wood{
@@ -3009,19 +3023,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/phalanx/security/b)
-"Jj" = (
-/obj/structure/closet/secure_closet/personal/cabinet,
-/obj/item/soulstone/anybody/chaplain,
-/obj/item/mod/control/pre_equipped/responsory/inquisitory,
-/obj/item/book/granter/action/spell/smoke/lesser,
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 4
-	},
-/obj/structure/sign/poster/official/bless_this_spess{
-	pixel_y = 32
-	},
-/turf/open/floor/wood,
-/area/shuttle/voidcrew/phalanx/chapel/office/b)
 "Jm" = (
 /obj/machinery/light{
 	dir = 8
@@ -3149,14 +3150,6 @@
 "KY" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/voidcrew/phalanx/medbay/b)
-"Lb" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/displaycase/captain,
-/obj/effect/turf_decal/siding/wood{
-	dir = 2
-	},
-/turf/open/floor/wood,
-/area/shuttle/voidcrew/phalanx/bridge/captain/b)
 "Ld" = (
 /obj/machinery/power/port_gen/pacman/pre_loaded{
 	anchored = 1
@@ -3602,6 +3595,16 @@
 /obj/structure/closet/crate/freezer/blood,
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/voidcrew/phalanx/medbay/storage/b)
+"Qg" = (
+/obj/structure/closet/secure_closet/captains,
+/obj/effect/turf_decal/siding/wood{
+	dir = 2
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/shuttle/voidcrew/phalanx/bridge/captain/b)
 "Qm" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/voidcrew/phalanx/chapel/office/b)
@@ -3634,16 +3637,6 @@
 	},
 /turf/open/floor/wood/large,
 /area/shuttle/voidcrew/phalanx/hallway/aft/b)
-"QQ" = (
-/obj/machinery/suit_storage_unit/captain,
-/obj/effect/turf_decal/siding/wood{
-	dir = 2
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
-	},
-/turf/open/floor/wood,
-/area/shuttle/voidcrew/phalanx/bridge/captain/b)
 "QT" = (
 /obj/structure/sign/poster/official/twelve_gauge{
 	pixel_y = 32
@@ -4135,6 +4128,19 @@
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/voidcrew/phalanx/cargo/mining/b)
+"XO" = (
+/obj/structure/closet/secure_closet/personal/cabinet,
+/obj/item/soulstone/anybody/chaplain,
+/obj/effect/spawner/random/modsuit/base_tier,
+/obj/item/book/granter/action/spell/smoke/lesser,
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4
+	},
+/obj/structure/sign/poster/official/bless_this_spess{
+	pixel_y = 32
+	},
+/turf/open/floor/wood,
+/area/shuttle/voidcrew/phalanx/chapel/office/b)
 "XT" = (
 /obj/machinery/light{
 	dir = 4
@@ -4561,7 +4567,7 @@ Ld
 NN
 Mo
 Fe
-dt
+ae
 qO
 LY
 re
@@ -5430,7 +5436,7 @@ qZ
 HL
 qZ
 Qm
-Jj
+XO
 FI
 CE
 Qm
@@ -5767,7 +5773,7 @@ oZ
 oZ
 oZ
 eR
-lQ
+yC
 di
 db
 Bf
@@ -5866,7 +5872,7 @@ oZ
 iN
 BV
 el
-QQ
+jo
 zo
 Cm
 sc
@@ -5994,7 +6000,7 @@ oZ
 zo
 ad
 Mv
-Lb
+DF
 zo
 QT
 Gz
@@ -6026,7 +6032,7 @@ oZ
 zo
 WQ
 dC
-vE
+Qg
 zo
 aa
 cL
diff --git a/_maps/voidcrew/ships/ship_nano_phalanx_c.dmm b/_maps/voidcrew/ships/ship_nano_phalanx_c.dmm
index b1e633d3858..7478d56ef6c 100644
--- a/_maps/voidcrew/ships/ship_nano_phalanx_c.dmm
+++ b/_maps/voidcrew/ships/ship_nano_phalanx_c.dmm
@@ -20,6 +20,14 @@
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/wood,
 /area/shuttle/voidcrew/phalanx/bridge/captain/c)
+"ad" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/orange,
+/obj/structure/fireaxecabinet/directional/east{
+	populate_contents = 0
+	},
+/obj/item/knife/combat/survival,
+/turf/open/floor/plating,
+/area/shuttle/voidcrew/phalanx/engineering/c)
 "af" = (
 /obj/machinery/door/airlock/medical,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -611,16 +619,6 @@
 /obj/structure/cable,
 /turf/open/floor/engine,
 /area/shuttle/voidcrew/phalanx/engineering/storage/c)
-"gT" = (
-/obj/structure/closet/secure_closet/captains,
-/obj/effect/turf_decal/siding/wood{
-	dir = 2
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/shuttle/voidcrew/phalanx/bridge/captain/c)
 "gY" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1969,6 +1967,20 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/phalanx/engineering/c)
+"zf" = (
+/obj/structure/window/reinforced/tinted{
+	dir = 8
+	},
+/obj/item/kirbyplants/random,
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/item/gun/ballistic/shotgun/doublebarrel,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/shuttle/voidcrew/phalanx/dorms/c)
 "zi" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/voidcrew/phalanx/dorms/c)
@@ -2061,6 +2073,25 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/phalanx/kitchen/c)
+"Ay" = (
+/obj/structure/closet/secure_closet/personal/cabinet,
+/obj/item/soulstone/anybody/chaplain,
+/obj/effect/spawner/random/modsuit/base_tier,
+/obj/item/book/granter/action/spell/smoke/lesser,
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4
+	},
+/obj/structure/sign/poster/official/bless_this_spess{
+	pixel_y = 32
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/shuttle/voidcrew/phalanx/chapel/office/c)
 "AC" = (
 /obj/machinery/mass_driver{
 	id = "phalanx_massdriver"
@@ -2704,6 +2735,19 @@
 /obj/structure/cable,
 /turf/open/floor/grass,
 /area/shuttle/voidcrew/phalanx/chapel/c)
+"IO" = (
+/obj/machinery/suit_storage_unit/base_tier{
+	mask_type = /obj/item/clothing/mask/gas/atmos/captain;
+	storage_type = /obj/item/tank/jetpack/oxygen/captain
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 2
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/shuttle/voidcrew/phalanx/bridge/captain/c)
 "IS" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
@@ -2896,16 +2940,6 @@
 	},
 /turf/open/floor/wood,
 /area/shuttle/voidcrew/phalanx/cafeteria/c)
-"Lc" = (
-/obj/machinery/suit_storage_unit/captain,
-/obj/effect/turf_decal/siding/wood{
-	dir = 2
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
-	},
-/turf/open/floor/wood,
-/area/shuttle/voidcrew/phalanx/bridge/captain/c)
 "Le" = (
 /obj/effect/spawner/structure/window/reinforced/shuttle,
 /turf/open/floor/plating,
@@ -3358,6 +3392,16 @@
 	},
 /turf/open/floor/wood,
 /area/shuttle/voidcrew/phalanx/dorms/c)
+"Rs" = (
+/obj/structure/closet/secure_closet/captains,
+/obj/effect/turf_decal/siding/wood{
+	dir = 2
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/shuttle/voidcrew/phalanx/bridge/captain/c)
 "RC" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/chair/sofa/bench/left{
@@ -3613,39 +3657,6 @@
 	},
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/phalanx/hallway/aft/c)
-"Ut" = (
-/obj/structure/closet/secure_closet/personal/cabinet,
-/obj/item/soulstone/anybody/chaplain,
-/obj/item/mod/control/pre_equipped/responsory/inquisitory,
-/obj/item/book/granter/action/spell/smoke/lesser,
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 4
-	},
-/obj/structure/sign/poster/official/bless_this_spess{
-	pixel_y = 32
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
-	},
-/turf/open/floor/wood,
-/area/shuttle/voidcrew/phalanx/chapel/office/c)
-"UB" = (
-/obj/structure/window/reinforced/tinted{
-	dir = 8
-	},
-/obj/item/kirbyplants/random,
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/item/gun/ballistic/shotgun/doublebarrel,
-/obj/effect/turf_decal/siding/wood{
-	dir = 1
-	},
-/turf/open/floor/wood,
-/area/shuttle/voidcrew/phalanx/dorms/c)
 "UE" = (
 /obj/structure/cable,
 /obj/item/kirbyplants/organic/plant11,
@@ -3745,14 +3756,6 @@
 /obj/structure/table/wood/poker,
 /turf/open/floor/wood,
 /area/shuttle/voidcrew/phalanx/dorms/c)
-"VE" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/displaycase/captain,
-/obj/effect/turf_decal/siding/wood{
-	dir = 2
-	},
-/turf/open/floor/wood,
-/area/shuttle/voidcrew/phalanx/bridge/captain/c)
 "VS" = (
 /obj/machinery/vending/clothing,
 /obj/effect/turf_decal/trimline/green/filled/line{
@@ -3889,6 +3892,14 @@
 	},
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/phalanx/hallway/aft/c)
+"Xf" = (
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/displaycase/captain,
+/obj/effect/turf_decal/siding/wood{
+	dir = 2
+	},
+/turf/open/floor/wood,
+/area/shuttle/voidcrew/phalanx/bridge/captain/c)
 "Xj" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -4127,11 +4138,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/phalanx/engineering/c)
-"ZS" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/orange,
-/obj/structure/fireaxecabinet/directional/east,
-/turf/open/floor/plating,
-/area/shuttle/voidcrew/phalanx/engineering/c)
 "ZZ" = (
 /obj/structure/closet/secure_closet/freezer/fridge/open,
 /turf/open/floor/iron/kitchen_coldroom/freezerfloor,
@@ -4282,7 +4288,7 @@ fD
 hy
 NN
 YU
-ZS
+ad
 tg
 SJ
 xS
@@ -5151,7 +5157,7 @@ Sm
 RL
 Sm
 Og
-Ut
+Ay
 IY
 Vf
 Og
@@ -5488,7 +5494,7 @@ oZ
 oZ
 oZ
 RO
-UB
+zf
 pW
 hf
 VA
@@ -5587,7 +5593,7 @@ oZ
 Ns
 Rb
 KW
-Lc
+IO
 EN
 RR
 Wn
@@ -5715,7 +5721,7 @@ oZ
 EN
 Xn
 ys
-VE
+Xf
 EN
 lo
 Lo
@@ -5747,7 +5753,7 @@ oZ
 EN
 Fh
 Hr
-gT
+Rs
 EN
 pJ
 Jy
diff --git a/_maps/voidcrew/ships/ship_nano_phalanx_d.dmm b/_maps/voidcrew/ships/ship_nano_phalanx_d.dmm
index c96bd1930f5..0ea55c2915e 100644
--- a/_maps/voidcrew/ships/ship_nano_phalanx_d.dmm
+++ b/_maps/voidcrew/ships/ship_nano_phalanx_d.dmm
@@ -1,14 +1,4 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"aa" = (
-/obj/structure/closet/secure_closet/captains,
-/obj/effect/turf_decal/siding/wood{
-	dir = 2
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 4
-	},
-/turf/open/floor/wood,
-/area/shuttle/voidcrew/phalanx/bridge/captain/d)
 "ab" = (
 /obj/effect/landmark/event_spawn,
 /turf/open/floor/wood,
@@ -22,10 +12,26 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/wood,
 /area/shuttle/voidcrew/phalanx/hallway/central/d)
+"ae" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/orange,
+/obj/structure/fireaxecabinet/directional/east{
+	populate_contents = 0
+	},
+/obj/item/knife/combat/survival,
+/turf/open/floor/plating,
+/area/shuttle/voidcrew/phalanx/engineering/d)
 "ax" = (
 /obj/structure/tank_dispenser/oxygen,
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/phalanx/cargo/mining/d)
+"ay" = (
+/obj/structure/window/reinforced/spawner/directional/west,
+/obj/structure/displaycase/captain,
+/obj/effect/turf_decal/siding/wood{
+	dir = 2
+	},
+/turf/open/floor/wood,
+/area/shuttle/voidcrew/phalanx/bridge/captain/d)
 "aG" = (
 /obj/effect/turf_decal/trimline/yellow/filled/warning{
 	dir = 8
@@ -670,6 +676,19 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/voidcrew/phalanx/medbay/storage/d)
+"jn" = (
+/obj/machinery/suit_storage_unit/base_tier{
+	mask_type = /obj/item/clothing/mask/gas/atmos/captain;
+	storage_type = /obj/item/tank/jetpack/oxygen/captain
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 2
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/shuttle/voidcrew/phalanx/bridge/captain/d)
 "jt" = (
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/phalanx/engineering/d)
@@ -789,6 +808,19 @@
 	},
 /turf/open/floor/wood,
 /area/shuttle/voidcrew/phalanx/hallway/aft/d)
+"lq" = (
+/obj/structure/closet/secure_closet/personal/cabinet,
+/obj/item/soulstone/anybody/chaplain,
+/obj/effect/spawner/random/modsuit/base_tier,
+/obj/item/book/granter/action/spell/smoke/lesser,
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4
+	},
+/obj/structure/sign/poster/official/bless_this_spess{
+	pixel_y = 32
+	},
+/turf/open/floor/bamboo/tatami,
+/area/shuttle/voidcrew/phalanx/chapel/office/d)
 "lv" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
 /turf/open/floor/engine,
@@ -819,16 +851,6 @@
 	},
 /turf/open/floor/carpet/executive,
 /area/shuttle/voidcrew/phalanx/bridge/d)
-"lI" = (
-/obj/machinery/suit_storage_unit/captain,
-/obj/effect/turf_decal/siding/wood{
-	dir = 2
-	},
-/obj/effect/turf_decal/siding/wood{
-	dir = 8
-	},
-/turf/open/floor/wood,
-/area/shuttle/voidcrew/phalanx/bridge/captain/d)
 "lJ" = (
 /obj/structure/table/wood,
 /obj/item/flashlight/lantern/on{
@@ -2178,19 +2200,6 @@
 /obj/structure/window/reinforced/spawner/directional/south,
 /turf/open/floor/wood/tile,
 /area/shuttle/voidcrew/phalanx/kitchen/d)
-"Dm" = (
-/obj/structure/closet/secure_closet/personal/cabinet,
-/obj/item/soulstone/anybody/chaplain,
-/obj/item/mod/control/pre_equipped/responsory/inquisitory,
-/obj/item/book/granter/action/spell/smoke/lesser,
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 4
-	},
-/obj/structure/sign/poster/official/bless_this_spess{
-	pixel_y = 32
-	},
-/turf/open/floor/bamboo/tatami,
-/area/shuttle/voidcrew/phalanx/chapel/office/d)
 "Do" = (
 /obj/machinery/light/small/directional/east,
 /obj/structure/rack,
@@ -2482,6 +2491,16 @@
 	},
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/phalanx/security/d)
+"Gg" = (
+/obj/structure/closet/secure_closet/captains,
+/obj/effect/turf_decal/siding/wood{
+	dir = 2
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/shuttle/voidcrew/phalanx/bridge/captain/d)
 "Gi" = (
 /obj/structure/window/reinforced/plasma/spawner/directional/south,
 /obj/structure/window/reinforced/plasma/spawner/directional/south,
@@ -2743,14 +2762,6 @@
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/phalanx/cargo/d)
-"Ju" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/displaycase/captain,
-/obj/effect/turf_decal/siding/wood{
-	dir = 2
-	},
-/turf/open/floor/wood,
-/area/shuttle/voidcrew/phalanx/bridge/captain/d)
 "JB" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -2952,6 +2963,19 @@
 /obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/phalanx/security/d)
+"MO" = (
+/obj/structure/window/reinforced/tinted{
+	dir = 8
+	},
+/obj/item/kirbyplants/random,
+/obj/machinery/light/warm/directional/north,
+/obj/item/gun/ballistic/shotgun/doublebarrel,
+/obj/item/flashlight/lantern/on{
+	pixel_x = -6;
+	pixel_y = 6
+	},
+/turf/open/floor/bamboo/tatami,
+/area/shuttle/voidcrew/phalanx/dorms/d)
 "MU" = (
 /obj/machinery/firealarm/directional/north,
 /turf/open/floor/iron,
@@ -3464,11 +3488,6 @@
 "Tl" = (
 /turf/open/floor/iron/kitchen_coldroom/freezerfloor,
 /area/shuttle/voidcrew/phalanx/kitchen/d)
-"Tn" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/orange,
-/obj/structure/fireaxecabinet/directional/east,
-/turf/open/floor/plating,
-/area/shuttle/voidcrew/phalanx/engineering/d)
 "Tp" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -3805,19 +3824,6 @@
 /obj/effect/mapping_helpers/airlock/access/any/engineering/general,
 /turf/open/floor/engine,
 /area/shuttle/voidcrew/phalanx/engineering/storage/d)
-"XP" = (
-/obj/structure/window/reinforced/tinted{
-	dir = 8
-	},
-/obj/item/kirbyplants/random,
-/obj/machinery/light/warm/directional/north,
-/obj/item/gun/ballistic/shotgun/doublebarrel,
-/obj/item/flashlight/lantern/on{
-	pixel_x = -6;
-	pixel_y = 6
-	},
-/turf/open/floor/bamboo/tatami,
-/area/shuttle/voidcrew/phalanx/dorms/d)
 "XS" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /turf/open/floor/bamboo,
@@ -4185,7 +4191,7 @@ rW
 Vv
 hy
 CH
-Tn
+ae
 NP
 sp
 wT
@@ -5054,7 +5060,7 @@ lV
 Fv
 lV
 tL
-Dm
+lq
 RR
 pa
 tL
@@ -5391,7 +5397,7 @@ oZ
 oZ
 oZ
 ZS
-XP
+MO
 Ew
 do
 iE
@@ -5490,7 +5496,7 @@ oZ
 ka
 bz
 YQ
-lI
+jn
 Ub
 gM
 GD
@@ -5618,7 +5624,7 @@ oZ
 Ub
 Pe
 DC
-Ju
+ay
 Ub
 RD
 Ad
@@ -5650,7 +5656,7 @@ oZ
 Ub
 bM
 VM
-aa
+Gg
 Ub
 Gc
 sm
diff --git a/_maps/voidcrew/ships/ship_nano_thunderbird.dmm b/_maps/voidcrew/ships/ship_nano_thunderbird.dmm
index 73abf9e03ab..62da8e0cfd8 100644
--- a/_maps/voidcrew/ships/ship_nano_thunderbird.dmm
+++ b/_maps/voidcrew/ships/ship_nano_thunderbird.dmm
@@ -9,14 +9,6 @@
 /obj/structure/window/reinforced/spawner/directional/east,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/voidcrew/thunderbird/dormitories)
-"cJ" = (
-/obj/structure/rack,
-/obj/item/storage/box/rubbershot,
-/obj/item/storage/box/rubbershot,
-/obj/item/storage/box/rubbershot,
-/obj/item/storage/box/rubbershot,
-/turf/open/floor/mineral/titanium,
-/area/shuttle/voidcrew/thunderbird/security/armory)
 "cM" = (
 /obj/structure/table/reinforced,
 /obj/item/food/pizza/meat/raw,
@@ -28,13 +20,6 @@
 /obj/structure/cable,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/voidcrew/thunderbird/dormitories)
-"dy" = (
-/obj/structure/rack,
-/obj/machinery/airalarm/directional/south,
-/obj/item/gun/ballistic/shotgun/riot,
-/obj/item/gun/ballistic/shotgun/riot,
-/turf/open/floor/mineral/titanium,
-/area/shuttle/voidcrew/thunderbird/security/armory)
 "dB" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/mineral/titanium,
@@ -250,11 +235,6 @@
 /obj/docking_port/mobile/voidcrew/thunderbird,
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/thunderbird/dormitories)
-"oU" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/vending/security/marine/solgov,
-/turf/open/floor/mineral/titanium,
-/area/shuttle/voidcrew/thunderbird/security)
 "po" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -299,6 +279,14 @@
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/voidcrew/thunderbird/security)
+"ra" = (
+/obj/structure/rack,
+/obj/item/storage/box/rubbershot,
+/obj/item/storage/box/rubbershot,
+/obj/item/storage/box/rubbershot,
+/obj/item/storage/box/rubbershot,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/voidcrew/thunderbird/security/armory)
 "sZ" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /turf/open/floor/mineral/titanium,
@@ -400,6 +388,14 @@
 /obj/machinery/airalarm/directional/south,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/voidcrew/thunderbird/dormitories)
+"xS" = (
+/obj/structure/rack,
+/obj/item/gun/energy/laser,
+/obj/item/gun/energy/laser,
+/obj/item/gun/energy/laser,
+/obj/item/gun/energy/laser,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/voidcrew/thunderbird/security/armory)
 "yj" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/voidcrew/thunderbird/cargo_bay)
@@ -500,7 +496,7 @@
 /area/shuttle/voidcrew/thunderbird/security/armory)
 "Fc" = (
 /obj/structure/table/reinforced,
-/obj/item/storage/backpack/duffelbag/med/surgery,
+/obj/item/storage/medkit/surgery,
 /obj/effect/turf_decal/tile/blue,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/voidcrew/thunderbird/dormitories)
@@ -569,6 +565,13 @@
 /obj/machinery/suit_storage_unit/ert/engineer,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/thunderbird/engineering)
+"JN" = (
+/obj/structure/rack,
+/obj/machinery/airalarm/directional/south,
+/obj/item/gun/ballistic/shotgun/riot,
+/obj/item/gun/ballistic/shotgun/riot,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/voidcrew/thunderbird/security/armory)
 "Km" = (
 /obj/structure/rack,
 /obj/item/gun/energy/disabler,
@@ -687,6 +690,12 @@
 "SG" = (
 /turf/open/floor/mineral/titanium,
 /area/shuttle/voidcrew/thunderbird/dormitories)
+"SL" = (
+/obj/structure/rack,
+/obj/item/gun/energy/e_gun,
+/obj/item/gun/energy/e_gun,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/voidcrew/thunderbird/security/armory)
 "SQ" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/voidcrew/thunderbird/bridge)
@@ -766,12 +775,6 @@
 	},
 /turf/open/floor/mineral/titanium,
 /area/shuttle/voidcrew/thunderbird/dormitories)
-"Xr" = (
-/obj/structure/rack,
-/obj/item/gun/energy/e_gun,
-/obj/item/gun/energy/e_gun,
-/turf/open/floor/mineral/titanium,
-/area/shuttle/voidcrew/thunderbird/security/armory)
 "Xz" = (
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/machinery/light{
@@ -810,6 +813,11 @@
 /obj/machinery/suit_storage_unit/ert/medic,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/voidcrew/thunderbird/dormitories)
+"YP" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/vending/security/marine/solgov,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/voidcrew/thunderbird/security)
 "YX" = (
 /obj/effect/turf_decal/tile/blue,
 /obj/machinery/computer/rdconsole{
@@ -844,14 +852,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/voidcrew/thunderbird/cargo_bay)
-"ZX" = (
-/obj/structure/rack,
-/obj/item/gun/energy/laser,
-/obj/item/gun/energy/laser,
-/obj/item/gun/energy/laser,
-/obj/item/gun/energy/laser,
-/turf/open/floor/mineral/titanium,
-/area/shuttle/voidcrew/thunderbird/security/armory)
 
 (1,1,1) = {"
 zq
@@ -972,10 +972,10 @@ Ww
 Ww
 Xz
 Ub
-cJ
+ra
 in
 EN
-dy
+JN
 Ub
 zq
 "}
@@ -996,7 +996,7 @@ GO
 ka
 qj
 in
-ZX
+xS
 Ub
 zq
 "}
@@ -1024,7 +1024,7 @@ zq
 (9,1,1) = {"
 zq
 OD
-oU
+YP
 kE
 zk
 zk
@@ -1038,7 +1038,7 @@ mt
 mt
 pR
 XM
-Xr
+SL
 Ub
 zq
 "}
diff --git a/_maps/voidcrew/ships/ship_nt_patrol.dmm b/_maps/voidcrew/ships/ship_nt_patrol.dmm
index 01b8e5328f4..ae1a76eb35b 100644
--- a/_maps/voidcrew/ships/ship_nt_patrol.dmm
+++ b/_maps/voidcrew/ships/ship_nt_patrol.dmm
@@ -352,14 +352,6 @@
 	pixel_y = 1
 	},
 /turf/open/floor/plating/airless,
-/area/shuttle/voidcrew/nt_patrol{
-	requires_power = 0
-	})
-"aL" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plating,
 /area/shuttle/voidcrew/nt_patrol{
 	requires_power = 0
 	})
@@ -882,14 +874,6 @@
 	dir = 1
 	},
 /turf/open/floor/pod/dark,
-/area/shuttle/voidcrew/nt_patrol{
-	requires_power = 0
-	})
-"gY" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/pod/dark,
 /area/shuttle/voidcrew/nt_patrol{
 	requires_power = 0
 	})
@@ -1065,13 +1049,6 @@
 /obj/structure/sign/poster/official/random/directional/east,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
-/area/shuttle/voidcrew/nt_patrol{
-	requires_power = 0
-	})
-"OL" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/obj/effect/turf_decal/tile/dark_blue/opposingcorners,
-/turf/open/floor/iron,
 /area/shuttle/voidcrew/nt_patrol{
 	requires_power = 0
 	})
@@ -1174,7 +1151,7 @@ er
 ey
 ay
 Oe
-OL
+Oe
 zw
 dy
 br
@@ -1227,7 +1204,7 @@ aC
 aW
 aj
 bg
-gY
+bA
 JT
 aj
 km
@@ -1266,7 +1243,7 @@ bm
 by
 bm
 mU
-aL
+aD
 bP
 bX
 ep
@@ -1281,7 +1258,7 @@ ah
 an
 aj
 bt
-gY
+bA
 bI
 aj
 bO
diff --git a/_maps/voidcrew/ships/ship_osprey.dmm b/_maps/voidcrew/ships/ship_osprey.dmm
index 72fd61c6eaa..0b6ce76bc1b 100644
--- a/_maps/voidcrew/ships/ship_osprey.dmm
+++ b/_maps/voidcrew/ships/ship_osprey.dmm
@@ -36,6 +36,20 @@
 /obj/effect/turf_decal/siding/wood,
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/osprey/medbay/lobby)
+"ai" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/binary/pump/on/layer4{
+	dir = 1;
+	name = "Air to Distro"
+	},
+/obj/structure/fireaxecabinet/directional/west{
+	populate_contents = 0
+	},
+/obj/item/knife/combat/survival,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/shuttle/voidcrew/osprey/engineering/atmospherics)
 "az" = (
 /obj/machinery/computer/rdconsole{
 	dir = 4
@@ -2483,6 +2497,16 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/osprey/hallway/port)
+"wU" = (
+/obj/structure/closet/secure_closet/captains{
+	name = "\proper captain's locker"
+	},
+/obj/item/clothing/under/rank/centcom/commander,
+/obj/structure/sign/poster/official/random{
+	pixel_x = 32
+	},
+/turf/open/floor/carpet/royalblue,
+/area/shuttle/voidcrew/osprey/bridge)
 "wV" = (
 /obj/structure/cable,
 /obj/machinery/light{
@@ -3844,14 +3868,6 @@
 /obj/effect/turf_decal/tile/neutral,
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/osprey/hallway/starboard)
-"Lh" = (
-/obj/item/storage/backpack,
-/obj/item/clothing/gloves/color/white,
-/obj/item/clothing/under/rank/centcom/officer,
-/obj/machinery/airalarm/directional/south,
-/obj/structure/closet/secure_closet/hop,
-/turf/open/floor/carpet/blue,
-/area/shuttle/voidcrew/osprey/bridge)
 "Lj" = (
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -4061,6 +4077,14 @@
 	},
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/osprey/service/dormitories)
+"Ny" = (
+/obj/item/storage/backpack,
+/obj/item/clothing/gloves/color/white,
+/obj/item/clothing/under/rank/centcom/officer,
+/obj/machinery/airalarm/directional/south,
+/obj/structure/closet/secure_closet/hop,
+/turf/open/floor/carpet/blue,
+/area/shuttle/voidcrew/osprey/bridge)
 "Nz" = (
 /obj/structure/frame/machine,
 /obj/effect/turf_decal/siding/thinplating_new/light{
@@ -4210,7 +4234,7 @@
 /obj/effect/turf_decal/trimline/dark_blue/warning,
 /obj/effect/turf_decal/siding/thinplating_new/light,
 /obj/structure/table/glass,
-/obj/item/storage/backpack/duffelbag/med/surgery{
+/obj/item/storage/medkit/surgery{
 	pixel_x = -3;
 	pixel_y = 13
 	},
@@ -4278,9 +4302,6 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/osprey/maintenance/starboard)
-"PU" = (
-/turf/open/floor/iron/white,
-/area/shuttle/voidcrew/osprey/medbay)
 "PW" = (
 /obj/structure/table,
 /obj/item/flashlight/lamp{
@@ -4380,17 +4401,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/osprey/service/janitor)
-"QJ" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/machinery/atmospherics/components/binary/pump/on/layer4{
-	dir = 1;
-	name = "Air to Distro"
-	},
-/obj/structure/fireaxecabinet/directional/west,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/shuttle/voidcrew/osprey/engineering/atmospherics)
 "QL" = (
 /obj/structure/table/wood,
 /obj/item/flashlight/lamp,
@@ -5022,16 +5032,6 @@
 /obj/effect/decal/cleanable/blood/oil,
 /turf/open/floor/iron/dark/textured,
 /area/shuttle/voidcrew/osprey/engineering)
-"XS" = (
-/obj/structure/closet/secure_closet/captains{
-	name = "\proper captain's locker"
-	},
-/obj/item/clothing/under/rank/centcom/commander,
-/obj/structure/sign/poster/official/random{
-	pixel_x = 32
-	},
-/turf/open/floor/carpet/royalblue,
-/area/shuttle/voidcrew/osprey/bridge)
 "XU" = (
 /turf/template_noop,
 /area/template_noop)
@@ -5909,7 +5909,7 @@ ke
 yZ
 hC
 zW
-Lh
+Ny
 ke
 IA
 BC
@@ -6257,7 +6257,7 @@ ke
 uH
 iC
 dI
-XS
+wU
 ke
 JV
 EW
@@ -6726,7 +6726,7 @@ yx
 gU
 ka
 CI
-QJ
+ai
 tW
 lf
 TI
diff --git a/_maps/voidcrew/ships/ship_pirate_default.dmm b/_maps/voidcrew/ships/ship_pirate_default.dmm
index 7d02b54f37b..f2395c366ae 100644
--- a/_maps/voidcrew/ships/ship_pirate_default.dmm
+++ b/_maps/voidcrew/ships/ship_pirate_default.dmm
@@ -290,6 +290,30 @@
 	},
 /obj/effect/turf_decal/tile/bar/opposingcorners,
 /turf/open/floor/iron,
+/area/shuttle/voidcrew/pirate_default{
+	requires_power = 0
+	})
+"aA" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/obj/machinery/light/small/directional/north,
+/obj/machinery/firealarm/directional/north,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table,
+/obj/item/spear{
+	pixel_x = -1;
+	pixel_y = 6
+	},
+/obj/item/spear{
+	pixel_x = 6;
+	pixel_y = 6
+	},
+/obj/item/spear{
+	pixel_x = 13;
+	pixel_y = 6
+	},
+/turf/open/floor/pod/light,
 /area/shuttle/voidcrew/pirate_default{
 	requires_power = 0
 	})
@@ -571,30 +595,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/stripes/line,
 /turf/open/floor/wood,
-/area/shuttle/voidcrew/pirate_default{
-	requires_power = 0
-	})
-"bt" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 10
-	},
-/obj/machinery/light/small/directional/north,
-/obj/machinery/firealarm/directional/north,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/item/melee/energy/sword/pirate{
-	pixel_x = -1;
-	pixel_y = 6
-	},
-/obj/item/melee/energy/sword/pirate{
-	pixel_x = 6;
-	pixel_y = 6
-	},
-/obj/item/melee/energy/sword/pirate{
-	pixel_x = 13;
-	pixel_y = 6
-	},
-/turf/open/floor/pod/light,
 /area/shuttle/voidcrew/pirate_default{
 	requires_power = 0
 	})
@@ -1357,7 +1357,7 @@ ad
 ah
 an
 aj
-bt
+aA
 gY
 bI
 aj
diff --git a/_maps/voidcrew/ships/ship_pirate_dutchman.dmm b/_maps/voidcrew/ships/ship_pirate_dutchman.dmm
index 33668b32cce..d89397bfd0c 100644
--- a/_maps/voidcrew/ships/ship_pirate_dutchman.dmm
+++ b/_maps/voidcrew/ships/ship_pirate_dutchman.dmm
@@ -1,4 +1,18 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ad" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1
+	},
+/obj/structure/table/wood,
+/obj/item/spear{
+	pixel_x = -4;
+	pixel_y = 4
+	},
+/obj/item/spear,
+/turf/open/floor/wood/airless,
+/area/shuttle/voidcrew/pirate_dutchman{
+	requires_power = 0
+	})
 "af" = (
 /turf/template_noop,
 /area/template_noop)
@@ -946,20 +960,6 @@
 	dir = 1
 	},
 /turf/open/floor/wood/airless,
-/area/shuttle/voidcrew/pirate_dutchman{
-	requires_power = 0
-	})
-"PS" = (
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 1
-	},
-/obj/structure/table/wood,
-/obj/item/claymore/cutlass{
-	pixel_x = -4;
-	pixel_y = 4
-	},
-/obj/item/claymore/cutlass,
-/turf/open/floor/wood/airless,
 /area/shuttle/voidcrew/pirate_dutchman{
 	requires_power = 0
 	})
@@ -1126,7 +1126,7 @@
 /obj/item/gun/energy/laser,
 /obj/item/megaphone,
 /obj/item/melee/chainofcommand/tailwhip/kitty,
-/obj/item/claymore/cutlass,
+/obj/item/spear,
 /turf/open/floor/carpet/royalblack/airless,
 /area/shuttle/voidcrew/pirate_dutchman{
 	requires_power = 0
@@ -1509,7 +1509,7 @@ WR
 WS
 Le
 Lt
-PS
+ad
 hV
 RO
 gS
diff --git a/_maps/voidcrew/ships/ship_pirate_grey.dmm b/_maps/voidcrew/ships/ship_pirate_grey.dmm
index 449db6e4645..253aff1dcfd 100644
--- a/_maps/voidcrew/ships/ship_pirate_grey.dmm
+++ b/_maps/voidcrew/ships/ship_pirate_grey.dmm
@@ -51,6 +51,19 @@
 /obj/item/food/chococoin,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/pirate_grey)
+"ah" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/mapping_helpers/broken_floor,
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+	dir = 1
+	},
+/obj/effect/spawner/random/maintenance/eight,
+/obj/item/knife/combat/survival,
+/turf/open/floor/iron,
+/area/shuttle/voidcrew/pirate_grey)
 "am" = (
 /obj/structure/cable,
 /turf/closed/wall/rust,
@@ -504,10 +517,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/pirate_grey)
-"qE" = (
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/plating,
-/area/shuttle/voidcrew/pirate_grey)
 "qU" = (
 /obj/effect/turf_decal/bot,
 /obj/effect/spawner/random/structure/closet_empty/crate,
@@ -958,19 +967,6 @@
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/pirate_grey)
-"Ci" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/mapping_helpers/broken_floor,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
-	dir = 1
-	},
-/obj/effect/spawner/random/maintenance/eight,
-/obj/item/knife/combat,
-/turf/open/floor/iron,
-/area/shuttle/voidcrew/pirate_grey)
 "CF" = (
 /obj/effect/spawner/random/trash/mess,
 /turf/open/floor/plating,
@@ -1038,9 +1034,6 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/pirate_grey)
-"EA" = (
-/turf/closed/wall/r_wall/rust,
-/area/shuttle/voidcrew/pirate_grey)
 "EC" = (
 /obj/effect/spawner/structure/window,
 /turf/open/floor/plating,
@@ -1323,9 +1316,6 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/pirate_grey)
-"Pn" = (
-/turf/closed/wall,
-/area/shuttle/voidcrew/pirate_grey)
 "PM" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/spawner/random/trash/grille_or_waste,
@@ -1381,10 +1371,6 @@
 /obj/effect/mapping_helpers/burnt_floor,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/pirate_grey)
-"RX" = (
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/plating,
-/area/shuttle/voidcrew/pirate_grey)
 "Sb" = (
 /obj/structure/reagent_dispensers/plumbed,
 /turf/open/floor/plating,
@@ -1680,7 +1666,7 @@ TV
 "}
 (5,1,1) = {"
 zB
-qE
+fj
 Su
 Si
 Wy
@@ -1789,7 +1775,7 @@ Yj
 rV
 Tq
 uE
-Pn
+yN
 HD
 "}
 (11,1,1) = {"
@@ -1808,7 +1794,7 @@ wX
 Oa
 Tq
 Lo
-Pn
+yN
 ei
 "}
 (12,1,1) = {"
@@ -1817,7 +1803,7 @@ sB
 GE
 Yj
 Nu
-Pn
+yN
 am
 Eq
 yN
@@ -1834,7 +1820,7 @@ HD
 HD
 XX
 vJ
-Pn
+yN
 SB
 Nm
 Vw
@@ -1846,14 +1832,14 @@ Sh
 gQ
 dd
 xy
-Pn
+yN
 HD
 "}
 (14,1,1) = {"
 pk
 pS
 pU
-Pn
+yN
 AL
 Ac
 Wc
@@ -1869,10 +1855,10 @@ Sh
 zB
 "}
 (15,1,1) = {"
-Pn
+yN
 dI
 Sv
-Pn
+yN
 Bu
 xO
 yf
@@ -1891,7 +1877,7 @@ zB
 zB
 vM
 lO
-Pn
+yN
 tJ
 xO
 ax
@@ -1942,7 +1928,7 @@ Bh
 Uf
 DP
 zB
-Pn
+yN
 "}
 (19,1,1) = {"
 je
@@ -1955,17 +1941,17 @@ sm
 CY
 fj
 DG
-Pn
-Ci
+yN
+ah
 Sh
 Gb
 xm
-Pn
+yN
 je
 "}
 (20,1,1) = {"
 je
-Pn
+yN
 ia
 NI
 yU
@@ -1974,18 +1960,18 @@ bv
 aD
 cJ
 tU
-Pn
+yN
 xl
 Sh
 AR
 lO
-Pn
+yN
 je
 "}
 (21,1,1) = {"
 je
 mr
-Pn
+yN
 xm
 yU
 OG
@@ -1993,30 +1979,30 @@ qo
 pT
 De
 sh
-Pn
+yN
 Zc
-Pn
+yN
 pB
-Pn
+yN
 Bk
 je
 "}
 (22,1,1) = {"
 je
 je
-Pn
-EA
+yN
+pk
 ll
 FI
 Hh
-Pn
-Pn
+yN
+yN
 Hh
-Pn
+yN
 gz
-Pn
-RX
-Pn
+yN
+RU
+yN
 je
 je
 "}
@@ -2033,8 +2019,8 @@ ti
 Yf
 FI
 aV
-Pn
-Pn
+yN
+yN
 je
 je
 je
@@ -2052,7 +2038,7 @@ Am
 FT
 pk
 pk
-Pn
+yN
 je
 je
 je
@@ -2065,8 +2051,8 @@ je
 je
 pk
 zB
-Pn
-Pn
+yN
+yN
 zB
 pk
 pk
diff --git a/_maps/voidcrew/ships/ship_pirate_irs.dmm b/_maps/voidcrew/ships/ship_pirate_irs.dmm
index 91a2a70b026..f042bc8f03b 100644
--- a/_maps/voidcrew/ships/ship_pirate_irs.dmm
+++ b/_maps/voidcrew/ships/ship_pirate_irs.dmm
@@ -6,6 +6,55 @@
 /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/hidden/layer2,
 /obj/structure/cable,
 /turf/open/floor/pod/light,
+/area/shuttle/voidcrew/pirate_irs{
+	requires_power = 0
+	})
+"ae" = (
+/obj/structure/rack,
+/obj/structure/window/reinforced/tinted/spawner/directional/east,
+/obj/item/knife/combat/survival{
+	pixel_x = -1
+	},
+/obj/item/knife/combat/survival{
+	pixel_x = 4
+	},
+/obj/item/spess_knife{
+	pixel_x = 2;
+	pixel_y = -4
+	},
+/turf/open/floor/iron/smooth,
+/area/shuttle/voidcrew/pirate_irs{
+	requires_power = 0
+	})
+"af" = (
+/obj/effect/turf_decal/tile/dark/full,
+/obj/structure/rack{
+	desc = "someones got a friend in Syria!"
+	},
+/obj/item/knife/combat/survival{
+	pixel_x = 2
+	},
+/obj/item/restraints/handcuffs{
+	pixel_y = -5;
+	pixel_x = -3
+	},
+/obj/item/restraints/handcuffs{
+	pixel_y = -5;
+	pixel_x = 2
+	},
+/obj/effect/turf_decal/stripes/white{
+	dir = 5
+	},
+/obj/effect/turf_decal/stripes/red/line{
+	dir = 10
+	},
+/obj/item/lead_pipe,
+/obj/item/flamethrower{
+	name = "Fallujah firehose";
+	desc = "Someone's got a friend in Syria!"
+	},
+/obj/structure/cable,
+/turf/open/floor/pod/light,
 /area/shuttle/voidcrew/pirate_irs{
 	requires_power = 0
 	})
@@ -840,23 +889,6 @@
 /obj/structure/sign/departments/vault/directional/north,
 /obj/machinery/vending/clothing,
 /turf/open/floor/mineral/plastitanium,
-/area/shuttle/voidcrew/pirate_irs{
-	requires_power = 0
-	})
-"uk" = (
-/obj/structure/rack,
-/obj/structure/window/reinforced/tinted/spawner/directional/east,
-/obj/item/knife/combat{
-	pixel_x = -1
-	},
-/obj/item/knife/combat{
-	pixel_x = 4
-	},
-/obj/item/spess_knife{
-	pixel_x = 2;
-	pixel_y = -4
-	},
-/turf/open/floor/iron/smooth,
 /area/shuttle/voidcrew/pirate_irs{
 	requires_power = 0
 	})
@@ -1406,40 +1438,6 @@
 	dir = 4
 	},
 /turf/open/floor/glass,
-/area/shuttle/voidcrew/pirate_irs{
-	requires_power = 0
-	})
-"HG" = (
-/obj/effect/turf_decal/tile/dark/full,
-/obj/structure/rack{
-	desc = "someones got a friend in Syria!"
-	},
-/obj/item/melee/baseball_bat/ablative{
-	name = "kneecap buster";
-	desc = "This bat is made of highly reflective, highly armored material, It seems to be made specifically for busting one's kneecap";
-	pixel_x = 2
-	},
-/obj/item/restraints/handcuffs{
-	pixel_y = -5;
-	pixel_x = -3
-	},
-/obj/item/restraints/handcuffs{
-	pixel_y = -5;
-	pixel_x = 2
-	},
-/obj/effect/turf_decal/stripes/white{
-	dir = 5
-	},
-/obj/effect/turf_decal/stripes/red/line{
-	dir = 10
-	},
-/obj/item/lead_pipe,
-/obj/item/flamethrower{
-	name = "Fallujah firehose";
-	desc = "Someone's got a friend in Syria!"
-	},
-/obj/structure/cable,
-/turf/open/floor/pod/light,
 /area/shuttle/voidcrew/pirate_irs{
 	requires_power = 0
 	})
@@ -2797,7 +2795,7 @@ XI
 UF
 cO
 hK
-uk
+ae
 kK
 BG
 Tg
@@ -2860,7 +2858,7 @@ IE
 hK
 iZ
 nI
-HG
+af
 Yu
 FU
 LM
diff --git a/_maps/voidcrew/ships/ship_pirate_medieval.dmm b/_maps/voidcrew/ships/ship_pirate_medieval.dmm
index 0dfa04a24e9..8c1101b19f0 100644
--- a/_maps/voidcrew/ships/ship_pirate_medieval.dmm
+++ b/_maps/voidcrew/ships/ship_pirate_medieval.dmm
@@ -6,6 +6,17 @@
 /obj/structure/cable,
 /obj/machinery/ship_combat/cloak_device,
 /turf/open/floor/stone,
+/area/shuttle/voidcrew/pirate_medieval{
+	requires_power = 0
+	})
+"ac" = (
+/obj/structure/closet/cabinet,
+/obj/item/spear,
+/obj/item/knife/combat/survival,
+/obj/item/knife/combat/survival,
+/obj/item/knife/combat/survival,
+/obj/machinery/power/terminal,
+/turf/open/floor/stone,
 /area/shuttle/voidcrew/pirate_medieval{
 	requires_power = 0
 	})
@@ -238,17 +249,6 @@
 "aP" = (
 /obj/effect/decal/cleanable/glass,
 /turf/open/floor/stone,
-/area/shuttle/voidcrew/pirate_medieval{
-	requires_power = 0
-	})
-"aQ" = (
-/obj/structure/closet/cabinet,
-/obj/item/claymore,
-/obj/item/shield/kite,
-/obj/item/shield/kite,
-/obj/item/shield/kite,
-/obj/machinery/power/terminal,
-/turf/open/floor/stone,
 /area/shuttle/voidcrew/pirate_medieval{
 	requires_power = 0
 	})
@@ -647,7 +647,7 @@ aR
 aX
 bd
 aC
-aQ
+ac
 dL
 Nz
 "}
diff --git a/_maps/voidcrew/ships/ship_pirate_silverscale.dmm b/_maps/voidcrew/ships/ship_pirate_silverscale.dmm
index 6139b56a193..0c907f7375d 100644
--- a/_maps/voidcrew/ships/ship_pirate_silverscale.dmm
+++ b/_maps/voidcrew/ships/ship_pirate_silverscale.dmm
@@ -189,6 +189,26 @@
 /obj/machinery/cryopod,
 /obj/structure/cable,
 /turf/open/floor/carpet/royalblack,
+/area/shuttle/voidcrew/pirate_silverscale{
+	requires_power = 0
+	})
+"au" = (
+/obj/structure/rack{
+	dir = 8
+	},
+/obj/item/spear{
+	pixel_y = 12
+	},
+/obj/item/spear{
+	pixel_x = 8;
+	pixel_y = 7
+	},
+/obj/item/spear{
+	pixel_x = 17
+	},
+/obj/effect/turf_decal/bot,
+/obj/structure/cable,
+/turf/open/floor/pod/dark,
 /area/shuttle/voidcrew/pirate_silverscale{
 	requires_power = 0
 	})
@@ -623,26 +643,6 @@
 	dir = 6
 	},
 /turf/open/floor/plating/airless,
-/area/shuttle/voidcrew/pirate_silverscale{
-	requires_power = 0
-	})
-"xR" = (
-/obj/structure/rack{
-	dir = 8
-	},
-/obj/item/melee/energy/sword/saber/purple{
-	pixel_y = 12
-	},
-/obj/item/melee/energy/sword/saber/purple{
-	pixel_x = 8;
-	pixel_y = 7
-	},
-/obj/item/melee/energy/sword/saber/purple{
-	pixel_x = 17
-	},
-/obj/effect/turf_decal/bot,
-/obj/structure/cable,
-/turf/open/floor/pod/dark,
 /area/shuttle/voidcrew/pirate_silverscale{
 	requires_power = 0
 	})
@@ -828,7 +828,7 @@
 /obj/structure/guncase,
 /obj/item/gun/energy/laser/luxurypaywall{
 	projectile_damage_multiplier = 1.30;
-	desc = "A laser gun modified to cost 20 credits to fire. Someone on the station should have an ID that works with this thing."
+	desc = "A lavishly decorated laser gun."
 	},
 /turf/open/floor/pod/dark,
 /area/shuttle/voidcrew/pirate_silverscale{
@@ -1416,7 +1416,7 @@ aZ
 Is
 Yj
 RO
-xR
+au
 rB
 Fk
 QI
diff --git a/_maps/voidcrew/ships/ship_pubby.dmm b/_maps/voidcrew/ships/ship_pubby.dmm
index 4d8156dac98..ea18f2df2e1 100644
--- a/_maps/voidcrew/ships/ship_pubby.dmm
+++ b/_maps/voidcrew/ships/ship_pubby.dmm
@@ -23,6 +23,23 @@
 /obj/machinery/atmospherics/components/unary/passive_vent/layer2,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/pubby/engineering)
+"bd" = (
+/obj/structure/window/reinforced/spawner/directional/north{
+	layer = 2.9
+	},
+/obj/effect/turf_decal/box,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/closet/crate/secure/weapon,
+/obj/item/gun/energy/laser/retro,
+/obj/item/gun/energy/laser/retro,
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/shuttle/voidcrew/pubby/cargo)
 "bn" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt,
@@ -859,23 +876,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/engine,
 /area/shuttle/voidcrew/pubby/cargo)
-"QO" = (
-/obj/structure/window/reinforced/spawner/directional/north{
-	layer = 2.9
-	},
-/obj/effect/turf_decal/box,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/closet/crate/secure/weapon,
-/obj/item/gun/energy/laser/retro,
-/obj/item/gun/energy/laser/retro,
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/shuttle/voidcrew/pubby/cargo)
 "Rj" = (
 /obj/effect/spawner/structure/window/reinforced/shuttle,
 /obj/machinery/door/poddoor{
@@ -1410,7 +1410,7 @@ gP
 PS
 wl
 fb
-QO
+bd
 sr
 GW
 Nk
diff --git a/_maps/voidcrew/ships/ship_scarab_c.dmm b/_maps/voidcrew/ships/ship_scarab_c.dmm
index 771f1f048b7..cfd683a4ebe 100644
--- a/_maps/voidcrew/ships/ship_scarab_c.dmm
+++ b/_maps/voidcrew/ships/ship_scarab_c.dmm
@@ -127,6 +127,16 @@
 /obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/scarab/bridge/c)
+"dX" = (
+/obj/machinery/light/small/directional/south,
+/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{
+	dir = 8
+	},
+/obj/structure/sign/poster/official/do_not_question/directional/south,
+/obj/machinery/airalarm/directional/west,
+/obj/structure/closet/secure_closet/captains,
+/turf/open/floor/iron/dark,
+/area/shuttle/voidcrew/scarab/captains_office/c)
 "eE" = (
 /obj/machinery/door/airlock/external,
 /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden/layer2{
@@ -1252,16 +1262,6 @@
 	},
 /turf/open/floor/iron/smooth,
 /area/shuttle/voidcrew/scarab/engines/c)
-"Fq" = (
-/obj/machinery/light/small/directional/south,
-/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{
-	dir = 8
-	},
-/obj/structure/sign/poster/official/do_not_question/directional/south,
-/obj/machinery/airalarm/directional/west,
-/obj/structure/closet/secure_closet/captains,
-/turf/open/floor/iron/dark,
-/area/shuttle/voidcrew/scarab/captains_office/c)
 "GT" = (
 /obj/effect/turf_decal/tile/dark_red/fourcorners,
 /turf/open/floor/iron/dark,
@@ -1280,6 +1280,21 @@
 /obj/effect/turf_decal/tile/dark_green/full,
 /turf/open/floor/iron/textured_large,
 /area/shuttle/voidcrew/scarab/dormitories/c)
+"Ho" = (
+/obj/structure/table/wood,
+/obj/effect/turf_decal/tile/dark_blue/half/contrasted,
+/obj/item/reagent_containers/cup/glass/mug{
+	pixel_x = -4
+	},
+/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
+	dir = 5
+	},
+/obj/item/gun/energy/e_gun/mini{
+	pixel_y = 3;
+	pixel_x = 2
+	},
+/turf/open/floor/iron/dark,
+/area/shuttle/voidcrew/scarab/captains_office/c)
 "HW" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 4
@@ -1849,21 +1864,6 @@
 	},
 /turf/open/floor/iron/smooth_large,
 /area/shuttle/voidcrew/scarab/engines/c)
-"Wk" = (
-/obj/structure/table/wood,
-/obj/effect/turf_decal/tile/dark_blue/half/contrasted,
-/obj/item/reagent_containers/cup/glass/mug{
-	pixel_x = -4
-	},
-/obj/machinery/atmospherics/pipe/smart/simple/supply/hidden/layer4{
-	dir = 5
-	},
-/obj/item/gun/energy/e_gun/mini{
-	pixel_y = 3;
-	pixel_x = 2
-	},
-/turf/open/floor/iron/dark,
-/area/shuttle/voidcrew/scarab/captains_office/c)
 "WB" = (
 /obj/machinery/door/airlock/command{
 	name = "Bridge"
@@ -2519,7 +2519,7 @@ ga
 qj
 Iy
 HW
-Fq
+dX
 MK
 gD
 gD
@@ -2541,7 +2541,7 @@ wD
 sz
 mu
 pW
-Wk
+Ho
 MQ
 gD
 gD
diff --git a/_maps/voidcrew/ships/ship_squab_a.dmm b/_maps/voidcrew/ships/ship_squab_a.dmm
index 0bdca321768..e9b1b433f01 100644
--- a/_maps/voidcrew/ships/ship_squab_a.dmm
+++ b/_maps/voidcrew/ships/ship_squab_a.dmm
@@ -272,21 +272,6 @@
 	},
 /turf/open/floor/iron/white,
 /area/shuttle/voidcrew/squab/laboratory)
-"bqx" = (
-/obj/effect/turf_decal/box{
-	color = "#B11111"
-	},
-/obj/structure/rack,
-/obj/item/gun/energy/e_gun{
-	pixel_x = 0;
-	pixel_y = -3
-	},
-/obj/item/gun/energy/e_gun{
-	pixel_x = 0;
-	pixel_y = 4
-	},
-/turf/open/floor/iron,
-/area/shuttle/voidcrew/squab/office)
 "bqM" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 8;
@@ -1603,6 +1588,21 @@
 	},
 /turf/open/floor/iron/dark/textured,
 /area/shuttle/voidcrew/squab/engineering)
+"kpW" = (
+/obj/effect/turf_decal/box{
+	color = "#B11111"
+	},
+/obj/structure/rack,
+/obj/item/gun/energy/e_gun{
+	pixel_x = 0;
+	pixel_y = -3
+	},
+/obj/item/gun/energy/e_gun{
+	pixel_x = 0;
+	pixel_y = 4
+	},
+/turf/open/floor/iron,
+/area/shuttle/voidcrew/squab/office)
 "ksc" = (
 /obj/machinery/airalarm/directional/south,
 /obj/modular_map_root/ship_upgrade{
@@ -3755,7 +3755,7 @@ jKO
 (11,1,1) = {"
 jKO
 gnj
-bqx
+kpW
 dGG
 uAs
 tBI
diff --git a/_maps/voidcrew/ships/ship_squab_b.dmm b/_maps/voidcrew/ships/ship_squab_b.dmm
index 9254ea1a5b7..7d460f7b07e 100644
--- a/_maps/voidcrew/ships/ship_squab_b.dmm
+++ b/_maps/voidcrew/ships/ship_squab_b.dmm
@@ -290,6 +290,21 @@
 /obj/structure/cable,
 /turf/open/floor/iron/textured_large,
 /area/shuttle/voidcrew/squab/cargo_entrance)
+"bDg" = (
+/obj/effect/turf_decal/box{
+	color = "#B11111"
+	},
+/obj/structure/rack,
+/obj/item/gun/energy/e_gun{
+	pixel_x = 0;
+	pixel_y = -3
+	},
+/obj/item/gun/energy/e_gun{
+	pixel_x = 0;
+	pixel_y = 4
+	},
+/turf/open/floor/iron,
+/area/shuttle/voidcrew/squab/office)
 "bEJ" = (
 /obj/structure/table/wood,
 /obj/effect/turf_decal/siding/wood{
@@ -1579,21 +1594,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/shuttle/voidcrew/squab/bridge)
-"jHb" = (
-/obj/effect/turf_decal/box{
-	color = "#B11111"
-	},
-/obj/structure/rack,
-/obj/item/gun/energy/e_gun{
-	pixel_x = 0;
-	pixel_y = -3
-	},
-/obj/item/gun/energy/e_gun{
-	pixel_x = 0;
-	pixel_y = 4
-	},
-/turf/open/floor/iron,
-/area/shuttle/voidcrew/squab/office)
 "jHU" = (
 /turf/closed/wall,
 /area/shuttle/voidcrew/squab/bathroom)
@@ -3646,7 +3646,7 @@ bpX
 (11,1,1) = {"
 bpX
 mwE
-jHb
+bDg
 vMW
 guF
 tsR
diff --git a/_maps/voidcrew/ships/ship_squab_c.dmm b/_maps/voidcrew/ships/ship_squab_c.dmm
index ced12d8b376..4f66799e62d 100644
--- a/_maps/voidcrew/ships/ship_squab_c.dmm
+++ b/_maps/voidcrew/ships/ship_squab_c.dmm
@@ -521,21 +521,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible/layer4,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/squab/engineering)
-"dHy" = (
-/obj/effect/turf_decal/box{
-	color = "#B11111"
-	},
-/obj/structure/rack,
-/obj/item/gun/energy/e_gun{
-	pixel_x = 0;
-	pixel_y = -3
-	},
-/obj/item/gun/energy/e_gun{
-	pixel_x = 0;
-	pixel_y = 4
-	},
-/turf/open/floor/iron,
-/area/shuttle/voidcrew/squab/office)
 "dIb" = (
 /obj/effect/turf_decal/siding/thinplating/light{
 	dir = 4
@@ -970,6 +955,20 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/squab/engineering)
+"gaM" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4;
+	layer = 2.5
+	},
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+	dir = 8
+	},
+/obj/structure/closet/secure_closet/captains,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/iron/dark/textured_large,
+/area/shuttle/voidcrew/squab/captain_quarters)
 "gbe" = (
 /turf/closed/wall/mineral/titanium/survival/nodiagonal,
 /area/shuttle/voidcrew/squab/dormitory)
@@ -1221,6 +1220,21 @@
 "hQF" = (
 /turf/open/floor/iron/dark/herringbone,
 /area/shuttle/voidcrew/squab/laboratory)
+"hRh" = (
+/obj/effect/turf_decal/box{
+	color = "#B11111"
+	},
+/obj/structure/rack,
+/obj/item/gun/energy/e_gun{
+	pixel_x = 0;
+	pixel_y = -3
+	},
+/obj/item/gun/energy/e_gun{
+	pixel_x = 0;
+	pixel_y = 4
+	},
+/turf/open/floor/iron,
+/area/shuttle/voidcrew/squab/office)
 "hUv" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/stripes{
@@ -1443,20 +1457,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/squab/bridge)
-"jIn" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 4;
-	layer = 2.5
-	},
-/obj/effect/turf_decal/siding/wideplating_new/dark{
-	dir = 8
-	},
-/obj/structure/closet/secure_closet/captains,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 4
-	},
-/turf/open/floor/iron/dark/textured_large,
-/area/shuttle/voidcrew/squab/captain_quarters)
 "jNj" = (
 /obj/structure/railing{
 	dir = 4
@@ -3630,7 +3630,7 @@ ecX
 (11,1,1) = {"
 ecX
 wZK
-dHy
+hRh
 qHQ
 rXg
 kFY
@@ -3810,7 +3810,7 @@ rYj
 cyJ
 oEd
 cED
-jIn
+gaM
 kRF
 kIW
 coU
diff --git a/_maps/voidcrew/ships/ship_syndicate_blackbeard.dmm b/_maps/voidcrew/ships/ship_syndicate_blackbeard.dmm
index 4008abd32aa..b35cbd2389c 100644
--- a/_maps/voidcrew/ships/ship_syndicate_blackbeard.dmm
+++ b/_maps/voidcrew/ships/ship_syndicate_blackbeard.dmm
@@ -32,14 +32,6 @@
 /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/blackbeard/bridge)
-"aT" = (
-/obj/structure/table/reinforced,
-/obj/item/gun/ballistic/rocketlauncher/unrestricted,
-/obj/structure/railing{
-	dir = 10
-	},
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/voidcrew/blackbeard/cargo)
 "bl" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/mineral/plastitanium,
@@ -229,6 +221,24 @@
 "lw" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/shuttle/voidcrew/blackbeard/engineering)
+"lX" = (
+/obj/structure/table/reinforced,
+/obj/structure/railing{
+	dir = 9
+	},
+/obj/item/gun/ballistic/automatic/proto/unrestricted{
+	desc = "A prototype full auto 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors and a folding stock, this one has a crudely scratched S overtop the Nanotrasen Logo."
+	},
+/obj/item/ammo_box/magazine/smgm9mm,
+/obj/item/ammo_box/magazine/smgm9mm,
+/obj/item/ammo_box/magazine/smgm9mm/ap,
+/obj/item/ammo_box/magazine/smgm9mm/fire,
+/obj/item/ammo_box/magazine/smgm9mm,
+/obj/item/gun/ballistic/automatic/ar{
+	desc = "A robust assault rifle used by Nanotrasen fighting forces, this one has has a crudely scratched in S over the Nanotrasen Logo."
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/voidcrew/blackbeard/cargo)
 "lZ" = (
 /obj/machinery/power/shuttle_engine/ship/fueled/plasma{
 	dir = 4
@@ -481,6 +491,10 @@
 "yC" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/shuttle/voidcrew/blackbeard/hallway/fore)
+"AV" = (
+/obj/machinery/vending/security/marine,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/voidcrew/blackbeard/equipment)
 "Bw" = (
 /obj/structure/cable,
 /obj/machinery/power/apc/auto_name/directional/west,
@@ -537,19 +551,6 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/voidcrew/blackbeard/hallway/aft)
-"DZ" = (
-/obj/structure/rack,
-/obj/item/gun/ballistic/automatic/pistol/aps,
-/obj/item/gun/ballistic/automatic/pistol/aps,
-/obj/item/ammo_box/magazine/m9mm_aps,
-/obj/item/ammo_box/magazine/m9mm_aps,
-/obj/item/ammo_box/magazine/m9mm_aps,
-/obj/item/ammo_box/magazine/m9mm_aps,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 1
-	},
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/voidcrew/blackbeard/equipment)
 "Ed" = (
 /obj/structure/cable,
 /turf/open/floor/catwalk_floor,
@@ -642,6 +643,18 @@
 /obj/structure/cable,
 /turf/open/floor/catwalk_floor,
 /area/shuttle/voidcrew/blackbeard/equipment)
+"Jk" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/backpack/duffelbag/syndie/c4,
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/item/gun/ballistic/shotgun/automatic/dual_tube,
+/obj/item/storage/box/lethalshot,
+/obj/item/storage/box/lethalshot,
+/obj/item/storage/box/rubbershot,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/voidcrew/blackbeard/cargo)
 "Jm" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -707,18 +720,6 @@
 /obj/machinery/light,
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/voidcrew/blackbeard/engineering)
-"ND" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/backpack/duffelbag/syndie/c4,
-/obj/structure/railing{
-	dir = 8
-	},
-/obj/item/gun/ballistic/shotgun/automatic/dual_tube,
-/obj/item/storage/box/lethalshot,
-/obj/item/storage/box/lethalshot,
-/obj/item/storage/box/rubbershot,
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/voidcrew/blackbeard/cargo)
 "Oa" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/shuttle/voidcrew/blackbeard/engineering)
@@ -763,24 +764,6 @@
 /obj/machinery/ship_combat/missile_launcher,
 /turf/closed/wall/mineral/plastitanium,
 /area/shuttle/voidcrew/blackbeard/hallway/fore)
-"Rp" = (
-/obj/structure/table/reinforced,
-/obj/structure/railing{
-	dir = 9
-	},
-/obj/item/gun/ballistic/automatic/proto/unrestricted{
-	desc = "A prototype full auto 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors and a folding stock, this one has a crudely scratched S overtop the Nanotrasen Logo."
-	},
-/obj/item/ammo_box/magazine/smgm9mm,
-/obj/item/ammo_box/magazine/smgm9mm,
-/obj/item/ammo_box/magazine/smgm9mm/ap,
-/obj/item/ammo_box/magazine/smgm9mm/fire,
-/obj/item/ammo_box/magazine/smgm9mm,
-/obj/item/gun/ballistic/automatic/ar{
-	desc = "A robust assault rifle used by Nanotrasen fighting forces, this one has has a crudely scratched in S over the Nanotrasen Logo."
-	},
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/voidcrew/blackbeard/cargo)
 "Rt" = (
 /obj/structure/window/reinforced/plasma/spawner,
 /obj/structure/window/reinforced/plasma/spawner/directional/east,
@@ -804,6 +787,14 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/voidcrew/blackbeard/engineering)
+"Tm" = (
+/obj/structure/table/reinforced,
+/obj/item/gun/ballistic/rocketlauncher/unrestricted,
+/obj/structure/railing{
+	dir = 10
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/voidcrew/blackbeard/cargo)
 "Tp" = (
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable,
@@ -867,6 +858,19 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/closed/wall/mineral/plastitanium,
 /area/shuttle/voidcrew/blackbeard/hallway/aft)
+"Ve" = (
+/obj/structure/rack,
+/obj/item/gun/ballistic/automatic/pistol/aps,
+/obj/item/gun/ballistic/automatic/pistol/aps,
+/obj/item/ammo_box/magazine/m9mm_aps,
+/obj/item/ammo_box/magazine/m9mm_aps,
+/obj/item/ammo_box/magazine/m9mm_aps,
+/obj/item/ammo_box/magazine/m9mm_aps,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/voidcrew/blackbeard/equipment)
 "Vl" = (
 /obj/effect/mapping_helpers/broken_floor,
 /turf/open/floor/mineral/plastitanium,
@@ -937,10 +941,6 @@
 /obj/machinery/power/apc/auto_name/directional/south,
 /turf/open/floor/catwalk_floor,
 /area/shuttle/voidcrew/blackbeard/bridge)
-"ZO" = (
-/obj/machinery/vending/security/marine,
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/voidcrew/blackbeard/equipment)
 
 (1,1,1) = {"
 TQ
@@ -1235,7 +1235,7 @@ Pi
 qW
 et
 dx
-ZO
+AV
 qW
 Pi
 yC
@@ -1250,7 +1250,7 @@ av
 qW
 et
 Jb
-ZO
+AV
 qW
 av
 Kj
@@ -1265,7 +1265,7 @@ av
 qW
 WT
 Gc
-DZ
+Ve
 qW
 dy
 Kj
@@ -1413,9 +1413,9 @@ TQ
 im
 Wp
 yl
-Rp
-ND
-aT
+lX
+Jk
+Tm
 XD
 Wp
 im
diff --git a/_maps/voidcrew/ships/ship_syndicate_hyena.dmm b/_maps/voidcrew/ships/ship_syndicate_hyena.dmm
index 2a0a757f6ed..c81bd59e32d 100644
--- a/_maps/voidcrew/ships/ship_syndicate_hyena.dmm
+++ b/_maps/voidcrew/ships/ship_syndicate_hyena.dmm
@@ -85,36 +85,6 @@
 	},
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/hyena/equipment)
-"cV" = (
-/obj/machinery/light{
-	dir = 1
-	},
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/rack,
-/obj/item/gun/ballistic/automatic/pistol,
-/obj/item/gun/ballistic/automatic/pistol{
-	pixel_y = 2
-	},
-/obj/item/gun/ballistic/automatic/pistol{
-	pixel_y = -2
-	},
-/obj/item/ammo_box/c10mm,
-/obj/item/ammo_box/c10mm,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
-/obj/item/ammo_box/magazine/m10mm,
-/turf/open/floor/iron/white,
-/area/shuttle/voidcrew/hyena/cargo_bay)
 "dc" = (
 /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
 /turf/open/floor/plating,
@@ -203,6 +173,36 @@
 	},
 /turf/open/floor/carpet/red,
 /area/shuttle/voidcrew/hyena/dorms)
+"dV" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/rack,
+/obj/item/gun/ballistic/automatic/pistol,
+/obj/item/gun/ballistic/automatic/pistol{
+	pixel_y = 2
+	},
+/obj/item/gun/ballistic/automatic/pistol{
+	pixel_y = -2
+	},
+/obj/item/ammo_box/c10mm,
+/obj/item/ammo_box/c10mm,
+/obj/item/ammo_box/magazine/m10mm,
+/obj/item/ammo_box/magazine/m10mm,
+/obj/item/ammo_box/magazine/m10mm,
+/obj/item/ammo_box/magazine/m10mm,
+/obj/item/ammo_box/magazine/m10mm,
+/obj/item/ammo_box/magazine/m10mm,
+/obj/item/ammo_box/magazine/m10mm,
+/obj/item/ammo_box/magazine/m10mm,
+/obj/item/ammo_box/magazine/m10mm,
+/turf/open/floor/iron/white,
+/area/shuttle/voidcrew/hyena/cargo_bay)
 "dY" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/shuttle/voidcrew/hyena/hallway)
@@ -242,20 +242,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/hyena/maintenance/port)
-"fv" = (
-/obj/effect/turf_decal/bot_white,
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/machinery/firealarm/directional/east{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/vending/security/marine,
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron/dark,
-/area/shuttle/voidcrew/hyena/armory)
 "fA" = (
 /obj/structure/tank_dispenser/oxygen,
 /obj/machinery/light/small{
@@ -302,21 +288,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden,
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/hyena/maintenance/starboard)
-"hs" = (
-/obj/item/storage/backpack/security,
-/obj/item/clothing/under/syndicate/combat,
-/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/gloves/combat,
-/obj/item/clothing/glasses/thermal/eyepatch,
-/obj/item/gun/ballistic/revolver,
-/obj/item/ammo_box/a357/match,
-/obj/item/pen/edagger,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/secure_closet/hos,
-/obj/item/clothing/head/hats/hos/cap/syndicate,
-/turf/open/floor/carpet/black,
-/area/shuttle/voidcrew/hyena/bridge)
 "hv" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/shuttle/voidcrew/hyena/dorms)
@@ -982,6 +953,13 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/mineral/plastitanium/red,
 /area/shuttle/voidcrew/hyena/armory)
+"wK" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/spider/stickyweb,
+/obj/structure/closet/crate/secure/loot,
+/turf/open/floor/plating,
+/area/shuttle/voidcrew/hyena/maintenance/fore)
 "wP" = (
 /obj/effect/turf_decal/bot_white,
 /turf/open/floor/iron/dark,
@@ -1291,13 +1269,6 @@
 	},
 /turf/open/floor/engine/hull,
 /area/shuttle/voidcrew/hyena/equipment)
-"DF" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/spider/stickyweb,
-/obj/structure/closet/crate/secure/loot,
-/turf/open/floor/plating,
-/area/shuttle/voidcrew/hyena/maintenance/fore)
 "DH" = (
 /obj/effect/turf_decal/bot_white,
 /obj/structure/reagent_dispensers/fueltank,
@@ -1327,6 +1298,21 @@
 	},
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/hyena/maintenance/starboard)
+"Ea" = (
+/obj/item/storage/backpack/security,
+/obj/item/clothing/under/syndicate/combat,
+/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
+/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/gloves/combat,
+/obj/item/clothing/glasses/thermal/eyepatch,
+/obj/item/gun/ballistic/revolver,
+/obj/item/ammo_box/a357/match,
+/obj/item/knife/combat/survival,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/closet/secure_closet/hos,
+/obj/item/clothing/head/hats/hos/cap/syndicate,
+/turf/open/floor/carpet/black,
+/area/shuttle/voidcrew/hyena/bridge)
 "Eb" = (
 /obj/effect/spawner/structure/window/reinforced/plasma/plastitanium,
 /obj/machinery/door/poddoor/shutters{
@@ -1648,6 +1634,11 @@
 	},
 /turf/open/floor/iron/white,
 /area/shuttle/voidcrew/hyena/hallway)
+"LD" = (
+/obj/effect/turf_decal/bot_white,
+/obj/machinery/vending/security/marine,
+/turf/open/floor/iron/dark,
+/area/shuttle/voidcrew/hyena/armory)
 "LU" = (
 /obj/effect/turf_decal/bot_white,
 /obj/machinery/suit_storage_unit/standard_unit{
@@ -1787,11 +1778,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/shuttle/voidcrew/hyena/maintenance/port)
-"OX" = (
-/obj/effect/turf_decal/bot_white,
-/obj/machinery/vending/security/marine,
-/turf/open/floor/iron/dark,
-/area/shuttle/voidcrew/hyena/armory)
 "Pw" = (
 /obj/machinery/button/door{
 	dir = 1;
@@ -1849,6 +1835,28 @@
 /obj/structure/sign/warning/vacuum/external,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/shuttle/voidcrew/hyena/hallway)
+"RM" = (
+/obj/structure/closet/secure_closet{
+	anchored = 1;
+	icon_state = "warden";
+	name = "foreman's locker";
+	req_access = list(56)
+	},
+/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/under/syndicate/tacticool,
+/obj/item/clothing/suit/hooded/wintercoat/engineering,
+/obj/item/clothing/gloves/combat,
+/obj/item/storage/belt/utility/chief,
+/obj/item/clothing/glasses/meson,
+/obj/item/clothing/glasses/welding,
+/obj/item/storage/toolbox/syndicate,
+/obj/item/wrench/combat,
+/obj/item/ammo_box/magazine/m10mm/ap,
+/obj/item/gun/ballistic/automatic/pistol,
+/obj/item/grenade/chem_grenade/metalfoam,
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/carpet/red,
+/area/shuttle/voidcrew/hyena/bridge/foreman)
 "Sd" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -1965,6 +1973,20 @@
 /obj/machinery/power/apc/auto_name/directional/south,
 /turf/open/floor/iron/white,
 /area/shuttle/voidcrew/hyena/hallway)
+"UK" = (
+/obj/effect/turf_decal/bot_white,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/firealarm/directional/east{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/vending/security/marine,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/iron/dark,
+/area/shuttle/voidcrew/hyena/armory)
 "Ve" = (
 /obj/structure/curtain,
 /obj/structure/toilet,
@@ -2046,28 +2068,6 @@
 	},
 /turf/open/floor/iron/dark,
 /area/shuttle/voidcrew/hyena/equipment)
-"VY" = (
-/obj/structure/closet/secure_closet{
-	anchored = 1;
-	icon_state = "warden";
-	name = "foreman's locker";
-	req_access = list(56)
-	},
-/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/under/syndicate/tacticool,
-/obj/item/clothing/suit/hooded/wintercoat/engineering,
-/obj/item/clothing/gloves/combat,
-/obj/item/storage/belt/utility/chief,
-/obj/item/clothing/glasses/meson,
-/obj/item/clothing/glasses/welding,
-/obj/item/storage/toolbox/syndicate,
-/obj/item/wrench/combat,
-/obj/item/ammo_box/magazine/m10mm/ap,
-/obj/item/gun/ballistic/automatic/pistol,
-/obj/item/grenade/chem_grenade/metalfoam,
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/carpet/red,
-/area/shuttle/voidcrew/hyena/bridge/foreman)
 "Wc" = (
 /obj/structure/table,
 /obj/item/flashlight/lamp,
@@ -2547,7 +2547,7 @@ Sh
 Zn
 qN
 KW
-VY
+RM
 rk
 nn
 Og
@@ -2619,17 +2619,17 @@ Ru
 px
 Pw
 jI
-fv
-OX
+UK
+LD
 jI
-cV
+dV
 jH
 Ik
 qN
 qN
 qN
 de
-DF
+wK
 de
 "}
 (20,1,1) = {"
@@ -2654,7 +2654,7 @@ de
 "}
 (21,1,1) = {"
 XN
-hs
+Ea
 tw
 Dq
 rd
diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_x_act.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_x_act.dm
index 0b732912726..4840bfa85dd 100644
--- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_x_act.dm
+++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_x_act.dm
@@ -9,7 +9,7 @@
 ///from the [EX_ACT] wrapper macro: (severity, target)
 #define COMSIG_ATOM_EX_ACT "atom_ex_act"
 ///from base of atom/emp_act(severity): (severity). return EMP protection flags
-#define COMSIG_ATOM_PRE_EMP_ACT "atom_emp_act"
+#define COMSIG_ATOM_PRE_EMP_ACT "atom_pre_emp_act" // VOIDCREW EDIT: separate protection from EMP notification.
 ///from base of atom/emp_act(severity): (severity, protection)
 #define COMSIG_ATOM_EMP_ACT "atom_emp_act"
 ///from base of atom/fire_act(): (exposed_temperature, exposed_volume)
diff --git a/code/controllers/subsystem/market.dm b/code/controllers/subsystem/market.dm
index 283a147d5ae..24077f3e6e9 100644
--- a/code/controllers/subsystem/market.dm
+++ b/code/controllers/subsystem/market.dm
@@ -102,6 +102,7 @@ SUBSYSTEM_DEF(market)
 					"path" = /obj/structure/closet/supplypod/back_to_station,
 				))
 				purchase.entry.spawn_item(spawned_pod, purchase)
+				mark_trader_goods(spawned_pod) // VOIDCREW EDIT: trade resale rule includes the completed pod bundle.
 
 				to_chat(buyer, span_notice("[purchase.uplink] flashes a message noting the order is being launched at your location. Right here, right now!"))
 				qdel(purchase)
diff --git a/code/controllers/subsystem/stock_market.dm b/code/controllers/subsystem/stock_market.dm
index 1cce5a8c549..2481512074a 100644
--- a/code/controllers/subsystem/stock_market.dm
+++ b/code/controllers/subsystem/stock_market.dm
@@ -50,7 +50,7 @@ SUBSYSTEM_DEF(stock_market)
 	var/price_minimum = round(mat.value_per_unit * SHEET_MATERIAL_AMOUNT * 0.5)
 	if(!isnull(mat.minimum_value_override))
 		price_minimum = round(mat.minimum_value_override * SHEET_MATERIAL_AMOUNT)
-	var/price_maximum = round(mat.value_per_unit * SHEET_MATERIAL_AMOUNT * 3)
+	var/price_maximum = round(mat.value_per_unit * SHEET_MATERIAL_AMOUNT * 1.5) // VOIDCREW EDIT: cargo materials market ceiling.
 
 	//clamp it down
 	new_price = round(clamp(new_price, price_minimum, price_maximum))
@@ -83,7 +83,7 @@ SUBSYSTEM_DEF(stock_market)
 	var/price_minimum = round(mat.value_per_unit * SHEET_MATERIAL_AMOUNT * 0.5)
 	if(!isnull(mat.minimum_value_override))
 		price_minimum = round(mat.minimum_value_override * SHEET_MATERIAL_AMOUNT)
-	var/price_maximum = round(mat.value_per_unit * SHEET_MATERIAL_AMOUNT * 3)
+	var/price_maximum = round(mat.value_per_unit * SHEET_MATERIAL_AMOUNT * 1.5) // VOIDCREW EDIT: cargo materials market ceiling.
 	var/price_baseline = mat.value_per_unit * SHEET_MATERIAL_AMOUNT
 	var/quantity_baseline = mat.tradable_base_quantity
 
diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm
index 912c6a602f1..2f8e5b08419 100644
--- a/code/datums/components/crafting/crafting.dm
+++ b/code/datums/components/crafting/crafting.dm
@@ -419,12 +419,6 @@
 		return FALSE
 	if (recipe.category == CAT_CULT && !IS_CULTIST(user)) // Skip blood cult recipes if not cultist
 		return FALSE
-	//VOID EDIT - blueprint schematics: only visible while carrying the physical blueprint or holding a round-long neural imprint (voidcrew/modules/weapons_bench/blueprint.dm)
-	// VOIDCREW EDIT START: Gate schematic crafting on a carried blueprint or imprint (voidcrew/modules/weapons_bench/blueprint.dm).
-	if(istype(recipe, /datum/crafting_recipe/blueprint) && !is_blueprint_recipe_available(recipe, user))
-		return FALSE
-	// VOIDCREW EDIT END
-	//VOID EDIT END
 	return TRUE
 
 /datum/component/personal_crafting/proc/component_ui_interact(atom/movable/screen/craft/image, location, control, params, user)
diff --git a/code/datums/components/spawner.dm b/code/datums/components/spawner.dm
index 4e7d24ebcc8..7b3fbf0c9c4 100644
--- a/code/datums/components/spawner.dm
+++ b/code/datums/components/spawner.dm
@@ -33,6 +33,10 @@
 	src.max_spawn_per_attempt = max_spawn_per_attempt
 	src.spawn_distance = spawn_distance
 	src.spawn_distance_exclude = spawn_distance_exclude
+	// VOIDCREW EDIT ADDITION START: npc_scaling pins the environmental source now.
+	var/atom/spawner = parent
+	spawner.get_npc_spawn_context()
+	// VOIDCREW EDIT ADDITION END
 	// If set, doesn't instantly spawn a creature when the spawner component is applied.
 	if(initial_spawn_delay)
 		COOLDOWN_START(src, spawn_delay, spawn_time)
@@ -109,19 +113,26 @@
 	for(var/i in 1 to adjusted_spawn_count)
 		var/atom/created
 		var/turf/picked_spot
+		// VOIDCREW EDIT: a fresh construction context inherits the parent's pinned site.
+		var/datum/npc_spawn_context/context = new(spawner)
 
 		if(spawn_distance == 1)
-			created = new chosen_mob_type(spawner.loc)
+			created = spawn_npc_in_zone(chosen_mob_type, spawner.loc, context, FALSE) // VOIDCREW EDIT: npc_scaling
 		else if(spawn_distance >= 1 && spawn_distance_exclude >= 1)
 			picked_spot = pick(turf_peel(spawn_distance, spawn_distance_exclude, spawner.loc, view_based = TRUE))
 			if(!picked_spot)
 				picked_spot = pick(circle_range_turfs(spawner.loc, spawn_distance))
 			if(picked_spot == spawner.loc)
 				SEND_SIGNAL(spawner, COMSIG_SPAWNER_SPAWNED_DEFAULT)
-			created = new chosen_mob_type(picked_spot)
+			created = spawn_npc_in_zone(chosen_mob_type, picked_spot, context, FALSE) // VOIDCREW EDIT: npc_scaling
 		else if (spawn_distance >= 1)
 			picked_spot = pick(circle_range_turfs(spawner.loc, spawn_distance))
-			created = new chosen_mob_type(picked_spot)
+			created = spawn_npc_in_zone(chosen_mob_type, picked_spot, context, FALSE) // VOIDCREW EDIT: npc_scaling
+
+		// VOIDCREW EDIT ADDITION START
+		if(QDELETED(created))
+			continue
+		// VOIDCREW EDIT ADDITION END
 
 		created.flags_1 |= (spawner.flags_1 & ADMIN_SPAWNED_1)
 		spawned_things += WEAKREF(created)
@@ -138,6 +149,7 @@
 		SEND_SIGNAL(src, COMSIG_SPAWNER_SPAWNED, created)
 		RegisterSignal(created, COMSIG_QDELETING, PROC_REF(on_deleted))
 		spawn_callback?.Invoke(created)
+		context.finalize() // VOIDCREW EDIT: npc_scaling runs after faction and callback setup.
 
 
 	if (spawn_text)
diff --git a/code/datums/mapgen/CaveGenerator.dm b/code/datums/mapgen/CaveGenerator.dm
index f7d8f2d08ef..152302a3acc 100644
--- a/code/datums/mapgen/CaveGenerator.dm
+++ b/code/datums/mapgen/CaveGenerator.dm
@@ -382,7 +382,10 @@
 					weighted_megafauna_spawn_list.Remove(picked_mob)
 					megafauna_spawn_list = expand_weights(weighted_megafauna_spawn_list)
 					megas_allowed = megas_allowed && length(megafauna_spawn_list)
-				new picked_mob(target_turf)
+				// VOIDCREW EDIT ADDITION START: npc_scaling pins this generating site.
+				var/datum/npc_spawn_context/context = new(src, role = is_megafauna ? "boss" : "auto", source_turf = target_turf)
+				spawn_npc_in_zone(picked_mob, target_turf, context)
+				// VOIDCREW EDIT ADDITION END
 				spawned_something = TRUE
 		// VOIDCREW EDIT: worldgen_yield, not CHECK_TICK - mid-round asteroid/field
 		// builds run this under the worldgen queue and must share its budget
diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
index ab08ffaa957..c5569156a9d 100644
--- a/code/game/machinery/computer/crew.dm
+++ b/code/game/machinery/computer/crew.dm
@@ -204,7 +204,8 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 // VOIDCREW EDIT END
 
 	var/list/results = list()
-	for(var/tracked_mob in GLOB.suit_sensors_list)
+	// VOIDCREW EDIT: nanite Monitoring shares the same scoped sensor feed (voidcrew/modules/nanites).
+	for(var/tracked_mob in (GLOB.suit_sensors_list | SSnanites.nanite_monitored_mobs))
 		if(!tracked_mob)
 			stack_trace("Null entry in suit sensors list.")
 			continue
@@ -225,25 +226,26 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 		if(!voidcrew_crew_sensor_in_scope(tracked_living_mob, pos, hull, z, source_turf)) // VOIDCREW EDIT: crew sensor integration: scope and cache readings by the requesting device (voidcrew/edits/machinery/crew_monitor.dm)
 			continue
 
-		var/mob/living/carbon/human/tracked_human = tracked_living_mob
-
-		// Check their humanity.
-		if(!ishuman(tracked_human))
-			stack_trace("Non-human mob is in suit_sensors_list: [tracked_living_mob] ([tracked_living_mob.type])")
-			continue
-
-		// Check they have a uniform
-		var/obj/item/clothing/under/uniform = tracked_human.w_uniform
-		if (!istype(uniform))
-			stack_trace("Human without a suit sensors compatible uniform is in suit_sensors_list: [tracked_human] ([tracked_human.type]) ([uniform?.type])")
-			continue
-
-		// Check if their uniform is in a compatible mode.
-		if((uniform.has_sensor == NO_SENSORS) || !uniform.sensor_mode)
-			stack_trace("Human without active suit sensors is in suit_sensors_list: [tracked_human] ([tracked_human.type]) ([uniform.type])")
-			continue
-
-		var/sensor_mode = uniform.sensor_mode
+		// VOIDCREW EDIT CHANGE START - nanites: Monitoring reports without a uniform (voidcrew/modules/nanites).
+		var/monitored = (tracked_living_mob in SSnanites.nanite_monitored_mobs)
+		var/obj/item/clothing/under/uniform
+		var/sensor_mode = SENSOR_COORDS
+		if(!monitored)
+			var/mob/living/carbon/human/tracked_human = tracked_living_mob
+			if(!ishuman(tracked_human))
+				stack_trace("Non-human mob is in suit_sensors_list: [tracked_living_mob] ([tracked_living_mob.type])")
+				continue
+
+			uniform = tracked_human.w_uniform
+			if(!istype(uniform))
+				stack_trace("Human without a suit sensors compatible uniform is in suit_sensors_list: [tracked_human] ([tracked_human.type]) ([uniform?.type])")
+				continue
+
+			if((uniform.has_sensor == NO_SENSORS) || !uniform.sensor_mode)
+				stack_trace("Human without active suit sensors is in suit_sensors_list: [tracked_human] ([tracked_human.type]) ([uniform.type])")
+				continue
+			sensor_mode = uniform.sensor_mode
+		// VOIDCREW EDIT CHANGE END
 
 		// The entry for this human
 		var/list/entry = list(
@@ -262,7 +264,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 				entry["ijob"] = jobs[trim_assignment]
 
 		// Broken sensors show garbage data
-		if (uniform.has_sensor == BROKEN_SENSORS)
+		if (!monitored && uniform.has_sensor == BROKEN_SENSORS) // VOIDCREW EDIT: nanite Monitoring has no uniform.
 			entry["life_status"] = rand(0,1)
 			entry["area"] = pick_list (ION_FILE, "ionarea")
 			entry["oxydam"] = rand(0,175)
diff --git a/code/game/machinery/computer/orders/order_computer/order_computer.dm b/code/game/machinery/computer/orders/order_computer/order_computer.dm
index a83b930eada..cedc3994254 100644
--- a/code/game/machinery/computer/orders/order_computer/order_computer.dm
+++ b/code/game/machinery/computer/orders/order_computer/order_computer.dm
@@ -191,11 +191,12 @@ GLOBAL_LIST_EMPTY(order_console_products)
 					continue
 				for(var/amt in 1 to grocery_list[item])//every order amount
 					ordered_paths += item.purchase_path
-			podspawn(list(
+			var/obj/structure/closet/supplypod/delivery = podspawn(list( // VOIDCREW EDIT: trade stamps the completed order bundle.
 				"target" = get_turf(living_user),
 				"style" = /datum/pod_style/advanced,
 				"spawn" = ordered_paths,
 			))
+			mark_trader_goods(delivery) // VOIDCREW EDIT: trade resale rule.
 			grocery_list.Cut()
 	return TRUE
 
diff --git a/code/game/objects/effects/spawners/random/random.dm b/code/game/objects/effects/spawners/random/random.dm
index 9614c4a1781..718150fcaca 100644
--- a/code/game/objects/effects/spawners/random/random.dm
+++ b/code/game/objects/effects/spawners/random/random.dm
@@ -114,6 +114,11 @@
  * type_path_to_make - what are we spawning?
  **/
 /obj/effect/spawner/random/proc/make_item(spawn_loc, type_path_to_make)
+	// VOIDCREW EDIT ADDITION START: npc_scaling also catches Initialize replacements.
+	if(ispath(type_path_to_make, /mob/living) || ispath(type_path_to_make, /obj/structure/spawner))
+		var/datum/npc_spawn_context/context = new(src)
+		return spawn_npc_in_zone(type_path_to_make, spawn_loc, context)
+	// VOIDCREW EDIT ADDITION END
 	return new type_path_to_make(spawn_loc)
 
 ///If the spawner has a spawn_scatter_radius set, this creates a list of nearby turfs available that are in view and have an unblocked line to them.
diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm
index b68b11d9f63..8da48f4be31 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -619,28 +619,15 @@
 					user.visible_message(span_warning("[req_defib ? "[defib]" : "[src]"] buzzes: Resuscitation failed - [fail_reason]"))
 					playsound(src, 'sound/machines/defib/defib_failed.ogg', 50, FALSE)
 				else
-					var/total_brute = H.getBruteLoss()
-					var/total_burn = H.getFireLoss()
-
-					var/need_mob_update = FALSE
-					//If the body has been fixed so that they would not be in crit when defibbed, give them oxyloss to put them back into crit
-					if (H.health > HALFWAYCRITDEATH)
-						need_mob_update += H.adjustOxyLoss(H.health - HALFWAYCRITDEATH, updating_health = FALSE)
-					else
-						var/overall_damage = total_brute + total_burn + H.getToxLoss() + H.getOxyLoss()
-						var/mobhealth = H.health
-						need_mob_update += H.adjustOxyLoss((mobhealth - HALFWAYCRITDEATH) * (H.getOxyLoss() / overall_damage), updating_health = FALSE)
-						need_mob_update += H.adjustToxLoss((mobhealth - HALFWAYCRITDEATH) * (H.getToxLoss() / overall_damage), updating_health = FALSE, forced = TRUE) // force tox heal for toxin lovers too
-						need_mob_update += H.adjustFireLoss((mobhealth - HALFWAYCRITDEATH) * (total_burn / overall_damage), updating_health = FALSE)
-						need_mob_update += H.adjustBruteLoss((mobhealth - HALFWAYCRITDEATH) * (total_brute / overall_damage), updating_health = FALSE)
-					if(need_mob_update)
-						H.updatehealth() // Previous "adjust" procs don't update health, so we do it manually.
+					// VOIDCREW EDIT ADDITION START: shared defib healing and explicit combat metrics attribution.
+					if(!revive_patient(H, defib_result))
+						playsound(src, 'sound/machines/defib/defib_failed.ogg', 50, FALSE)
+						do_success() // The shock still consumes a charge and recharges the paddles.
+						return
+					// VOIDCREW EDIT ADDITION END
 					user.visible_message(span_notice("[req_defib ? "[defib]" : "[src]"] pings: Resuscitation successful."))
 					playsound(src, 'sound/machines/defib/defib_success.ogg', 50, FALSE)
-					H.set_heartattack(FALSE)
-					if(defib_result == DEFIB_POSSIBLE)
-						H.grab_ghost()
-					H.revive()
+					// VOIDCREW EDIT: revival happens in revive_patient(), before any success effects.
 					H.emote("gasp")
 					H.set_jitter_if_lower(200 SECONDS)
 					SEND_SIGNAL(H, COMSIG_LIVING_MINOR_SHOCK)
@@ -672,6 +659,17 @@
 				playsound(src, 'sound/machines/defib/defib_failed.ogg', 50, FALSE)
 	do_cancel()
 
+// VOIDCREW EDIT ADDITION START: shared defib healing and explicit combat metrics attribution.
+/obj/item/shockpaddles/proc/revive_patient(mob/living/carbon/patient, defib_result)
+	if(defib_result != DEFIB_POSSIBLE && defib_result != DEFIB_NOGRAB_AGHOST)
+		return FALSE
+	patient.heal_for_defib()
+	patient.set_heartattack(FALSE)
+	if(defib_result == DEFIB_POSSIBLE)
+		patient.grab_ghost()
+	return patient.revive_from("defibrillator")
+// VOIDCREW EDIT ADDITION END
+
 /obj/item/shockpaddles/proc/is_wielded()
 	return HAS_TRAIT(src, TRAIT_WIELDED)
 
diff --git a/code/game/objects/structures/lavaland/ore_vent.dm b/code/game/objects/structures/lavaland/ore_vent.dm
index 0a51fdfa612..f309556fd05 100644
--- a/code/game/objects/structures/lavaland/ore_vent.dm
+++ b/code/game/objects/structures/lavaland/ore_vent.dm
@@ -6,7 +6,7 @@
 
 /obj/structure/ore_vent
 	name = "ore vent"
-	desc = "An ore vent, brimming with underground ore. Scan with an advanced mining scanner to start extracting ore from it."
+	desc = "A fissure brimming with underground ore." // VOIDCREW EDIT: keep descriptions in character.
 	icon = 'icons/obj/mining_zones/terrain.dmi'
 	icon_state = "ore_vent"
 	base_icon_state = "ore_vent"
@@ -116,15 +116,17 @@
 	if(!HAS_TRAIT(user, TRAIT_BOULDER_BREAKER))
 		return
 	if(!discovered)
-		to_chat(user, span_notice("You can't quite find the weakpoint of [src]... Perhaps it needs to be scanned first?"))
+		to_chat(user, span_notice("You can't find a weak point in [src].")) // VOIDCREW EDIT: omit scanner instructions.
 		return
 	to_chat(user, span_notice("You start striking [src] with your golem's fist, attempting to dredge up a boulder..."))
 	for(var/i in 1 to 3)
 		if(do_after(user, boulder_size * 1 SECONDS, src))
 			user.apply_damage(20, STAMINA)
 			playsound(src, 'sound/items/weapons/genhit.ogg', 50, TRUE)
-	produce_boulder(TRUE)
-	visible_message(span_notice("You've successfully produced a boulder! Boy are your arms tired."))
+	// VOIDCREW EDIT CHANGE START - exhausted vents produce nothing (mining/ore_vents.dm).
+	if(produce_boulder(TRUE))
+		visible_message(span_notice("A boulder breaks free!"))
+	// VOIDCREW EDIT CHANGE END
 
 /obj/structure/ore_vent/attack_basic_mob(mob/user, list/modifiers)
 	. = ..()
@@ -140,7 +142,7 @@
 
 /obj/structure/ore_vent/examine(mob/user)
 	. = ..()
-	if(discovered)
+	if(discovered && can_produce_ore()) // VOIDCREW EDIT: spent seams do not advertise production (mining/ore_vents.dm).
 		switch(boulder_size)
 			if(BOULDER_SIZE_SMALL)
 				. += span_notice("This vent produces [span_bold("small")] boulders containing [ore_string]")
@@ -148,8 +150,7 @@
 				. += span_notice("This vent produces [span_bold("medium")] boulders containing [ore_string]")
 			if(BOULDER_SIZE_LARGE)
 				. += span_notice("This vent produces [span_bold("large")] boulders containing [ore_string]")
-	else
-		. += span_notice("This vent can be scanned with a [span_bold("Mining Scanner")].")
+	// VOIDCREW EDIT: omit scanner instructions.
 
 /obj/structure/ore_vent/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
 	if(is_type_in_list(held_item, scanning_equipment))
@@ -160,7 +161,8 @@
  * This proc is called when the ore vent is initialized, in order to determine what minerals boulders it spawns can contain.
  * The materials available are determined by SSore_generation.ore_vent_minerals, which is a list of all minerals that can be contained in ore vents for a given cave generation.
  * As a result, minerals use a weighted list as seen by ore_vent_minerals_lavaland, which is then copied to ore_vent_minerals.
- * Once a material is picked from the weighted list, it's removed from ore_vent_minerals, so that it can't be picked again and provided its own internal weight used when assigning minerals to boulders spawned by this vent.
+ * VOIDCREW EDIT: each weighted pick spends one allocation; only exhausted entries are removed.
+ * The selected material gets its own internal weight for this vent's boulders.
  * May also be called after the fact, as seen in SSore_generation's initialize, to add more minerals to an existing vent.
  *
  * The above applies only when spawning in at mapload, otherwise we pick randomly from ore_vent_minerals_lavaland.
@@ -171,25 +173,13 @@
 /obj/structure/ore_vent/proc/generate_mineral_breakdown(new_minerals = MINERAL_TYPE_OPTIONS_RANDOM, map_loading = FALSE)
 	if(new_minerals < 1)
 		CRASH("generate_mineral_breakdown called with new_minerals < 1.")
-	var/list/available_mats = difflist(first = SSore_generation.ore_vent_minerals, second = mineral_breakdown, skiprep = 1)
+	// VOIDCREW EDIT ADDITION START - weighted, finite allocation (mining/ore_vents.dm).
 	for(var/i in 1 to new_minerals)
-		if(!length(SSore_generation.ore_vent_minerals) && map_loading)
-			// We should prevent this from happening in SSore_generation, but if not then we crash here
-			CRASH("No minerals left to pick from! We may have spawned too many ore vents in init, or the map config in seedRuins may not have enough resources for the mineral budget.")
-		var/datum/material/new_material
-		if(map_loading)
-			if(length(available_mats))
-				new_material = pick(GLOB.ore_vent_minerals_lavaland)
-				var/datum/material/surrogate_mat = pick(SSore_generation.ore_vent_minerals)
-				available_mats -= surrogate_mat
-				SSore_generation.ore_vent_minerals -= surrogate_mat
-			else
-				new_material = pick(available_mats)
-				available_mats -= new_material
-				SSore_generation.ore_vent_minerals -= new_material
-		else
-			new_material = pick(GLOB.ore_vent_minerals_lavaland)
+		var/new_material = select_vent_mineral(map_loading)
+		if(isnull(new_material))
+			break
 		mineral_breakdown[new_material] = rand(1, 4)
+	// VOIDCREW EDIT ADDITION END
 
 
 /**
@@ -417,6 +407,17 @@
 		return
 	// VOIDCREW EDIT END
 
+	// VOIDCREW EDIT ADDITION START - prepare and debit both finite limits before emission.
+	if(!can_produce_ore())
+		return
+	var/list/mats_list = list()
+	for(var/iteration in 1 to MINERALS_PER_BOULDER)
+		var/datum/material/material = pick_weight(mineral_breakdown)
+		mats_list[material] += ore_quantity_function(iteration)
+	if(!commit_ore_payload(mats_list))
+		return
+	// VOIDCREW EDIT ADDITION END
+
 	//produce the boulder
 	var/obj/item/boulder/new_rock
 	if(prob(artifact_chance))
@@ -425,11 +426,7 @@
 		new_rock = new /obj/item/boulder(loc)
 	Shake(duration = 1.5 SECONDS)
 
-	//decorate the boulder with materials
-	var/list/mats_list = list()
-	for(var/iteration in 1 to MINERALS_PER_BOULDER)
-		var/datum/material/material = pick_weight(mineral_breakdown)
-		mats_list[material] += ore_quantity_function(iteration)
+	// VOIDCREW EDIT REMOVAL: the materials are rolled and debited before the boulder is made, above.
 	new_rock.set_custom_materials(mats_list)
 
 	//set size & durability
@@ -608,7 +605,10 @@
 	if(!COOLDOWN_FINISHED(src, wave_cooldown))
 		return
 	// Completely override the normal wave defense, and just spawn the boss.
-	var/mob/living/simple_animal/hostile/megafauna/boss = new summoned_boss(loc)
+	// VOIDCREW EDIT ADDITION START - npc_scaling: capture the vent's planet band before construction.
+	var/datum/npc_spawn_context/context = new(src, SSovermap_zones.planet_zone_type_for_turf(get_turf(src)), "boss")
+	var/mob/living/simple_animal/hostile/megafauna/boss = spawn_npc_in_zone(summoned_boss, loc, context)
+	// VOIDCREW EDIT ADDITION END
 	RegisterSignal(boss, COMSIG_LIVING_DEATH, PROC_REF(handle_wave_conclusion))
 	SSblackbox.record_feedback("tally", "ore_vent_mobs_spawned", 1, summoned_boss)
 	COOLDOWN_START(src, wave_cooldown, INFINITY) //Basically forever
diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm
index 9d198d1983c..82250b132e1 100644
--- a/code/game/turfs/closed/minerals.dm
+++ b/code/game/turfs/closed/minerals.dm
@@ -92,8 +92,12 @@
 					M.Change_Ore(mineralType)
 
 /turf/closed/mineral/proc/Change_Ore(ore_type, random = 0)
-	if(random)
+	// VOIDCREW EDIT ADDITION START - ordinary ore ranges also apply to vein spreading.
+	if(is_ordinary_ore(ore_type))
+		mineralAmt = ordinary_ore_amount(ore_type)
+	else if(random)
 		mineralAmt = rand(1, 5)
+	// VOIDCREW EDIT ADDITION END
 	if(ispath(ore_type, /obj/item/stack/ore)) //If it has a scan_state, switch to it
 		var/obj/item/stack/ore/the_ore = ore_type
 		scan_state = initial(the_ore.scan_state) // I SAID. SWITCH. TO. IT.
@@ -230,7 +234,6 @@
 	if(istype(user))
 		SEND_SIGNAL(user, COMSIG_MOB_MINED, src, exp_multiplier)
 	if(mineralType && (mineralAmt > 0))
-		mineralAmt = zone_scaled_ore_amount(mineralAmt) // VOIDCREW EDIT: deeper-zone planets yield more ore per wall (see voidcrew/turfs/closed/minerals.dm)
 		new mineralType(src, mineralAmt)
 		SSblackbox.record_feedback("tally", "ore_mined", mineralAmt, mineralType)
 	if(spawned_boulder)
@@ -315,17 +318,12 @@
 	)
 
 /turf/closed/mineral/random/Initialize(mapload)
-	var/static/list/mineral_chances_by_type = list()
-
+	// VOIDCREW EDIT REMOVAL: ore choices come from zone profiles below, not a per-type cache.
 	. = ..()
-	var/dynamic_prob = mineralChance
-	if(proximity_based)
-		dynamic_prob = proximity_ore_chance() // We assign the chance of ore spawning based on probability.
-	if (prob(dynamic_prob))
-		var/list/spawn_chance_list = mineral_chances_by_type[type]
-		if (isnull(spawn_chance_list))
-			mineral_chances_by_type[type] = expand_weights(mineral_chances())
-			spawn_chance_list = mineral_chances_by_type[type]
+	// VOIDCREW EDIT ADDITION START - zone profiles, independent of vent proximity (mining/ore_profiles.dm).
+	if (ore_initial_roll())
+		var/list/spawn_chance_list = ore_spawn_choices()
+		// VOIDCREW EDIT ADDITION END
 		var/path = pick(spawn_chance_list)
 		if(ispath(path, /turf))
 			var/stored_flags = 0
@@ -337,7 +335,7 @@
 			if(ismineralturf(T))
 				var/turf/closed/mineral/M = T
 				M.turf_type = src.turf_type
-				M.mineralAmt = scale_ore_to_vent()
+				// VOIDCREW EDIT: special veins retain their authored quantity and gibtonite bookkeeping.
 				GLOB.post_ore_random["[M.mineralAmt]"] += 1
 				src = M
 				M.levelupdate()
@@ -348,7 +346,7 @@
 		else
 			Change_Ore(path, FALSE)
 			Spread_Vein(path)
-			mineralAmt = scale_ore_to_vent()
+			// VOIDCREW EDIT: Change_Ore() assigns ordinary ore quantities, including spread walls.
 			GLOB.post_ore_manual["[mineralAmt]"] += 1
 
 /turf/closed/mineral/random/high_chance
diff --git a/code/modules/admin/team_panel.dm b/code/modules/admin/team_panel.dm
index 3eba8be9494..1cd6d826bc9 100644
--- a/code/modules/admin/team_panel.dm
+++ b/code/modules/admin/team_panel.dm
@@ -106,24 +106,39 @@
 	log_admin("[key_name(usr)] removed objective \"[O.explanation_text]\" from [name]")
 	//qdel maybe
 
-/datum/team/proc/admin_add_member(mob/user)
+/datum/team/proc/admin_add_member(mob/user, datum/mind/selected_member) // VOIDCREW EDIT - testable crew enrollment
 	var/list/minds = list()
 	for(var/mob/M in GLOB.mob_list)
 		if(M.mind)
 			minds |= M.mind
-	var/datum/mind/value = input("Select new member:", "New team member", null) as null|anything in sort_names(minds)
+	// VOIDCREW EDIT ADDITION START - explicit enrollment target for crew regressions
+	var/datum/mind/value = selected_member
+	if(!value)
+		value = input("Select new member:", "New team member", null) as null|anything in sort_names(minds)
+	// VOIDCREW EDIT ADDITION END
 	if (!value)
 		return
 
 	message_admins("[key_name_admin(usr)] added [key_name_admin(value)] as a member of [name] team")
 	log_admin("[key_name(usr)] added [key_name(value)] as a member of [name] team")
 
-	add_member(value)
+	// VOIDCREW EDIT ADDITION START - authoritative affiliation, voidcrew/modules/teams
+	if(istype(src, /datum/team/voidcrew))
+		var/datum/team/voidcrew/crew = src
+		crew.join_member(value)
+	else
+		add_member(value)
+	// VOIDCREW EDIT ADDITION END
 
 /datum/team/proc/admin_remove_member(mob/user,datum/mind/M)
 	message_admins("[key_name_admin(usr)] removed [key_name_admin(M)] from [name] team")
 	log_admin("[key_name(usr)] removed [key_name(M)] from [name] team")
-	remove_member(M)
+	// VOIDCREW EDIT ADDITION START - explicit crew departure, voidcrew/modules/teams
+	if(istype(src, /datum/team/voidcrew))
+		M.leave_reputation_crew()
+	else
+		remove_member(M)
+	// VOIDCREW EDIT ADDITION END
 
 //After a bit of consideration i block team deletion if there's any members left until unified objective handling is in.
 /datum/team/proc/admin_delete(mob/user)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index d619e7712e4..3d2b5093f30 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -585,7 +585,7 @@
 			to_chat(usr, "This can only be used on instances of type /mob/living.", confidential = TRUE)
 			return
 
-		L.revive(ADMIN_HEAL_ALL)
+		L.revive_from("admin", ADMIN_HEAL_ALL) // VOIDCREW EDIT: explicit combat metrics attribution.
 		message_admins(span_danger("Admin [key_name_admin(usr)] healed / revived [key_name_admin(L)]!"))
 		log_admin("[key_name(usr)] healed / Revived [key_name(L)].")
 
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index c0abfcd88cc..9a504e9b8a6 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -459,7 +459,7 @@ ADMIN_VERB_ONLY_CONTEXT_MENU(cmd_admin_rejuvenate, R_ADMIN, "Rejuvenate", mob/li
 	if(!istype(M))
 		tgui_alert(user,"Cannot revive a ghost")
 		return
-	M.revive(ADMIN_HEAL_ALL)
+	M.revive_from("admin", ADMIN_HEAL_ALL) // VOIDCREW EDIT: explicit combat metrics attribution.
 
 	log_admin("[key_name(user)] healed / revived [key_name(M)]")
 	var/msg = span_danger("Admin [key_name_admin(user)] healed / revived [ADMIN_LOOKUPFLW(M)]!")
diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm
index f9c9bdc50f6..2a7733515d8 100644
--- a/code/modules/admin/verbs/secrets.dm
+++ b/code/modules/admin/verbs/secrets.dm
@@ -684,7 +684,7 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w
 				ghost.reenter_corpse()
 
 			for(var/mob/living/player in GLOB.player_list)
-				player.revive(ADMIN_HEAL_ALL, force_grab_ghost = TRUE)
+				player.revive_from("admin", ADMIN_HEAL_ALL, force_grab_ghost = TRUE) // VOIDCREW EDIT: explicit combat metrics attribution.
 
 			sound_to_playing_players('sound/effects/pray_chaplain.ogg')
 			message_admins("[key_name_admin(holder)] healed everyone.")
diff --git a/code/modules/cargo/exports.dm b/code/modules/cargo/exports.dm
index f2de2cfa8fe..b3c8a7b18fd 100644
--- a/code/modules/cargo/exports.dm
+++ b/code/modules/cargo/exports.dm
@@ -82,6 +82,8 @@ Then the player gets the profit from selling his own wasted time.
 
 /// The main bit responsible for selling the item. Shared by export_single_item() and export_item_and_contents()
 /proc/_export_loop(atom/movable/exported_atom, apply_elastic = TRUE, dry_run = FALSE, datum/export_report/external_report, export_market)
+	if(is_trader_good(exported_atom)) // VOIDCREW EDIT: trade resale rule also covers exporters that bypass parent applies_to().
+		return EXPORT_NOT_SOLD // VOIDCREW EDIT
 	var/sold = EXPORT_NOT_SOLD
 	for(var/datum/export/export as anything in GLOB.exports_list)
 		if(export.applies_to(exported_atom, apply_elastic, export_market))
diff --git a/code/modules/cargo/markets/market_item.dm b/code/modules/cargo/markets/market_item.dm
index c073b0ca0ae..fc38d08a1e1 100644
--- a/code/modules/cargo/markets/market_item.dm
+++ b/code/modules/cargo/markets/market_item.dm
@@ -76,6 +76,7 @@
 	SEND_SIGNAL(src, COMSIG_MARKET_ITEM_SPAWNED, purchase.uplink, purchase.method, loc)
 	if(ismovable(item))
 		var/atom/movable/return_item = item
+		mark_trader_goods(return_item) // VOIDCREW EDIT: trade stamps stock before moving it can merge stacks.
 		UnregisterSignal(item, COMSIG_QDELETING)
 		item.visible_message(span_notice("[item] vanishes..."))
 		do_sparks(8, FALSE, item)
@@ -86,7 +87,7 @@
 		item = null
 		return return_item
 	if(ispath(item))
-		return new item(loc)
+		return create_trader_goods(item, loc) // VOIDCREW EDIT: trade stamps every created stack before automatic merges.
 	CRASH("Invalid item type for market item [item || "null"]")
 
 /**
diff --git a/code/modules/cargo/materials_market.dm b/code/modules/cargo/materials_market.dm
index d341c53f7de..d3686d59640 100644
--- a/code/modules/cargo/materials_market.dm
+++ b/code/modules/cargo/materials_market.dm
@@ -198,7 +198,7 @@
 
 		material_data += list(list(
 			"name" = initial(traded_mat.name),
-			"price" = SSstock_market.materials_prices[traded_mat],
+			"price" = material_market_buy_price(traded_mat), // VOIDCREW EDIT: trade uses a settled buy floor; the live sale bid is unchanged.
 			"rarity" = initial(traded_mat.value_per_unit),
 			"threshold" = minimum_value_threshold,
 			"quantity" = SSstock_market.materials_quantity[traded_mat],
@@ -284,7 +284,7 @@
 				say("Not enough materials on the market to purchase!")
 				return
 
-			var/cost = SSstock_market.materials_prices[material_bought] * quantity
+			var/cost = material_market_buy_price(material_bought) * quantity // VOIDCREW EDIT: trade applies per-sheet buy floors to the quote.
 
 			var/list/things_to_order = list()
 			things_to_order += (sheet_to_buy)
diff --git a/code/modules/jobs/job_types/chaplain/chaplain.dm b/code/modules/jobs/job_types/chaplain/chaplain.dm
index 6f84c0f840a..4c96c41f4f5 100644
--- a/code/modules/jobs/job_types/chaplain/chaplain.dm
+++ b/code/modules/jobs/job_types/chaplain/chaplain.dm
@@ -42,6 +42,11 @@
 	if(!ishuman(spawned))
 		return
 	var/mob/living/carbon/human/human_spawned = spawned
+	// VOIDCREW EDIT ADDITION START: Equip the first chaplain's holy weapon too.
+	var/nrt = GLOB.holy_weapon_type || /obj/item/nullrod
+	var/obj/item/nullrod/nullrod = new nrt(human_spawned)
+	human_spawned.put_in_hands(nullrod)
+	// VOIDCREW EDIT ADDITION END
 	var/obj/item/book/bible/booze/holy_bible = new
 	if(GLOB.religion)
 		if(human_spawned.mind)
@@ -55,9 +60,7 @@
 			holy_bible.inhand_icon_state = GLOB.bible_inhand_icon_state
 		to_chat(human_spawned, span_boldnotice("There is already an established religion onboard the station. You are an acolyte of [GLOB.deity]. Defer to the Chaplain."))
 		human_spawned.equip_to_storage(holy_bible, ITEM_SLOT_BACK, indirect_action = TRUE, del_on_fail = TRUE)
-		var/nrt = GLOB.holy_weapon_type || /obj/item/nullrod
-		var/obj/item/nullrod/nullrod = new nrt(human_spawned)
-		human_spawned.put_in_hands(nullrod)
+		// VOIDCREW EDIT: Holy weapon creation moved before the religion branch.
 		if(GLOB.religious_sect)
 			GLOB.religious_sect.on_conversion(human_spawned)
 		return
diff --git a/code/modules/mining/equipment/monster_organs/regenerative_core.dm b/code/modules/mining/equipment/monster_organs/regenerative_core.dm
index bcec0eb6c4e..528764f1e40 100644
--- a/code/modules/mining/equipment/monster_organs/regenerative_core.dm
+++ b/code/modules/mining/equipment/monster_organs/regenerative_core.dm
@@ -31,7 +31,7 @@
 		trigger_organ_action(TRIGGER_FORCE_AVAILABLE)
 
 /obj/item/organ/monster_core/regenerative_core/on_triggered_internal()
-	owner.revive(HEAL_ALL & ~HEAL_REFRESH_ORGANS)
+	owner.revive_from("legion_core", HEAL_ALL & ~HEAL_REFRESH_ORGANS) // VOIDCREW EDIT: explicit combat metrics attribution.
 	qdel(src)
 
 /// Log applications and apply moodlet.
diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm
index cd902b071c3..1eaf948cdc5 100644
--- a/code/modules/mining/machine_redemption.dm
+++ b/code/modules/mining/machine_redemption.dm
@@ -23,19 +23,7 @@
 	var/ore_multiplier = 1
 	/// Increases the amount of points the miners gain
 	var/point_upgrade = 1
-	/// Details how many credits each smelted ore is worth
-	var/static/list/ore_values = list(
-		/datum/material/iron = 1,
-		/datum/material/glass = 1,
-		/datum/material/plasma = 15,
-		/datum/material/silver = 16,
-		/datum/material/gold = 18,
-		/datum/material/titanium = 30,
-		/datum/material/uranium = 30,
-		/datum/material/diamond = 50,
-		/datum/material/bluespace = 50,
-		/datum/material/bananium = 60,
-	)
+	// VOIDCREW EDIT - ore_values removed; voidcrew/modules/mining/ore_redemption.dm quotes the actual ore payout.
 	/// Variable that holds a timer which is used for callbacks to `send_console_message()`. Used for preventing multiple calls to this proc while the ORM is eating a stack of ores.
 	var/console_notify_timer
 	/// References the alloys the smelter can create
@@ -267,7 +255,7 @@
 				"id" = REF(material),
 				"amount" = sheet_amount,
 				"category" = "material",
-				"value" = ore_values[material.type],
+				"value" = get_ore_points(material), // VOIDCREW EDIT - use the actual raw ore rate and point upgrade.
 				"icon" = sheet_type::icon,
 				"icon_state" = sheet_type::icon_state,
 			))
diff --git a/code/modules/mob/living/basic/icemoon/ice_demon/ice_demon.dm b/code/modules/mob/living/basic/icemoon/ice_demon/ice_demon.dm
index 282ae4d6f55..bd1501aa172 100644
--- a/code/modules/mob/living/basic/icemoon/ice_demon/ice_demon.dm
+++ b/code/modules/mob/living/basic/icemoon/ice_demon/ice_demon.dm
@@ -44,8 +44,7 @@
 	AddElement(/datum/element/simple_flying)
 
 /mob/living/basic/mining/ice_demon/death(gibbed)
-	if(prob(5))
-		new /obj/item/raw_anomaly_core/bluespace(loc)
+	// VOIDCREW EDIT: Core rolls use the spawn-bound allowance in voidcrew/modules/anomalies/core_rewards.dm.
 	return ..()
 
 /mob/living/basic/mining/demon_afterimage
diff --git a/code/modules/mob/living/basic/lavaland/hivelord/hivelord.dm b/code/modules/mob/living/basic/lavaland/hivelord/hivelord.dm
index fbe205ba074..27e5f05e2e2 100644
--- a/code/modules/mob/living/basic/lavaland/hivelord/hivelord.dm
+++ b/code/modules/mob/living/basic/lavaland/hivelord/hivelord.dm
@@ -50,6 +50,7 @@
 			safe_turfs -= check_turf
 
 	var/turf/our_turf = get_turf(src)
+	get_npc_spawn_context() // VOIDCREW EDIT - npc_scaling: pin the death burst's source before its delay.
 	for (var/i in 1 to 3)
 		if (!length(safe_turfs))
 			return
@@ -59,10 +60,15 @@
 
 /// Spawns a worm on the specified turf
 /mob/living/basic/mining/hivelord/proc/complete_spawn(turf/spawn_turf)
-	var/mob/living/brood = new death_spawn_type(spawn_turf)
+	// VOIDCREW EDIT ADDITION START - npc_scaling: carry the environmental source into death brood.
+	get_npc_spawn_context()
+	var/datum/npc_spawn_context/context = new(src, role = "ordinary")
+	var/mob/living/brood = spawn_npc_in_zone(death_spawn_type, spawn_turf, context, FALSE)
+	// VOIDCREW EDIT ADDITION END
 	brood.faction = faction
-	brood.ai_controller?.set_blackboard_key(ai_controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET])
+	brood.ai_controller?.set_blackboard_key(BB_BASIC_MOB_CURRENT_TARGET, ai_controller?.blackboard[BB_BASIC_MOB_CURRENT_TARGET]) // VOIDCREW EDIT - npc_scaling: retain the death brood's target during setup.
 	brood.dir = get_dir(src, spawn_turf)
+	context.finalize() // VOIDCREW EDIT - npc_scaling: finalize after faction setup.
 
 /mob/living/basic/mining/hivelord/RangedAttack(atom/atom_target, modifiers)
 	spawn_brood?.Trigger(target = atom_target)
diff --git a/code/modules/mob/living/basic/lavaland/hivelord/spawn_hivelord_brood.dm b/code/modules/mob/living/basic/lavaland/hivelord/spawn_hivelord_brood.dm
index 6dbbe72a245..be222e5156c 100644
--- a/code/modules/mob/living/basic/lavaland/hivelord/spawn_hivelord_brood.dm
+++ b/code/modules/mob/living/basic/lavaland/hivelord/spawn_hivelord_brood.dm
@@ -70,6 +70,7 @@
 		return FALSE
 
 	var/turf/land_turf = pick(target_turfs)
+	owner.get_npc_spawn_context() // VOIDCREW EDIT - npc_scaling: pin the parent before the delayed emission.
 	var/obj/effect/temp_visual/hivebrood_spawn/forecast = new(land_turf)
 	forecast.create_from(spawn_type, get_turf(owner), CALLBACK(src, PROC_REF(complete_spawn), land_turf, ai_target))
 	StartCooldown()
@@ -78,10 +79,15 @@
 
 /// Actually create a mob
 /datum/action/cooldown/mob_cooldown/hivelord_spawn/proc/complete_spawn(turf/spawn_turf, target)
-	var/mob/living/brood = new spawn_type(spawn_turf)
+	// VOIDCREW EDIT ADDITION START - npc_scaling: children inherit the source, not the parent's role.
+	owner.get_npc_spawn_context()
+	var/datum/npc_spawn_context/context = new(owner, role = "ordinary")
+	var/mob/living/brood = spawn_npc_in_zone(spawn_type, spawn_turf, context, FALSE)
+	// VOIDCREW EDIT ADDITION END
 	brood.faction = owner.faction
 	brood.ai_controller?.set_blackboard_key(ai_target_key, target)
 	brood.dir = get_dir(owner, spawn_turf)
+	context.finalize() // VOIDCREW EDIT - npc_scaling: faction and targeting setup is complete.
 
 #define BROOD_ARC_Y_OFFSET 8
 #define BROOD_ARC_ROTATION 45
diff --git a/code/modules/mob/living/basic/lavaland/legion/legion_brood.dm b/code/modules/mob/living/basic/lavaland/legion/legion_brood.dm
index e09a617f122..c92f839fae9 100644
--- a/code/modules/mob/living/basic/lavaland/legion/legion_brood.dm
+++ b/code/modules/mob/living/basic/lavaland/legion/legion_brood.dm
@@ -66,9 +66,19 @@
 /mob/living/basic/legion_brood/proc/infest(mob/living/carbon/human/target)
 	visible_message(span_warning("[name] burrows into the flesh of [target]!"))
 	var/spawn_type = get_legion_type(target)
-	var/mob/living/basic/mining/legion/new_legion = new spawn_type(loc)
+	// VOIDCREW EDIT ADDITION START - npc_scaling: infestation retains the attacking brood's source.
+	get_npc_spawn_context()
+	var/datum/npc_spawn_context/context = new(src, role = "ordinary")
+	var/mob/living/basic/mining/legion/new_legion = spawn_npc_in_zone(spawn_type, loc, context, FALSE)
+	// VOIDCREW EDIT ADDITION END
 	new_legion.consume(target)
 	new_legion.faction = faction.Copy()
+	// VOIDCREW EDIT ADDITION START - npc_scaling: a parasite left in the victim retains the same source.
+	var/obj/item/organ/legion_tumour/tumour = target.get_organ_slot(ORGAN_SLOT_PARASITE_EGG)
+	if(istype(tumour))
+		tumour.npc_spawn_context = context
+	context.finalize()
+	// VOIDCREW EDIT ADDITION END
 	qdel(src)
 
 /// Returns the kind of legion we make out of the target
diff --git a/code/modules/mob/living/basic/lavaland/legion/legion_tumour.dm b/code/modules/mob/living/basic/lavaland/legion/legion_tumour.dm
index 6be564ab4ab..ab282e805c4 100644
--- a/code/modules/mob/living/basic/lavaland/legion/legion_tumour.dm
+++ b/code/modules/mob/living/basic/lavaland/legion/legion_tumour.dm
@@ -58,6 +58,9 @@
 
 /obj/item/organ/legion_tumour/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags)
 	. = ..()
+	// VOIDCREW EDIT ADDITION START - npc_scaling: retain infection context, including constructor-created parasites.
+	npc_spawn_context ||= GLOB.npc_zone_construction_context || new /datum/npc_spawn_context(organ_owner)
+	// VOIDCREW EDIT ADDITION END
 	owner.log_message("has received [src] which will eventually turn them into a Legion.", LOG_VICTIM)
 
 /obj/item/organ/legion_tumour/attack(mob/living/target, mob/living/user, list/modifiers, list/attack_modifiers)
@@ -86,7 +89,10 @@
 
 	log_combat(user, target, "used a Legion Tumour on", src, "as they are in crit, this will turn them into a Legion.")
 	target.visible_message(span_boldwarning("[user] splatters [target] with [src]... and it springs into horrible life!"))
-	var/mob/living/basic/legion_brood/skull = new(target.loc)
+	// VOIDCREW EDIT ADDITION START - npc_scaling: manually applied tumours inherit the user's ownership exemption.
+	var/datum/npc_spawn_context/context = new(user, role = "ordinary")
+	var/mob/living/basic/legion_brood/skull = spawn_npc_in_zone(/mob/living/basic/legion_brood, target.loc, context)
+	// VOIDCREW EDIT ADDITION END
 	skull.melee_attack(target)
 	return TRUE
 
@@ -125,8 +131,7 @@
 				if (prob(50))
 					var/turf/check_turf = get_step(owner.loc, owner.dir)
 					var/atom/land_turf = (check_turf.is_blocked_turf()) ? owner.loc : check_turf
-					var/mob/living/basic/legion_brood/child = new(land_turf)
-					child.assign_creator(owner, copy_full_faction = FALSE)
+					spawn_brood(land_turf) // VOIDCREW EDIT - npc_scaling: finalize after creator assignment.
 
 			if(SPT_PROB(3, seconds_per_tick))
 				to_chat(owner, span_danger("Your muscles ache."))
@@ -145,14 +150,35 @@
 	if (stage == 5)
 		to_chat(owner, span_bolddanger("Something is moving under your skin!"))
 
+// VOIDCREW EDIT ADDITION START - npc_scaling: parasite children retain the infection source.
+/obj/item/organ/legion_tumour/proc/spawn_brood(atom/location)
+	get_npc_spawn_context()
+	var/datum/npc_spawn_context/context = new(src, role = "ordinary")
+	var/mob/living/basic/legion_brood/child = spawn_npc_in_zone(/mob/living/basic/legion_brood, location, context, FALSE)
+	child.assign_creator(owner, copy_full_faction = FALSE)
+	context.finalize()
+	return child
+// VOIDCREW EDIT ADDITION END
+
 /// Consume our host
 /obj/item/organ/legion_tumour/proc/infest()
 	if (QDELETED(src) || QDELETED(owner))
 		return
 	owner.log_message("has been turned into a Legion by their tumour.", LOG_VICTIM)
 	owner.visible_message(span_boldwarning("Black tendrils burst from [owner]'s flesh, covering them in amorphous flesh!"))
-	var/mob/living/basic/mining/legion/new_legion = new spawn_type(owner.loc)
-	new_legion.consume(owner)
+	// VOIDCREW EDIT ADDITION START - npc_scaling: finalize the transformed body after consumption.
+	get_npc_spawn_context()
+	var/datum/npc_spawn_context/context = new(src, role = "ordinary")
+	var/mob/living/basic/mining/legion/new_legion = spawn_npc_in_zone(spawn_type, owner.loc, context, FALSE)
+	// VOIDCREW EDIT ADDITION END
+	// VOIDCREW EDIT ADDITION START - npc_scaling: consume may replace this tumour; preserve the next infection too.
+	var/mob/living/carbon/human/host = owner
+	new_legion.consume(host)
+	var/obj/item/organ/legion_tumour/tumour = host.get_organ_slot(ORGAN_SLOT_PARASITE_EGG)
+	if(istype(tumour))
+		tumour.npc_spawn_context = context
+	// VOIDCREW EDIT ADDITION END
+	context.finalize() // VOIDCREW EDIT - npc_scaling
 	qdel(src)
 
 /obj/item/organ/legion_tumour/on_find(mob/living/finder)
diff --git a/code/modules/mob/living/basic/lavaland/legion/spawn_legions.dm b/code/modules/mob/living/basic/lavaland/legion/spawn_legions.dm
index b1732eb752f..12dca635db3 100644
--- a/code/modules/mob/living/basic/lavaland/legion/spawn_legions.dm
+++ b/code/modules/mob/living/basic/lavaland/legion/spawn_legions.dm
@@ -62,6 +62,7 @@
 		ai_target = owner.ai_controller?.blackboard[ai_target_key]
 
 	var/target_dir = get_dir(owner, target)
+	owner.get_npc_spawn_context() // VOIDCREW EDIT: npc_scaling: pin the source before the landing delay.
 
 	var/obj/effect/temp_visual/legion_skull_depart/launch = new(get_turf(owner))
 	launch.set_appearance(spawn_type)
@@ -74,7 +75,11 @@
 
 /// Actually create a mob
 /datum/action/cooldown/mob_cooldown/skull_launcher/proc/spawn_skull(turf/spawn_location, target)
-	var/mob/living/basic/legion_brood/brood = new spawn_type(spawn_location)
+	// VOIDCREW EDIT ADDITION START - npc_scaling: finalize the surviving child after creator setup.
+	owner.get_npc_spawn_context()
+	var/datum/npc_spawn_context/context = new(owner, role = "ordinary")
+	var/mob/living/basic/legion_brood/brood = spawn_npc_in_zone(spawn_type, spawn_location, context, FALSE)
+	// VOIDCREW EDIT ADDITION END
 	if (istype(brood))
 		brood.assign_creator(owner)
 	brood.ai_controller?.set_blackboard_key(ai_target_key, target)
@@ -83,6 +88,7 @@
 		brood.face_atom(target)
 	else
 		brood.dir = get_dir(owner, spawn_location)
+	context.finalize() // VOIDCREW EDIT - npc_scaling
 
 
 /// Animation for launching a skull
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 9bb4e2da159..4778809a828 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1022,7 +1022,7 @@
 		setFireLoss(round(fire_loss - fire_healing, DAMAGE_PRECISION), updating_health=TRUE, forced=TRUE)
 		healing_amount = max(0, healing_amount - fire_healing)
 
-	revive(NONE, excess_healing=max(healing_amount, 0), force_grab_ghost=FALSE) // and any excess healing is passed along
+	revive_from("strange_reagent", NONE, excess_healing=max(healing_amount, 0), force_grab_ghost=FALSE) // VOIDCREW EDIT: explicit combat metrics attribution; pass excess healing along.
 
 /// Checks if we are actually able to ressuscitate this mob.
 /// (We don't want to revive then to have them instantly die again)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
index 17171fb9176..8448b92752c 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
@@ -148,7 +148,11 @@
 	var/mob/living/living_target = target
 	switch(living_target.stat)
 		if(UNCONSCIOUS, HARD_CRIT)
-			var/mob/living/basic/legion_brood/legion = new(loc)
+			// VOIDCREW EDIT ADDITION START - npc_scaling: infestation uses the boss's source with the child type's role.
+			get_npc_spawn_context()
+			var/datum/npc_spawn_context/context = new(src, role = "ordinary")
+			var/mob/living/basic/legion_brood/legion = spawn_npc_in_zone(/mob/living/basic/legion_brood, loc, context)
+			// VOIDCREW EDIT ADDITION END
 			legion.infest(living_target)
 
 ///Special snowflake death() here. Can only die if size is 1 or lower and HP is 0 or below.
@@ -176,14 +180,17 @@
 ///Splits legion into smaller skulls.
 /mob/living/simple_animal/hostile/megafauna/legion/proc/Split()
 	size--
+	get_npc_spawn_context() // VOIDCREW EDIT - npc_scaling: pin the split source before constructing children.
 	switch(size)
 		if (LEGION_SMALL)
 			for (var/i in 0 to 2)
-				new /mob/living/simple_animal/hostile/megafauna/legion/small(loc)
+				spawn_npc_in_zone(/mob/living/simple_animal/hostile/megafauna/legion/small, loc, new /datum/npc_spawn_context(src)) // VOIDCREW EDIT - npc_scaling
 		if (LEGION_MEDIUM)
-			new /mob/living/simple_animal/hostile/megafauna/legion/medium/left(loc)
-			new /mob/living/simple_animal/hostile/megafauna/legion/medium/right(loc)
-			new /mob/living/simple_animal/hostile/megafauna/legion/medium/eye(loc)
+			// VOIDCREW EDIT ADDITION START - npc_scaling: each split is a fresh, once-finalized boss body.
+			spawn_npc_in_zone(/mob/living/simple_animal/hostile/megafauna/legion/medium/left, loc, new /datum/npc_spawn_context(src))
+			spawn_npc_in_zone(/mob/living/simple_animal/hostile/megafauna/legion/medium/right, loc, new /datum/npc_spawn_context(src))
+			spawn_npc_in_zone(/mob/living/simple_animal/hostile/megafauna/legion/medium/eye, loc, new /datum/npc_spawn_context(src))
+			// VOIDCREW EDIT ADDITION END
 
 #undef LEGION_LARGE
 #undef LEGION_MEDIUM
diff --git a/code/modules/power/supermatter/supermatter_extra_effects.dm b/code/modules/power/supermatter/supermatter_extra_effects.dm
index 0724667300f..5ba978c76d1 100644
--- a/code/modules/power/supermatter/supermatter_extra_effects.dm
+++ b/code/modules/power/supermatter/supermatter_extra_effects.dm
@@ -163,22 +163,24 @@
 	var/turf/local_turf = pick(RANGE_TURFS(anomalyrange, anomalycenter))
 	if(!local_turf)
 		return
+	// VOIDCREW EDIT CHANGE START - Coreless hazards: voidcrew/edits/modules/power/supermatter_anomalies.dm.
 	switch(type)
 		if(FLUX_ANOMALY)
 			var/explosive = has_changed_lifespan ? FLUX_NO_EMP : FLUX_LIGHT_EMP
-			new /obj/effect/anomaly/flux(local_turf, has_changed_lifespan ? rand(25 SECONDS, 35 SECONDS) : null, FALSE, explosive)
+			new /obj/effect/anomaly/flux/supermatter(local_turf, has_changed_lifespan ? rand(25 SECONDS, 35 SECONDS) : null, FALSE, explosive)
 		if(GRAVITATIONAL_ANOMALY)
-			new /obj/effect/anomaly/grav(local_turf, has_changed_lifespan ? rand(20 SECONDS, 30 SECONDS) : null, FALSE)
+			new /obj/effect/anomaly/grav/supermatter(local_turf, has_changed_lifespan ? rand(20 SECONDS, 30 SECONDS) : null, FALSE)
 		if(PYRO_ANOMALY)
-			new /obj/effect/anomaly/pyro(local_turf, has_changed_lifespan ? rand(15 SECONDS, 25 SECONDS) : null, FALSE)
+			new /obj/effect/anomaly/pyro/supermatter(local_turf, has_changed_lifespan ? rand(15 SECONDS, 25 SECONDS) : null, FALSE)
 		if(HALLUCINATION_ANOMALY)
-			new /obj/effect/anomaly/hallucination/supermatter(local_turf, has_changed_lifespan ? rand(15 SECONDS, 25 SECONDS) : null, FALSE)
+			new /obj/effect/anomaly/hallucination/supermatter/coreless(local_turf, has_changed_lifespan ? rand(15 SECONDS, 25 SECONDS) : null, FALSE)
 		if(VORTEX_ANOMALY)
-			new /obj/effect/anomaly/bhole(local_turf, 2 SECONDS, FALSE)
+			new /obj/effect/anomaly/bhole/supermatter(local_turf, 2 SECONDS, FALSE)
 		if(BIOSCRAMBLER_ANOMALY)
-			new /obj/effect/anomaly/bioscrambler/docile(local_turf, null, FALSE)
+			new /obj/effect/anomaly/bioscrambler/docile/supermatter(local_turf, null, FALSE)
 		if(DIMENSIONAL_ANOMALY)
-			new /obj/effect/anomaly/dimensional(local_turf, null, FALSE)
+			new /obj/effect/anomaly/dimensional/supermatter(local_turf, null, FALSE)
+	// VOIDCREW EDIT CHANGE END
 
 #undef CHANCE_EQUATION_SLOPE
 #undef INTEGRITY_EXPONENTIAL_DEGREE
diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
index 3099051c106..caeafc53bcd 100644
--- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
@@ -76,7 +76,7 @@
 			if(3) //VICTORY ROYALE
 				to_chat(affected_mob, span_hierophant("You win, and the malevolent spirits fade away as well as your wounds."))
 				affected_mob.client.give_award(/datum/award/achievement/jobs/helbitaljanken, affected_mob)
-				affected_mob.revive(HEAL_ALL & ~HEAL_REFRESH_ORGANS)
+				affected_mob.revive_from("reagent", HEAL_ALL & ~HEAL_REFRESH_ORGANS) // VOIDCREW EDIT: explicit combat metrics attribution.
 				holder.del_reagent(type)
 				return
 
diff --git a/code/modules/research/techweb/_techweb.dm b/code/modules/research/techweb/_techweb.dm
index 589cdf310e6..96406664344 100644
--- a/code/modules/research/techweb/_techweb.dm
+++ b/code/modules/research/techweb/_techweb.dm
@@ -307,22 +307,12 @@
 	available_experiments -= completed_experiment
 	completed_experiments[completed_experiment.type] = completed_experiment
 
-	var/result_text = "[completed_experiment] has been completed"
-	var/refund = skipped_experiment_types[completed_experiment.type] || 0
-	if(refund > 0)
-		add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = refund))
-		result_text += ", refunding [refund] points"
-		// Nothing more to gain here, but we keep it in the list to prevent double dipping
-		skipped_experiment_types[completed_experiment.type] = -1
-	var/points_rewarded
-	if(completed_experiment.points_reward)
-		add_point_list(completed_experiment.points_reward)
-		points_rewarded = ",[refund > 0 ? " and" : ""] rewarding [completed_experiment.get_points_reward_text()]"
-		result_text += points_rewarded
-	result_text += "!"
-
-	log_research("[completed_experiment.name] ([completed_experiment.type]) has been completed on techweb [id]/[organization][refund ? ", refunding [refund] points" : ""][points_rewarded].")
-	return result_text
+	// VOIDCREW EDIT ADDITION START - research: paid-discount receipts and owner-scoped completion rewards.
+	var/list/refunded_points = refund_experiment_discounts(completed_experiment)
+	var/list/rewarded_points = award_experiment_completion(completed_experiment)
+	log_research("[completed_experiment.name] ([completed_experiment.type]) has been completed on techweb [id]/[organization], refunding [json_encode(refunded_points)] and rewarding [json_encode(rewarded_points)].")
+	return "[completed_experiment] has been completed!"
+	// VOIDCREW EDIT ADDITION END
 
 /datum/techweb/proc/printout_points()
 	return techweb_point_display_generic(research_points)
@@ -374,17 +364,15 @@
 	var/log_message = "[id]/[organization] researched node [node.id]"
 	if(auto_adjust_cost)
 		var/list/node_cost = node.get_price(src)
+		var/list/points_before = research_points.Copy() // VOIDCREW EDIT - research: capture the actual debit.
 		remove_point_list(node_cost)
+		record_node_payment(node, points_before) // VOIDCREW EDIT - research: only paid nodes earn discount refunds.
 		log_message += " at the cost of [json_encode(node_cost)]"
 
 	//Add to our researched list
 	researched_nodes[node.id] = TRUE
 
-	// Track any experiments we skipped relating to this
-	for(var/missed_experiment in node.discount_experiments)
-		if(completed_experiments[missed_experiment] || skipped_experiment_types[missed_experiment])
-			continue
-		skipped_experiment_types[missed_experiment] = node.discount_experiments[missed_experiment]
+	// VOIDCREW EDIT - research: skipped discounts are recorded only with their payment above.
 
 	// Gain the experiments from the new node
 	for(var/id in node.unlock_ids)
diff --git a/code/modules/shuttle/mobile_port/variants/supply.dm b/code/modules/shuttle/mobile_port/variants/supply.dm
index 30a5da9aa0b..5d97a596c04 100644
--- a/code/modules/shuttle/mobile_port/variants/supply.dm
+++ b/code/modules/shuttle/mobile_port/variants/supply.dm
@@ -154,6 +154,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
 		for(var/datum/orderable_item/item as anything in SSshuttle.chef_groceries)//every order
 			for(var/amt in 1 to SSshuttle.chef_groceries[item])//every order amount
 				new item.purchase_path(grocery_crate)
+		mark_trader_goods(grocery_crate) // VOIDCREW EDIT: trade resale rule covers cook-console deliveries.
 		SSshuttle.chef_groceries.Cut() //This lets the console know it can order another round.
 
 	if(!SSshuttle.shopping_list.len)
diff --git a/code/modules/spells/spell_types/conjure/_conjure.dm b/code/modules/spells/spell_types/conjure/_conjure.dm
index 5501f1055ca..670c42906de 100644
--- a/code/modules/spells/spell_types/conjure/_conjure.dm
+++ b/code/modules/spells/spell_types/conjure/_conjure.dm
@@ -17,6 +17,8 @@
 	var/summon_respects_prev_spawn_points = TRUE
 	/// for how long must we stay still when summoning
 	var/create_summon_timer
+	/// VOIDCREW EDIT - npc_scaling: hostile encounter spells can explicitly designate their outputs.
+	var/npc_summon_role = "auto"
 
 /datum/action/cooldown/spell/conjure/is_valid_target(atom/cast_on)
 	return isturf(cast_on.loc)
@@ -55,13 +57,18 @@
 			open_turf.replace_floor(summoned_object_type, flags = CHANGETURF_INHERIT_AIR)
 			return
 
-		var/atom/summoned_object = new summoned_object_type(spawn_place)
+		// VOIDCREW EDIT ADDITION START - npc_scaling: player-owned casters propagate exemption before construction.
+		owner.get_npc_spawn_context()
+		var/datum/npc_spawn_context/context = new(owner, role = npc_summon_role)
+		var/atom/summoned_object = spawn_npc_in_zone(summoned_object_type, spawn_place, context, FALSE)
+		// VOIDCREW EDIT ADDITION END
 
 		summoned_object.flags_1 |= ADMIN_SPAWNED_1
 		if(summon_lifespan > 0)
 			QDEL_IN(summoned_object, summon_lifespan)
 
 		post_summon(summoned_object, cast_on)
+		context.finalize() // VOIDCREW EDIT - npc_scaling: finalize after subtype faction/body setup.
 
 /// Called on atoms summoned after they are created, allows extra variable editing and such of created objects
 /datum/action/cooldown/spell/conjure/proc/post_summon(atom/summoned_object, atom/cast_on)
diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm b/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm
index c5dedb71fab..d08207aa0c9 100644
--- a/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm
+++ b/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm
@@ -145,7 +145,7 @@
 		if(human_owner.stat != DEAD && prob(50 / severity) && human_owner.can_heartattack())
 			human_owner.set_heartattack(TRUE)
 			to_chat(human_owner, span_userdanger("You feel a horrible agony in your chest!"))
-			addtimer(CALLBACK(src, PROC_REF(undo_heart_attack)), 600 / severity)
+			addtimer(CALLBACK(src, PROC_REF(undo_heart_attack), WEAKREF(human_owner), implantation_generation), 600 / severity) // VOIDCREW EDIT: scope EMP recovery (edits/surgery/reviver.dm).
 
 /obj/item/organ/cyberimp/chest/reviver/proc/undo_heart_attack()
 	var/mob/living/carbon/human/human_owner = owner
diff --git a/code/modules/surgery/revival.dm b/code/modules/surgery/revival.dm
index 65c8116769d..351cee78fc4 100644
--- a/code/modules/surgery/revival.dm
+++ b/code/modules/surgery/revival.dm
@@ -115,7 +115,7 @@
 	if(iscarbon(target))
 		var/mob/living/carbon/carbon_target = target
 		carbon_target.set_heartattack(FALSE)
-	if(target.revive())
+	if(target.revive_from("surgery")) // VOIDCREW EDIT: explicit combat metrics attribution.
 		on_revived(user, target)
 		return TRUE
 
diff --git a/config/voidcrew/voidcrew_config.txt b/config/voidcrew/voidcrew_config.txt
index f165d09ec0a..030b213c016 100644
--- a/config/voidcrew/voidcrew_config.txt
+++ b/config/voidcrew/voidcrew_config.txt
@@ -2,6 +2,10 @@
 
 ALLOW_VOTE_TRANSFER
 
+## Round duration in minutes, read at roundstart. Defaults to 360 without a config entry.
+## 0 disables the automatic fleet jump and restores early round ends and transfer votes.
+#ROUND_TIME_LIMIT 360
+
 ## Makes all ship hulls, themes, and modules free: everything shows as unlocked
 ## in the shipyard and no ship parts are ever charged. Set to 1 to enable.
 
diff --git a/tgstation.dme b/tgstation.dme
index 22c33b7caa9..6b4b40046c3 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -6848,6 +6848,11 @@
 #include "voidcrew\edits\game\movable_luminosity.dm"
 #include "voidcrew\edits\game\area\areas.dm"
 #include "voidcrew\edits\game\machinery\computer\crew.dm"
+#include "voidcrew\edits\game\machinery\computer\orders\order_items\cook\order_milk_eggs.dm"
+#include "voidcrew\edits\game\machinery\computer\orders\order_items\cook\order_reagents.dm"
+#include "voidcrew\edits\game\machinery\computer\orders\order_items\mining\order_consumables.dm"
+#include "voidcrew\edits\game\machinery\computer\orders\order_items\mining\order_golem.dm"
+#include "voidcrew\edits\game\machinery\computer\orders\order_items\mining\order_mining.dm"
 #include "voidcrew\edits\game\objects\items\rcd\RCD.dm"
 #include "voidcrew\edits\game\objects\items\rcd\RPD.dm"
 #include "voidcrew\edits\game\objects\items\storage\bags.dm"
@@ -6869,22 +6874,29 @@
 #include "voidcrew\edits\machinery\silicon_ship_systems.dm"
 #include "voidcrew\edits\mobs\ghost_respawn.dm"
 #include "voidcrew\edits\mobs\green_zone_respawn.dm"
+#include "voidcrew\edits\mobs\ladder_outfits.dm"
 #include "voidcrew\edits\mobs\megafauna_logging.dm"
 #include "voidcrew\edits\mobs\new_player.dm"
 #include "voidcrew\edits\mobs\plasmaman.dm"
 #include "voidcrew\edits\mobs\respawn_timer.dm"
 #include "voidcrew\edits\mobs\ruin_icons.dm"
 #include "voidcrew\edits\mobs\ship_join_menu.dm"
+#include "voidcrew\edits\mobs\weapon_drops.dm"
 #include "voidcrew\edits\modules\antagonists\abductor\equipment\glands\heal.dm"
 #include "voidcrew\edits\modules\antagonists\heretic\magic\rust_construction.dm"
 #include "voidcrew\edits\modules\asset_cache\assets\rcd.dm"
 #include "voidcrew\edits\modules\atmospherics\machinery\datum_pipeline.dm"
 #include "voidcrew\edits\modules\awaymissions\signpost.dm"
+#include "voidcrew\edits\modules\bitrunning\orders\flair.dm"
 #include "voidcrew\edits\modules\cargo\materials_market.dm"
 #include "voidcrew\edits\modules\cargo\order.dm"
 #include "voidcrew\edits\modules\cargo\exports\large_objects.dm"
 #include "voidcrew\edits\modules\cargo\exports\manifest.dm"
 #include "voidcrew\edits\modules\cargo\exports\materials.dm"
+#include "voidcrew\edits\modules\cargo\markets\market_items\consumables.dm"
+#include "voidcrew\edits\modules\cargo\markets\market_items\misc.dm"
+#include "voidcrew\edits\modules\cargo\markets\market_items\tools.dm"
+#include "voidcrew\edits\modules\cargo\markets\market_items\weapons.dm"
 #include "voidcrew\edits\modules\cargo\packs\_packs.dm"
 #include "voidcrew\edits\modules\client\client_defines.dm"
 #include "voidcrew\edits\modules\client\preferences.dm"
@@ -6904,6 +6916,7 @@
 #include "voidcrew\edits\modules\mob\living\carbon\inventory.dm"
 #include "voidcrew\edits\modules\mod\modules\modules_supply.dm"
 #include "voidcrew\edits\modules\modular_computers\file_system\programs\budgetordering.dm"
+#include "voidcrew\edits\modules\power\supermatter_anomalies.dm"
 #include "voidcrew\edits\modules\power\turbine\turbine.dm"
 #include "voidcrew\edits\modules\projectiles\boxes_magazines\_box_magazine.dm"
 #include "voidcrew\edits\modules\research\designs.dm"
@@ -6921,11 +6934,14 @@
 #include "voidcrew\edits\modules\wiremod\core\integrated_circuit.dm"
 #include "voidcrew\edits\modules\wiremod\core\port.dm"
 #include "voidcrew\edits\modules\wiremod\dcs_components\component_add_port.dm"
+#include "voidcrew\edits\objects\items\event_horizon_rifle.dm"
 #include "voidcrew\edits\objects\items\extinguisher.dm"
 #include "voidcrew\edits\objects\items\kinetic_accelerator_modkits.dm"
 #include "voidcrew\edits\objects\items\posibrain.dm"
+#include "voidcrew\edits\objects\items\weapon_ladder.dm"
 #include "voidcrew\edits\objects\structures\closet_containment.dm"
 #include "voidcrew\edits\objects\structures\movable_fixtures.dm"
+#include "voidcrew\edits\objects\structures\ruin_turrets.dm"
 #include "voidcrew\edits\objects\structures\spacevine_cap.dm"
 #include "voidcrew\edits\objects\structures\lavaland\necropolis_tendril.dm"
 #include "voidcrew\edits\subsystem\dynamic.dm"
@@ -6936,7 +6952,9 @@
 #include "voidcrew\edits\subsystem\ticker.dm"
 #include "voidcrew\edits\subsystem\tutorials.dm"
 #include "voidcrew\edits\surgery\decapitation.dm"
+#include "voidcrew\edits\surgery\installed_capacity.dm"
 #include "voidcrew\edits\surgery\leg_manipulation.dm"
+#include "voidcrew\edits\surgery\reviver.dm"
 #include "voidcrew\edits\surgery\self_surgery.dm"
 #include "voidcrew\edits\vehicles\mecha.dm"
 #include "voidcrew\gamemodes\game_mode.dm"
@@ -7025,6 +7043,7 @@
 #include "voidcrew\modules\ambient_npcs\recruit.dm"
 #include "voidcrew\modules\ambient_npcs\stranded.dm"
 #include "voidcrew\modules\ambient_npcs\stranded_lifeboat.dm"
+#include "voidcrew\modules\anomalies\core_rewards.dm"
 #include "voidcrew\modules\antag_ruins\antag_ruin.dm"
 #include "voidcrew\modules\antag_ruins\ascension.dm"
 #include "voidcrew\modules\antag_ruins\ascension_mech.dm"
@@ -7088,6 +7107,7 @@
 #include "voidcrew\modules\captain_management\captain_management.dm"
 #include "voidcrew\modules\captain_management\command_transfer.dm"
 #include "voidcrew\modules\captain_management\ship_applications.dm"
+#include "voidcrew\modules\cargo\anomaly_packs.dm"
 #include "voidcrew\modules\cargo\bank_account.dm"
 #include "voidcrew\modules\cargo\bank_machine.dm"
 #include "voidcrew\modules\cargo\exports.dm"
@@ -7246,7 +7266,9 @@
 #include "voidcrew\modules\metrics\research_metrics.dm"
 #include "voidcrew\modules\metrics\ship_metrics.dm"
 #include "voidcrew\modules\metrics\structured_logging_fallback.dm"
+#include "voidcrew\modules\mining\ore_profiles.dm"
 #include "voidcrew\modules\mining\ore_redemption.dm"
+#include "voidcrew\modules\mining\ore_vents.dm"
 #include "voidcrew\modules\mining\edits\fulton.dm"
 #include "voidcrew\modules\mining\edits\order_consumables.dm"
 #include "voidcrew\modules\mining\equipment\explorer_gear.dm"
@@ -7347,6 +7369,9 @@
 #include "voidcrew\modules\nanites\code\programs\supression.dm"
 #include "voidcrew\modules\nanites\code\programs\utility.dm"
 #include "voidcrew\modules\nanites\code\programs\weapon.dm"
+#include "voidcrew\modules\npc_scaling\damage.dm"
+#include "voidcrew\modules\npc_scaling\spawn_hooks.dm"
+#include "voidcrew\modules\npc_scaling\zone_profiles.dm"
 #include "voidcrew\modules\npc_ships\code\_defines.dm"
 #include "voidcrew\modules\npc_ships\code\admin_verbs.dm"
 #include "voidcrew\modules\npc_ships\code\boarding_pod.dm"
@@ -7534,6 +7559,7 @@
 #include "voidcrew\modules\research\edits\_techweb.dm"
 #include "voidcrew\modules\research\edits\_techweb_node.dm"
 #include "voidcrew\modules\research\edits\component_printer.dm"
+#include "voidcrew\modules\research\edits\destructive_analyzer.dm"
 #include "voidcrew\modules\research\edits\dna_console.dm"
 #include "voidcrew\modules\research\edits\handheld_scanner.dm"
 #include "voidcrew\modules\research\edits\mech_fabricator.dm"
@@ -7636,20 +7662,25 @@
 #include "voidcrew\modules\surgery\experimental_dissection.dm"
 #include "voidcrew\modules\teams\_team.dm"
 #include "voidcrew\modules\throwing\diagnostics.dm"
+#include "voidcrew\modules\trade\anomaly_charts.dm"
 #include "voidcrew\modules\trade\bag_rift_protection.dm"
-#include "voidcrew\modules\trade\blueprint_imprinter.dm"
 #include "voidcrew\modules\trade\modsuit_bench.dm"
 #include "voidcrew\modules\trade\outpost.dm"
 #include "voidcrew\modules\trade\outpost_amenities.dm"
 #include "voidcrew\modules\trade\outpost_apiary.dm"
 #include "voidcrew\modules\trade\outpost_berth_layout.dm"
+#include "voidcrew\modules\trade\outpost_checkpoint.dm"
+#include "voidcrew\modules\trade\outpost_checkpoint_guard.dm"
+#include "voidcrew\modules\trade\outpost_checkpoint_npcs.dm"
 #include "voidcrew\modules\trade\outpost_elevator.dm"
 #include "voidcrew\modules\trade\outpost_hangar.dm"
 #include "voidcrew\modules\trade\outpost_missions.dm"
 #include "voidcrew\modules\trade\outpost_quests.dm"
 #include "voidcrew\modules\trade\outpost_residents.dm"
 #include "voidcrew\modules\trade\outpost_security.dm"
+#include "voidcrew\modules\trade\outpost_trespass.dm"
 #include "voidcrew\modules\trade\planetary_goods.dm"
+#include "voidcrew\modules\trade\resale.dm"
 #include "voidcrew\modules\trade\rumor_charts.dm"
 #include "voidcrew\modules\trade\shop.dm"
 #include "voidcrew\modules\trade\shop_buyback.dm"
@@ -7674,6 +7705,8 @@
 #include "voidcrew\modules\transporter\transporter_designs.dm"
 #include "voidcrew\modules\transporter\transporter_pad.dm"
 #include "voidcrew\modules\transporter\transporter_transponder.dm"
+#if defined(UNIT_TESTS) || defined(SPACEMAN_DMM)
+#endif
 #include "voidcrew\modules\vehicles\atv.dm"
 #include "voidcrew\modules\vending\_vending.dm"
 #include "voidcrew\modules\vending\security.dm"
@@ -7686,13 +7719,7 @@
 #include "voidcrew\modules\voice_barks\speech_hook.dm"
 #include "voidcrew\modules\voice_barks\voice_packs.dm"
 #include "voidcrew\modules\voice_barks\voice_screen.dm"
-#include "voidcrew\modules\weapons_bench\blueprint.dm"
-#include "voidcrew\modules\weapons_bench\guns\bulldog.dm"
-#include "voidcrew\modules\weapons_bench\guns\c20r.dm"
-#include "voidcrew\modules\weapons_bench\guns\l6_saw.dm"
-#include "voidcrew\modules\weapons_bench\guns\laser_carbine.dm"
-#include "voidcrew\modules\weapons_bench\guns\sniper.dm"
-#include "voidcrew\modules\weapons_bench\guns\wt550.dm"
+#include "voidcrew\modules\weapons_bench\ammunition.dm"
 #include "voidcrew\modules\worldgen_logging\worldgen.dm"
 #include "voidcrew\objects\items\blueprints.dm"
 #include "voidcrew\objects\items\cards_ids.dm"
diff --git a/tgui/packages/tgui/interfaces/DestructiveAnalyzer.tsx b/tgui/packages/tgui/interfaces/DestructiveAnalyzer.tsx
index 72fa3a05364..767b2d4ab6c 100644
--- a/tgui/packages/tgui/interfaces/DestructiveAnalyzer.tsx
+++ b/tgui/packages/tgui/interfaces/DestructiveAnalyzer.tsx
@@ -38,7 +38,8 @@ export const DestructiveAnalyzer = (props) => {
       <Window width={400} height={260} title="Destructive Analyzer">
         <Window.Content>
           <NoticeBox textAlign="center" danger>
-            Not connected to a server. Please sync one using a multitool.
+            {/* VOIDCREW EDIT: research - state only, no linking how-to */}
+            No research server.
           </NoticeBox>
         </Window.Content>
       </Window>
diff --git a/tgui/packages/voidcrew_tgui/interfaces/BlueprintImprinter.jsx b/tgui/packages/voidcrew_tgui/interfaces/BlueprintImprinter.jsx
deleted file mode 100644
index 8f39516c103..00000000000
--- a/tgui/packages/voidcrew_tgui/interfaces/BlueprintImprinter.jsx
+++ /dev/null
@@ -1,195 +0,0 @@
-import {
-  Box,
-  Button,
-  Flex,
-  Icon,
-  LabeledList,
-  NoticeBox,
-  Section,
-  Stack,
-} from 'tgui-core/components';
-import { toFixed } from 'tgui-core/math';
-
-import { useBackend } from '../../tgui/backend';
-import { Window } from '../../tgui/layouts';
-
-const TIERS = {
-  1: { name: 'Green', color: 'good' },
-  2: { name: 'Yellow', color: 'yellow' },
-  3: { name: 'Red', color: 'bad' },
-};
-
-const TimeFormat = (props) => {
-  const { value } = props;
-  const seconds = toFixed(Math.floor((value / 10) % 60)).padStart(2, '0');
-  const minutes = toFixed(Math.floor((value / (10 * 60)) % 60)).padStart(
-    2,
-    '0',
-  );
-  return `${minutes}:${seconds}`;
-};
-
-const LoadedCash = (props) => {
-  const { act, data } = useBackend();
-  const { loaded_credits, account_credits, working } = data;
-
-  return (
-    <Section
-      title="Payment"
-      buttons={
-        <Button
-          icon="eject"
-          disabled={!loaded_credits || !!working}
-          onClick={() => act('eject_cash')}
-          content="Eject Cash"
-        />
-      }
-    >
-      <LabeledList>
-        <LabeledList.Item label="Loaded Cash">
-          <Box bold color={loaded_credits ? 'good' : 'grey'}>
-            <Icon name="coins" mr={1} />
-            {loaded_credits} cr
-          </Box>
-        </LabeledList.Item>
-        <LabeledList.Item label="ID Account">
-          {account_credits === null ? (
-            <Box color="grey" italic>
-              No bank account on ID
-            </Box>
-          ) : (
-            <Box>
-              <Icon name="id-card" mr={1} />
-              {account_credits} cr
-            </Box>
-          )}
-        </LabeledList.Item>
-      </LabeledList>
-      <Box mt={1} color="label" fontSize="0.9em">
-        Fees draw from loaded cash first, then your ID account. Feed bills, coins
-        or holochips into the cradle to load cash.
-      </Box>
-    </Section>
-  );
-};
-
-const InsertedSchematic = (props) => {
-  const { act, data } = useBackend();
-  const {
-    blueprint_ready,
-    schematic_name,
-    tier,
-    fee,
-    already_known,
-    can_afford,
-    working,
-    barred,
-  } = data;
-
-  if (!blueprint_ready) {
-    return (
-      !working && (
-        <NoticeBox info>
-          Slot a schematic scroll into the cradle to begin.
-        </NoticeBox>
-      )
-    );
-  }
-
-  const tierInfo = TIERS[tier] || TIERS[2];
-  const blocked = already_known || !can_afford || barred;
-
-  return (
-    <Section
-      title="Loaded Schematic"
-      buttons={
-        <>
-          <Button
-            icon="brain"
-            disabled={blocked || !!working}
-            color={blocked ? 'default' : 'good'}
-            onClick={() => act('imprint')}
-            content="Imprint"
-            tooltip={
-              (barred && 'Trade embargo in effect.') ||
-              (already_known && 'You already know this schematic.') ||
-              (!can_afford && 'Insufficient funds.') ||
-              null
-            }
-          />
-          <Button
-            icon="eject"
-            disabled={!!working}
-            onClick={() => act('eject_blueprint')}
-            content="Eject"
-          />
-        </>
-      }
-    >
-      <LabeledList>
-        <LabeledList.Item label="Schematic">
-          <Box bold>{schematic_name}</Box>
-        </LabeledList.Item>
-        <LabeledList.Item label="Tier">
-          <Box bold color={tierInfo.color}>
-            {tierInfo.name}
-          </Box>
-        </LabeledList.Item>
-        <LabeledList.Item label="Fee">
-          <Box bold color={can_afford ? 'good' : 'bad'}>
-            {fee} cr
-          </Box>
-        </LabeledList.Item>
-        {!!already_known && (
-          <LabeledList.Item label="Status" color="good">
-            Already imprinted this round.
-          </LabeledList.Item>
-        )}
-        {!already_known && !can_afford && (
-          <LabeledList.Item label="Status" color="bad">
-            Insufficient funds: load cash or top up your ID.
-          </LabeledList.Item>
-        )}
-      </LabeledList>
-    </Section>
-  );
-};
-
-export const BlueprintImprinter = (props) => {
-  const { act, data } = useBackend();
-  const { working, timeleft, has_occupant, barred } = data;
-
-  return (
-    <Window title="Neural Schematic Imprinter" width={420} height={400}>
-      <Window.Content>
-        {!has_occupant && (
-          <NoticeBox>No occupant detected. Climb into the cradle.</NoticeBox>
-        )}
-        {!!barred && <NoticeBox danger>Trade embargo in effect.</NoticeBox>}
-        {!!working && (
-          <NoticeBox danger>
-            <Flex direction="column">
-              <Flex.Item mb={0.5}>
-                Imprinting in progress. Do not leave the cradle.
-              </Flex.Item>
-              <Flex.Item>
-                Time Left: <TimeFormat value={timeleft} />
-              </Flex.Item>
-            </Flex>
-          </NoticeBox>
-        )}
-        <InsertedSchematic />
-        <LoadedCash />
-        <Button
-          fluid
-          icon="door-open"
-          mt={1}
-          disabled={!has_occupant}
-          onClick={() => act('open_door')}
-          content="Open Cradle"
-          tooltip="Pop the cradle door from the inside and step out."
-        />
-      </Window.Content>
-    </Window>
-  );
-};
diff --git a/tgui/packages/voidcrew_tgui/interfaces/CaptainManagement.tsx b/tgui/packages/voidcrew_tgui/interfaces/CaptainManagement.tsx
index b9ff94c0444..569f0246f37 100644
--- a/tgui/packages/voidcrew_tgui/interfaces/CaptainManagement.tsx
+++ b/tgui/packages/voidcrew_tgui/interfaces/CaptainManagement.tsx
@@ -55,6 +55,7 @@ type Data = {
   crew_only_airlocks: BooleanLike;
   is_captain: BooleanLike;
   crew: CrewMember[];
+  crew_leader: string;
   available_players: AvailablePlayer[];
   pending_invites: PendingInvite[];
   applications: CrewApplication[];
@@ -141,10 +142,11 @@ export const CaptainManagement = () => {
 
 const CrewTab = () => {
   const { act, data } = useBackend<Data>();
-  const { crew, command_offer_pending } = data;
+  const { crew, crew_leader, command_offer_pending } = data;
 
   return (
     <Section title="Crew Roster">
+      <Box mb={1}>Crew leader: {crew_leader}</Box>
       {crew.length === 0 ? (
         <NoticeBox info>No crew members found.</NoticeBox>
       ) : (
@@ -196,7 +198,7 @@ const CrewTab = () => {
                         command_offer_pending
                           ? 'An offer of command is already waiting on an answer'
                           : member.can_take_command
-                            ? 'Offer them command of the ship. They get 30 seconds to accept, and you stop being captain if they do.'
+                            ? 'Offer command'
                             : 'They must be alive and online to take command'
                       }
                     >
diff --git a/tgui/packages/voidcrew_tgui/interfaces/MissionBoard.tsx b/tgui/packages/voidcrew_tgui/interfaces/MissionBoard.tsx
index 8cfcac16912..5b52fadedc3 100644
--- a/tgui/packages/voidcrew_tgui/interfaces/MissionBoard.tsx
+++ b/tgui/packages/voidcrew_tgui/interfaces/MissionBoard.tsx
@@ -9,7 +9,6 @@ import {
   LabeledList,
   NoticeBox,
   NumberInput,
-  ProgressBar,
   Section,
   Stack,
   Tabs,
@@ -34,10 +33,7 @@ type Mission = {
   author: string;
   value: number;
   reward_items?: RewardItem[];
-  reward_item: string | null;
-  reward_item_icon: string | null;
   duration: number;
-  time_remaining: number;
   time_remaining_text: string;
   progress: string;
   can_complete: BooleanLike;
@@ -48,9 +44,6 @@ type Mission = {
   target_x?: number;
   target_y?: number;
   visited?: BooleanLike;
-  difficulty: number;
-  difficulty_name: string;
-  difficulty_color: string;
   zone_name: string | null;
   zone_color: string;
 };
@@ -339,11 +332,12 @@ const MissionBoardContent = () => {
               <Button
                 icon="sync"
                 disabled={refresh_cooldown_remaining > 0}
+                tooltip={
+                  refresh_cooldown_remaining > 0 ? 'No new postings' : undefined
+                }
                 onClick={() => act('refresh')}
               >
-                {refresh_cooldown_remaining > 0
-                  ? `Refresh (${refresh_cooldown_remaining}s)`
-                  : 'Refresh'}
+                Refresh
               </Button>
             </>
           }
@@ -368,7 +362,7 @@ const MissionBoardContent = () => {
         </Section>
       </Stack.Item>
 
-      {posting && !has_created_bounty && (
+      {!!posting && !has_created_bounty && (
         <Stack.Item>
           <PlayerBountyCreator
             shipBalance={ship_balance}
@@ -453,22 +447,16 @@ type MissionCardProps = {
   padContents?: PadItem[];
 };
 
-/**
- * Renders a mission's full payout: credits, each item in the reward bundle
- * (rare picks accented), research points and vouchers, as " + "-joined
- * segments. `full` spells out "credits" for the detail view; the compact form
- * says "cr".
- */
-const RewardSummary = (props: { mission: Mission; full?: boolean }) => {
-  const { mission, full } = props;
+/** The quoted currency and named goods, without empty reward segments. */
+const RewardSummary = (props: { mission: Mission }) => {
+  const { mission } = props;
   const items = mission.reward_items ?? [];
   const segments: ReactNode[] = [];
 
   if (mission.value > 0) {
     segments.push(
       <Box as="span" bold color="good">
-        {mission.value}
-        {full ? ' credits' : ' cr'}
+        {formatMoney(mission.value)} cr
       </Box>,
     );
   }
@@ -490,25 +478,31 @@ const RewardSummary = (props: { mission: Mission; full?: boolean }) => {
       </Box>,
     );
   }
-  if (mission.research_reward) {
+  if ((mission.research_reward ?? 0) > 0) {
     segments.push(
       <Box as="span" bold color="teal">
-        {mission.research_reward}
-        {full ? ' research points' : ' RP'}
+        research notes
       </Box>,
     );
   }
-  if (mission.voucher_count) {
+  const vouchers = mission.voucher_count ?? 0;
+  if (vouchers > 0) {
     segments.push(
       <Box as="span" bold color="gold">
-        {mission.voucher_count} trade voucher
-        {mission.voucher_count > 1 ? 's' : ''}
+        {vouchers} trade voucher{vouchers > 1 ? 's' : ''}
       </Box>,
     );
   }
 
+  if (segments.length === 0) {
+    return null;
+  }
+
   return (
-    <>
+    <Box mb={1}>
+      <Box as="span" color="label">
+        Pays:{' '}
+      </Box>
       {segments.map((segment, index) => (
         <Box as="span" key={index}>
           {index > 0 && (
@@ -519,7 +513,7 @@ const RewardSummary = (props: { mission: Mission; full?: boolean }) => {
           {segment}
         </Box>
       ))}
-    </>
+    </Box>
   );
 };
 
@@ -531,8 +525,8 @@ const MissionCard = (props: MissionCardProps) => {
   const canAccept = !isActive && active_count < max_missions;
 
   // Format time remaining
-  const formatTime = (ms: number) => {
-    const totalSeconds = Math.floor(ms / 10);
+  const formatTime = (deciseconds: number) => {
+    const totalSeconds = Math.floor(deciseconds / 10);
     const minutes = Math.floor(totalSeconds / 60);
     const seconds = totalSeconds % 60;
     return `${minutes}:${seconds.toString().padStart(2, '0')}`;
@@ -549,10 +543,6 @@ const MissionCard = (props: MissionCardProps) => {
               [{mission.zone_name}]
             </Box>
           )}
-          <Box inline color={mission.difficulty_color} mr={1}>
-            [{mission.difficulty_name}]
-          </Box>
-          <RewardSummary mission={mission} />
         </Box>
       }
     >
@@ -561,30 +551,15 @@ const MissionCard = (props: MissionCardProps) => {
       </Box>
       <Box mb={1}>{mission.desc}</Box>
 
-      {/* Rewards summary */}
-      <Box mb={1}>
-        <Box as="span" color="label">
-          Rewards:{' '}
-        </Box>
-        <RewardSummary mission={mission} full />
+      <RewardSummary mission={mission} />
+      <Box color="label" mb={1}>
+        {isActive ? 'Due in: ' : 'Time allowed: '}
+        {isActive ? mission.time_remaining_text : formatTime(mission.duration)}
       </Box>
 
       {!!isActive && (
         <>
           <LabeledList>
-            <LabeledList.Item label="Time Remaining">
-              <ProgressBar
-                value={mission.time_remaining}
-                maxValue={mission.duration}
-                ranges={{
-                  good: [mission.duration * 0.5, Infinity],
-                  average: [mission.duration * 0.25, mission.duration * 0.5],
-                  bad: [0, mission.duration * 0.25],
-                }}
-              >
-                {mission.time_remaining_text}
-              </ProgressBar>
-            </LabeledList.Item>
             {!!mission.progress && (
               <LabeledList.Item label="Progress">
                 {mission.progress}
@@ -651,6 +626,12 @@ const BountyCard = (props: BountyCardProps) => {
     return undefined;
   };
 
+  // Crews hunting it besides this one
+  const otherHunters = Math.max(
+    0,
+    bounty.hunter_count - (bounty.is_hunting ? 1 : 0),
+  );
+
   // Display effective reward if hunting (may be reduced by tracking)
   const displayReward = bounty.is_hunting
     ? (bounty.effective_reward ?? bounty.reward)
@@ -719,9 +700,9 @@ const BountyCard = (props: BountyCardProps) => {
       <Flex justify="space-between" align="center" mb={1}>
         <Flex.Item>
           <Box color="label">
-            <Box as="span" color={bounty.hunter_count > 0 ? 'orange' : 'gray'}>
-              ⚔ {bounty.hunter_count} crew{bounty.hunter_count !== 1 ? 's' : ''}{' '}
-              hunting
+            <Box as="span" color={otherHunters > 0 ? 'orange' : 'gray'}>
+              ⚔ {otherHunters} {bounty.is_hunting ? 'other ' : ''}crew
+              {otherHunters !== 1 ? 's' : ''} hunting
             </Box>
           </Box>
         </Flex.Item>
@@ -1001,7 +982,7 @@ const PlayerBountyCreator = (props: PlayerBountyCreatorProps) => {
         </LabeledList.Item>
         <LabeledList.Item label="Objective">
           <TextArea
-            placeholder="Describe what needs to be done..."
+            placeholder="Objective..."
             width="100%"
             height="60px"
             maxLength={256}
diff --git a/tgui/packages/voidcrew_tgui/interfaces/OutpostMissionBoard.tsx b/tgui/packages/voidcrew_tgui/interfaces/OutpostMissionBoard.tsx
index 9492557274f..2bb8259d3d1 100644
--- a/tgui/packages/voidcrew_tgui/interfaces/OutpostMissionBoard.tsx
+++ b/tgui/packages/voidcrew_tgui/interfaces/OutpostMissionBoard.tsx
@@ -3,12 +3,14 @@ import type { ReactNode } from 'react';
 import {
   Box,
   Button,
+  Dropdown,
   Icon,
   NoticeBox,
   Section,
   Stack,
   Tooltip,
 } from 'tgui-core/components';
+import { formatMoney, formatTime } from 'tgui-core/format';
 import type { BooleanLike } from 'tgui-core/react';
 
 import { useBackend } from '../../tgui/backend';
@@ -28,25 +30,18 @@ type Offer = {
   value: number;
   reward_items?: RewardItem[];
   voucher_count: number;
-  difficulty_name: string;
-  difficulty_color: string;
+  research_reward?: number;
+  duration: number;
   zone_name: string | null;
   zone_color: string;
   progress: string;
-  wanted_text: string;
   archetype: string;
   time_remaining_text: string;
-  favor_reward: number;
-  favor_trader: string | null;
 };
 
 type FavorStanding = {
-  points: number;
   tier: number;
   tier_name: string;
-  discount_pct: number;
-  next_at: number;
-  trader: string;
 };
 
 type ShipMission = Offer & {
@@ -65,7 +60,9 @@ type Data = {
   ship_mission_slots_free: number;
   offers: Offer[];
   ship_missions: ShipMission[];
-  favor?: FavorStanding;
+  crew_ships: { ref: string; name: string }[];
+  crew_ship_ref: string | null;
+  favor?: FavorStanding | null;
 };
 
 const ARCHETYPE_ICONS = {
@@ -81,6 +78,21 @@ const archetypeIcon = (archetype: string) =>
   ARCHETYPE_ICONS[archetype as keyof typeof ARCHETYPE_ICONS] ??
   ARCHETYPE_ICONS.contract;
 
+/** The crew's standing with this outpost, named as such */
+const ReputationLabel = (props: { favor: FavorStanding }) => {
+  const { favor } = props;
+  const tierColor =
+    favor.tier >= 3 ? 'orange' : favor.tier >= 1 ? 'good' : 'label';
+  return (
+    <Box inline nowrap color="label">
+      Reputation:{' '}
+      <Box inline bold color={tierColor}>
+        {favor.tier_name}
+      </Box>
+    </Box>
+  );
+};
+
 const RewardLine = (props: { offer: Offer }) => {
   const { offer } = props;
   const items = offer.reward_items ?? [];
@@ -89,7 +101,7 @@ const RewardLine = (props: { offer: Offer }) => {
   if (offer.value > 0) {
     segments.push(
       <Box as="span" bold color="gold">
-        {offer.value} cr
+        {formatMoney(offer.value)} cr
       </Box>,
     );
   }
@@ -118,44 +130,50 @@ const RewardLine = (props: { offer: Offer }) => {
       </Box>,
     );
   }
-  if (offer.favor_reward > 0) {
+  if ((offer.research_reward ?? 0) > 0) {
     segments.push(
-      <Box as="span" bold color="orange">
-        +{offer.favor_reward} standing
+      <Box as="span" bold color="teal">
+        research notes
       </Box>,
     );
   }
 
+  if (segments.length === 0) {
+    return null;
+  }
+
   return (
     <Box>
       <Box inline color="label">
         Pays:{' '}
       </Box>
-      {segments.length === 0 ? (
-        <Box inline color="label">
-          goods
+      {segments.map((segment, index) => (
+        // biome-ignore lint/suspicious/noArrayIndexKey: static, order-stable list
+        <Box as="span" key={index}>
+          {index > 0 && (
+            <Box as="span" color="label">
+              {' + '}
+            </Box>
+          )}
+          {segment}
         </Box>
-      ) : (
-        segments.map((segment, index) => (
-          // biome-ignore lint/suspicious/noArrayIndexKey: static, order-stable list
-          <Box as="span" key={index}>
-            {index > 0 && <Box as="span" color="label">{' + '}</Box>}
-            {segment}
-          </Box>
-        ))
-      )}
+      ))}
     </Box>
   );
 };
 
 const OfferCard = (props: { offer: Offer; canAccept: boolean }) => {
-  const { act } = useBackend<Data>();
+  const { act, data } = useBackend<Data>();
   const { offer, canAccept } = props;
   return (
     <Section>
       <Stack align="center">
         <Stack.Item>
-          <Icon name={archetypeIcon(offer.archetype)} size={1.6} color="label" />
+          <Icon
+            name={archetypeIcon(offer.archetype)}
+            size={1.6}
+            color="label"
+          />
         </Stack.Item>
         <Stack.Item grow>
           <Stack vertical>
@@ -166,9 +184,6 @@ const OfferCard = (props: { offer: Offer; canAccept: boolean }) => {
                   [{offer.zone_name}]{' '}
                 </Box>
               )}
-              <Box inline color={offer.difficulty_color}>
-                [{offer.difficulty_name}]
-              </Box>
             </Stack.Item>
             <Stack.Item color="label" fontSize="0.9em">
               {offer.desc}
@@ -176,12 +191,22 @@ const OfferCard = (props: { offer: Offer; canAccept: boolean }) => {
             <Stack.Item>
               <RewardLine offer={offer} />
             </Stack.Item>
+            <Stack.Item color="label" fontSize="0.85em">
+              Time allowed: {formatTime(offer.duration, 'short')}
+            </Stack.Item>
           </Stack>
         </Stack.Item>
         <Stack.Item>
           <Button
             icon="file-signature"
             disabled={!canAccept}
+            tooltip={
+              canAccept
+                ? undefined
+                : data.ship_name && data.ship_mission_slots_free <= 0
+                  ? 'Docket full.'
+                  : 'Order declined.'
+            }
             onClick={() => act('accept', { ref: offer.ref })}
           >
             Accept
@@ -218,10 +243,16 @@ const ShipMissionRow = (props: { mission: ShipMission }) => {
       <Stack.Item grow>
         <Box bold>{mission.name}</Box>
         <Box color="label" fontSize="0.85em">
-          {mission.progress} · {mission.time_remaining_text} left
+          {mission.desc}
+        </Box>
+        {!!mission.progress && (
+          <Box color="label" fontSize="0.85em">
+            {mission.progress}
+          </Box>
+        )}
+        <Box color="label" fontSize="0.85em">
+          Due in: {mission.time_remaining_text}
         </Box>
-      </Stack.Item>
-      <Stack.Item>
         <RewardLine offer={mission} />
       </Stack.Item>
       <Stack.Item>
@@ -236,7 +267,7 @@ const ShipMissionRow = (props: { mission: ShipMission }) => {
 };
 
 export const OutpostMissionBoard = (props) => {
-  const { data } = useBackend<Data>();
+  const { act, data } = useBackend<Data>();
   const {
     shop_name,
     trader_name,
@@ -245,6 +276,8 @@ export const OutpostMissionBoard = (props) => {
     ship_mission_slots_free,
     offers = [],
     ship_missions = [],
+    crew_ships = [],
+    crew_ship_ref,
     favor,
   } = data;
 
@@ -254,15 +287,28 @@ export const OutpostMissionBoard = (props) => {
     <Window title={`${shop_name}, Contract Board`} width={560} height={620}>
       <Window.Content scrollable>
         {!!barred && (
-          <NoticeBox danger>
-            TRADE EMBARGO IN EFFECT: {trader_name} is not posting work for
-            you.
-          </NoticeBox>
+          <NoticeBox danger>{trader_name}: Service refused.</NoticeBox>
         )}
-        {!ship_name && (
-          <NoticeBox>
-            No crew registration found: you need a ship to take a contract.
-          </NoticeBox>
+        {!ship_name && <NoticeBox>No ship account selected.</NoticeBox>}
+        {crew_ships.length > 0 && (
+          <Section>
+            <Box inline mr={1} color="label">
+              Ship account
+            </Box>
+            <Dropdown
+              selected={crew_ship_ref ?? ''}
+              displayText={
+                crew_ships.find((ship) => ship.ref === crew_ship_ref)?.name ??
+                'Ship account'
+              }
+              options={crew_ships.map((ship) => ({
+                value: ship.ref,
+                displayText: ship.name,
+              }))}
+              disabled={!!barred}
+              onSelected={(ref) => act('select_ship', { ref })}
+            />
+          </Section>
         )}
         <Section
           title={`${trader_name}'s postings`}
@@ -270,26 +316,10 @@ export const OutpostMissionBoard = (props) => {
             ship_name ? (
               <Box inline color="label">
                 {!!favor && (
-                  <Tooltip
-                    content={`Completing ${favor.trader}'s contracts earns standing: discounts at each tier, back-room stock at Trusted.`}
-                  >
-                    <Box inline>
-                      <Box
-                        inline
-                        bold
-                        color={favor.tier >= 3 ? 'orange' : 'good'}
-                      >
-                        {favor.tier_name}
-                      </Box>
-                      {favor.next_at > 0 && (
-                        <Box inline>
-                          {' '}
-                          ({favor.points}/{favor.next_at})
-                        </Box>
-                      )}
-                      {' · '}
-                    </Box>
-                  </Tooltip>
+                  <>
+                    <ReputationLabel favor={favor} />
+                    {' · '}
+                  </>
                 )}
                 {ship_name} · {ship_mission_slots_free} slot
                 {ship_mission_slots_free === 1 ? '' : 's'} free
@@ -309,10 +339,6 @@ export const OutpostMissionBoard = (props) => {
             {ship_missions.map((mission) => (
               <ShipMissionRow key={mission.ref} mission={mission} />
             ))}
-            <Box color="label" fontSize="0.85em" mt={1}>
-              Item contracts can be turned in right here. Hold the goods in
-              hand. Courier pods only unseal at their destination outpost.
-            </Box>
           </Section>
         )}
       </Window.Content>
diff --git a/tgui/packages/voidcrew_tgui/interfaces/SurveyComputer.tsx b/tgui/packages/voidcrew_tgui/interfaces/SurveyComputer.tsx
index bf6e5b4eafc..f1e1c45af79 100644
--- a/tgui/packages/voidcrew_tgui/interfaces/SurveyComputer.tsx
+++ b/tgui/packages/voidcrew_tgui/interfaces/SurveyComputer.tsx
@@ -67,26 +67,12 @@ interface SurveyTarget {
   atRange: number;
   dist: number;
   points: number;
-  cash: number;
   mappable: number;
-  /** Seconds the charted surface stays generated, or null when it is not counting down. */
-  holdSeconds: number | null;
-}
-
-/** "14m 20s" / "45s" - short enough to sit inline in a target row. */
-function formatHold(seconds: number): string {
-  const minutes = Math.floor(seconds / 60);
-  const rest = seconds % 60;
-  if (minutes <= 0) {
-    return `${rest}s`;
-  }
-  return rest > 0 ? `${minutes}m ${rest}s` : `${minutes}m`;
 }
 
 interface Data {
   archiveMode: number;
   researchLinked: number;
-  bankedCash: number;
   bankedPoints: number;
   currentCelestialRef: string;
   currentCelestialType: string;
@@ -94,11 +80,9 @@ interface Data {
   mappingEnabled?: number;
   shipMoving: number;
   surveyAtRange?: number;
-  rangeSurveyDistance?: number;
-  rangeSurveyPercent?: number;
   surveyStatus?: 'unsurveyed' | 'complete' | 'in-progress' | 'no-orbit';
   surveyTargets?: SurveyTarget[];
-  surveyValue: { cash: number; points: number };
+  surveyValue: { points: number };
   surveyDataDisk: number;
   theme?: string;
 }
@@ -219,18 +203,6 @@ export const SurveyComputer = () => {
                       >
                         Surveying
                       </Tabs.Tab>
-                      <Tabs.Tab
-                        icon="dollar-sign"
-                        mt={1}
-                        mb={1}
-                        selected={tab === 8}
-                        key={8}
-                        onClick={() => {
-                          setTab(8);
-                        }}
-                      >
-                        Banking
-                      </Tabs.Tab>
                       <Tabs.Tab
                         icon="flask"
                         mt={1}
@@ -395,8 +367,6 @@ export const SurveyComputer = () => {
                 <Asteroids />
               ) : tab === 7 ? (
                 <Stars />
-              ) : tab === 8 ? (
-                <Banking />
               ) : tab === 9 ? (
                 <Research />
               ) : (
@@ -423,8 +393,8 @@ const SurveyArchive = () => {
       <Window.Content scrollable>
         <NoticeBox>
           {data.researchLinked
-            ? 'Completed records are synchronized with the linked local research server.'
-            : 'Link a local research server with a multitool to use completed survey records for research.'}
+            ? 'Research server connected.'
+            : 'No research server connected.'}
         </NoticeBox>
         <Section title="Disk and display settings">
           <Settings />
@@ -464,15 +434,7 @@ const SurveyArchive = () => {
 
 const Surveying = () => {
   const { act, data } = useBackend<Data>();
-  const {
-    bankedCash,
-    theme,
-    bankedPoints,
-    shipMoving,
-    surveyTargets = [],
-    rangeSurveyDistance = 3,
-    rangeSurveyPercent = 60,
-  } = data;
+  const { theme, bankedPoints, shipMoving, surveyTargets = [] } = data;
 
   interface Option {
     content: string;
@@ -509,40 +471,16 @@ const Surveying = () => {
         : {
             content: 'Start survey',
             action: 'survey',
-            tooltip:
-              selectedTarget.points && selectedTarget.cash
-                ? `Value: ${selectedTarget.points} points | ${selectedTarget.cash} credits`
-                : undefined,
           };
 
   const notices: string[] = [];
 
   if (shipMoving === 0) {
-    notices.push('Ship is currently moving, surveying disabled');
-  }
-
-  if (
-    selectedTarget &&
-    selectedTarget.atRange === 1 &&
-    selectedTarget.status === 'unsurveyed'
-  ) {
-    notices.push('Storm targeted at range: reduced survey yield');
-  }
-
-  if (selectedTarget && selectedTarget.holdSeconds !== null) {
-    notices.push(
-      `Charted surface of ${selectedTarget.name} holds for ${formatHold(
-        selectedTarget.holdSeconds,
-      )} — land within that window or it drifts to another sector`,
-    );
+    notices.push('Ship in motion');
   }
 
   if (bankedPoints && bankedPoints !== 0) {
-    notices.push(`You have ${bankedPoints} research points to print`);
-  }
-
-  if (bankedCash && bankedCash !== 0) {
-    notices.push(`You have ${bankedCash} credits to cash out`);
+    notices.push(`Research awaiting print: ${bankedPoints}`);
   }
 
   const currentThemeColors = theme ? getThemeColors(theme) : undefined;
@@ -578,12 +516,6 @@ const Surveying = () => {
       </Stack.Item>
       <Stack.Item grow>
         <Section title="Targets" fill scrollable>
-          <Box color="label" mb={1}>
-            Surveying needs the ship stationary on the same overmap tile as the
-            target — no docking or landing required. Electric and EMP storms can
-            also be scanned from up to {rangeSurveyDistance} tiles away at{' '}
-            {rangeSurveyPercent}% yield.
-          </Box>
           {surveyTargets.length > 0 ? (
             <Tabs vertical>
               {surveyTargets.map((target) => {
@@ -598,9 +530,6 @@ const Surveying = () => {
                     {target.name}
                     {target.atRange ? ` (${target.dist} tiles out)` : ''}
                     {target.status === 'complete' ? ' — surveyed' : ''}
-                    {target.holdSeconds !== null
-                      ? ` — holds ${formatHold(target.holdSeconds)}`
-                      : ''}
                   </Tabs.Tab>
                 );
               })}
@@ -616,6 +545,9 @@ const Surveying = () => {
         </Section>
       </Stack.Item>
       <Stack.Item>
+        {selectedTarget?.status === 'unsurveyed' ? (
+          <Box mb={1}>Research: {selectedTarget.points}</Box>
+        ) : null}
         <Button
           lineHeight={3}
           backgroundColor={currentThemeColors?.button}
@@ -1373,47 +1305,6 @@ const Stars = () => {
   );
 };
 
-const Banking = () => {
-  const { act, data } = useBackend<Data>();
-  const { bankedCash, theme } = data;
-  const currentThemeColors = theme ? getThemeColors(theme) : undefined;
-
-  return (
-    <Stack vertical>
-      <Stack.Item>
-        <Button
-          lineHeight={3}
-          backgroundColor={currentThemeColors?.button}
-          textColor={currentThemeColors?.buttonText}
-          ml="10%"
-          textAlign="center"
-          mr="10%"
-          fluid
-          mt="10%"
-          mb="10%"
-          icon="dollar-sign"
-          fontSize={3}
-          disabled={!bankedCash || bankedCash === 0 ? true : false}
-          onClick={() => {
-            act('cashOut');
-          }}
-        >
-          Withdrawal
-        </Button>
-      </Stack.Item>
-      <Stack.Item>
-        <NoticeBox
-          textAlign="center"
-          backgroundColor={currentThemeColors?.notice}
-          textColor={currentThemeColors?.noticeText}
-        >
-          You currently have ${bankedCash} to withdrawal
-        </NoticeBox>
-      </Stack.Item>
-    </Stack>
-  );
-};
-
 const Research = () => {
   const { act, data } = useBackend<Data>();
   const { bankedPoints, surveyStatus, theme } = data;
@@ -1449,7 +1340,7 @@ const Research = () => {
           textColor={currentThemeColors?.noticeText}
           textAlign="center"
         >
-          You currently have {bankedPoints} research points to print
+          Research awaiting print: {bankedPoints}
         </NoticeBox>
       </Stack.Item>
     </Stack>
diff --git a/tgui/packages/voidcrew_tgui/interfaces/Techweb.jsx b/tgui/packages/voidcrew_tgui/interfaces/Techweb.jsx
index e3685c642ba..ad862d541f7 100644
--- a/tgui/packages/voidcrew_tgui/interfaces/Techweb.jsx
+++ b/tgui/packages/voidcrew_tgui/interfaces/Techweb.jsx
@@ -498,7 +498,7 @@ const TechNode = (props) => {
     surveyed_objects,
   } = data;
   const { node, nodetails, nocontrols } = props;
-  const { id, can_unlock, tier } = node;
+  const { id, can_unlock, tier, zone_permission_blocked } = node;
   const {
     name,
     description,
@@ -598,6 +598,11 @@ const TechNode = (props) => {
               <Button
                 icon="lightbulb"
                 disabled={!can_unlock || tier > 1}
+                tooltip={
+                  zone_permission_blocked
+                    ? 'Authorization declined.'
+                    : undefined
+                }
                 onClick={() => act('researchNode', { node_id: id })}
               >
                 Research
@@ -687,11 +692,11 @@ const TechNode = (props) => {
                       average: [0.5, 1],
                       bad: [-Infinity, 0.5],
                     }}
-                    value={surveyed_objects[obj[0]] / obj[1]}
+                    value={(surveyed_objects?.[obj[0]] ?? 0) / obj[1]}
                   >
                     {obj[0].charAt(0).toUpperCase() +
                       obj[0].slice(1).replace('_', ' ')}{' '}
-                    ({surveyed_objects[obj[0]]}/{obj[1]}){' '}
+                    ({surveyed_objects?.[obj[0]] ?? 0}/{obj[1]}){' '}
                   </ProgressBar>
                 </Stack.Item>
               );
diff --git a/tgui/packages/voidcrew_tgui/interfaces/TraderShop.tsx b/tgui/packages/voidcrew_tgui/interfaces/TraderShop.tsx
index bd0b5e301f3..1c81bb59987 100644
--- a/tgui/packages/voidcrew_tgui/interfaces/TraderShop.tsx
+++ b/tgui/packages/voidcrew_tgui/interfaces/TraderShop.tsx
@@ -2,16 +2,15 @@ import { useState } from 'react';
 import {
   Box,
   Button,
-  Icon,
+  Dropdown,
   Image,
   NoticeBox,
   Section,
   Stack,
   Tabs,
-  TimeDisplay,
   Tooltip,
 } from 'tgui-core/components';
-import { formatTime } from 'tgui-core/format';
+import { formatMoney } from 'tgui-core/format';
 import type { BooleanLike } from 'tgui-core/react';
 
 import { useBackend } from '../../tgui/backend';
@@ -30,7 +29,6 @@ type CatalogSku = {
   discount_pct: number;
   price_text: string;
   barter: BooleanLike;
-  favor_required: number;
   crew_limit: number;
 };
 
@@ -45,12 +43,8 @@ type StockState = {
 };
 
 type FavorStanding = {
-  points: number;
   tier: number;
   tier_name: string;
-  discount_pct: number;
-  next_at: number;
-  trader: string;
 };
 
 type LedgerEntry = {
@@ -79,15 +73,16 @@ type Data = {
   categories: string[];
   catalog: CatalogSku[];
   ledger: LedgerEntry[];
-  restock_interval: number;
   // dynamic
-  restock_remaining: number | null;
   barred: BooleanLike;
   held_vouchers: number;
   account_credits: number | null;
+  sell_account_credits: number | null;
   stock_states: StockState[];
   ledger_states: LedgerState[];
-  favor?: FavorStanding;
+  crew_ships: { ref: string; name: string }[];
+  crew_ship_ref: string | null;
+  favor?: FavorStanding | null;
 };
 
 const SHELF_TAGS = {
@@ -96,27 +91,17 @@ const SHELF_TAGS = {
   favor: { label: 'BACK ROOM', color: 'orange' },
 } as const;
 
-const StandingHeader = (props: { favor: FavorStanding }) => {
+/** The crew's standing with this outpost, named as such */
+const ReputationLabel = (props: { favor: FavorStanding }) => {
   const { favor } = props;
   const tierColor =
     favor.tier >= 3 ? 'orange' : favor.tier >= 1 ? 'good' : 'label';
   return (
     <Box inline nowrap color="label" fontSize={1} fontWeight="normal">
+      Reputation:{' '}
       <Box inline bold color={tierColor}>
         {favor.tier_name}
       </Box>
-      {favor.discount_pct > 0 && (
-        <Box inline color="good">
-          {' '}
-          −{favor.discount_pct}%
-        </Box>
-      )}
-      {favor.next_at > 0 && (
-        <Box inline color="label">
-          {' '}
-          ({favor.points}/{favor.next_at})
-        </Box>
-      )}
     </Box>
   );
 };
@@ -136,11 +121,11 @@ const WalletHeader = (props: {
       {' · '}
       {account_credits === null ? (
         <Box inline color="bad">
-          no ID account
+          no bank account
         </Box>
       ) : (
         <Box inline bold color="gold">
-          {account_credits} cr
+          {formatMoney(account_credits)} cr
         </Box>
       )}
     </Box>
@@ -178,7 +163,7 @@ const PriceTag = (props: { sku: CatalogSku; finalCredits: number }) => {
     <Box inline textAlign="right">
       {sku.price_vouchers > 0 && (
         <Box inline bold color="purple">
-          {sku.price_vouchers} vch
+          {sku.price_vouchers} voucher{sku.price_vouchers === 1 ? '' : 's'}
         </Box>
       )}
       {sku.price_vouchers > 0 && sku.price_credits > 0 && (
@@ -194,11 +179,11 @@ const PriceTag = (props: { sku: CatalogSku; finalCredits: number }) => {
               color="label"
               style={{ textDecoration: 'line-through' }}
             >
-              {sku.price_credits}
+              {formatMoney(sku.price_credits)}
             </Box>
           )}{' '}
           <Box inline bold color="gold">
-            {finalCredits} cr
+            {formatMoney(finalCredits)} cr
           </Box>
         </>
       )}
@@ -252,20 +237,10 @@ const SkuRow = (props: {
       <Stack.Item grow>
         <Box bold>
           {sku.name}{' '}
-          {sku.discount_pct > 0 && (
-            <Box inline color="good" bold>
-              −{sku.discount_pct}%
-            </Box>
-          )}{' '}
           {!!shelfTag && (
             <Box inline color={shelfTag.color} fontSize="0.8em" bold>
               {shelfTag.label}
             </Box>
-          )}{' '}
-          {isFavor && sku.favor_required > 0 && (
-            <Box inline color="label" fontSize="0.8em">
-              needs {sku.favor_required} standing
-            </Box>
           )}
         </Box>
         <Box color="label" fontSize="0.85em">
@@ -278,14 +253,14 @@ const SkuRow = (props: {
       <Stack.Item color="label" minWidth="30px" textAlign="center">
         {isFavor ? (
           <Box color={soldOut ? 'bad' : 'label'}>
-            yours: {live?.crew_remaining ?? sku.crew_limit}
+            x{live?.crew_remaining ?? sku.crew_limit}
           </Box>
         ) : (
           <>x{stock}</>
         )}
       </Stack.Item>
       <Stack.Item>
-        {live?.denial && !barred && !soldOut ? (
+        {live?.denial && !live.can_buy && !barred && (isFavor || !soldOut) ? (
           <Tooltip content={live.denial}>{buyButton}</Tooltip>
         ) : (
           buyButton
@@ -380,7 +355,6 @@ const LedgerRow = (props: {
         <Button
           disabled={!live?.can_sell}
           icon="boxes-stacked"
-          tooltip="Sell everything you're carrying, up to demand"
           onClick={() => act('sell_all', { ref: entry.ref })}
         >
           All
@@ -459,18 +433,19 @@ const SellView = (props: { barred: BooleanLike }) => {
 };
 
 export const TraderShop = (props) => {
-  const { data } = useBackend<Data>();
+  const { act, data } = useBackend<Data>();
   const {
     shop_name,
     trader_name,
     barred,
     held_vouchers,
     account_credits,
+    sell_account_credits,
     catalog = [],
     ledger = [],
+    crew_ships = [],
+    crew_ship_ref,
     favor,
-    restock_interval,
-    restock_remaining = null,
   } = data;
 
   const [tab, setTab] = useState<'buy' | 'sell'>('buy');
@@ -481,39 +456,36 @@ export const TraderShop = (props) => {
     <Window title={shop_name} width={720} height={640}>
       <Window.Content>
         <Stack fill vertical>
-          {restock_remaining !== null && (
+          {!!barred && (
             <Stack.Item>
-              <Box px={1}>
-                <Icon name="clock" mr={1} />
-                Next restock:{' '}
-                <Box inline bold>
-                  {restock_remaining > 0 ? (
-                    <TimeDisplay value={restock_remaining} auto="down" />
-                  ) : (
-                    'Restocking...'
-                  )}
-                </Box>
-                <Box inline color="label" ml={1}>
-                  (every {formatTime(restock_interval, 'short')})
-                </Box>
-              </Box>
+              <NoticeBox danger>Service refused.</NoticeBox>
             </Stack.Item>
           )}
-          {!!barred && (
+          {crew_ships.length > 0 && (
             <Stack.Item>
-              <NoticeBox danger>
-                TRADE EMBARGO IN EFFECT: service refused. Embargoes expire;
-                grudges do not.
-              </NoticeBox>
+              <Box inline mr={1} color="label">
+                Ship account
+              </Box>
+              <Dropdown
+                selected={crew_ship_ref ?? ''}
+                displayText={
+                  crew_ships.find((ship) => ship.ref === crew_ship_ref)?.name ??
+                  'Ship account'
+                }
+                options={crew_ships.map((ship) => ({
+                  value: ship.ref,
+                  displayText: ship.name,
+                }))}
+                disabled={!!barred}
+                onSelected={(ref) => act('select_ship', { ref })}
+              />
             </Stack.Item>
           )}
           {specials.length > 0 && tab === 'buy' && (
             <Stack.Item>
               <NoticeBox info>
                 {trader_name}&apos;s special today:{' '}
-                {specials
-                  .map((sku) => `${sku.name} (−${sku.discount_pct}%)`)
-                  .join(', ')}
+                {specials.map((sku) => sku.name).join(', ')}
               </NoticeBox>
             </Stack.Item>
           )}
@@ -546,17 +518,15 @@ export const TraderShop = (props) => {
                   </Stack.Item>
                   {!!favor && (
                     <Stack.Item>
-                      <Tooltip
-                        content={`Standing with ${favor.trader}: run their contract board to earn more. Trusted opens the back room.`}
-                      >
-                        <StandingHeader favor={favor} />
-                      </Tooltip>
+                      <ReputationLabel favor={favor} />
                     </Stack.Item>
                   )}
                   <Stack.Item>
                     <WalletHeader
                       held_vouchers={held_vouchers}
-                      account_credits={account_credits}
+                      account_credits={
+                        tab === 'sell' ? sell_account_credits : account_credits
+                      }
                     />
                   </Stack.Item>
                 </Stack>
@@ -569,12 +539,6 @@ export const TraderShop = (props) => {
               )}
             </Section>
           </Stack.Item>
-          <Stack.Item>
-            <Box color="label" fontSize="0.85em" px={1}>
-              Fixed prices, charged on the spot, vouchers from anywhere on you,
-              credits off your ID, barter goods held in hand. No refunds.
-            </Box>
-          </Stack.Item>
         </Stack>
       </Window.Content>
     </Window>
diff --git a/voidcrew/_DEFINES/cyberware.dm b/voidcrew/_DEFINES/cyberware.dm
index 911864fd572..78d71dbfde3 100644
--- a/voidcrew/_DEFINES/cyberware.dm
+++ b/voidcrew/_DEFINES/cyberware.dm
@@ -40,8 +40,6 @@
 #define ORGAN_SLOT_CYBERWARE_LEGS "cyberware_legs"
 /// Vocal hardware, mouth. Currently unused (Voicebox Mimic cut in roster v2).
 #define ORGAN_SLOT_CYBERWARE_LARYNX "cyberware_larynx"
-/// Capacity governor, head. Governor Delete (+6 capacity).
-#define ORGAN_SLOT_CYBERWARE_GOVERNOR "cyberware_governor"
 /// Hand augmentation, arms. Gecko Grips vs Fixer's Fingers.
 #define ORGAN_SLOT_CYBERWARE_HANDS "cyberware_hands"
 /// Emissive circuit tattoos, chest. Chromatic Dermis.
diff --git a/voidcrew/_DEFINES/loot.dm b/voidcrew/_DEFINES/loot.dm
index bafbbece15e..4e9f0a8ee78 100644
--- a/voidcrew/_DEFINES/loot.dm
+++ b/voidcrew/_DEFINES/loot.dm
@@ -15,6 +15,35 @@
 #define LOOT_TIER_PRIME "3"
 #define LOOT_TIER_UNIQUE "4"
 
+// Weapon classes are independent of the nonweapon quality tiers.
+#define LOOT_WEAPON_GREEN "1"
+#define LOOT_WEAPON_YELLOW "2"
+#define LOOT_WEAPON_RED "3"
+
+#define LOOT_GUN_POOL_ARMORY "armory"
+#define LOOT_GUN_POOL_SYNDICATE "syndicate"
+#define LOOT_GUN_POOL_PLUNDER "plunder"
+#define LOOT_GUN_POOL_FREIGHT "freight"
+
+// One Bernoulli roll per container, before selecting a weapon class.
+#define LOOT_GUN_CHANCE_ARMORY list(12, 32, 55)
+#define LOOT_GUN_CHANCE_SYNDICATE list(6, 18, 36)
+#define LOOT_GUN_CHANCE_PLUNDER list(6, 18, 36)
+#define LOOT_GUN_CHANCE_EXPEDITION list(4, 12, 24)
+#define LOOT_GUN_CHANCE_INDUSTRIAL list(2, 6, 12)
+#define LOOT_GUN_CHANCE_MEDICAL list(1, 4, 8)
+#define LOOT_GUN_CHANCE_RESEARCH list(2, 8, 18)
+#define LOOT_GUN_CHANCE_OCCULT list(2, 6, 12)
+#define LOOT_GUN_CHANCE_WARDROBE list(2, 6, 12)
+#define LOOT_GUN_CHANCE_FREIGHT list(8, 19, 33)
+
+#define LOOT_GUN_CLASSES_GREEN list(LOOT_WEAPON_GREEN = 940, LOOT_WEAPON_YELLOW = 59, LOOT_WEAPON_RED = 1)
+#define LOOT_GUN_CLASSES_YELLOW list(LOOT_WEAPON_GREEN = 450, LOOT_WEAPON_YELLOW = 540, LOOT_WEAPON_RED = 10)
+#define LOOT_GUN_CLASSES_RED list(LOOT_WEAPON_GREEN = 150, LOOT_WEAPON_YELLOW = 350, LOOT_WEAPON_RED = 500)
+#define LOOT_MELEE_CLASSES_GREEN list(LOOT_WEAPON_GREEN = 900, LOOT_WEAPON_YELLOW = 99, LOOT_WEAPON_RED = 1)
+#define LOOT_MELEE_CLASSES_YELLOW list(LOOT_WEAPON_GREEN = 350, LOOT_WEAPON_YELLOW = 640, LOOT_WEAPON_RED = 10)
+#define LOOT_MELEE_CLASSES_RED list(LOOT_WEAPON_GREEN = 100, LOOT_WEAPON_YELLOW = 450, LOOT_WEAPON_RED = 450)
+
 /**
  * Per-band draw counts and tier odds, the whole balance surface of the zone
  * loot system on one screen (consumed by voidcrew/modules/loot/zone_loot.dm,
@@ -49,33 +78,9 @@
 #define ZONE_LOOT_ODDS_RED list(LOOT_TIER_COMMON = 14, LOOT_TIER_UNCOMMON = 38, LOOT_TIER_PRIME = 45, LOOT_TIER_UNIQUE = 3)
 
 /**
- * # Abandoned crate (the deca-code crate)
- *
- * The OTHER loot channel, and deliberately not the zone one. Where a zone
- * cache is themed content whose payout scales with how deep in the overmap a
- * mapper put it, the abandoned crate is unclaimed freight: a mixed manifest
- * nobody came back for, worth the same everywhere because freight is freight
- * everywhere. It carries ONE flat profile, no band lookup, no zone resolver.
- *
- * What justifies the payout is the lock, not the location. Loot spawns only
- * when somebody actually cracks the 4-digit deca-code
- * (code/modules/mining/abandoned_crates.dm): ten attempts, multitool
- * bulls-and-cows hints, and an anti-tamper bomb on the tenth miss. boom()
- * dumps an empty crate, so blowing it, cutting it or emagging it pays
- * nothing at all: the puzzle is this crate's gate, the way a guarded ruin
- * and a deep band are a zone cache's.
- *
- * Ceiling is deliberately below the themed caches. This crate turns up in
- * maintenance and in ruins that may have no guards at all, so its top tier is
- * "gear a crew is glad to have" (a loaded RCD, plasteel by the fifty, a combat
- * ship part, a shotgun or a laser, a blueprint at long odds) and never a
- * payday or a one-of-a-kind. Big cash, cyberware and the authored uniques stay
- * behind guarded zone caches, where the loot audit test
- * (code/modules/unit_tests/voidcrew_loot.dm) enforces a guard marker. There is
- * no UNIQUE tier here at all, on purpose.
- *
- * Robustness comes from DRAW COUNT, not from a higher ceiling: 5-7 items of
- * ordinary usefulness reads as a full crate, which is what the crate is.
+ * Freight retains five to seven draws and its deca-code lock. One draw is
+ * replaced by the shared weapon roll; remaining draws use these nonweapon
+ * tier odds. Freight substitutes yellow guns for red-class gun outcomes.
  */
 #define ABANDONED_CRATE_DRAWS_MIN 5
 #define ABANDONED_CRATE_DRAWS_MAX 7
diff --git a/voidcrew/_DEFINES/missions.dm b/voidcrew/_DEFINES/missions.dm
index e853888f043..1191aad2b90 100644
--- a/voidcrew/_DEFINES/missions.dm
+++ b/voidcrew/_DEFINES/missions.dm
@@ -16,11 +16,8 @@
 #define DEFAULT_AVAILABLE_MISSIONS 5
 #define DEFAULT_MAX_ACTIVE_MISSIONS 3
 #define DEFAULT_MISSION_DURATION (30 MINUTES)
-/// Board reroll wipes all five offers, so a short cooldown made it free to fish
-/// for the top-paying contract type. Five minutes makes the posted board a hand
-/// you play rather than one you redraw.
-#define MISSION_REFRESH_COOLDOWN (5 MINUTES)
-/// Unaccepted board offers older than this are rotated out by SSmissions
+/// The ship keeps one fixed set of offers until its scheduled refresh.
+#define MISSION_REFRESH_COOLDOWN (20 MINUTES)
 #define MISSION_BOARD_EXPIRY (20 MINUTES)
 
 /**
diff --git a/voidcrew/_DEFINES/overmap_zones.dm b/voidcrew/_DEFINES/overmap_zones.dm
index 4116c638962..59cea1da61a 100644
--- a/voidcrew/_DEFINES/overmap_zones.dm
+++ b/voidcrew/_DEFINES/overmap_zones.dm
@@ -110,15 +110,16 @@
  * planet - roughly 60 permanent hostiles on top of the 15 SSplanet_mobs allows.
  */
 #define ZONE_PLANET_SPAWNER_BUDGET_GREEN 3
-#define ZONE_PLANET_SPAWNER_BUDGET_YELLOW 5
-#define ZONE_PLANET_SPAWNER_BUDGET_RED 8
+#define ZONE_PLANET_SPAWNER_BUDGET_YELLOW 3
+#define ZONE_PLANET_SPAWNER_BUDGET_RED 3
 
 /// Minimum tiles between two structure spawners on a planet. Keeps the budget spread out
 /// instead of letting the whole allowance land in one corner of the map.
 #define ZONE_PLANET_SPAWNER_SPACING 24
 
 /**
- * How many anomalies a planet may seed, per zone.
+ * Natural anomalies seeded per planet, by zone. Purchased charts add their own anomaly
+ * separately when the buying ship arrives.
  *
  * Anomalies used to be a ship-scoped dynamic event, which made them something that
  * happened TO a crew in their own corridors with nowhere to stand back to. On a planet
@@ -126,22 +127,15 @@
  * open ground, and the crew chose to walk over there. Approaching one is a decision, and
  * a crew carrying a neutralizer (Anomaly Research, tier 3) gets a core out of it.
  *
- * Green stays empty for the same reason it seeds no megafauna: it is where a crew takes
- * its first landing.
+ * Deeper bands have more sites to investigate.
  */
-#define ZONE_PLANET_ANOMALY_BUDGET_GREEN 0
+#define ZONE_PLANET_ANOMALY_BUDGET_GREEN 1
 #define ZONE_PLANET_ANOMALY_BUDGET_YELLOW 2
 #define ZONE_PLANET_ANOMALY_BUDGET_RED 3
 
-/// Minimum tiles between two planet anomalies, so a budget of 3 is three separate finds
-/// rather than one lethal clearing.
+/// Minimum tiles between two natural planet anomalies.
 #define ZONE_PLANET_ANOMALY_SPACING 20
 
-/// Cap on random turf draws while placing the anomaly budget. A planet whose open ground
-/// is nearly all taken simply seeds fewer than its budget rather than spinning.
+/// Random draws before scanning the remaining ground for safe anomaly sites.
 #define PLANET_ANOMALY_PLACEMENT_ATTEMPTS 400
 
-/// Multiplier on ore mined per planet rock wall (mineralAmt), per zone, green stays baseline (x1). Applied in /turf/closed/mineral/proc/zone_scaled_ore_amount()
-#define ZONE_PLANET_ORE_MULT_YELLOW 1.5
-#define ZONE_PLANET_ORE_MULT_RED 2
-
diff --git a/voidcrew/_DEFINES/player_outposts.dm b/voidcrew/_DEFINES/player_outposts.dm
index d5bb4c91cd2..3e328ec0309 100644
--- a/voidcrew/_DEFINES/player_outposts.dm
+++ b/voidcrew/_DEFINES/player_outposts.dm
@@ -17,7 +17,7 @@
 #define PLAYER_OUTPOST_MEMO_MAX_LEN 256
 
 /// Credit cost of one galaxy-wide advertisement
-#define OUTPOST_ADVERT_COST 2500
+#define OUTPOST_ADVERT_COST 500
 /// How long a purchased advertisement stays live
 #define OUTPOST_ADVERT_DURATION (20 MINUTES)
 /// Minimum time between advertisement purchases per outpost
@@ -34,14 +34,14 @@
 
 /// One permanent construction bay per outpost.
 #define OUTPOST_SHIP_BAY_SLOTS 1
-#define OUTPOST_SHIP_BAY_COST 10000
+#define OUTPOST_SHIP_BAY_COST 6000
 #define OUTPOST_DOCK_VARIANT_BAY "ship_bay"
 
 /// Round-local, prepaid hull recovery. A ship has at most one current registration.
 #define OUTPOST_MAX_CHECKPOINTS 12
 #define OUTPOST_CHECKPOINT_MAX_TEXT (1024 * 1024)
-#define OUTPOST_CHECKPOINT_SAVE_COST 10000
-#define OUTPOST_CHECKPOINT_UPDATE_COST 5000
+#define OUTPOST_CHECKPOINT_SAVE_COST 5000
+#define OUTPOST_CHECKPOINT_UPDATE_COST 2000
 
 /// New ships built to order in the ship bay (outpost_ship_orders.dm). Credits replace parts:
 /// every part a hull, theme or module would cost in the lobby shipyard is this many credits.
diff --git a/voidcrew/_DEFINES/techweb_nodes.dm b/voidcrew/_DEFINES/techweb_nodes.dm
index f9bcf266077..ec7961253bc 100644
--- a/voidcrew/_DEFINES/techweb_nodes.dm
+++ b/voidcrew/_DEFINES/techweb_nodes.dm
@@ -20,18 +20,12 @@
 #define TECHWEB_NODE_NANITE_SMART "nanite_smart"
 #define TECHWEB_NODE_NANITE_MESH "nanite_mesh"
 
-// Weapon blueprint pipeline (per-gun part/ammo nodes)
-#define TECHWEB_NODE_WEAPON_PART_L6_SAW "weapon_part_l6_saw"
+// Per-gun ammunition nodes
 #define TECHWEB_NODE_WEAPON_AMMO_L6_SAW "weapon_ammo_l6_saw"
-#define TECHWEB_NODE_WEAPON_PART_C20R "weapon_part_c20r"
 #define TECHWEB_NODE_WEAPON_AMMO_C20R "weapon_ammo_c20r"
-#define TECHWEB_NODE_WEAPON_PART_SNIPER "weapon_part_sniper"
 #define TECHWEB_NODE_WEAPON_AMMO_SNIPER "weapon_ammo_sniper"
-#define TECHWEB_NODE_WEAPON_PART_BULLDOG "weapon_part_bulldog"
 #define TECHWEB_NODE_WEAPON_AMMO_BULLDOG "weapon_ammo_bulldog"
-#define TECHWEB_NODE_WEAPON_PART_WT550 "weapon_part_wt550"
 #define TECHWEB_NODE_WEAPON_AMMO_WT550 "weapon_ammo_wt550"
-#define TECHWEB_NODE_WEAPON_PART_CARBINE "weapon_part_carbine"
 
 // Ship Combat
 #define TECHWEB_NODE_SHIP_COMBAT "ship_combat"
@@ -54,7 +48,7 @@
 #define TECHWEB_NODE_TRANSPORTER_TARGETING "transporter_targeting"
 #define TECHWEB_NODE_TRANSPORTER_BIOFILTER "transporter_biofilter"
 
-// Generic ammunition (the per-gun blueprint ammo nodes live in _DEFINES above)
+// Generic ammunition (per-gun ammunition nodes are defined above)
 #define TECHWEB_NODE_BALLISTIC_AMMO "ballistic_ammo"
 #define TECHWEB_NODE_AUTOMATIC_AMMO "automatic_ammo"
 #define TECHWEB_NODE_SPECIALIST_AMMO "specialist_ammo"
diff --git a/voidcrew/_DEFINES/trade.dm b/voidcrew/_DEFINES/trade.dm
index 63779ab4e1b..169f03cdcfc 100644
--- a/voidcrew/_DEFINES/trade.dm
+++ b/voidcrew/_DEFINES/trade.dm
@@ -41,11 +41,6 @@
 /// before self-freeing (dock warmup is 10s, plus shuttle transit and margin)
 #define OUTPOST_BERTH_ARRIVAL_GRACE (45 SECONDS)
 
-// Blueprint tiers: drive the neural imprinter's fee and the schematic's tint
-#define BLUEPRINT_TIER_GREEN 1
-#define BLUEPRINT_TIER_YELLOW 2
-#define BLUEPRINT_TIER_RED 3
-
 // Shop shelf kinds: how a SKU entered the shop's live list (drives UI styling,
 // per-round supply caps and, later, restock behavior)
 /// Always stocked, every round
@@ -59,10 +54,30 @@
 #define SHELF_FAVOR "favor"
 
 // ===== TRADER FAVOR =====
-// Standing a crew (ship) earns with a trader by running their board contracts.
-// Tracked per ship on ship.trader_favor, keyed by the outpost's MAIN shop type,
-// so every stall on an outpost honors the same standing. Favor dies with the
-// hull by design (losing the ship costs the crew its reputation too).
+// Favor and purchase caps live on the round-owned voidcrew_crew_record.
+// Hull teams share that record; hull accounts and mission slots stay separate.
+
+// Internal service permissions, never player-facing tier labels.
+#define ZONE_PERMISSION_PUBLIC 0
+#define ZONE_PERMISSION_YELLOW 1
+#define ZONE_PERMISSION_ADVANCED 2
+#define ZONE_PERMISSION_ELITE 3
+
+#define ZONE_REPUTATION_GREEN_REQUIRED 3
+#define ZONE_REPUTATION_YELLOW_REQUIRED 6
+#define ZONE_REPUTATION_RED_REQUIRED 9
+#define ZONE_REPUTATION_GREEN_FAMILY_CAP 1
+#define ZONE_REPUTATION_DANGER_FAMILY_CAP 5
+
+// Canonical progression families. Guarded prize families deliberately differ.
+#define ZONE_FAMILY_NAMED_KILL "named_kill"
+#define ZONE_FAMILY_HUNT "hunt"
+#define ZONE_FAMILY_CAPTURE "capture"
+#define ZONE_FAMILY_POACHERS "poachers"
+#define ZONE_FAMILY_PYLONS "pylons"
+#define ZONE_FAMILY_EXTRACTION "extraction"
+#define ZONE_FAMILY_CRIMINAL_BOUNTY "criminal_bounty"
+#define ZONE_FAMILY_LAIR "lair"
 
 // Tier thresholds, in favor points
 #define FAVOR_TIER_REGULAR 2
@@ -79,7 +94,7 @@
 // Favor paid per completed board contract, by difficulty band
 #define FAVOR_GAIN_EASY 1
 #define FAVOR_GAIN_MEDIUM 2
-#define FAVOR_GAIN_HARD 4
+#define FAVOR_GAIN_HARD 3
 
 /// How many of each favor-shelf unique one crew may buy per round
 #define FAVOR_UNIQUE_CREW_LIMIT 3
@@ -88,23 +103,30 @@
 #define OUTPOST_RESTOCK_INTERVAL (22 MINUTES)
 
 // ===== CONTRACT PAY BANDS =====
-// Outpost contracts settle in goods, not credits, so the bundle a contract pays
-// has to be assembled to hit a credit-equivalent target. These are that target,
-// in shop credits, per difficulty band. Anything below the EASY floor reads as
-// an insult on the board, a 600cr box of shells for a 2000cr haul of cores was
-// the bug these bands exist to prevent.
-// These bands include travel and delivery work. Routine supplies can form a
-// bundle, medium contracts fund a ship component, and hard ones add an exclusive.
-#define CONTRACT_PAY_EASY_MIN 1400
-#define CONTRACT_PAY_EASY_MAX 2000
-#define CONTRACT_PAY_MEDIUM_MIN 2600
-#define CONTRACT_PAY_MEDIUM_MAX 3800
-#define CONTRACT_PAY_HARD_MIN 5500
-#define CONTRACT_PAY_HARD_MAX 8000
+// Total quote, before archetype multipliers and supply service ceilings.
+#define CONTRACT_PAY_EASY_MIN 600
+#define CONTRACT_PAY_EASY_MAX 900
+#define CONTRACT_PAY_MEDIUM_MIN 1300
+#define CONTRACT_PAY_MEDIUM_MAX 1800
+#define CONTRACT_PAY_HARD_MIN 2400
+#define CONTRACT_PAY_HARD_MAX 3200
 
 /// A contract must beat selling the same goods over the counter by this much,
 /// or accepting it is strictly worse than walking to the buyback window.
-#define CONTRACT_ASK_PREMIUM 1.6
+#define CONTRACT_ASK_PREMIUM 1.15
+
+#define CONTRACT_SERVICE_EASY 200
+#define CONTRACT_SERVICE_MEDIUM 350
+#define CONTRACT_SERVICE_HARD 500
+#define CONTRACT_EXCEPTION_MULT 0.4
+#define CONTRACT_EXCEPTION_PREMIUM 1.10
+#define CONTRACT_SHELF_SHARE 0.6
+#define CONTRACT_COURIER_DISTANCE_PAY 10
+
+/// Shared board vacancies wait for the next scheduled refill.
+#define OUTPOST_SHOP_OFFER_COUNT 4
+#define OUTPOST_CONTRACT_REFILL_INTERVAL (11 MINUTES)
+#define OUTPOST_CONTRACT_EXPIRY (22 MINUTES)
 
 /// Imputed credit worth of one trade voucher, for valuing voucher-priced stock
 /// and for paying out a bundle's shortfall in scrip instead of money.
@@ -113,11 +135,8 @@
 /// Credit worth assumed for a back-room exclusive, which no shelf prices
 #define CONTRACT_EXCLUSIVE_VALUE 3600
 
-/// Shortfall below this is just rounding; above it, top the contract up in vouchers
-#define CONTRACT_SHORTFALL_TOLERANCE 600
-
 /// Never hand over more than this many separate items for one contract
-#define CONTRACT_MAX_REWARD_ITEMS 3
+#define CONTRACT_MAX_REWARD_ITEMS 2
 
 /// Trait source for TRAIT_FOOD_CHEF_MADE on dishes sold over an outpost
 /// kitchen's counter (the Chowder Pot's plated shelves). Kept distinct from
@@ -143,3 +162,78 @@
 #define TRADER_LINE_WARNING "warning"
 #define TRADER_LINE_IDLE "idle"
 #define TRADER_LINE_RESTOCK "restock"
+
+// Trader outpost weapons checkpoint (voidcrew/modules/trade/outpost_checkpoint.dm, outpost_trespass.dm)
+/// How long the scan chamber hums before its verdict
+#define OUTPOST_CHECKPOINT_SCAN_TIME (2 SECONDS)
+/// How long the inner door stays open after a clean scan
+#define OUTPOST_CHECKPOINT_PASS_TIME (5 SECONDS)
+/// How long the outer door stays open before it closes and the chamber scans
+#define OUTPOST_CHECKPOINT_OUTER_HOLD (4 SECONDS)
+/// How long the outer door stays open at least after a refusal, to let the refused group back out
+#define OUTPOST_CHECKPOINT_REJECT_HOLD (6 SECONDS)
+/// After that, how often a refusing chamber looks again for whatever it refused; the outer door shuts once it is gone
+#define OUTPOST_CHECKPOINT_REJECT_RECHECK (2 SECONDS)
+/// A door waits this long before trying again to close on a doorway someone is standing in
+#define OUTPOST_CHECKPOINT_DOORWAY_WAIT (1 SECONDS)
+/// The same line from the checkpoint is not said again within this long
+#define OUTPOST_CHECKPOINT_REPEAT_LINE (20 SECONDS)
+/// A refused walk into a checkpoint door shows at most once this often
+#define OUTPOST_CHECKPOINT_DENY_COOLDOWN (2 SECONDS)
+/// An ambient NPC off the lift gives up going through the checkpoint after this long
+#define OUTPOST_CHECKPOINT_NPC_PATIENCE (90 SECONDS)
+/// An ambient NPC waiting at a checkpoint asks a door at most once this often
+#define OUTPOST_CHECKPOINT_NPC_ASK_GAP (4 SECONDS)
+/// On an NPC going through a checkpoint (outpost_checkpoint_npcs.dm): pathing lets them through its open doors
+#define TRAIT_CHECKPOINT_CROSSING "checkpoint_crossing"
+/// How long prying (or hacking) the inner door open takes
+#define OUTPOST_CHECKPOINT_FORCE_TIME (20 SECONDS)
+/// How long a forced inner door stays open before it shuts again
+#define OUTPOST_CHECKPOINT_FORCED_OPEN_TIME (10 SECONDS)
+/// Minimum gap between two lines from the checkpoint about the same thing
+#define OUTPOST_CHECKPOINT_LINE_COOLDOWN (4 SECONDS)
+/// Turrets treat an armed trespasser as hostile until this long after they were last seen armed inside
+#define OUTPOST_TRESPASS_HOSTILE_DURATION (10 MINUTES)
+/// An armed trespasser is refused by the traders, the permit desk and the checkpoint until this long after they were last seen armed inside
+#define OUTPOST_TRESPASS_BAR_DURATION (30 MINUTES)
+/// How often the outpost looks for drawn guns past the checkpoint
+#define OUTPOST_ARMED_SWEEP_INTERVAL (2 SECONDS)
+/// A gun has to stay in hand this long before it counts as drawn (a gun shoved into someone's hand can be dropped)
+#define OUTPOST_ARMED_SIGHTING_GRACE (2 SECONDS)
+/// A weapons permit lasts this long
+#define OUTPOST_WEAPONS_PERMIT_DURATION (20 MINUTES)
+/// A weapons permit costs this many credits
+#define OUTPOST_WEAPONS_PERMIT_PRICE 1000
+/// After a permit runs out, a gun still in hand is overlooked for this long
+#define OUTPOST_WEAPONS_PERMIT_GRACE (30 SECONDS)
+
+// Checkpoint states (/datum/outpost_checkpoint)
+#define CHECKPOINT_IDLE "idle"
+#define CHECKPOINT_SCANNING "scanning"
+#define CHECKPOINT_PASSING "passing"
+#define CHECKPOINT_REJECTING "rejecting"
+#define CHECKPOINT_FORCED "forced"
+
+// Checkpoint guard speech line categories (read from the guard shop's trader_lines)
+#define CHECKPOINT_LINE_PASS "checkpoint_pass"
+#define CHECKPOINT_LINE_ARMED "checkpoint_armed"
+#define CHECKPOINT_LINE_BARRED "checkpoint_barred"
+#define CHECKPOINT_LINE_FORCING "checkpoint_forcing"
+#define CHECKPOINT_LINE_INTRUDER "checkpoint_intruder"
+#define CHECKPOINT_LINE_PERMIT_LAPSED "checkpoint_permit_lapsed"
+
+/// Original shop deliveries cannot be sold to cargo or a trader's wanted ledger.
+#define TRAIT_TRADER_GOODS "trader_goods"
+/// Limbgrower organs share their type with natural donor organs.
+#define TRAIT_PRINTED_ORGAN "printed_organ"
+
+// Settled materials-market asks, in credits per sheet.
+#define MATERIAL_BUY_FLOOR_DIAMOND 230
+#define MATERIAL_BUY_FLOOR_BLUESPACE 160
+#define MATERIAL_BUY_FLOOR_GOLD 80
+#define MATERIAL_BUY_FLOOR_TITANIUM 80
+#define MATERIAL_BUY_FLOOR_URANIUM 60
+#define MATERIAL_BUY_FLOOR_SILVER 30
+#define MATERIAL_BUY_FLOOR_PLASMA 15
+#define MATERIAL_BUY_FLOOR_IRON 5
+#define MATERIAL_BUY_FLOOR_GLASS 5
diff --git a/voidcrew/_maps/map_files/outposts/trader_outpost_black_market.dmm b/voidcrew/_maps/map_files/outposts/trader_outpost_black_market.dmm
index 2840d9d2f44..0910507dcba 100644
--- a/voidcrew/_maps/map_files/outposts/trader_outpost_black_market.dmm
+++ b/voidcrew/_maps/map_files/outposts/trader_outpost_black_market.dmm
@@ -472,6 +472,12 @@
 /obj/machinery/newscaster/directional/east,
 /turf/open/indestructible/dark,
 /area/voidcrew/trader_outpost)
+"aX" = (
+/obj/structure/filingcabinet/chestdrawer,
+/obj/machinery/light/small/red/directional/north,
+/obj/effect/turf_decal/tile/dark_red/full,
+/turf/open/indestructible/dark/smooth_large,
+/area/voidcrew/trader_outpost/checkpoint)
 "aY" = (
 /obj/machinery/sleeper/outpost{
 	dir = 4
@@ -512,16 +518,6 @@
 /obj/effect/decal/cleanable/cobweb,
 /turf/open/indestructible/dark,
 /area/voidcrew/trader_outpost)
-"bb" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/turf/open/indestructible/dark/textured,
-/area/voidcrew/trader_outpost)
 "bc" = (
 /obj/effect/landmark/outpost_elevator_alcove,
 /obj/effect/turf_decal/stripes/line{
@@ -529,29 +525,24 @@
 	},
 /turf/open/indestructible/dark/textured,
 /area/voidcrew/trader_outpost)
-"bd" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/turf/open/indestructible/dark/textured,
-/area/voidcrew/trader_outpost)
 "be" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/obj/machinery/outpost_elevator/directional/south,
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
+/obj/effect/turf_decal/box/red,
+/obj/machinery/light/small/red/directional/north,
+/obj/effect/landmark/outpost_checkpoint_chamber{
+	checkpoint_id = "undertow_door"
 	},
 /turf/open/indestructible/dark/textured,
-/area/voidcrew/trader_outpost)
+/area/voidcrew/trader_outpost/checkpoint)
 "bf" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/box/red,
+/obj/effect/landmark/outpost_checkpoint_chamber{
+	checkpoint_id = "undertow_door"
+	},
+/obj/machinery/outpost_checkpoint_sensor/directional/west{
+	checkpoint_id = "undertow_door"
+	},
 /turf/open/indestructible/dark/textured,
-/area/voidcrew/trader_outpost)
+/area/voidcrew/trader_outpost/checkpoint)
 "bg" = (
 /obj/effect/turf_decal/siding/thinplating_new/dark/corner{
 	dir = 4
@@ -561,42 +552,18 @@
 	},
 /turf/open/indestructible/dark/textured,
 /area/voidcrew/trader_outpost)
-"bh" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/machinery/light/warm/directional/north,
-/turf/open/indestructible/dark/textured,
-/area/voidcrew/trader_outpost)
-"bi" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/indestructible/dark/textured,
-/area/voidcrew/trader_outpost)
 "bj" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
+/obj/structure/sign/warning/vacuum/external/directional/north,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/floor,
+/obj/effect/landmark/outpost_checkpoint_chamber{
+	checkpoint_id = "undertow_bar"
 	},
-/turf/open/indestructible/dark/textured,
-/area/voidcrew/trader_outpost)
-"bk" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
+/obj/machinery/outpost_checkpoint_sensor/directional/south{
+	checkpoint_id = "undertow_bar"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/indestructible/dark/textured,
-/area/voidcrew/trader_outpost)
+/turf/open/indestructible/plating,
+/area/voidcrew/trader_outpost/checkpoint)
 "bn" = (
 /obj/effect/turf_decal/siding/wideplating_new/dark{
 	dir = 8
@@ -607,6 +574,56 @@
 /obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/indestructible/dark,
 /area/voidcrew/trader_outpost)
+"bo" = (
+/obj/machinery/door/airlock/outpost/checkpoint/inner/grunge{
+	checkpoint_id = "undertow_door";
+	name = "The Door"
+	},
+/obj/effect/turf_decal/delivery/red,
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"br" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin,
+/obj/effect/turf_decal/tile/dark_red/full,
+/turf/open/indestructible/dark/smooth_large,
+/area/voidcrew/trader_outpost/checkpoint)
+"bt" = (
+/mob/living/basic/outpost_trader/checkpoint_guard/undertow{
+	checkpoint_id = "undertow_door"
+	},
+/obj/effect/turf_decal/tile/dark_red/full,
+/turf/open/indestructible/dark/smooth_large,
+/area/voidcrew/trader_outpost/checkpoint)
+"bu" = (
+/obj/structure/outpost_exit_gate{
+	dir = 2
+	},
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bv" = (
+/obj/machinery/door/airlock/outpost/checkpoint/outer/grunge{
+	checkpoint_id = "undertow_door";
+	name = "Scan Room"
+	},
+/obj/effect/turf_decal/delivery/red,
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bw" = (
+/obj/effect/landmark/outpost_network_pad_spot,
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
+"bx" = (
+/obj/effect/turf_decal/arrows{
+	dir = 2
+	},
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
+"by" = (
+/obj/structure/sign/poster/contraband/smoke/directional/north,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
 "bz" = (
 /obj/effect/turf_decal/siding/thinplating_new/dark,
 /obj/machinery/porta_turret/outpost,
@@ -615,6 +632,50 @@
 /obj/effect/decal/cleanable/cobweb,
 /turf/open/indestructible/dark/smooth_large,
 /area/voidcrew/trader_outpost)
+"bA" = (
+/obj/structure/railing/unbreakable{
+	dir = 2
+	},
+/obj/structure/railing/unbreakable{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+	dir = 2
+	},
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
+"bB" = (
+/obj/structure/railing/unbreakable{
+	dir = 2
+	},
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+	dir = 2
+	},
+/obj/structure/sign/warning/secure_area/directional/north,
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
+"bC" = (
+/obj/structure/railing/unbreakable{
+	dir = 2
+	},
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+	dir = 2
+	},
+/obj/effect/turf_decal/delivery,
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
+"bD" = (
+/obj/structure/railing/unbreakable{
+	dir = 2
+	},
+/obj/effect/turf_decal/trimline/dark_red/filled/line{
+	dir = 2
+	},
+/obj/effect/turf_decal/arrows{
+	dir = 8
+	},
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
 "bE" = (
 /obj/effect/turf_decal/siding/wideplating_new/dark{
 	dir = 8
@@ -630,10 +691,38 @@
 	},
 /turf/open/indestructible/dark/textured,
 /area/voidcrew/trader_outpost)
+"bF" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
 "bG" = (
 /obj/structure/chair/comfy/carp,
 /turf/open/floor/carpet/neon/simple/red/nodots,
 /area/voidcrew/trader_outpost)
+"bH" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bI" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/light/red/directional/east,
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
 "bJ" = (
 /obj/effect/turf_decal/siding/thinplating_new/dark{
 	dir = 8
@@ -652,11 +741,22 @@
 /obj/machinery/light/floor,
 /turf/open/indestructible/dark/smooth_large,
 /area/voidcrew/trader_outpost)
+"bK" = (
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
 "bL" = (
 /obj/effect/turf_decal/siding/thinplating_new/dark,
 /obj/effect/turf_decal/tile/dark_red/half/contrasted,
 /turf/open/indestructible/dark,
 /area/voidcrew/trader_outpost)
+"bM" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
+"bN" = (
+/obj/machinery/light/floor,
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
 "bO" = (
 /obj/structure/railing/unbreakable{
 	dir = 1
@@ -685,6 +785,111 @@
 /obj/machinery/light/floor,
 /turf/open/indestructible/dark/smooth_large,
 /area/voidcrew/trader_outpost)
+"bP" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bQ" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bR" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bS" = (
+/obj/structure/closet/secure_closet/outpost_rental/checkpoint,
+/obj/effect/turf_decal/bot,
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
+"bT" = (
+/obj/machinery/light/red/directional/south,
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
+"bU" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bV" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
+/obj/machinery/outpost_elevator/directional/south,
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bW" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bX" = (
+/obj/effect/turf_decal/tile/dark_red/half/contrasted,
+/obj/effect/turf_decal/siding/wideplating_new/dark,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/arrows{
+	dir = 2
+	},
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost)
+"bY" = (
+/obj/effect/turf_decal/tile/dark_red/half/contrasted,
+/obj/effect/turf_decal/siding/wideplating_new/dark,
+/obj/structure/sign/painting/library{
+	pixel_y = -32
+	},
+/obj/machinery/light/red/directional/south,
+/obj/item/radio/intercom/directional/south,
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost)
+"bZ" = (
+/obj/machinery/door/airlock/outpost/checkpoint/outer{
+	checkpoint_id = "undertow_bar";
+	name = "Bar Hatch"
+	},
+/obj/structure/fans/tiny,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/stripes{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/indestructible/plating,
+/area/voidcrew/trader_outpost/checkpoint)
+"ca" = (
+/obj/machinery/door/airlock/outpost/checkpoint/inner/grunge{
+	checkpoint_id = "undertow_bar";
+	name = "Bar Gate"
+	},
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/indestructible/plating,
+/area/voidcrew/trader_outpost/checkpoint)
 "ci" = (
 /obj/structure/chair/sofa/corp/left,
 /turf/open/floor/carpet/neon/simple/red/nodots,
@@ -983,9 +1188,6 @@
 	},
 /turf/open/indestructible/dark/smooth_large,
 /area/voidcrew/trader_outpost)
-"gE" = (
-/turf/open/floor/carpet/neon/simple/red/nodots,
-/area/voidcrew/trader_outpost)
 "gK" = (
 /obj/effect/turf_decal/siding/wideplating_new/dark{
 	dir = 4
@@ -1336,6 +1538,18 @@
 /obj/structure/extinguisher_cabinet/directional/north,
 /turf/open/floor/carpet/neon/simple/red/nodots,
 /area/voidcrew/trader_outpost)
+"mv" = (
+/obj/machinery/newscaster/directional/north,
+/obj/machinery/light/red/directional/north,
+/obj/effect/turf_decal/tile/dark_red/half/contrasted{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/wideplating_new/dark{
+	dir = 1
+	},
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost)
 "mx" = (
 /obj/effect/turf_decal/trimline/dark_red/filled/corner{
 	dir = 4
@@ -2468,21 +2682,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/indestructible/dark,
 /area/voidcrew/trader_outpost)
-"ED" = (
-/obj/structure/fans/tiny,
-/obj/machinery/door/airlock/outpost{
-	name = "Bar Exterior"
-	},
-/obj/effect/turf_decal/bot,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/indestructible/plating,
-/area/voidcrew/trader_outpost)
 "EN" = (
 /obj/structure/railing/unbreakable{
 	dir = 5
@@ -3197,9 +3396,6 @@
 /obj/effect/turf_decal/tile/dark_red/opposingcorners,
 /turf/open/indestructible/dark,
 /area/voidcrew/trader_outpost)
-"Qf" = (
-/turf/open/floor/carpet/neon/simple/red/nodots,
-/area/voidcrew/trader_outpost)
 "Ql" = (
 /turf/open/indestructible{
 	base_icon_state = "stairs-r";
@@ -3333,9 +3529,6 @@
 /obj/machinery/light/floor,
 /turf/open/indestructible/dark,
 /area/voidcrew/trader_outpost)
-"SI" = (
-/turf/open/indestructible/light,
-/area/voidcrew/trader_outpost)
 "SS" = (
 /obj/effect/turf_decal/siding/thinplating_new/dark{
 	dir = 1
@@ -4387,11 +4580,11 @@ aV
 Vr
 Sp
 bL
-SI
-SI
-SI
-SI
-SI
+Jy
+Jy
+Jy
+Jy
+Jy
 ae
 VR
 KU
@@ -4421,11 +4614,11 @@ aV
 MG
 aG
 bL
-SI
-SI
-SI
-SI
-SI
+Jy
+Jy
+Jy
+Jy
+Jy
 KQ
 aj
 Kc
@@ -4455,11 +4648,11 @@ aV
 MG
 Sp
 uB
-SI
-SI
+Jy
+Jy
 ve
 Jy
-SI
+Jy
 ae
 aj
 Kc
@@ -4482,18 +4675,18 @@ Gq
 kF
 KQ
 bL
-gE
-Qf
+ai
+ai
 ck
 aV
 MG
 Sp
 bL
-SI
-SI
-SI
-SI
-SI
+Jy
+Jy
+Jy
+Jy
+Jy
 KQ
 aj
 Kc
@@ -4523,11 +4716,11 @@ aV
 Vr
 MP
 bL
-SI
-SI
-SI
-SI
-SI
+Jy
+Jy
+Jy
+Jy
+Jy
 KQ
 jx
 NP
@@ -4601,12 +4794,12 @@ Jz
 wK
 ak
 ar
-zA
+bY
+aa
+aa
+aa
 aa
 aa
-aC
-aC
-aC
 "}
 (27,1,1) = {"
 aC
@@ -4637,10 +4830,10 @@ aK
 aB
 Ha
 aa
-aJ
-aC
-aC
-aC
+bw
+bK
+bS
+aa
 "}
 (28,1,1) = {"
 aC
@@ -4667,14 +4860,14 @@ we
 we
 aa
 aa
-aq
+mv
 ar
-Eu
-aV
-vn
-aC
-aC
-aC
+bX
+bu
+bx
+bM
+bS
+aa
 "}
 (29,1,1) = {"
 aC
@@ -4701,14 +4894,14 @@ rw
 Si
 aa
 aa
-ut
-ar
-au
 aa
-vn
-aC
-aC
-aC
+bo
+aa
+aa
+by
+bN
+bS
+aa
 "}
 (30,1,1) = {"
 aC
@@ -4735,14 +4928,14 @@ TD
 al
 BJ
 aa
-bd
-bc
-bb
 aa
-vn
-aC
-aC
-aC
+be
+bf
+bv
+bA
+bK
+bT
+aa
 "}
 (31,1,1) = {"
 aC
@@ -4769,14 +4962,14 @@ Pn
 TO
 Ux
 aa
-bh
-bf
-be
 aa
-vn
-vn
-aC
-aC
+aV
+aV
+aa
+bB
+bK
+bS
+aa
 "}
 (32,1,1) = {"
 aC
@@ -4803,14 +4996,14 @@ DM
 YU
 aa
 aa
-bk
-bj
-bi
+aX
+br
+bt
+aV
+bC
+bK
+bS
 aa
-vn
-aJ
-aC
-aC
 "}
 (33,1,1) = {"
 aC
@@ -4841,10 +5034,10 @@ aV
 aV
 aV
 aa
-vn
-vn
-aC
-aC
+bD
+bN
+bS
+aa
 "}
 (34,1,1) = {"
 aC
@@ -4861,7 +5054,7 @@ dW
 BL
 aa
 aa
-ip
+ca
 aa
 vn
 vn
@@ -4874,11 +5067,11 @@ vn
 vn
 vn
 vn
-vn
-vn
-aC
-aC
-aC
+aa
+bF
+bP
+bU
+aa
 "}
 (35,1,1) = {"
 aC
@@ -4895,7 +5088,7 @@ aa
 aa
 aa
 aa
-vK
+bj
 aa
 vn
 vn
@@ -4908,11 +5101,11 @@ aC
 aC
 vn
 aJ
-vn
-aC
-aC
-aC
-aC
+aa
+bH
+bQ
+bV
+aa
 "}
 (36,1,1) = {"
 aC
@@ -4929,7 +5122,7 @@ aC
 aJ
 vn
 aa
-ED
+bZ
 aa
 aJ
 aC
@@ -4942,11 +5135,11 @@ aC
 aC
 aC
 aC
-aC
-aC
-aC
-aC
-aC
+aa
+bI
+bR
+bW
+aa
 "}
 (37,1,1) = {"
 aC
@@ -4976,11 +5169,11 @@ aC
 aC
 aC
 aC
-aC
-aC
-aC
-aC
-aC
+aa
+aa
+aa
+aa
+aa
 "}
 (38,1,1) = {"
 aC
diff --git a/voidcrew/_maps/map_files/outposts/trader_outpost_general.dmm b/voidcrew/_maps/map_files/outposts/trader_outpost_general.dmm
index 1ce457704a9..a9ddd090019 100644
--- a/voidcrew/_maps/map_files/outposts/trader_outpost_general.dmm
+++ b/voidcrew/_maps/map_files/outposts/trader_outpost_general.dmm
@@ -1,14 +1,4 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"aa" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/turf/open/indestructible/dark/smooth_large,
-/area/voidcrew/trader_outpost)
 "ab" = (
 /obj/effect/turf_decal/siding/wideplating_new,
 /obj/effect/turf_decal/tile/neutral/half/contrasted,
@@ -21,16 +11,12 @@
 /turf/open/indestructible,
 /area/voidcrew/trader_outpost)
 "ac" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/thinplating_new/dark{
-	dir = 6
+/obj/effect/turf_decal/box/red,
+/obj/effect/landmark/outpost_checkpoint_chamber{
+	checkpoint_id = "halcyon_arrivals"
 	},
-/obj/effect/turf_decal/tile/dark/full,
-/obj/effect/invisible_wall,
-/turf/open/indestructible/dark/smooth_large,
-/area/voidcrew/trader_outpost)
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
 "ad" = (
 /obj/effect/turf_decal/siding/thinplating_new{
 	dir = 4
@@ -62,13 +48,6 @@
 /obj/item/radio/intercom/directional/south,
 /turf/open/indestructible/stone,
 /area/voidcrew/trader_outpost)
-"ah" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/turf/open/indestructible/dark/smooth_large,
-/area/voidcrew/trader_outpost)
 "ai" = (
 /turf/open/indestructible/hoteltile,
 /area/voidcrew/trader_outpost)
@@ -80,15 +59,13 @@
 /turf/closed/indestructible/reinforced/titanium/outpost,
 /area/voidcrew/trader_outpost)
 "al" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
+/obj/effect/turf_decal/box/red,
+/obj/machinery/light/small/directional/north,
+/obj/effect/landmark/outpost_checkpoint_chamber{
+	checkpoint_id = "halcyon_arrivals"
 	},
-/turf/open/indestructible/dark/smooth_large,
-/area/voidcrew/trader_outpost)
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
 "am" = (
 /obj/structure/chair/sofa/corp/left,
 /obj/effect/turf_decal/siding/thinplating_new/dark{
@@ -104,16 +81,15 @@
 /turf/open/indestructible/dark/smooth_large,
 /area/voidcrew/trader_outpost)
 "an" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/obj/machinery/outpost_elevator/directional/south{
-	pixel_w = 0;
-	pixel_z = 3
+/obj/effect/turf_decal/box/red,
+/obj/effect/landmark/outpost_checkpoint_chamber{
+	checkpoint_id = "halcyon_arrivals"
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
+/obj/machinery/outpost_checkpoint_sensor/directional/west{
+	checkpoint_id = "halcyon_arrivals"
 	},
-/turf/open/indestructible/dark/smooth_large,
-/area/voidcrew/trader_outpost)
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
 "ao" = (
 /obj/effect/turf_decal/siding/wideplating_new/dark{
 	dir = 8
@@ -123,21 +99,6 @@
 	},
 /turf/open/indestructible/dark,
 /area/voidcrew/trader_outpost)
-"ap" = (
-/obj/structure/railing/unbreakable{
-	dir = 6
-	},
-/obj/effect/turf_decal/siding/wideplating_new{
-	dir = 6
-	},
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
-/obj/item/kirbyplants/organic/plant22,
-/turf/open/indestructible,
-/area/voidcrew/trader_outpost)
-"aq" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/turf/open/indestructible/dark/smooth_large,
-/area/voidcrew/trader_outpost)
 "ar" = (
 /obj/effect/turf_decal/siding/wideplating_new/light{
 	color = "#5d341f";
@@ -169,16 +130,6 @@
 	},
 /turf/open/indestructible/dark/smooth_large,
 /area/voidcrew/trader_outpost)
-"av" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/indestructible/dark/smooth_large,
-/area/voidcrew/trader_outpost)
 "aw" = (
 /obj/effect/turf_decal/siding/wideplating_new{
 	dir = 4
@@ -192,13 +143,6 @@
 	},
 /turf/open/indestructible,
 /area/voidcrew/trader_outpost)
-"ax" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/indestructible/dark/smooth_large,
-/area/voidcrew/trader_outpost)
 "ay" = (
 /obj/effect/turf_decal/siding/wideplating_new{
 	dir = 8
@@ -221,16 +165,6 @@
 	},
 /turf/open/indestructible/dark/smooth_large,
 /area/voidcrew/trader_outpost)
-"aA" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/indestructible/dark/smooth_large,
-/area/voidcrew/trader_outpost)
 "aB" = (
 /obj/effect/turf_decal/siding/thinplating_new/dark{
 	dir = 1
@@ -267,15 +201,6 @@
 /obj/structure/curtain/bounty/start_closed,
 /turf/open/indestructible/plating,
 /area/voidcrew/trader_outpost)
-"aG" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/thinplating_new/dark/end,
-/obj/effect/turf_decal/tile/dark/full,
-/obj/effect/invisible_wall,
-/turf/open/indestructible/dark/smooth_large,
-/area/voidcrew/trader_outpost)
 "aH" = (
 /obj/machinery/vending/coffee,
 /obj/machinery/light/blacklight/directional/north,
@@ -349,16 +274,14 @@
 /obj/structure/sign/departments/medbay/alt/directional/east,
 /turf/open/indestructible/dark,
 /area/voidcrew/trader_outpost)
-"aQ" = (
-/obj/structure/railing/unbreakable{
-	dir = 5
+"aP" = (
+/obj/machinery/door/airlock/outpost/checkpoint/inner/security{
+	checkpoint_id = "halcyon_arrivals";
+	name = "Arrivals Checkpoint"
 	},
-/obj/effect/turf_decal/siding/wideplating_new{
-	dir = 5
-	},
-/obj/effect/turf_decal/tile/neutral/full,
-/turf/open/indestructible/large,
-/area/voidcrew/trader_outpost)
+/obj/effect/turf_decal/delivery/red,
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
 "aS" = (
 /obj/structure/chair/stool/directional/north,
 /obj/effect/turf_decal/trimline/neutral/filled/line{
@@ -372,16 +295,12 @@
 	},
 /turf/open/indestructible/dark/smooth_large,
 /area/voidcrew/trader_outpost)
-"aU" = (
-/obj/effect/turf_decal/siding/wideplating_new{
-	dir = 4
-	},
-/obj/structure/railing/unbreakable{
-	dir = 4
-	},
+"aT" = (
+/obj/structure/closet/secure_closet/outpost_rental/checkpoint,
+/obj/effect/turf_decal/bot,
 /obj/effect/turf_decal/tile/neutral/full,
 /turf/open/indestructible/large,
-/area/voidcrew/trader_outpost)
+/area/voidcrew/trader_outpost/checkpoint)
 "aV" = (
 /obj/structure/table/reinforced,
 /obj/effect/turf_decal/siding/thinplating_new/dark{
@@ -409,24 +328,34 @@
 	},
 /turf/open/indestructible/dark/smooth_large,
 /area/voidcrew/trader_outpost)
-"aY" = (
-/turf/open/indestructible/glass,
-/area/voidcrew/trader_outpost)
-"aZ" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/obj/effect/turf_decal/tile/dark/full,
-/obj/effect/invisible_wall,
-/turf/open/indestructible/dark/smooth_large,
-/area/voidcrew/trader_outpost)
 "bb" = (
 /obj/effect/spawner/random/engineering/tank,
 /obj/machinery/light/small/directional/south,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/indestructible/plating,
 /area/voidcrew/trader_outpost)
+"bc" = (
+/obj/structure/filingcabinet/security,
+/obj/machinery/light/small/directional/north,
+/obj/effect/turf_decal/tile/red/full,
+/turf/open/indestructible/dark/smooth_large,
+/area/voidcrew/trader_outpost/checkpoint)
+"bd" = (
+/obj/item/kirbyplants/organic/plant22,
+/obj/effect/turf_decal/tile/neutral/full,
+/turf/open/indestructible/large,
+/area/voidcrew/trader_outpost/checkpoint)
+"be" = (
+/obj/effect/turf_decal/tile/neutral/full,
+/turf/open/indestructible/large,
+/area/voidcrew/trader_outpost/checkpoint)
+"bf" = (
+/mob/living/basic/outpost_trader/checkpoint_guard/halcyon{
+	checkpoint_id = "halcyon_arrivals"
+	},
+/obj/effect/turf_decal/tile/red/full,
+/turf/open/indestructible/dark/smooth_large,
+/area/voidcrew/trader_outpost/checkpoint)
 "bg" = (
 /obj/effect/turf_decal/siding/wideplating_new/light{
 	color = "#5d341f";
@@ -445,6 +374,23 @@
 	},
 /turf/open/indestructible/hotelwood,
 /area/voidcrew/trader_outpost)
+"bh" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin,
+/obj/item/stamp,
+/obj/effect/turf_decal/tile/red/full,
+/turf/open/indestructible/dark/smooth_large,
+/area/voidcrew/trader_outpost/checkpoint)
+"bi" = (
+/obj/effect/landmark/outpost_network_pad_spot,
+/obj/effect/turf_decal/tile/neutral/full,
+/turf/open/indestructible/large,
+/area/voidcrew/trader_outpost/checkpoint)
+"bj" = (
+/obj/machinery/light/floor,
+/obj/effect/turf_decal/tile/neutral/full,
+/turf/open/indestructible/large,
+/area/voidcrew/trader_outpost/checkpoint)
 "bk" = (
 /obj/structure/chair/sofa/corp/left,
 /obj/effect/turf_decal/siding/thinplating_new/dark{
@@ -458,6 +404,40 @@
 	},
 /turf/open/indestructible/dark/smooth_large,
 /area/voidcrew/trader_outpost)
+"bl" = (
+/obj/machinery/door/airlock/outpost/checkpoint/outer/security{
+	checkpoint_id = "halcyon_arrivals";
+	name = "Scan Room"
+	},
+/obj/effect/turf_decal/delivery/red,
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bm" = (
+/obj/structure/reagent_dispensers/water_cooler,
+/obj/effect/turf_decal/tile/neutral/full,
+/turf/open/indestructible/large,
+/area/voidcrew/trader_outpost/checkpoint)
+"bn" = (
+/obj/structure/sign/warning/secure_area/directional/north,
+/obj/effect/turf_decal/tile/neutral/full,
+/turf/open/indestructible/large,
+/area/voidcrew/trader_outpost/checkpoint)
+"bo" = (
+/obj/structure/railing/unbreakable{
+	dir = 4
+	},
+/obj/structure/railing/unbreakable{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/wideplating_new{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wideplating_new{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral/full,
+/turf/open/indestructible/large,
+/area/voidcrew/trader_outpost/checkpoint)
 "bp" = (
 /obj/structure/railing/unbreakable{
 	dir = 4
@@ -468,6 +448,24 @@
 /obj/effect/turf_decal/tile/neutral/anticorner,
 /turf/open/indestructible/stone,
 /area/voidcrew/trader_outpost)
+"bq" = (
+/obj/structure/sign/departments/security/directional/north,
+/obj/effect/turf_decal/tile/neutral/full,
+/turf/open/indestructible/large,
+/area/voidcrew/trader_outpost/checkpoint)
+"br" = (
+/obj/effect/turf_decal/delivery,
+/obj/effect/turf_decal/tile/neutral/full,
+/turf/open/indestructible/large,
+/area/voidcrew/trader_outpost/checkpoint)
+"bs" = (
+/obj/machinery/light/directional/west,
+/obj/effect/turf_decal/tile/neutral/full,
+/turf/open/indestructible/large,
+/area/voidcrew/trader_outpost/checkpoint)
+"bt" = (
+/turf/open/indestructible/glass,
+/area/voidcrew/trader_outpost/checkpoint)
 "bu" = (
 /obj/structure/flora/bush/flowers_yw/style_random,
 /obj/structure/railing/unbreakable{
@@ -475,19 +473,38 @@
 	},
 /turf/open/indestructible/grass,
 /area/voidcrew/trader_outpost)
-"bv" = (
-/obj/structure/railing/unbreakable,
+"bw" = (
 /obj/structure/railing/unbreakable{
-	dir = 1
+	dir = 4
+	},
+/obj/structure/railing/unbreakable{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/wideplating_new{
+	dir = 4
 	},
-/obj/effect/turf_decal/siding/wideplating_new,
 /obj/effect/turf_decal/siding/wideplating_new{
+	dir = 8
+	},
+/obj/effect/turf_decal/arrows{
 	dir = 1
 	},
-/obj/machinery/light/floor,
 /obj/effect/turf_decal/tile/neutral/full,
 /turf/open/indestructible/large,
-/area/voidcrew/trader_outpost)
+/area/voidcrew/trader_outpost/checkpoint)
+"bx" = (
+/obj/structure/outpost_exit_gate{
+	dir = 4
+	},
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"by" = (
+/obj/effect/turf_decal/arrows{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral/full,
+/turf/open/indestructible/large,
+/area/voidcrew/trader_outpost/checkpoint)
 "bz" = (
 /obj/structure/chair/stool/directional/south,
 /obj/effect/turf_decal/trimline/neutral/filled/line{
@@ -501,12 +518,33 @@
 	},
 /turf/open/indestructible/dark/smooth_large,
 /area/voidcrew/trader_outpost)
+"bA" = (
+/obj/structure/chair/sofa/bench/tram/left{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral/full,
+/turf/open/indestructible/large,
+/area/voidcrew/trader_outpost/checkpoint)
 "bB" = (
 /obj/effect/turf_decal/weather/dirt{
 	dir = 1
 	},
 /turf/open/indestructible/stone,
 /area/voidcrew/trader_outpost)
+"bC" = (
+/obj/structure/chair/sofa/bench/tram/right{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral/full,
+/turf/open/indestructible/large,
+/area/voidcrew/trader_outpost/checkpoint)
+"bD" = (
+/obj/structure/chair/sofa/bench/tram/right{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral/full,
+/turf/open/indestructible/large,
+/area/voidcrew/trader_outpost/checkpoint)
 "bE" = (
 /obj/effect/turf_decal/siding/wideplating_new{
 	dir = 5
@@ -516,6 +554,23 @@
 	},
 /turf/open/indestructible,
 /area/voidcrew/trader_outpost)
+"bF" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/indestructible/dark/smooth_large,
+/area/voidcrew/trader_outpost/checkpoint)
+"bG" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/indestructible/dark/smooth_large,
+/area/voidcrew/trader_outpost/checkpoint)
 "bH" = (
 /obj/structure/table/reinforced,
 /obj/item/reagent_containers/cup/bottle/syrup_bottle/caramel{
@@ -536,6 +591,90 @@
 	},
 /turf/open/indestructible/dark/smooth_large,
 /area/voidcrew/trader_outpost)
+"bI" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/indestructible/dark/smooth_large,
+/area/voidcrew/trader_outpost/checkpoint)
+"bJ" = (
+/obj/structure/chair/sofa/bench/tram/left{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral/full,
+/turf/open/indestructible/large,
+/area/voidcrew/trader_outpost/checkpoint)
+"bK" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/indestructible/dark/smooth_large,
+/area/voidcrew/trader_outpost/checkpoint)
+"bL" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/turf/open/indestructible/dark/smooth_large,
+/area/voidcrew/trader_outpost/checkpoint)
+"bM" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/indestructible/dark/smooth_large,
+/area/voidcrew/trader_outpost/checkpoint)
+"bN" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/indestructible/dark/smooth_large,
+/area/voidcrew/trader_outpost/checkpoint)
+"bO" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
+/obj/machinery/outpost_elevator/directional/south{
+	pixel_w = 0;
+	pixel_z = 3
+	},
+/turf/open/indestructible/dark/smooth_large,
+/area/voidcrew/trader_outpost/checkpoint)
+"bP" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/indestructible/dark/smooth_large,
+/area/voidcrew/trader_outpost/checkpoint)
+"bQ" = (
+/obj/effect/turf_decal/siding/wideplating_new{
+	dir = 5
+	},
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+	dir = 4
+	},
+/obj/item/kirbyplants/organic/plant22,
+/turf/open/indestructible,
+/area/voidcrew/trader_outpost)
+"bR" = (
+/obj/effect/turf_decal/siding/wideplating_new{
+	dir = 6
+	},
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted,
+/obj/item/kirbyplants/organic/plant22,
+/turf/open/indestructible,
+/area/voidcrew/trader_outpost)
 "bS" = (
 /obj/structure/table/reinforced,
 /obj/machinery/coffeemaker/impressa{
@@ -562,6 +701,53 @@
 	},
 /turf/open/indestructible/stone,
 /area/voidcrew/trader_outpost)
+"bU" = (
+/obj/effect/turf_decal/siding/wideplating_new{
+	dir = 9
+	},
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+	dir = 1
+	},
+/obj/item/kirbyplants/organic/plant22,
+/turf/open/indestructible,
+/area/voidcrew/trader_outpost)
+"bV" = (
+/obj/effect/turf_decal/siding/wideplating_new{
+	dir = 10
+	},
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+	dir = 8
+	},
+/obj/item/kirbyplants/organic/plant22,
+/turf/open/indestructible,
+/area/voidcrew/trader_outpost)
+"bW" = (
+/obj/effect/turf_decal/siding/wideplating_new/corner,
+/obj/effect/turf_decal/siding/wideplating_new/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral/half{
+	dir = 4
+	},
+/obj/effect/turf_decal/arrows{
+	dir = 4
+	},
+/turf/open/indestructible/large,
+/area/voidcrew/trader_outpost)
+"bY" = (
+/obj/effect/turf_decal/siding/thinplating_new/light{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/blue/filled/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
+	dir = 1
+	},
+/obj/machinery/light/directional/south,
+/obj/machinery/iv_drip,
+/turf/open/indestructible/white/smooth_large,
+/area/voidcrew/trader_outpost)
 "bZ" = (
 /obj/structure/railing/unbreakable{
 	color = "#5d341f";
@@ -577,19 +763,6 @@
 	},
 /turf/open/indestructible/hotelwood,
 /area/voidcrew/trader_outpost)
-"cc" = (
-/obj/structure/railing/unbreakable{
-	dir = 10
-	},
-/obj/effect/turf_decal/siding/wideplating_new{
-	dir = 10
-	},
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
-	dir = 8
-	},
-/obj/item/kirbyplants/organic/plant22,
-/turf/open/indestructible,
-/area/voidcrew/trader_outpost)
 "cd" = (
 /obj/structure/flora/ausbushes/leafybush{
 	pixel_w = -2;
@@ -689,24 +862,6 @@
 /obj/effect/turf_decal/box/red,
 /turf/open/floor/grass,
 /area/voidcrew/trader_outpost)
-"dk" = (
-/obj/effect/turf_decal/siding/wideplating_new/corner,
-/obj/effect/turf_decal/siding/wideplating_new/corner{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral/full,
-/turf/open/indestructible/large,
-/area/voidcrew/trader_outpost)
-"dp" = (
-/obj/structure/railing/unbreakable{
-	dir = 10
-	},
-/obj/effect/turf_decal/siding/wideplating_new{
-	dir = 10
-	},
-/obj/effect/turf_decal/tile/neutral/full,
-/turf/open/indestructible/large,
-/area/voidcrew/trader_outpost)
 "dq" = (
 /obj/structure/flora/ausbushes/leafybush{
 	pixel_w = -1;
@@ -846,12 +1001,6 @@
 	},
 /turf/open/indestructible,
 /area/voidcrew/trader_outpost)
-"eK" = (
-/obj/effect/turf_decal/siding/wideplating_new,
-/obj/structure/railing/unbreakable,
-/obj/effect/turf_decal/tile/neutral/full,
-/turf/open/indestructible/large,
-/area/voidcrew/trader_outpost)
 "eL" = (
 /obj/effect/turf_decal/siding/wideplating_new/light/corner{
 	color = "#5d341f"
@@ -1325,16 +1474,6 @@
 /obj/structure/marker_beacon/olive,
 /turf/open/space/basic,
 /area/space)
-"kh" = (
-/obj/effect/turf_decal/siding/wideplating_new/corner{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/wideplating_new/corner{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral/full,
-/turf/open/indestructible/large,
-/area/voidcrew/trader_outpost)
 "kr" = (
 /obj/structure/flora/branches,
 /turf/open/water/outpost_pond,
@@ -1344,22 +1483,6 @@
 /obj/item/seeds/cotton,
 /turf/open/floor/grass,
 /area/voidcrew/trader_outpost)
-"kE" = (
-/obj/structure/railing/unbreakable{
-	dir = 4
-	},
-/obj/structure/railing/unbreakable{
-	dir = 8
-	},
-/obj/effect/turf_decal/siding/wideplating_new{
-	dir = 8
-	},
-/obj/effect/turf_decal/siding/wideplating_new{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral/full,
-/turf/open/indestructible/large,
-/area/voidcrew/trader_outpost)
 "kK" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
@@ -1399,16 +1522,6 @@
 	},
 /turf/open/indestructible/dark/smooth_large,
 /area/voidcrew/trader_outpost)
-"lf" = (
-/obj/structure/railing/unbreakable{
-	dir = 9
-	},
-/obj/effect/turf_decal/siding/wideplating_new{
-	dir = 9
-	},
-/obj/effect/turf_decal/tile/neutral/full,
-/turf/open/indestructible/large,
-/area/voidcrew/trader_outpost)
 "lg" = (
 /obj/structure/flora/bush/lavendergrass/style_random,
 /obj/machinery/light/floor,
@@ -1570,16 +1683,6 @@
 /obj/structure/flora/bush/ferny/style_random,
 /turf/open/floor/grass,
 /area/voidcrew/trader_outpost)
-"mJ" = (
-/obj/effect/turf_decal/siding/wideplating_new{
-	dir = 8
-	},
-/obj/structure/railing/unbreakable{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral/full,
-/turf/open/indestructible/large,
-/area/voidcrew/trader_outpost)
 "mL" = (
 /obj/effect/turf_decal/siding/wideplating_new/dark{
 	dir = 9
@@ -1605,20 +1708,7 @@
 	color = "#5d341f";
 	dir = 8
 	},
-/turf/open/indestructible/hotelwood,
-/area/voidcrew/trader_outpost)
-"nh" = (
-/obj/structure/railing/unbreakable{
-	dir = 9
-	},
-/obj/effect/turf_decal/siding/wideplating_new{
-	dir = 9
-	},
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
-	dir = 1
-	},
-/obj/item/kirbyplants/organic/plant22,
-/turf/open/indestructible,
+/turf/open/indestructible/hotelwood,
 /area/voidcrew/trader_outpost)
 "nl" = (
 /obj/structure/railing/unbreakable{
@@ -1774,18 +1864,6 @@
 	},
 /turf/open/indestructible/dark,
 /area/voidcrew/trader_outpost)
-"pE" = (
-/obj/structure/railing/unbreakable{
-	dir = 8
-	},
-/obj/effect/turf_decal/siding/wideplating_new{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
-	dir = 8
-	},
-/turf/open/indestructible,
-/area/voidcrew/trader_outpost)
 "pF" = (
 /obj/structure/flora/rock/pile{
 	pixel_w = 4;
@@ -1835,10 +1913,6 @@
 	},
 /turf/open/indestructible/hotelwood,
 /area/voidcrew/trader_outpost)
-"qw" = (
-/obj/structure/flora/bush/ferny/style_random,
-/turf/open/floor/grass,
-/area/voidcrew/trader_outpost)
 "qy" = (
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
@@ -1869,18 +1943,6 @@
 	},
 /turf/open/water/outpost_pond,
 /area/voidcrew/trader_outpost)
-"qF" = (
-/obj/structure/railing/unbreakable,
-/obj/structure/railing/unbreakable{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/wideplating_new,
-/obj/effect/turf_decal/siding/wideplating_new{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral/full,
-/turf/open/indestructible/large,
-/area/voidcrew/trader_outpost)
 "qH" = (
 /obj/structure/flora/bush/sparsegrass/style_random,
 /obj/machinery/light/floor,
@@ -2159,19 +2221,6 @@
 /obj/machinery/light/directional/north,
 /turf/open/indestructible/kitchen,
 /area/voidcrew/trader_outpost)
-"tR" = (
-/obj/structure/chair/stool/directional/south,
-/obj/effect/turf_decal/trimline/neutral/filled/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/thinplating_new/dark{
-	dir = 1
-	},
-/obj/effect/turf_decal/trimline/neutral/filled/mid_joiner{
-	dir = 1
-	},
-/turf/open/indestructible/dark/smooth_large,
-/area/voidcrew/trader_outpost)
 "tS" = (
 /obj/structure/reagent_dispensers/watertank/high,
 /obj/item/reagent_containers/cup/bucket,
@@ -2368,18 +2417,6 @@
 	},
 /turf/open/indestructible/white,
 /area/voidcrew/trader_outpost)
-"vJ" = (
-/obj/structure/railing/unbreakable{
-	dir = 4
-	},
-/obj/effect/turf_decal/siding/wideplating_new{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
-	dir = 4
-	},
-/turf/open/indestructible,
-/area/voidcrew/trader_outpost)
 "vM" = (
 /obj/effect/turf_decal/siding/thinplating_new/light{
 	dir = 4
@@ -2489,10 +2526,6 @@
 /obj/machinery/light/floor,
 /turf/open/indestructible/grass,
 /area/voidcrew/trader_outpost)
-"xf" = (
-/obj/structure/beebox/premade,
-/turf/open/misc/dirt/station,
-/area/voidcrew/trader_outpost)
 "xh" = (
 /obj/effect/turf_decal/tile/blue/opposingcorners,
 /obj/effect/turf_decal/siding/thinplating_new/light{
@@ -3106,16 +3139,6 @@
 /obj/machinery/light/directional/west,
 /turf/open/indestructible/stone,
 /area/voidcrew/trader_outpost)
-"CZ" = (
-/obj/effect/turf_decal/siding/wideplating_new/corner,
-/obj/effect/turf_decal/siding/wideplating_new/corner{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral/half{
-	dir = 4
-	},
-/turf/open/indestructible/large,
-/area/voidcrew/trader_outpost)
 "Dc" = (
 /obj/effect/turf_decal/siding/wideplating_new{
 	dir = 6
@@ -3276,19 +3299,6 @@
 	},
 /turf/open/indestructible/dark/smooth_large,
 /area/voidcrew/trader_outpost)
-"EG" = (
-/obj/structure/railing/unbreakable{
-	dir = 5
-	},
-/obj/effect/turf_decal/siding/wideplating_new{
-	dir = 5
-	},
-/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
-	dir = 4
-	},
-/obj/item/kirbyplants/organic/plant22,
-/turf/open/indestructible,
-/area/voidcrew/trader_outpost)
 "EH" = (
 /obj/effect/turf_decal/siding/wideplating_new/light{
 	dir = 10
@@ -3503,16 +3513,6 @@
 	},
 /turf/open/indestructible/white/smooth_large,
 /area/voidcrew/trader_outpost)
-"GQ" = (
-/obj/effect/turf_decal/siding/wideplating_new{
-	dir = 1
-	},
-/obj/structure/railing/unbreakable{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral/full,
-/turf/open/indestructible/large,
-/area/voidcrew/trader_outpost)
 "Hn" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 1
@@ -3971,18 +3971,6 @@
 	},
 /turf/open/indestructible/dark/smooth_large,
 /area/voidcrew/trader_outpost)
-"LU" = (
-/obj/structure/railing/unbreakable{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/wideplating_new{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
-	dir = 1
-	},
-/turf/open/indestructible,
-/area/voidcrew/trader_outpost)
 "LW" = (
 /obj/effect/turf_decal/siding/wideplating_new/dark{
 	dir = 4
@@ -4009,16 +3997,6 @@
 	},
 /turf/open/indestructible/stone,
 /area/voidcrew/trader_outpost)
-"Md" = (
-/obj/structure/railing/unbreakable{
-	dir = 6
-	},
-/obj/effect/turf_decal/siding/wideplating_new{
-	dir = 6
-	},
-/obj/effect/turf_decal/tile/neutral/full,
-/turf/open/indestructible/large,
-/area/voidcrew/trader_outpost)
 "Mm" = (
 /obj/structure/chair{
 	dir = 4
@@ -4189,20 +4167,6 @@
 	},
 /turf/open/indestructible/kitchen,
 /area/voidcrew/trader_outpost)
-"NW" = (
-/obj/effect/turf_decal/siding/thinplating_new/light{
-	dir = 10
-	},
-/obj/effect/turf_decal/trimline/blue/filled/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{
-	dir = 1
-	},
-/obj/machinery/blueprint_imprinter,
-/obj/machinery/light/directional/south,
-/turf/open/indestructible/white/smooth_large,
-/area/voidcrew/trader_outpost)
 "NY" = (
 /obj/effect/turf_decal/tile/neutral,
 /obj/effect/turf_decal/siding/wideplating_new/dark/corner,
@@ -4240,23 +4204,6 @@
 /obj/structure/flora/rock/pile/style_3,
 /turf/open/water/outpost_pond,
 /area/voidcrew/trader_outpost)
-"Or" = (
-/obj/structure/railing/unbreakable{
-	dir = 4
-	},
-/obj/structure/railing/unbreakable{
-	dir = 8
-	},
-/obj/effect/turf_decal/siding/wideplating_new{
-	dir = 8
-	},
-/obj/effect/turf_decal/siding/wideplating_new{
-	dir = 4
-	},
-/obj/machinery/light/floor,
-/obj/effect/turf_decal/tile/neutral/full,
-/turf/open/indestructible/large,
-/area/voidcrew/trader_outpost)
 "Os" = (
 /obj/effect/turf_decal/trimline/blue/filled/corner{
 	dir = 1
@@ -4691,25 +4638,10 @@
 	},
 /turf/open/indestructible/hotelwood,
 /area/voidcrew/trader_outpost)
-"Tc" = (
-/obj/structure/chair/sofa/corp{
-	dir = 4
-	},
-/obj/effect/turf_decal/siding/thinplating_new/dark{
-	dir = 8
-	},
-/turf/open/indestructible/dark/smooth_large,
-/area/voidcrew/trader_outpost)
 "Tf" = (
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /turf/open/indestructible/hoteltile,
 /area/voidcrew/trader_outpost)
-"Tg" = (
-/obj/structure/railing/unbreakable,
-/obj/effect/turf_decal/siding/wideplating_new,
-/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/turf/open/indestructible,
-/area/voidcrew/trader_outpost)
 "To" = (
 /obj/structure/flora/deadgrass/tall{
 	pixel_w = -4;
@@ -4911,14 +4843,6 @@
 	dir = 1
 	},
 /area/voidcrew/trader_outpost)
-"Vj" = (
-/obj/effect/turf_decal/siding/wideplating_new/corner,
-/obj/effect/turf_decal/siding/wideplating_new/corner{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral/full,
-/turf/open/indestructible/large,
-/area/voidcrew/trader_outpost)
 "Vn" = (
 /obj/structure/chair/stool/directional/south,
 /turf/open/indestructible/dark/smooth_large,
@@ -5133,17 +5057,6 @@
 	},
 /turf/open/indestructible/stone,
 /area/voidcrew/trader_outpost)
-"WP" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/thinplating_new/dark{
-	dir = 10
-	},
-/obj/effect/turf_decal/tile/dark/full,
-/obj/effect/invisible_wall,
-/turf/open/indestructible/dark/smooth_large,
-/area/voidcrew/trader_outpost)
 "WT" = (
 /obj/structure/window/reinforced/shuttle/indestructible,
 /obj/structure/curtain/bounty,
@@ -5805,13 +5718,13 @@ Ya
 Uv
 Uv
 aj
-xf
+wU
 UF
 Uv
 uX
 aj
 UF
-xf
+wU
 Uv
 aj
 Uv
@@ -5872,7 +5785,7 @@ rh
 Uv
 pe
 Uv
-qw
+mH
 Ya
 TD
 Pa
@@ -6004,11 +5917,11 @@ NF
 Ya
 uX
 PG
-xf
+wU
 Uv
 UF
 aj
-xf
+wU
 Uv
 Uv
 mA
@@ -7434,7 +7347,7 @@ as
 ak
 ak
 Qq
-Tc
+ci
 sX
 Ij
 tl
@@ -7455,13 +7368,13 @@ aK
 ef
 ef
 kM
-vJ
-vJ
-vJ
-CZ
-vJ
-vJ
-vJ
+yZ
+yZ
+yZ
+bW
+yZ
+yZ
+yZ
 Oc
 ef
 ef
@@ -7519,17 +7432,17 @@ ul
 eJ
 ef
 kM
-vJ
-ap
-aG
-aY
-aY
-qF
-WP
-aY
-aY
-EG
-vJ
+yZ
+bR
+ak
+ul
+ak
+bx
+ak
+ul
+ul
+bQ
+yZ
 Oc
 ef
 JW
@@ -7584,19 +7497,19 @@ ul
 Pk
 aK
 ef
-Tg
-WP
-aY
-aY
-aY
-aY
-bv
-aZ
-aY
-aY
-aY
-aY
-LU
+JW
+ak
+ak
+bi
+be
+bs
+by
+be
+bA
+bD
+ak
+ak
+eJ
 ef
 Iu
 Bx
@@ -7650,19 +7563,19 @@ ak
 DU
 ef
 kM
-ap
-ac
-aY
-aY
-aY
-aY
-qF
-ac
-aY
-aY
-aY
-aY
-EG
+bR
+ak
+bd
+be
+be
+be
+be
+be
+be
+be
+bd
+ak
+bQ
 Oc
 ef
 oF
@@ -7715,21 +7628,21 @@ ak
 ak
 FW
 ef
-Tg
-WP
-aY
-aY
-aY
-lf
-mJ
-kh
-mJ
-dp
-aG
-aY
-aY
-aY
-LU
+JW
+ul
+aT
+be
+bj
+be
+bt
+bt
+be
+be
+be
+be
+aT
+ul
+eJ
 ef
 zg
 ak
@@ -7781,21 +7694,21 @@ ZS
 ak
 IO
 ef
-Tg
-aZ
-aY
-aY
-lf
-aC
-ad
-ad
-ad
-aJ
-dp
-WP
-aY
-aY
-LU
+JW
+ul
+aT
+be
+be
+be
+bt
+bt
+bj
+be
+be
+be
+aT
+ul
+eJ
 ef
 Zm
 ak
@@ -7807,7 +7720,7 @@ ak
 VP
 QJ
 ae
-tR
+nq
 cM
 im
 Ke
@@ -7847,21 +7760,21 @@ ay
 wA
 aK
 ef
-Tg
-ac
-aY
-aY
-GQ
-Vv
-al
-ah
-aa
-zB
-eK
-ac
-aY
-aY
-LU
+JW
+ak
+ak
+ak
+ak
+bn
+be
+be
+be
+be
+bF
+bK
+bN
+ak
+eJ
 ef
 Iu
 wA
@@ -7873,7 +7786,7 @@ ZG
 ao
 JN
 ae
-tR
+nq
 id
 im
 Ke
@@ -7914,19 +7827,19 @@ BX
 ef
 ef
 lU
-kE
-Or
-kE
-Aa
-Vv
-at
-aq
+aP
 an
-Uo
-dk
-kE
-Or
-kE
+ac
+bl
+bo
+bw
+bo
+bw
+bo
+bG
+bL
+bO
+ak
 kQ
 ef
 ef
@@ -7979,21 +7892,21 @@ yZ
 aw
 Oc
 ef
-Tg
-WP
-aY
-aY
-GQ
-Vv
-aA
-ax
-av
-zB
-eK
-WP
-aY
-aY
-LU
+JW
+ak
+al
+ac
+ak
+be
+be
+be
+be
+be
+bI
+bM
+bP
+ak
+eJ
 ef
 kM
 aw
@@ -8005,7 +7918,7 @@ nR
 Ki
 HZ
 ae
-tR
+nq
 id
 im
 Ke
@@ -8045,21 +7958,21 @@ sn
 ak
 XM
 ef
-Tg
-aZ
-aY
-aY
-aQ
-aI
-ib
-ib
-ib
-aL
-Md
-ac
-aY
-aY
-LU
+JW
+ak
+ul
+ul
+ak
+bq
+bt
+bt
+bj
+be
+be
+be
+aT
+ul
+eJ
 ef
 QQ
 ak
@@ -8111,21 +8024,21 @@ ak
 ak
 eW
 ef
-Tg
-ac
-aY
-aY
-aY
-aQ
-aU
-Vj
-aU
-Md
-aG
-aY
-aY
-aY
-LU
+JW
+ak
+bc
+bf
+ul
+br
+bt
+bt
+be
+be
+be
+be
+aT
+ul
+eJ
 ef
 Qo
 ak
@@ -8178,19 +8091,19 @@ ak
 TZ
 ef
 Iu
-cc
-WP
-aY
-aY
-aY
-aY
-qF
-WP
-aY
-aY
-aY
-aY
-nh
+bV
+ak
+bh
+ul
+br
+be
+be
+be
+be
+be
+be
+ak
+bU
 aK
 ef
 HX
@@ -8244,19 +8157,19 @@ ul
 WC
 Oc
 ef
-Tg
-ac
-aY
-aY
-aY
-aY
-bv
-aZ
-aY
-aY
-aY
-aY
-LU
+JW
+ak
+ak
+bm
+be
+bd
+be
+be
+bC
+bJ
+ak
+ak
+eJ
 ef
 kM
 Dc
@@ -8311,17 +8224,17 @@ ul
 eJ
 ef
 Iu
-pE
-cc
-aG
-aY
-aY
-qF
-ac
-aY
-aY
-nh
-pE
+ay
+bV
+ak
+ul
+ul
+ul
+ul
+ul
+ul
+bU
+ay
 aK
 ef
 JW
@@ -8379,13 +8292,13 @@ Oc
 ef
 ef
 Iu
-pE
-pE
-pE
+ay
+ay
+ay
 Gw
-pE
-pE
-pE
+ay
+ay
+ay
 aK
 ef
 ef
@@ -8540,7 +8453,7 @@ FU
 Fd
 vN
 Gv
-NW
+bY
 ak
 ak
 as
diff --git a/voidcrew/_maps/map_files/outposts/trader_outpost_outfitter.dmm b/voidcrew/_maps/map_files/outposts/trader_outpost_outfitter.dmm
index 8e61e566b67..2d4848184b2 100644
--- a/voidcrew/_maps/map_files/outposts/trader_outpost_outfitter.dmm
+++ b/voidcrew/_maps/map_files/outposts/trader_outpost_outfitter.dmm
@@ -63,15 +63,12 @@
 /turf/open/indestructible,
 /area/voidcrew/trader_outpost)
 "ak" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
+/obj/effect/turf_decal/box/red,
+/obj/effect/landmark/outpost_checkpoint_chamber{
+	checkpoint_id = "quartermain_gate"
 	},
 /turf/open/indestructible/dark/textured,
-/area/voidcrew/trader_outpost)
+/area/voidcrew/trader_outpost/checkpoint)
 "al" = (
 /turf/open/indestructible{
 	base_icon_state = "stairs-l";
@@ -94,21 +91,15 @@
 /obj/structure/extinguisher_cabinet/directional/south,
 /turf/open/indestructible/white/smooth_large,
 /area/voidcrew/trader_outpost)
-"an" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/machinery/light/directional/west,
-/turf/open/indestructible/dark/textured,
-/area/voidcrew/trader_outpost)
 "ao" = (
 /turf/template_noop,
 /area/template_noop)
 "ap" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/turf/open/indestructible/dark,
-/area/voidcrew/trader_outpost)
+/obj/structure/outpost_exit_gate{
+	dir = 2
+	},
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
 "aq" = (
 /obj/structure/railing/unbreakable{
 	dir = 4
@@ -119,27 +110,23 @@
 	},
 /area/voidcrew/trader_outpost)
 "ar" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
+/obj/effect/turf_decal/box/red,
+/obj/machinery/light/small/directional/north,
+/obj/effect/landmark/outpost_checkpoint_chamber{
+	checkpoint_id = "quartermain_gate"
 	},
 /turf/open/indestructible/dark/textured,
-/area/voidcrew/trader_outpost)
+/area/voidcrew/trader_outpost/checkpoint)
 "as" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/obj/machinery/outpost_elevator/directional/south,
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
+/obj/effect/turf_decal/box/red,
+/obj/effect/landmark/outpost_checkpoint_chamber{
+	checkpoint_id = "quartermain_gate"
+	},
+/obj/machinery/outpost_checkpoint_sensor/directional/west{
+	checkpoint_id = "quartermain_gate"
 	},
 /turf/open/indestructible/dark/textured,
-/area/voidcrew/trader_outpost)
-"at" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/turf/open/indestructible/dark/textured,
-/area/voidcrew/trader_outpost)
+/area/voidcrew/trader_outpost/checkpoint)
 "au" = (
 /obj/structure/railing/unbreakable,
 /obj/effect/turf_decal/tile/yellow/half/contrasted,
@@ -165,24 +152,17 @@
 	},
 /turf/open/indestructible/dark/textured,
 /area/voidcrew/trader_outpost)
-"ax" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/indestructible/dark/textured,
-/area/voidcrew/trader_outpost)
 "ay" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/floor,
+/obj/effect/landmark/outpost_checkpoint_chamber{
+	checkpoint_id = "quartermain_west_yard"
 	},
-/turf/open/indestructible/dark/textured,
-/area/voidcrew/trader_outpost)
+/obj/machinery/outpost_checkpoint_sensor/directional/north{
+	checkpoint_id = "quartermain_west_yard"
+	},
+/turf/open/indestructible/plating,
+/area/voidcrew/trader_outpost/checkpoint)
 "az" = (
 /obj/structure/railing/unbreakable{
 	dir = 4
@@ -236,21 +216,19 @@
 /obj/structure/marker_beacon/yellow,
 /turf/open/floor/engine/hull/reinforced,
 /area/space)
-"aG" = (
-/obj/effect/landmark/outpost_elevator_alcove,
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/indestructible/dark/textured,
-/area/voidcrew/trader_outpost)
 "aH" = (
 /obj/effect/turf_decal/bot,
 /obj/structure/closet/crate,
 /turf/open/indestructible/dark/smooth_large,
 /area/voidcrew/trader_outpost)
+"aI" = (
+/obj/machinery/door/airlock/outpost/checkpoint/inner/security{
+	checkpoint_id = "quartermain_gate";
+	name = "Depot Gate"
+	},
+/obj/effect/turf_decal/delivery/red,
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
 "aJ" = (
 /obj/effect/turf_decal/tile/yellow/half/contrasted{
 	dir = 1
@@ -285,6 +263,17 @@
 	},
 /turf/open/indestructible/dark,
 /area/voidcrew/trader_outpost)
+"aM" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/floor,
+/obj/effect/landmark/outpost_checkpoint_chamber{
+	checkpoint_id = "quartermain_east_yard"
+	},
+/obj/machinery/outpost_checkpoint_sensor/directional/north{
+	checkpoint_id = "quartermain_east_yard"
+	},
+/turf/open/indestructible/plating,
+/area/voidcrew/trader_outpost/checkpoint)
 "aN" = (
 /obj/effect/turf_decal/stripes,
 /obj/effect/turf_decal/trimline/yellow/warning{
@@ -318,17 +307,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/indestructible,
 /area/voidcrew/trader_outpost)
-"aQ" = (
-/obj/structure/table,
-/obj/effect/spawner/random/engineering/material_rare,
-/obj/effect/turf_decal/siding/wideplating_new/dark{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
-	dir = 8
-	},
-/turf/open/indestructible/dark,
-/area/voidcrew/trader_outpost)
 "aR" = (
 /obj/machinery/door/airlock/outpost{
 	name = "West Yard Gate"
@@ -350,19 +328,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/indestructible/dark/textured,
 /area/voidcrew/trader_outpost)
-"aU" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark{
-	dir = 8
-	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
-	},
-/obj/effect/turf_decal/box/corners{
-	dir = 8
-	},
-/obj/structure/marker_beacon/yellow,
-/turf/open/indestructible/dark/smooth_large,
-/area/voidcrew/trader_outpost)
 "aV" = (
 /turf/open/floor/engine/hull/reinforced,
 /area/space)
@@ -403,6 +368,16 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/indestructible/white,
 /area/voidcrew/trader_outpost)
+"ba" = (
+/obj/effect/landmark/outpost_network_pad_spot,
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
+"bd" = (
+/obj/effect/turf_decal/arrows{
+	dir = 2
+	},
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
 "bf" = (
 /obj/structure/closet/wardrobe/mixed,
 /obj/effect/turf_decal/siding/wideplating_new/dark{
@@ -414,32 +389,228 @@
 /obj/machinery/light/directional/west,
 /turf/open/indestructible/dark,
 /area/voidcrew/trader_outpost)
-"bo" = (
-/obj/machinery/porta_turret/outpost,
-/obj/effect/turf_decal/siding/wideplating_new/dark{
+"bg" = (
+/obj/structure/bounty_wanted_board/directional/north,
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
+"bh" = (
+/obj/structure/closet/secure_closet/outpost_rental/checkpoint,
+/obj/effect/turf_decal/bot,
+/obj/machinery/light/directional/north,
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
+"bi" = (
+/obj/structure/closet/secure_closet/outpost_rental/checkpoint,
+/obj/effect/turf_decal/bot,
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
+"bl" = (
+/obj/structure/filingcabinet/security,
+/obj/machinery/light/small/directional/north,
+/obj/effect/turf_decal/tile/red/full,
+/turf/open/indestructible/dark/smooth_large,
+/area/voidcrew/trader_outpost/checkpoint)
+"bm" = (
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
+"bn" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
+"bp" = (
+/mob/living/basic/outpost_trader/checkpoint_guard/quartermain{
+	checkpoint_id = "quartermain_gate"
+	},
+/obj/effect/turf_decal/tile/red/full,
+/turf/open/indestructible/dark/smooth_large,
+/area/voidcrew/trader_outpost/checkpoint)
+"bq" = (
+/obj/machinery/light/floor,
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
+"br" = (
+/obj/machinery/door/airlock/outpost/checkpoint/outer/security{
+	checkpoint_id = "quartermain_gate";
+	name = "Scan Room"
+	},
+/obj/effect/turf_decal/delivery/red,
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bs" = (
+/obj/effect/turf_decal/stripes{
+	dir = 1
+	},
+/turf/open/indestructible,
+/area/voidcrew/trader_outpost)
+"bt" = (
+/obj/structure/railing/unbreakable{
+	dir = 2
+	},
+/obj/structure/railing/unbreakable{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/yellow/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/yellow/line{
+	dir = 2
+	},
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bu" = (
+/obj/structure/railing/unbreakable{
+	dir = 2
+	},
+/obj/effect/turf_decal/trimline/yellow/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/yellow/line{
+	dir = 2
+	},
+/obj/effect/turf_decal/arrows{
+	dir = 4
+	},
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bv" = (
+/obj/structure/railing/unbreakable{
+	dir = 2
+	},
+/obj/structure/railing/unbreakable{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/yellow/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/yellow/line{
+	dir = 2
+	},
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bw" = (
+/obj/structure/sign/warning/secure_area/directional/north,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
+"bx" = (
+/obj/effect/turf_decal/delivery,
+/obj/structure/sign/departments/security/directional/north,
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
+"by" = (
+/obj/effect/turf_decal/delivery,
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
+"bz" = (
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/machinery/light/floor,
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost/checkpoint)
+"bA" = (
+/obj/structure/closet/secure_closet/outpost_rental/checkpoint,
+/obj/effect/turf_decal/bot,
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bB" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
+/obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bD" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
-/obj/effect/turf_decal/box/red/corners{
+/obj/machinery/light/directional/west,
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bE" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bF" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/machinery/outpost_elevator/directional/south,
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bG" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bH" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bI" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
+/obj/effect/turf_decal/stripes/line{
 	dir = 4
 	},
-/obj/effect/turf_decal/box/red/corners,
-/obj/machinery/light/directional/west,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bJ" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bK" = (
+/obj/effect/landmark/outpost_elevator_alcove,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/indestructible/dark/textured,
+/area/voidcrew/trader_outpost/checkpoint)
+"bL" = (
+/obj/effect/turf_decal/arrows{
+	dir = 2
+	},
 /turf/open/indestructible/dark,
 /area/voidcrew/trader_outpost)
-"bs" = (
-/obj/effect/turf_decal/stripes{
+"bM" = (
+/obj/machinery/porta_turret/outpost,
+/obj/effect/turf_decal/box/red/corners{
 	dir = 1
 	},
-/turf/open/indestructible,
-/area/voidcrew/trader_outpost)
-"bC" = (
-/obj/effect/turf_decal/stripes{
-	dir = 10
+/obj/effect/turf_decal/box/red/corners{
+	dir = 4
 	},
-/turf/open/indestructible/dark/textured,
+/obj/effect/turf_decal/box/red/corners,
+/obj/effect/turf_decal/box/red/corners{
+	dir = 8
+	},
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost)
+"bN" = (
+/obj/structure/table,
+/obj/effect/spawner/random/engineering/material_rare,
+/obj/effect/turf_decal/trimline/yellow/warning,
+/turf/open/indestructible/dark,
 /area/voidcrew/trader_outpost)
 "bO" = (
 /obj/effect/turf_decal/bot,
@@ -452,6 +623,61 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/indestructible/plating,
 /area/voidcrew/trader_outpost)
+"bP" = (
+/obj/structure/table,
+/obj/effect/spawner/random/engineering/material_cheap,
+/obj/effect/turf_decal/trimline/yellow/warning,
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost)
+"bQ" = (
+/obj/structure/table,
+/obj/effect/spawner/random/engineering/material,
+/obj/effect/turf_decal/trimline/yellow/warning,
+/turf/open/indestructible/dark,
+/area/voidcrew/trader_outpost)
+"bR" = (
+/obj/machinery/door/airlock/outpost/checkpoint/outer{
+	checkpoint_id = "quartermain_west_yard";
+	name = "West Yard Hatch"
+	},
+/obj/effect/turf_decal/bot,
+/obj/structure/fans/tiny,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/indestructible/plating,
+/area/voidcrew/trader_outpost/checkpoint)
+"bS" = (
+/obj/machinery/door/airlock/outpost/checkpoint/inner/glass{
+	checkpoint_id = "quartermain_west_yard";
+	name = "West Yard Gate"
+	},
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/indestructible/plating,
+/area/voidcrew/trader_outpost/checkpoint)
+"bU" = (
+/obj/machinery/door/airlock/outpost/checkpoint/outer{
+	checkpoint_id = "quartermain_east_yard";
+	name = "East Yard Hatch"
+	},
+/obj/structure/fans/tiny,
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/indestructible/plating,
+/area/voidcrew/trader_outpost/checkpoint)
+"bV" = (
+/obj/machinery/door/airlock/outpost/checkpoint/inner/glass{
+	checkpoint_id = "quartermain_east_yard";
+	name = "East Yard Gate"
+	},
+/obj/effect/turf_decal/bot,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/indestructible/plating,
+/area/voidcrew/trader_outpost/checkpoint)
+"bX" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/siding/thinplating_new,
+/turf/open/indestructible/large,
+/area/voidcrew/trader_outpost)
 "cg" = (
 /obj/effect/turf_decal/tile/dark/full,
 /obj/effect/invisible_wall,
@@ -742,17 +968,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/indestructible/dark,
 /area/voidcrew/trader_outpost)
-"fF" = (
-/obj/structure/table,
-/obj/effect/spawner/random/engineering/material_cheap,
-/obj/effect/turf_decal/siding/wideplating_new/dark{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
-	dir = 8
-	},
-/turf/open/indestructible/dark,
-/area/voidcrew/trader_outpost)
 "fK" = (
 /obj/item/kirbyplants/organic/plant15{
 	pixel_w = 1;
@@ -1077,18 +1292,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/indestructible/large,
 /area/voidcrew/trader_outpost)
-"kt" = (
-/obj/structure/fans/tiny,
-/obj/effect/turf_decal/bot,
-/obj/machinery/door/airlock/outpost{
-	name = "East Yard Exterior"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/indestructible/plating,
-/area/voidcrew/trader_outpost)
 "kv" = (
 /obj/effect/turf_decal/siding/thinplating_new/dark/corner{
 	dir = 1
@@ -1229,14 +1432,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/indestructible/dark/textured,
 /area/voidcrew/trader_outpost)
-"lS" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark,
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/yellow/half/contrasted,
-/turf/open/indestructible/dark,
-/area/voidcrew/trader_outpost)
 "lT" = (
 /obj/effect/turf_decal/stripes,
 /turf/open/indestructible/dark/textured,
@@ -1982,16 +2177,6 @@
 	},
 /turf/open/indestructible/dark,
 /area/voidcrew/trader_outpost)
-"wC" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
-	dir = 8
-	},
-/obj/effect/turf_decal/tile/yellow{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/indestructible/dark,
-/area/voidcrew/trader_outpost)
 "wF" = (
 /obj/structure/closet/outpost_medical,
 /obj/effect/turf_decal/trimline/blue/filled/line{
@@ -2352,18 +2537,6 @@
 	},
 /turf/open/indestructible/hoteltile,
 /area/voidcrew/trader_outpost)
-"BA" = (
-/obj/effect/turf_decal/trimline/yellow/warning{
-	dir = 4
-	},
-/obj/effect/turf_decal/siding/wideplating_new/dark,
-/obj/effect/turf_decal/stripes/corner,
-/obj/effect/turf_decal/tile/yellow{
-	dir = 8
-	},
-/obj/structure/extinguisher_cabinet/directional/south,
-/turf/open/indestructible/dark,
-/area/voidcrew/trader_outpost)
 "BD" = (
 /obj/structure/table,
 /obj/item/dest_tagger{
@@ -2492,12 +2665,6 @@
 	},
 /turf/open/indestructible/large,
 /area/voidcrew/trader_outpost)
-"Dp" = (
-/obj/machinery/blueprint_imprinter,
-/obj/effect/turf_decal/box,
-/obj/effect/turf_decal/siding/thinplating_new,
-/turf/open/indestructible/large,
-/area/voidcrew/trader_outpost)
 "Dy" = (
 /mob/living/basic/outpost_trader,
 /obj/structure/chair/office/light{
@@ -2652,18 +2819,6 @@
 /obj/machinery/light/floor,
 /turf/open/indestructible/dark,
 /area/voidcrew/trader_outpost)
-"FK" = (
-/obj/machinery/door/airlock/outpost{
-	name = "West Yard Exterior"
-	},
-/obj/effect/turf_decal/bot,
-/obj/structure/fans/tiny,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/indestructible/plating,
-/area/voidcrew/trader_outpost)
 "FM" = (
 /obj/machinery/shower/directional/west,
 /obj/effect/decal/cleanable/blood/old,
@@ -2889,17 +3044,6 @@
 /obj/machinery/newscaster/directional/north,
 /turf/open/indestructible,
 /area/voidcrew/trader_outpost)
-"JG" = (
-/obj/structure/table,
-/obj/effect/spawner/random/engineering/material,
-/obj/effect/turf_decal/siding/wideplating_new/dark{
-	dir = 10
-	},
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
-	dir = 8
-	},
-/turf/open/indestructible/dark,
-/area/voidcrew/trader_outpost)
 "JH" = (
 /obj/structure/table,
 /obj/item/stack/wrapping_paper{
@@ -2940,12 +3084,6 @@
 /obj/structure/marker_beacon/yellow,
 /turf/open/indestructible/dark/smooth_large,
 /area/voidcrew/trader_outpost)
-"Kc" = (
-/obj/effect/turf_decal/trimline/yellow/warning{
-	dir = 4
-	},
-/turf/open/indestructible/dark,
-/area/voidcrew/trader_outpost)
 "Kr" = (
 /obj/item/clipboard{
 	pixel_w = 11;
@@ -3228,11 +3366,6 @@
 	},
 /turf/open/indestructible/dark,
 /area/voidcrew/trader_outpost)
-"Oi" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark,
-/obj/effect/turf_decal/tile/yellow/half/contrasted,
-/turf/open/indestructible/dark,
-/area/voidcrew/trader_outpost)
 "Oo" = (
 /obj/structure/table,
 /obj/item/stack/rods{
@@ -3770,12 +3903,6 @@
 	},
 /turf/open/indestructible/dark/smooth_large,
 /area/voidcrew/trader_outpost)
-"YH" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark,
-/obj/effect/turf_decal/stripes/corner,
-/obj/effect/turf_decal/tile/yellow/half/contrasted,
-/turf/open/indestructible/dark,
-/area/voidcrew/trader_outpost)
 "YT" = (
 /obj/machinery/suit_storage_unit,
 /obj/effect/turf_decal/trimline/yellow/filled/line,
@@ -3797,19 +3924,6 @@
 	},
 /turf/open/indestructible,
 /area/voidcrew/trader_outpost)
-"ZO" = (
-/obj/item/kirbyplants/organic/plant22,
-/obj/effect/turf_decal/siding/wideplating_new/dark{
-	dir = 10
-	},
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/directional/west,
-/obj/structure/bounty_wanted_board/directional/south,
-/turf/open/indestructible/dark,
-/area/voidcrew/trader_outpost)
 "ZV" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light/floor,
@@ -4247,7 +4361,7 @@ ao
 ao
 aF
 dU
-FK
+bR
 dU
 aF
 aV
@@ -4289,7 +4403,7 @@ aV
 aV
 aV
 dU
-ZV
+ay
 dU
 aV
 aV
@@ -4331,7 +4445,7 @@ dU
 dU
 dU
 dU
-aR
+bS
 dU
 lE
 lE
@@ -4350,7 +4464,7 @@ dU
 tL
 xl
 sj
-ZO
+dU
 dU
 dU
 dU
@@ -4391,12 +4505,12 @@ zS
 al
 eo
 XZ
-ly
-YH
-lE
-ar
-an
-ak
+dU
+ba
+bm
+bE
+bD
+bB
 dU
 aV
 ao
@@ -4432,13 +4546,13 @@ aq
 aq
 aq
 KA
-ly
-ly
-iT
-LQ
-aw
-at
-as
+bL
+ap
+bd
+bn
+bH
+bG
+bF
 dU
 aV
 aV
@@ -4475,12 +4589,12 @@ Xv
 kg
 xl
 ly
-ly
-lS
-lE
-aG
-ay
-ax
+dU
+bg
+bm
+bK
+bJ
+bI
 dU
 aV
 aV
@@ -4516,13 +4630,13 @@ av
 zD
 ly
 ly
-ly
-ly
-Oi
+bM
 dU
-lE
-lE
-lE
+bh
+bm
+bm
+bm
+bn
 dU
 aV
 aV
@@ -4559,12 +4673,12 @@ ly
 XZ
 ly
 ly
-ly
-wC
-bo
-aQ
-fF
-JG
+dU
+bi
+bm
+bq
+bt
+bm
 dU
 aV
 aV
@@ -4601,12 +4715,12 @@ Gw
 Gw
 pp
 wX
-Kc
-Kc
-Kc
-Kc
-Kc
-BA
+dU
+dU
+dU
+dU
+bu
+bz
 dU
 dU
 aV
@@ -4643,13 +4757,13 @@ VK
 aH
 qk
 ag
-kw
-iR
-iR
-iR
-iR
-aU
-bC
+aI
+as
+ak
+br
+bv
+bm
+bA
 aa
 aV
 aV
@@ -4664,7 +4778,7 @@ zo
 TB
 ks
 Xe
-Dp
+bX
 lE
 aJ
 fp
@@ -4684,14 +4798,14 @@ es
 fc
 aA
 cA
-ag
-dc
-iI
-vz
-vz
-vz
-iI
-ad
+bN
+dU
+ar
+ak
+dU
+bw
+bm
+bA
 aa
 aV
 aV
@@ -4726,14 +4840,14 @@ es
 IF
 aH
 qk
-ag
-dc
-vz
-vz
-vz
-vz
-vz
-lT
+bP
+dU
+lE
+lE
+dU
+bx
+bq
+bA
 aa
 aV
 aV
@@ -4768,14 +4882,14 @@ sE
 aD
 aD
 qk
-ag
-ac
-ab
-ab
-IS
-ab
-JS
-aK
+bQ
+dU
+bl
+bp
+lE
+by
+bm
+bA
 aa
 aV
 aV
@@ -4811,13 +4925,13 @@ KN
 FG
 kv
 AD
-EB
-EB
-EB
-EB
-EB
-EB
-aN
+dU
+dU
+dU
+dU
+lE
+lE
+dU
 dU
 aV
 aV
@@ -4844,11 +4958,11 @@ WK
 Gw
 Gw
 pp
-ap
+ah
 aH
 aD
 qk
-ap
+ah
 aH
 aD
 qk
@@ -4882,11 +4996,11 @@ au
 cg
 Ky
 ly
-ap
+ah
 aA
 aD
 qk
-ap
+ah
 IF
 fc
 qk
@@ -4924,7 +5038,7 @@ au
 cg
 BD
 ly
-ap
+ah
 aD
 aH
 qk
@@ -4932,7 +5046,7 @@ gT
 aD
 aH
 qk
-ap
+ah
 aD
 IF
 qk
@@ -4966,15 +5080,15 @@ au
 Jt
 JH
 ly
-ap
+ah
 aD
 su
 qk
-ap
+ah
 aD
 aD
 qk
-ap
+ah
 aH
 aD
 qk
@@ -5050,11 +5164,11 @@ au
 cg
 fC
 ly
-ap
+ah
 aD
 fc
 qk
-ap
+ah
 aD
 su
 qk
@@ -5092,15 +5206,15 @@ au
 tQ
 Yg
 vb
-ap
+ah
 fc
 vQ
 qk
-ap
+ah
 aH
 aA
 qk
-ap
+ah
 aD
 aH
 qk
@@ -5142,7 +5256,7 @@ gT
 aD
 aH
 qk
-ap
+ah
 aA
 aD
 cA
@@ -5180,11 +5294,11 @@ Ob
 Ei
 ly
 ly
-ap
+ah
 aD
 aH
 qk
-ap
+ah
 aD
 aA
 qk
@@ -5319,7 +5433,7 @@ dU
 dU
 dU
 dU
-bO
+bV
 dU
 dU
 aV
@@ -5361,7 +5475,7 @@ aV
 aV
 aV
 dU
-ZV
+aM
 dU
 aV
 aV
@@ -5403,7 +5517,7 @@ ao
 ao
 aF
 dU
-kt
+bU
 dU
 aF
 ao
diff --git a/voidcrew/controllers/subsystem/planet_mobs.dm b/voidcrew/controllers/subsystem/planet_mobs.dm
index 82decbe7e91..ba6718aa84a 100644
--- a/voidcrew/controllers/subsystem/planet_mobs.dm
+++ b/voidcrew/controllers/subsystem/planet_mobs.dm
@@ -25,8 +25,7 @@ SUBSYSTEM_DEF(planet_mobs)
 
 	/// Max managed mobs across ALL planets
 	var/global_mob_cap = 150
-	/// Base cap on managed mobs for any one planet, before the zone-band scaling in
-	/// mob_cap_for_band(). Per PLANET, not per z-level: a packed level can hold several
+	/// Cap on managed mobs for any one planet. Per PLANET, not per z-level: a packed level can hold several
 	/// tenants and each of them gets its own budget, exactly as it would have on a level
 	/// of its own.
 	var/per_planet_mob_cap = 15
@@ -136,19 +135,8 @@ SUBSYSTEM_DEF(planet_mobs)
 	trackers_here |= tracker
 	return tracker
 
-/**
- * A planet's share of the mob budget for its zone band.
- *
- * A flat cap muted the density half of danger scaling: deeper bands roll more spawns, then
- * the cap threw the surplus away. Scale it modestly instead. The global cap still bounds
- * the whole galaxy.
- */
+/// Every band has the same fauna budget; profiles supply the zone's stat scaling.
 /datum/controller/subsystem/planet_mobs/proc/mob_cap_for_band(zone_band)
-	switch(zone_band)
-		if(ZONE_YELLOW)
-			return round(per_planet_mob_cap * 1.2) // 18 at the default 15
-		if(ZONE_RED)
-			return round(per_planet_mob_cap * 1.5) // 22 at the default 15
 	return per_planet_mob_cap
 
 /**
@@ -307,7 +295,7 @@ SUBSYSTEM_DEF(planet_mobs)
 		return TRUE
 	return FALSE
 
-/// Spawns up to this planet's own zone-scaled cap from its candidate turfs, less `already_spawned`
+/// Spawns up to this planet's own cap from its candidate turfs, less `already_spawned`
 /// (the planet's people, spawned first out of the same cap). Returns how many mobs it actually spawned.
 /datum/controller/subsystem/planet_mobs/proc/spawn_for_tracker(datum/planet_mob_tracker/tracker, already_spawned = 0)
 	var/list/spawn_turfs = tracker.surface_spawn_turfs
@@ -362,7 +350,8 @@ SUBSYSTEM_DEF(planet_mobs)
 		if(!mob_type)
 			continue
 
-		new mob_type(candidate)
+		var/datum/npc_spawn_context/context = new(tracker, tracker.zone_band, source_turf = candidate)
+		spawn_npc_in_zone(mob_type, candidate, context)
 		spawned++
 		total_managed_mobs++
 
diff --git a/voidcrew/datums/mapgen/Cavegens/AsteroidCaves.dm b/voidcrew/datums/mapgen/Cavegens/AsteroidCaves.dm
index 8b72f7c2624..870d68346db 100644
--- a/voidcrew/datums/mapgen/Cavegens/AsteroidCaves.dm
+++ b/voidcrew/datums/mapgen/Cavegens/AsteroidCaves.dm
@@ -63,9 +63,7 @@
  * Same recipe as /datum/map_generator/cave_generator/asteroid above (cellular-automata
  * rock/sand mix, mining mob/geyser spawn tables, /area/centcom/asteroid/voidcrew ground)
  * but scattered as several independent blobs instead of one solid field, with real vacuum
- * left between and around them - "an asteroid field", not a single asteroid. Ore seeding
- * itself is handled separately by seed_asteroid_ore_block() (events.dm) after generation,
- * the way space ruin asteroid signals used to be seeded before that category was retired.
+ * left between and around them - "an asteroid field", not a single asteroid. Ore profiles are selected before the mineral turfs initialize; there is no second ore pass.
  *
  * Unlike /datum/map_generator/cave_generator/asteroid, weighted_* vars are used (not the
  * expanded open_turf_types/closed_turf_types/mob_spawn_list/feature_spawn_list directly) -
@@ -75,7 +73,7 @@
 /datum/map_generator/cave_generator/asteroid_field
 	name = "Asteroid Field Generator"
 	weighted_open_turf_types = list(/turf/open/misc/asteroid/airless = 1)
-	weighted_closed_turf_types = list(/turf/closed/mineral/random = 1)
+	weighted_closed_turf_types = list(/turf/closed/mineral/random/asteroid_field = 1)
 
 	feature_spawn_chance = 1
 	weighted_feature_spawn_list = list(/obj/structure/geyser/random = 1)
@@ -100,12 +98,14 @@
 	var/blob_radius_max = EVENT_FIELD_BLOB_RADIUS_MAX
 
 /datum/map_generator/cave_generator/asteroid_field/minor
+	weighted_closed_turf_types = list(/turf/closed/mineral/random/asteroid_field/minor = 1)
 	blob_count_min = 22
 	blob_count_max = 28
 	blob_radius_min = 4
 	blob_radius_max = 7
 
 /datum/map_generator/cave_generator/asteroid_field/majour
+	weighted_closed_turf_types = list(/turf/closed/mineral/random/asteroid_field/majour = 1)
 	blob_count_min = 46
 	blob_count_max = 58
 	blob_radius_min = 6
diff --git a/voidcrew/datums/mapgen/PlanetGenerator.dm b/voidcrew/datums/mapgen/PlanetGenerator.dm
index 399c382326f..4bfb47df656 100644
--- a/voidcrew/datums/mapgen/PlanetGenerator.dm
+++ b/voidcrew/datums/mapgen/PlanetGenerator.dm
@@ -551,7 +551,8 @@
 					break
 
 				if(can_spawn)
-					new picked_mob(target_turf)
+					var/datum/npc_spawn_context/context = new(src, zone_band, "auto", source_turf = target_turf)
+					spawn_npc_in_zone(picked_mob, target_turf, context)
 					spawned_something = TRUE
 		// The expensive half of a planet build - every iteration runs several range()
 		// scans - and the one that most needs to stop hogging the tick. See
@@ -560,8 +561,8 @@
 		// forward-progress floor than the default, to keep its tick overshoot in line.
 		SSovermap.worldgen_yield(throttled, min_iterations = 8)
 
-	var/spawners_placed = place_budgeted_spawners(spawner_candidates, spawner_budget)
-	var/megafauna_placed = place_planet_megafauna(megafauna_candidates)
+	var/spawners_placed = place_budgeted_spawners(spawner_candidates, spawner_budget, zone_band)
+	var/megafauna_placed = place_planet_megafauna(megafauna_candidates, zone_band)
 	var/anomalies_placed = place_budgeted_anomalies(turfs, anomaly_budget)
 
 	log_world("[name] terrain population finished in [(REALTIMEOFDAY - start_time)/10]s! \
@@ -577,7 +578,7 @@
  * row-major, so taking the first N would put every tendril on the planet in the same
  * corner. Returns how many were placed.
  */
-/datum/map_generator/planet_generator/proc/place_budgeted_spawners(list/candidates, budget)
+/datum/map_generator/planet_generator/proc/place_budgeted_spawners(list/candidates, budget, zone_band)
 	if(!length(candidates) || budget <= 0)
 		return 0
 
@@ -599,7 +600,8 @@
 			continue
 
 		var/spawner_type = candidates[candidate]
-		new spawner_type(candidate)
+		var/datum/npc_spawn_context/context = new(src, zone_band, "auto", source_turf = candidate)
+		spawn_npc_in_zone(spawner_type, candidate, context)
 		placed_at += candidate
 		placed++
 		CHECK_TICK
@@ -616,29 +618,28 @@
  * instead: pick() is O(1), where walking the list in order would put every anomaly in the
  * low corner of the map, get_block() handing out turfs row-major.
  *
- * The draw is attempt-bounded rather than exhaustive. A planet whose open ground is
- * nearly all spoken for seeds fewer anomalies than its budget, which is the right way to
- * fail: this is optional scenery, not something worth stalling a build over.
+ * If random sampling misses safe ground, scan the supplied planet turfs to fill the
+ * remainder. Both passes yield to the worldgen budget and use the same safety checks.
  *
  * The landing strip is off limits, the same as it is to spawners and megafauna. A rejected
- * draw costs one of PLANET_ANOMALY_PLACEMENT_ATTEMPTS attempts and the budget is re-spent
- * on the next roll, so this moves anomalies off the berths rather than losing any. The
- * strip is the bottom 54 rows of a 123-row planet, so a bit under half the draws land in it
- * - against 400 attempts for a budget of at most three, which is not close to tight.
+ * draw is re-spent on another tile. If the geometry cannot fit the budget safely, report
+ * the shortfall rather than relaxing the spacing or putting a hazard on reserved ground.
  */
 /datum/map_generator/planet_generator/proc/place_budgeted_anomalies(list/turfs, budget)
-	if(!length(turfs) || budget <= 0)
+	if(budget <= 0)
 		return 0
 
 	var/list/placed_at = list()
 	var/placed = 0
 
-	for(var/attempt in 1 to PLANET_ANOMALY_PLACEMENT_ATTEMPTS)
+	var/random_attempts = length(turfs) ? PLANET_ANOMALY_PLACEMENT_ATTEMPTS : 0
+	for(var/attempt in 1 to random_attempts + length(turfs))
 		if(placed >= budget)
 			break
+		SSovermap.worldgen_yield(throttled)
 
-		var/turf/candidate = pick(turfs)
-		if(!isturf(candidate) || candidate.density)
+		var/turf/candidate = attempt <= random_attempts ? pick_anomaly_turf(turfs) : turfs[attempt - random_attempts]
+		if(!isturf(candidate) || candidate.density || candidate.planet_river)
 			continue
 
 		// Reserved ground: the planet's landing strip (reserve_dock_strip() flags the berth
@@ -671,13 +672,18 @@
 		new anomaly_type(candidate)
 		placed_at += candidate
 		placed++
-		CHECK_TICK
 
+	if(placed < budget)
+		log_world("[name] anomaly placement shortfall: [placed]/[budget] safe sites.")
 	return placed
 
+/// Samples the planet's supplied turf list before the exhaustive placement pass.
+/datum/map_generator/planet_generator/proc/pick_anomaly_turf(list/turfs)
+	return pick(turfs)
+
 /// Places a single megafauna from the banked candidates. One per planet, and only where
 /// the zone band allows them at all - see megafauna_allowed in populate_terrain().
-/datum/map_generator/planet_generator/proc/place_planet_megafauna(list/candidates)
+/datum/map_generator/planet_generator/proc/place_planet_megafauna(list/candidates, zone_band)
 	if(!length(candidates))
 		return 0
 
@@ -687,7 +693,8 @@
 		if(!isturf(candidate) || candidate.density)
 			continue
 		var/megafauna_type = candidates[candidate]
-		new megafauna_type(candidate)
+		var/datum/npc_spawn_context/context = new(src, zone_band, "boss", source_turf = candidate)
+		spawn_npc_in_zone(megafauna_type, candidate, context)
 		return 1
 
 	return 0
diff --git a/voidcrew/datums/mapgen/biomes/_biome.dm b/voidcrew/datums/mapgen/biomes/_biome.dm
index d28fd10022a..6ef081c4196 100644
--- a/voidcrew/datums/mapgen/biomes/_biome.dm
+++ b/voidcrew/datums/mapgen/biomes/_biome.dm
@@ -125,7 +125,8 @@
 				break
 
 		if(can_spawn)
-			new picked_mob(new_turf)
+			var/datum/npc_spawn_context/context = new(src, source_turf = new_turf)
+			spawn_npc_in_zone(picked_mob, new_turf, context)
 			new_turf.flags_1 |= NO_LAVA_GEN
 
 
diff --git a/voidcrew/datums/mapgen/biomes/wasteland_biomes.dm b/voidcrew/datums/mapgen/biomes/wasteland_biomes.dm
index 612c7644d0c..2a0736c2fba 100644
--- a/voidcrew/datums/mapgen/biomes/wasteland_biomes.dm
+++ b/voidcrew/datums/mapgen/biomes/wasteland_biomes.dm
@@ -24,14 +24,14 @@
 	feature_spawn_chance = 3
 	mob_spawn_chance = 7
 	mob_spawn_list = list(
-		/mob/living/simple_animal/hostile/asteroid/hermit/ranged/hunter = 5,
-		/mob/living/simple_animal/hostile/asteroid/hermit/ranged/gunslinger = 5,
+		/mob/living/simple_animal/hostile/asteroid/hermit/ranged/hunter = 10,
 		/mob/living/basic/spider/giant/wasteland = 1,
 		/mob/living/basic/spider/giant/tarantula/wasteland = 1,
 		/mob/living/basic/mining/legion/wasteland = 3
 	)
 	// Meaner tier for dangerous-zone planets (see dangerous_mob_spawn_list)
 	dangerous_mob_spawn_list = list(
+		/mob/living/simple_animal/hostile/asteroid/hermit/ranged/gunslinger = 5,
 		/mob/living/basic/mining/legion/wasteland = 3,
 		/mob/living/basic/spider/giant/tarantula/wasteland = 2,
 		/mob/living/basic/spider/giant/wasteland = 2,
@@ -92,13 +92,13 @@
 	flora_spawn_list = list(/obj/structure/flora/rock/wasteland = 30, /obj/effect/decal/cleanable/greenglow = 30, /obj/structure/elite_tumor = 1)
 	mob_spawn_chance = 20
 	mob_spawn_list = list(
-		/mob/living/simple_animal/hostile/asteroid/hermit/ranged/hunter = 10,
-		/mob/living/simple_animal/hostile/asteroid/hermit/ranged/gunslinger = 7,
-		/mob/living/basic/hivebot/rapid/wasteland = 5,
+		/mob/living/simple_animal/hostile/asteroid/hermit/ranged/hunter = 17,
+		/mob/living/basic/hivebot/range = 5,
 		/mob/living/basic/spider/giant/wasteland = 1,
 		/mob/living/basic/spider/giant/tarantula/wasteland = 1
 	)
 	dangerous_mob_spawn_list = list(
+		/mob/living/simple_animal/hostile/asteroid/hermit/ranged/gunslinger = 7,
 		/mob/living/basic/hivebot/rapid/wasteland = 3,
 		/mob/living/basic/spider/giant/tarantula/wasteland = 1,
 	)
@@ -166,7 +166,7 @@
 		/obj/structure/closet/crate/grave/filled/lead_researcher = 20,
 		/obj/item/pickaxe/rusted = 40,
 		/obj/item/pickaxe/diamond = 1,
-		/obj/item/shovel/serrated = 30,
+		/obj/item/shovel/serrated/dull = 30,
 		/obj/structure/radioactive = 30,
 		/obj/structure/radioactive/stack = 50,
 		/obj/structure/radioactive/waste = 50,
diff --git a/voidcrew/datums/mapgen/planet_anomalies.dm b/voidcrew/datums/mapgen/planet_anomalies.dm
index d48ca372ae5..d2b5c747912 100644
--- a/voidcrew/datums/mapgen/planet_anomalies.dm
+++ b/voidcrew/datums/mapgen/planet_anomalies.dm
@@ -7,74 +7,276 @@
  * has one route between compartments, so "avoid the gravitational anomaly" and "reach
  * engineering" were frequently the same tile.
  *
- * The same object on open planet ground is the opposite proposition. It is stationary,
- * it is lit and visible from well outside its own reach, and nothing brought it to the
- * crew, the crew walked to it. Standing next to one is a decision, and a crew that
- * researched Anomaly Research (tier 3) and printed a neutralizer turns that decision
- * into an anomaly core.
+ * The same object on open planet ground is the opposite proposition. Nothing brought it
+ * to the crew, the crew walked to it, and a crew that researched Anomaly Research
+ * (tier 3) and printed a neutralizer turns it into an anomaly core.
  *
  * These are the ONLY anomalies that spawn naturally. The ship-scoped controls in
  * voidcrew/modules/dynamic_events/events/anomalies.dm are all weight 0 / admin-only.
+ * Boffin's anomaly charts (voidcrew/modules/trade/anomaly_charts.dm) spawn the same
+ * subtypes inside derelicts and on planets.
  *
- * Two properties separate a planet anomaly from its parent:
+ * Every anomaly type can turn up, with its stock behaviour: they wander, the vortex eats
+ * what it reaches and the dimensional anomaly rewrites the ground around it. Planets are
+ * rebuilt when a crew leaves, so the damage does not outlast the visit. What differs
+ * from the station versions:
  *
  * - `immortal`: planets are prebuilt in the lobby and released minutes into the round,
  *   so a normal ANOMALY_COUNTDOWN_TIMER anomaly would detonate and vanish long before
- *   anybody could land and look at it. Immortal also suppresses detonate(), which is
- *   correct here: the payoff for finding one is the core, not the explosion.
- * - `move_chance = 0`: a wandering hazard cannot be routed around, and one that drifts
- *   into a landing site turns a considered approach into an ambush. Planet anomalies
- *   stay where the generator put them.
+ *   anybody could land and look at it. Immortal also suppresses detonate(), so the
+ *   payoff for finding one is the core, not the explosion.
+ * - `site_bound`: the anomaly stays on its own site (see /datum/component/anomaly_site_leash).
+ *   It never wanders into the cordon, onto a neighbour's site on a shared z-level, onto a
+ *   docked ship or into a planet's landing strip, and the dimensional anomaly relocates
+ *   within the site instead of across the sector.
+ * - the pyroclastic anomaly spits short jets of flame instead of venting plasma. The
+ *   stock version's gas release gives every planet turf it spreads to a private air
+ *   mix that never goes back to the shared one (voidcrew/edits/planetary_shared_air.dm),
+ *   so a wandering one leaves an ever-growing trail of active air. The jets are
+ *   visual effects plus direct burns: they never touch atmos.
+ * - hallucination decoys stay off. Decoys are separate, unbound anomalies with their own
+ *   timers, spawned in a cluster around the real one; on a planet they would wander off
+ *   the site like any unbound anomaly.
  */
 
 /**
- * Weighted table of anomaly types a planet may seed.
- *
- * Deliberately not the full anomaly roster. Excluded, and why:
- *
- * - bioscrambler: swapped limbs need surgery, so the injury outlives the trip home.
- * - vortex: eats what it reaches, and there is nothing to do about it but not be there.
- * - dimensional: rewrites surrounding turfs into a themed set, which on generated
- *   terrain carves a chunk of somebody's station out of the landscape.
- * - pyroclastic: dumps 1000K plasma into open air every few seconds. On a planet with
- *   planetary_atmos that is a fire with a whole biome to spread through.
- * - ectoplasm: scales off orbiting ghost count, which has nothing to do with the planet.
+ * Weighted table of anomaly types a planet may seed, in three rarity bands that match
+ * the price bands Boffin sells their cores and charts in. The per-zone natural count
+ * is set by ZONE_PLANET_ANOMALY_BUDGET_* in PlanetGenerator.dm.
  */
 GLOBAL_LIST_INIT(voidcrew_planet_anomalies, list(
-	/obj/effect/anomaly/flux/planetary = 30,
-	/obj/effect/anomaly/grav/planetary = 30,
+	// Common
+	/obj/effect/anomaly/flux/planetary = 25,
+	/obj/effect/anomaly/grav/planetary = 25,
 	/obj/effect/anomaly/hallucination/planetary = 25,
-	/obj/effect/anomaly/bluespace/planetary = 15,
+	/obj/effect/anomaly/pyro/planetary = 25,
+	// Uncommon
+	/obj/effect/anomaly/bioscrambler/planetary = 12,
+	/obj/effect/anomaly/ectoplasm/planetary = 12,
+	/obj/effect/anomaly/dimensional/planetary = 12,
+	// Rare
+	/obj/effect/anomaly/bluespace/planetary = 5,
+	/obj/effect/anomaly/bhole/planetary = 5,
 ))
 
-/// Dense, and shocks whatever touches it. The clearest of the four: it does nothing at
-/// all until something makes contact with it.
+/obj/effect/anomaly
+	/// Whether this anomaly is leashed to the site it formed on (see anomaly_site_leash)
+	var/site_bound = FALSE
+
+// Chains onto the upstream Initialize: runs after it, before any subtype's own body.
+/obj/effect/anomaly/Initialize(mapload, new_lifespan)
+	. = ..()
+	if(site_bound && . != INITIALIZE_HINT_QDEL)
+		AddComponent(/datum/component/anomaly_site_leash)
+
 /obj/effect/anomaly/flux/planetary
 	immortal = TRUE
-	move_chance = 0
+	site_bound = TRUE
 
-/// Pulls loose objects and unsecured people in from a few tiles out. The one with reach,
-/// so it reads as a hazard at a distance rather than a trap.
 /obj/effect/anomaly/grav/planetary
 	immortal = TRUE
-	move_chance = 0
+	site_bound = TRUE
 
-/**
- * Pulses hallucinations at anyone within a few tiles. Harmless in the sense that matters
- * here: it does no damage and leaves nothing behind once the crew walks away.
- *
- * Decoys are off. On a station they are a science minigame. Scan the cluster, find the
- * one that answers. On a planet they would be three extra processing objects and three
- * extra ghost points of interest per anomaly, sitting on a z-level that is prebuilt and
- * then left alone for most of the round, in service of a puzzle nobody came here to do.
- */
 /obj/effect/anomaly/hallucination/planetary
 	immortal = TRUE
-	move_chance = 0
+	site_bound = TRUE
 	spawn_decoys = FALSE
 
-/// Dense, and throws whatever touches it a short distance. Planets are a single cordoned
-/// z-level, so it can only ever relocate somebody within the same landmass.
+/**
+ * Every few seconds it spits one to three jets of flame, three or four tiles long,
+ * stopped by anything dense and by the edge of its site. Anyone in a jet or standing
+ * next to the anomaly at the burst is set alight and takes a light burn. The flames
+ * are temp visuals only: no gas, no hotspots, nothing for SSair to process.
+ */
+/obj/effect/anomaly/pyro/planetary
+	immortal = TRUE
+	site_bound = TRUE
+	/// Seconds between bursts
+	var/burst_delay = 4
+	/// Seconds since the last burst
+	var/burst_timer = 0
+	/// Most jets in one burst
+	var/max_jets = 3
+	/// Jet length range, in tiles
+	var/jet_length_min = 3
+	var/jet_length_max = 4
+	/// Fire stacks given to anyone caught
+	var/burn_stacks = 3
+	/// Burn damage dealt to anyone caught
+	var/burn_damage = 5
+
+/obj/effect/anomaly/pyro/planetary/anomalyEffect(seconds_per_tick)
+	// No ..(): the parent vents plasma. Only the base proc's drift is kept.
+#ifndef UNIT_TESTS
+	if(SPT_PROB(move_chance, seconds_per_tick))
+		move_anomaly()
+#endif
+	burst_timer += seconds_per_tick
+	if(burst_timer < burst_delay)
+		return
+	burst_timer = 0
+	spit_flames()
+
+/obj/effect/anomaly/pyro/planetary/proc/spit_flames()
+	var/turf/origin = get_turf(src)
+	if(!origin)
+		return
+	var/datum/component/anomaly_site_leash/leash = GetComponent(/datum/component/anomaly_site_leash)
+	var/list/burned = list()
+	for(var/turf/adjacent in range(1, origin))
+		burn_turf(adjacent, burned)
+	var/list/directions = GLOB.alldirs.Copy()
+	for(var/_ in 1 to rand(1, max_jets))
+		var/jet_dir = pick_n_take(directions)
+		var/turf/current = origin
+		for(var/__ in 1 to rand(jet_length_min, jet_length_max))
+			var/turf/next = get_step(current, jet_dir)
+			if(!next || next.is_blocked_turf(exclude_mobs = TRUE))
+				break
+			if(leash && !leash.allows(next))
+				break
+			new /obj/effect/temp_visual/fire(next)
+			burn_turf(next, burned)
+			current = next
+	playsound(src, 'sound/effects/fire_puff.ogg', 50, TRUE)
+
+/// Sets anyone living on `target` alight, once per burst
+/obj/effect/anomaly/pyro/planetary/proc/burn_turf(turf/target, list/burned)
+	for(var/mob/living/victim in target)
+		if(victim in burned)
+			continue
+		burned += victim
+		victim.adjust_fire_stacks(burn_stacks)
+		victim.ignite_mob()
+		victim.apply_damage(burn_damage, BURN)
+
+/obj/effect/anomaly/bioscrambler/planetary
+	immortal = TRUE
+	site_bound = TRUE
+
+/obj/effect/anomaly/ectoplasm/planetary
+	immortal = TRUE
+	site_bound = TRUE
+
+/obj/effect/anomaly/dimensional/planetary
+	immortal = TRUE
+	site_bound = TRUE
+
+/// Never converts ground off its own site: no docked hull, no cordon, no neighbour.
+/obj/effect/anomaly/dimensional/planetary/prepare_area(new_theme_path)
+	. = ..()
+	var/datum/component/anomaly_site_leash/leash = GetComponent(/datum/component/anomaly_site_leash)
+	if(!leash)
+		return
+	for(var/turf/target as anything in target_turfs.Copy())
+		if(!leash.allows(target))
+			target_turfs -= target
+
+/// Upstream relocates to a random station area with a sector-wide announcement. Here it
+/// jumps to another spot on the same site, quietly.
+/obj/effect/anomaly/dimensional/planetary/relocate()
+	var/datum/component/anomaly_site_leash/leash = GetComponent(/datum/component/anomaly_site_leash)
+	var/turf/new_turf = leash?.random_open_turf()
+	if(new_turf)
+		forceMove(new_turf)
+	prepare_area()
+
 /obj/effect/anomaly/bluespace/planetary
 	immortal = TRUE
-	move_chance = 0
+	site_bound = TRUE
+
+/obj/effect/anomaly/bhole/planetary
+	immortal = TRUE
+	site_bound = TRUE
+
+/**
+ * # Anomaly site leash
+ *
+ * Keeps a wandering anomaly on the site it formed on. Bounds are taken from the site's
+ * map footprint when the anomaly appears: the whole footprint for a planet, minus the
+ * landing strip along its bottom, or the ruin template's own rectangle for a space
+ * ruin. On top of that it never enters a ship (/area/shuttle), the cordon or open space
+ * (/area/space), or another z-level.
+ *
+ * Every way an anomaly moves itself (random drift, the bioscrambler's pursuit, deadchat
+ * steering of the ectoplasm anomaly) goes through Move(), so blocking PRE_MOVE covers
+ * them. The dimensional anomaly's forceMove relocation asks random_open_turf() instead.
+ */
+/datum/component/anomaly_site_leash
+	/// The z-level the anomaly formed on
+	var/home_z
+	/// Inclusive bounds, null when the anomaly formed outside any known site
+	var/low_x
+	var/low_y
+	var/high_x
+	var/high_y
+
+/datum/component/anomaly_site_leash/Initialize()
+	if(!istype(parent, /obj/effect/anomaly))
+		return COMPONENT_INCOMPATIBLE
+	var/turf/home = get_turf(parent)
+	if(!home)
+		return COMPONENT_INCOMPATIBLE
+	home_z = home.z
+	derive_bounds(home)
+
+/datum/component/anomaly_site_leash/RegisterWithParent()
+	RegisterSignal(parent, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(on_pre_move))
+
+/datum/component/anomaly_site_leash/UnregisterFromParent()
+	UnregisterSignal(parent, COMSIG_MOVABLE_PRE_MOVE)
+
+/datum/component/anomaly_site_leash/proc/derive_bounds(turf/home)
+	var/datum/map_footprint/footprint = map_region_for_turf(home)
+	if(!istype(footprint))
+		return
+	low_x = footprint.low_x
+	low_y = footprint.low_y
+	high_x = footprint.high_x
+	high_y = footprint.high_y
+	if(istype(footprint.owner, /obj/structure/overmap/planet))
+		var/obj/structure/overmap/planet/planet = footprint.owner
+		var/strip_top = planet.get_dock_strip_top_y(footprint.level)
+		// An anomaly placed inside the strip by hand keeps the full footprint rather
+		// than being frozen in place.
+		if(!isnull(strip_top) && home.y > strip_top)
+			low_y = max(low_y, strip_top + 1)
+	else if(istype(footprint.owner, /obj/structure/overmap/space_ruin))
+		var/obj/structure/overmap/space_ruin/ruin = footprint.owner
+		var/turf/corner = ruin.ruin_bottom_left
+		if(corner && ruin.ruin_template?.width && ruin.ruin_template?.height)
+			low_x = max(low_x, corner.x)
+			low_y = max(low_y, corner.y)
+			high_x = min(high_x, corner.x + ruin.ruin_template.width - 1)
+			high_y = min(high_y, corner.y + ruin.ruin_template.height - 1)
+
+/// Whether the anomaly may stand on `destination`
+/datum/component/anomaly_site_leash/proc/allows(turf/destination)
+	if(!isturf(destination) || destination.z != home_z)
+		return FALSE
+	if(!isnull(low_x) && (destination.x < low_x || destination.x > high_x || destination.y < low_y || destination.y > high_y))
+		return FALSE
+	if(istype(destination, /turf/cordon))
+		return FALSE
+	var/area/destination_area = get_area(destination)
+	if(istype(destination_area, /area/shuttle) || istype(destination_area, /area/space))
+		return FALSE
+	return TRUE
+
+/datum/component/anomaly_site_leash/proc/on_pre_move(atom/movable/source, atom/new_loc)
+	SIGNAL_HANDLER
+	if(!allows(new_loc))
+		return COMPONENT_MOVABLE_BLOCK_PRE_MOVE
+
+/// A random open, walkable turf the anomaly may stand on, or null
+/datum/component/anomaly_site_leash/proc/random_open_turf(attempts = 60)
+	if(isnull(low_x))
+		return null
+	for(var/_ in 1 to attempts)
+		var/turf/candidate = locate(rand(low_x, high_x), rand(low_y, high_y), home_z)
+		if(!isopenturf(candidate) || isgroundlessturf(candidate) || candidate.density)
+			continue
+		if(!allows(candidate))
+			continue
+		return candidate
+	return null
diff --git a/voidcrew/datums/votes/transfer_vote.dm b/voidcrew/datums/votes/transfer_vote.dm
index dc80ac945f9..e10ea9506cd 100644
--- a/voidcrew/datums/votes/transfer_vote.dm
+++ b/voidcrew/datums/votes/transfer_vote.dm
@@ -19,20 +19,22 @@
 	CONFIG_SET(flag/allow_vote_transfer, !CONFIG_GET(flag/allow_vote_transfer))
 	return TRUE
 
+/// Include the lobby so a pending vote cannot launch the fleet before the timer is armed.
+/datum/vote/transfer_vote/proc/departure_scheduled()
+	return SSovermap.round_end_time || (!SSticker.HasRoundStarted() && CONFIG_GET(number/round_time_limit))
+
 /datum/vote/transfer_vote/is_config_enabled()
-	return CONFIG_GET(flag/allow_vote_transfer)
+	return CONFIG_GET(flag/allow_vote_transfer) && !departure_scheduled()
 
-/datum/vote/transfer_vote/can_be_initiated(mob/by_who, forced)
+/datum/vote/transfer_vote/can_be_initiated(forced = FALSE)
 	. = ..()
-	if(!.)
-		return FALSE
+	if(. != VOTE_AVAILABLE)
+		return .
 
-	if(!forced && !CONFIG_GET(flag/allow_vote_transfer))
-		default_message = "Transfer voting is disabled by server configuration settings."
-		return FALSE
+	if(departure_scheduled())
+		return "Fleet departure is already scheduled."
 
-	default_message = initial(default_message)
-	return TRUE
+	return VOTE_AVAILABLE
 
 /datum/vote/transfer_vote/get_vote_result(list/non_voters)
 	if(!CONFIG_GET(flag/default_no_vote))
diff --git a/voidcrew/edits/config.dm b/voidcrew/edits/config.dm
index d5db2640042..e551b35e95b 100644
--- a/voidcrew/edits/config.dm
+++ b/voidcrew/edits/config.dm
@@ -13,6 +13,11 @@
 /datum/config_entry/flag/allow_vote_transfer
 	default = TRUE
 
+/// Round duration in real minutes, measured from roundstart. Zero restores untimed rounds.
+/datum/config_entry/number/round_time_limit
+	default = 360
+	min_val = 0
+
 /datum/config_entry/flag/free_ships
 	default = FALSE
 
diff --git a/voidcrew/edits/game/machinery/computer/orders/order_items/cook/order_milk_eggs.dm b/voidcrew/edits/game/machinery/computer/orders/order_items/cook/order_milk_eggs.dm
new file mode 100644
index 00000000000..f84be4b31ae
--- /dev/null
+++ b/voidcrew/edits/game/machinery/computer/orders/order_items/cook/order_milk_eggs.dm
@@ -0,0 +1,7 @@
+// Voidcrew trader price overrides.
+
+/datum/orderable_item/milk_eggs/fillet
+	cost_per_order = 10
+
+/datum/orderable_item/milk_eggs/octopus
+	cost_per_order = 10
diff --git a/voidcrew/edits/game/machinery/computer/orders/order_items/cook/order_reagents.dm b/voidcrew/edits/game/machinery/computer/orders/order_items/cook/order_reagents.dm
new file mode 100644
index 00000000000..c71578270d9
--- /dev/null
+++ b/voidcrew/edits/game/machinery/computer/orders/order_items/cook/order_reagents.dm
@@ -0,0 +1,4 @@
+// Voidcrew trader price overrides.
+
+/datum/orderable_item/reagents/honey
+	cost_per_order = 60
diff --git a/voidcrew/edits/game/machinery/computer/orders/order_items/mining/order_consumables.dm b/voidcrew/edits/game/machinery/computer/orders/order_items/mining/order_consumables.dm
new file mode 100644
index 00000000000..def8c7ced6b
--- /dev/null
+++ b/voidcrew/edits/game/machinery/computer/orders/order_items/mining/order_consumables.dm
@@ -0,0 +1,4 @@
+// Voidcrew trader price overrides.
+
+/datum/orderable_item/consumables/medkit_fire
+	cost_per_order = 400
diff --git a/voidcrew/edits/game/machinery/computer/orders/order_items/mining/order_golem.dm b/voidcrew/edits/game/machinery/computer/orders/order_items/mining/order_golem.dm
new file mode 100644
index 00000000000..5951e0532b4
--- /dev/null
+++ b/voidcrew/edits/game/machinery/computer/orders/order_items/mining/order_golem.dm
@@ -0,0 +1,4 @@
+// Voidcrew trader price overrides.
+
+/datum/orderable_item/golem/trigger_guard
+	cost_per_order = 400
diff --git a/voidcrew/edits/game/machinery/computer/orders/order_items/mining/order_mining.dm b/voidcrew/edits/game/machinery/computer/orders/order_items/mining/order_mining.dm
new file mode 100644
index 00000000000..1787bc164b9
--- /dev/null
+++ b/voidcrew/edits/game/machinery/computer/orders/order_items/mining/order_mining.dm
@@ -0,0 +1,22 @@
+// Voidcrew trader price overrides.
+
+/datum/orderable_item/mining/fulton
+	cost_per_order = 600
+
+/datum/orderable_item/mining/hiking_boots
+	cost_per_order = 800
+
+/datum/orderable_item/mining/mining_modsuit
+	cost_per_order = 7200
+
+/datum/orderable_item/mining/mining_scanner
+	cost_per_order = 400
+
+/datum/orderable_item/mining/resonator
+	cost_per_order = 600
+
+/datum/orderable_item/mining/resonator_advanced
+	cost_per_order = 1200
+
+/datum/orderable_item/mining/ventpointer
+	cost_per_order = 800
diff --git a/voidcrew/edits/mobs/ladder_outfits.dm b/voidcrew/edits/mobs/ladder_outfits.dm
new file mode 100644
index 00000000000..d188f81b7df
--- /dev/null
+++ b/voidcrew/edits/mobs/ladder_outfits.dm
@@ -0,0 +1,89 @@
+// Shared role kits, also inherited by purchased hulls and module-added jobs.
+/datum/outfit/job/security
+	backpack_contents = list(/obj/item/evidencebag = 1, /obj/item/knife/combat/survival = 1)
+
+/datum/outfit/job/warden
+	backpack_contents = list(/obj/item/evidencebag = 1, /obj/item/knife/combat/survival = 1)
+
+/datum/outfit/job/hos
+	backpack_contents = list(
+		/obj/item/evidencebag = 1,
+		/obj/item/melee/baton/security/loaded/hos = 1,
+		/obj/item/knife/combat/survival = 1,
+	)
+
+/datum/outfit/job/proc/ladder_add_survival_knife()
+	backpack_contents = backpack_contents?.Copy() || list()
+	backpack_contents[/obj/item/knife/combat/survival] = 1
+
+/datum/outfit/job/miner/pre_equip(mob/living/carbon/human/H, visuals_only = FALSE)
+	. = ..()
+	ladder_add_survival_knife()
+
+/datum/outfit/job/security/pre_equip(mob/living/carbon/human/H, visuals_only = FALSE)
+	. = ..()
+	ladder_add_survival_knife()
+
+/datum/outfit/job/warden/pre_equip(mob/living/carbon/human/H, visuals_only = FALSE)
+	. = ..()
+	ladder_add_survival_knife()
+
+/datum/outfit/job/hos/pre_equip(mob/living/carbon/human/H, visuals_only = FALSE)
+	. = ..()
+	ladder_add_survival_knife()
+
+/// Only remove kit created by this equip call, never a player's existing salvage.
+/proc/remove_ladder_starting_weapons(mob/living/carbon/human/wearer, list/previous_contents)
+	for(var/obj/item/item in wearer.get_all_contents() - previous_contents)
+		if(is_ladder_combat_gun(item.type) || is_ladder_restricted_melee(item.type))
+			qdel(item)
+
+/datum/outfit/job/equip(mob/living/carbon/human/user, visuals_only = FALSE)
+	var/list/previous_contents = user.get_all_contents()
+	. = ..()
+	for(var/obj/item/item in user.get_all_contents() - previous_contents)
+		if(is_ladder_restricted_melee(item.type))
+			qdel(item)
+	if(visuals_only)
+		return
+	// Workshop pre_equip overrides can replace their parent's entire backpack list.
+	// Check the finished kit rather than overwriting medical supplies or tools.
+	if(!istype(src, /datum/outfit/job/miner) && !istype(src, /datum/outfit/job/security) && !istype(src, /datum/outfit/job/warden) && !istype(src, /datum/outfit/job/hos))
+		return
+	if(locate(/obj/item/knife/combat/survival) in user.get_all_contents())
+		return
+	var/obj/item/knife/combat/survival/knife = new(user)
+	if(!user.equip_to_storage(knife, ITEM_SLOT_BACK, indirect_action = TRUE))
+		user.put_in_hands(knife)
+
+// Corpse and ghost-role outfits are also fixed starting placements.
+/obj/effect/mob_spawn/equip(mob/living/spawned_mob)
+	. = ..()
+	if(ishuman(spawned_mob))
+		remove_ladder_starting_weapons(spawned_mob, list())
+
+/datum/voucher_set/mining/crusher_kit
+	name = "Accelerator Kit"
+	description = "A mining accelerator and a pocket extinguisher."
+	icon_state = "kineticgun"
+	set_items = list(/obj/item/gun/energy/recharge/kinetic_accelerator, /obj/item/extinguisher/mini)
+
+// Direct variants remain available to guarded loot, but not to the free picker.
+/obj/item/nullrod/claymore
+	chaplain_spawnable = FALSE
+
+/obj/item/nullrod/vibro
+	chaplain_spawnable = FALSE
+
+/obj/item/nullrod/hypertool
+	chaplain_spawnable = FALSE
+
+/datum/component/subtype_picker/Initialize(list/subtype2descriptions, on_picked_callback)
+	if(istype(parent, /obj/item/nullrod))
+		subtype2descriptions = subtype2descriptions.Copy()
+		for(var/choice in subtype2descriptions)
+			if(ispath(choice, /obj/item/gun) || ispath(choice, /obj/item/organ/cyberimp/arm/toolkit/shard/scythe))
+				subtype2descriptions -= choice
+			else
+				subtype2descriptions[choice] = null
+	return ..(subtype2descriptions, on_picked_callback)
diff --git a/voidcrew/edits/mobs/new_player.dm b/voidcrew/edits/mobs/new_player.dm
index fb0aaa29c32..06a93b2919d 100644
--- a/voidcrew/edits/mobs/new_player.dm
+++ b/voidcrew/edits/mobs/new_player.dm
@@ -121,7 +121,7 @@
 
 /**
  * Callback when player confirms their hull, theme and upgrade selections.
- * The selector has already handled the hull unlock and part deduction.
+ * The selector has already handled permanent hull, theme and module unlocks.
  */
 /mob/dead/new_player/proc/on_upgrades_confirmed(datum/map_template/shuttle/voidcrew/template, list/upgrade_selections, datum/ship_theme/selected_theme)
 	if(!template)
@@ -135,26 +135,31 @@
 /mob/dead/new_player/proc/spawn_ship_with_upgrades(datum/map_template/shuttle/voidcrew/template, list/upgrade_selections, datum/ship_theme/selected_theme)
 	if(!template)
 		return select_ship()
+	var/form_new = choose_new_reputation_crew(src)
+	if(isnull(form_new))
+		return
+	var/datum/voidcrew_crew_record/registration_crew = mind?.recover_reputation_crew()
 
 	// Prevent double-click spawning
 	if(spawning_ship)
-		to_chat(src, span_warning("Your ship is already being prepared. Please wait..."))
+		to_chat(src, span_warning("Your ship is already being prepared."))
 		return
 	spawning_ship = TRUE
 
-	to_chat(src, span_notice("Your [template.name] is being prepared. Please be patient!"))
+	to_chat(src, span_notice("Your [template.name] is being prepared."))
 	var/obj/structure/overmap/ship/target = SSshuttle.create_ship(template, upgrade_selections, selected_theme)
 	if(!istype(target))
 		spawning_ship = FALSE
-		// A refusal at the map-volume ceiling is transient - transit space frees up in
-		// seconds as ships move. Say so instead of sending the buyer to the admins for
-		// a condition that fixes itself.
 		if(SSmapping.at_z_level_ceiling())
-			to_chat(src, span_warning("The shipyard is congested right now - hull assembly space frees up as ships move. Try again in a minute."))
+			to_chat(src, span_warning("The shipyard is congested."))
 		else
-			to_chat(src, span_danger("There was an error loading the ship. Please contact admins!"))
+			to_chat(src, span_danger("The shipyard could not prepare your ship."))
 		return select_ship()
 
+	if(mind?.recover_reputation_crew() != registration_crew || !target.bind_reputation_crew(mind, form_new))
+		qdel(target)
+		spawning_ship = FALSE
+		return
 	SSblackbox.record_feedback("tally", "ship_purchased", 1, template.name)
 	ship_metric_purchased(target, src)
 
@@ -162,10 +167,10 @@
 	// The buyer is cleared anyway so a password set before they seat themselves (or
 	// after a failed spawn) can never lock them out of the hull they paid for.
 	target.password_cleared_ckeys[ckey] = TRUE
-	to_chat(src, span_notice("Your ship is open for anyone to join. To lock it, set a join password from Ship Management once aboard."))
+	to_chat(src, span_notice("Your ship is ready."))
 
 	if(!AttemptSpawnOnShip(target.job_slots[1], target))
-		to_chat(src, span_danger("Ship spawned, but you were unable to be spawned. You can likely try to spawn in the ship through joining normally, but if not, please contact an admin."))
+		to_chat(src, span_danger("Your berth is unavailable."))
 
 /**
  * Spawns a free hull for a player the fleet has no room for, and seats them on it as
@@ -186,28 +191,36 @@
 		return
 
 	if(!can_requisition_hull(src))
-		to_chat(src, span_warning("A position opened up in the fleet while you were deciding. Join a crew instead."))
+		to_chat(src, span_warning("A berth has opened aboard the fleet."))
 		return select_ship()
+	var/form_new = choose_new_reputation_crew(src)
+	if(isnull(form_new))
+		return
+	var/datum/voidcrew_crew_record/registration_crew = mind?.recover_reputation_crew()
 
 	// Prevent double-click spawning
 	if(spawning_ship)
-		to_chat(src, span_warning("Your ship is already being prepared. Please wait..."))
+		to_chat(src, span_warning("Your ship is already being prepared."))
 		return
 	spawning_ship = TRUE
 
-	to_chat(src, span_notice("No ship in the fleet has room for you. A hull is being prepared - please be patient!"))
+	to_chat(src, span_notice("A hull is being prepared."))
 	var/obj/structure/overmap/ship/target = SSovermap.spawn_free_hull(track_as_initial = FALSE)
 	if(!istype(target))
 		spawning_ship = FALSE
-		to_chat(src, span_danger("There was an error loading the ship. Please contact admins!"))
+		to_chat(src, span_danger("The shipyard could not prepare your ship."))
 		return select_ship()
 
+	if(mind?.recover_reputation_crew() != registration_crew || !target.bind_reputation_crew(mind, form_new))
+		qdel(target)
+		spawning_ship = FALSE
+		return
 	SSblackbox.record_feedback("tally", "ship_requisitioned", 1, target.source_template?.name || "[target.type]")
 	log_shuttle("[key_name(src)] requisitioned a free hull: [target.name]")
 	ship_metric_purchased(target, src, requisition = TRUE)
 
 	if(!AttemptSpawnOnShip(target.job_slots[1], target))
-		to_chat(src, span_danger("Ship spawned, but you were unable to be spawned. You can likely try to spawn in the ship through joining normally, but if not, please contact an admin."))
+		to_chat(src, span_danger("Your berth is unavailable."))
 
 /**
  * Join as the given job
diff --git a/voidcrew/edits/mobs/ruin_icons.dm b/voidcrew/edits/mobs/ruin_icons.dm
index 4b2cf006325..dce2855a3e3 100644
--- a/voidcrew/edits/mobs/ruin_icons.dm
+++ b/voidcrew/edits/mobs/ruin_icons.dm
@@ -1,6 +1,14 @@
 // Static/editor fallbacks for dynamically assembled basic mobs used by legacy
 // Voidcrew ruins. These states are sourced from Voidcrew-LRP's simple_human.dmi.
 
+/mob/living/basic/skeleton/templar
+	loot = list(
+		/obj/effect/decal/remains/human,
+		/obj/item/clothing/suit/chaplainsuit/armor/templar,
+		/obj/item/clothing/head/helmet/chaplain,
+		/obj/item/hatchet,
+	)
+
 /mob/living/basic/skeleton/plasmaminer
 	icon = 'voidcrew/icons/mob/legacy_ruin_mobs.dmi'
 
diff --git a/voidcrew/edits/mobs/weapon_drops.dm b/voidcrew/edits/mobs/weapon_drops.dm
new file mode 100644
index 00000000000..4627ab6345c
--- /dev/null
+++ b/voidcrew/edits/mobs/weapon_drops.dm
@@ -0,0 +1,153 @@
+/// The ordinary yellow melee shelf, also used by faction pirates.
+/proc/npc_ladder_yellow_melee()
+	var/static/list/weapons = list(
+		/obj/item/knife/combat,
+		/obj/item/claymore/shortsword,
+		/obj/item/melee/baseball_bat/ablative,
+		/obj/item/fireaxe,
+		/obj/item/melee/cleric_mace,
+		/obj/item/melee/sabre,
+	)
+	return weapons
+
+/// A probability, never an associative death-loot quantity.
+/proc/npc_ladder_red_drop(roll = rand(1, 100))
+	return roll <= 25
+
+/mob/living
+	var/npc_weapon_ladder_applied = FALSE
+	var/npc_red_weapon_drop = FALSE
+
+/// Called after construction and again when a deferred source zone resolves.
+/mob/living/proc/apply_npc_weapon_ladder()
+	if(npc_weapon_ladder_applied || !npc_zone_initialization_complete || isnull(npc_spawn_context?.zone_type))
+		return FALSE
+	npc_weapon_ladder_applied = TRUE
+	return TRUE
+
+/mob/living/basic/trooper/pirate/faction/apply_npc_weapon_ladder()
+	if(!..())
+		return FALSE
+	initialize_weapon_loot(npc_spawn_context.zone_type)
+	return TRUE
+
+// Each bespoke element pays independently (corpse and combat loot are separate).
+// Detaching before creation also covers reentrant deaths and resurrection.
+/datum/element/death_drops/on_death(mob/living/target, gibbed)
+	SIGNAL_HANDLER
+	if(istype(target, /mob/living/basic/trooper) || istype(target, /mob/living/basic/skeleton) || istype(target, /mob/living/basic/stickman))
+		Detach(target)
+	return ..()
+
+/datum/element/death_drops/create_loot(typepath, atom/loot_loc, mob/living/dead, gibbed, spread_px = 4)
+	if(ispath(typepath, /obj/item/gun) && (dead.npc_spawn_context?.suppress_gun_loot || (dead.flags_1 & ADMIN_SPAWNED_1)))
+		return
+	return ..()
+
+// Legacy simple animals bypass death_drops. Filter a private copy so a summon
+// cannot change the loot of the next naturally spawned mob of the same type.
+/mob/living/simple_animal/drop_loot()
+	if(npc_spawn_context?.suppress_gun_loot || (flags_1 & ADMIN_SPAWNED_1))
+		var/list/original_loot = loot
+		loot = loot?.Copy()
+		for(var/loot_type in original_loot)
+			if(ispath(loot_type, /obj/item/gun))
+				loot -= loot_type
+	return ..()
+
+/// Use the existing pistol/knife archetype on low-zone placements. Keep the
+/// original body, source references, atmos immunity and source-specific setup.
+/mob/living/basic/trooper/apply_npc_weapon_ladder()
+	if(!..())
+		return FALSE
+	if(is_npc_zone_exempt())
+		return TRUE
+	var/zone = npc_spawn_context.zone_type
+	var/pistol_type
+	if(istype(src, /mob/living/basic/trooper/nanotrasen/ranged))
+		if((zone == ZONE_GREEN && (istype(src, /mob/living/basic/trooper/nanotrasen/ranged/smg) || istype(src, /mob/living/basic/trooper/nanotrasen/ranged/assault))) || (zone != ZONE_RED && istype(src, /mob/living/basic/trooper/nanotrasen/ranged/elite)))
+			pistol_type = /mob/living/basic/trooper/nanotrasen/ranged
+		if(zone != ZONE_RED && (istype(src, /mob/living/basic/trooper/nanotrasen/ranged/smg/customs) || istype(src, /mob/living/basic/trooper/nanotrasen/ranged/assault/customs)))
+			pistol_type = /mob/living/basic/trooper/nanotrasen/ranged
+	else if(istype(src, /mob/living/basic/trooper/syndicate/ranged))
+		if(zone != ZONE_RED && (istype(src, /mob/living/basic/trooper/syndicate/ranged/smg) || istype(src, /mob/living/basic/trooper/syndicate/ranged/shotgun) || (zone == ZONE_GREEN && istype(src, /mob/living/basic/trooper/syndicate/ranged/space/stormtrooper))))
+			pistol_type = /mob/living/basic/trooper/syndicate/ranged
+	if(pistol_type)
+		use_ladder_pistol(pistol_type)
+	if(zone == ZONE_GREEN && istype(src, /mob/living/basic/trooper/syndicate/melee/sword))
+		var/mob/living/basic/trooper/syndicate/melee/guard = src
+		var/mob/living/basic/trooper/knife_profile = /mob/living/basic/trooper/syndicate/melee
+		guard.projectile_deflect_chance = 0
+		armour_penetration = 0
+		set_npc_zone_health(initial(knife_profile.maxHealth))
+		set_npc_zone_melee(15, 15)
+		r_hand = /obj/item/knife/combat/survival
+		l_hand = null
+		set_light(0)
+		if(use_dynamic_appearance)
+			apply_dynamic_human_appearance(src, mob_spawn_path = mob_spawner, r_hand = r_hand)
+	return TRUE
+
+/mob/living/basic/trooper/proc/use_ladder_pistol(mob/living/basic/trooper/profile)
+	var/datum/component/ranged_attacks/ranged = GetComponent(/datum/component/ranged_attacks)
+	if(!ranged)
+		return
+	// Use the base archetype's unchanged cadence, rather than retuning a gun.
+	ranged.casing_type = initial(profile:casingtype)
+	ranged.projectile_type = null
+	ranged.projectile_sound = initial(profile:projectilesound)
+	ranged.burst_shots = initial(profile:burst_shots)
+	ranged.cooldown_time = initial(profile:ranged_cooldown)
+	vars["casingtype"] = ranged.casing_type
+	vars["projectilesound"] = ranged.projectile_sound
+	vars["burst_shots"] = ranged.burst_shots
+	vars["ranged_cooldown"] = ranged.cooldown_time
+	set_npc_zone_health(initial(profile.maxHealth))
+	if(!GetComponent(/datum/component/ranged_mob_full_auto))
+		AddComponent(/datum/component/ranged_mob_full_auto)
+	if(ai_controller)
+		ai_controller.set_ai_status(AI_STATUS_OFF)
+		QDEL_NULL(ai_controller)
+	ai_controller = new /datum/ai_controller/basic_controller/trooper/ranged(src)
+	r_hand = initial(profile.r_hand)
+	if(use_dynamic_appearance)
+		apply_dynamic_human_appearance(src, mob_spawn_path = mob_spawner, r_hand = r_hand, l_hand = l_hand)
+
+// Copy both lists before trimming them: crusher kills must use the very same
+// construction-time roll, and must keep trophies and the mining accelerator.
+/mob/living/simple_animal/hostile/megafauna/Initialize(mapload)
+	. = ..()
+	npc_red_weapon_drop = npc_ladder_red_drop()
+	loot = loot?.Copy()
+	crusher_loot = crusher_loot?.Copy()
+	if(!npc_red_weapon_drop)
+		if(istype(src, /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner))
+			loot -= /obj/item/melee/cleaving_saw
+			crusher_loot -= /obj/item/melee/cleaving_saw
+		else if(istype(src, /mob/living/simple_animal/hostile/megafauna/hierophant))
+			loot -= /obj/item/hierophant_club
+			crusher_loot -= /obj/item/hierophant_club
+
+/mob/living/simple_animal/hostile/megafauna
+	var/npc_death_loot_spent = FALSE
+
+/mob/living/simple_animal/hostile/megafauna/drop_loot()
+	if(npc_death_loot_spent)
+		return
+	npc_death_loot_spent = TRUE
+	return ..()
+
+// Colossus contents are lazy. Pass the boss's roll into its chest before opening.
+/mob/living/simple_animal/hostile/megafauna/colossus/drop_loot()
+	if(npc_death_loot_spent)
+		return
+	npc_death_loot_spent = TRUE
+	// Deliberately replace the bare parent constructor to carry the original roll.
+	for(var/loot_type in loot)
+		var/obj/structure/closet/crate/necropolis/colossus/chest = new loot_type(drop_location())
+		chest.ladder_weapon_drop = npc_red_weapon_drop
+	loot = list()
+
+/mob/living/basic/lich/Initialize(mapload)
+	. = ..()
+	npc_red_weapon_drop = npc_ladder_red_drop()
diff --git a/voidcrew/edits/modules/bitrunning/orders/flair.dm b/voidcrew/edits/modules/bitrunning/orders/flair.dm
new file mode 100644
index 00000000000..684d97a470f
--- /dev/null
+++ b/voidcrew/edits/modules/bitrunning/orders/flair.dm
@@ -0,0 +1,28 @@
+// Voidcrew trader price overrides.
+
+/datum/orderable_item/bitrunning_flair/cornchips
+	cost_per_order = 50
+
+/datum/orderable_item/bitrunning_flair/grey_bull
+	cost_per_order = 100
+
+/datum/orderable_item/bitrunning_flair/jackboots
+	cost_per_order = 200
+
+/datum/orderable_item/bitrunning_flair/medkit
+	cost_per_order = 200
+
+/datum/orderable_item/bitrunning_flair/medkit_fire
+	cost_per_order = 200
+
+/datum/orderable_item/bitrunning_flair/mountain_wind
+	cost_per_order = 50
+
+/datum/orderable_item/bitrunning_flair/oval_sunglasses
+	cost_per_order = 400
+
+/datum/orderable_item/bitrunning_flair/pwr_game
+	cost_per_order = 100
+
+/datum/orderable_item/bitrunning_flair/trenchcoat
+	cost_per_order = 300
diff --git a/voidcrew/edits/modules/cargo/exports/large_objects.dm b/voidcrew/edits/modules/cargo/exports/large_objects.dm
index 4b4553db972..7ad48921dc0 100644
--- a/voidcrew/edits/modules/cargo/exports/large_objects.dm
+++ b/voidcrew/edits/modules/cargo/exports/large_objects.dm
@@ -8,3 +8,7 @@
 		var/obj/structure/closet/crate/crate = exported_obj
 		if(!isnull(crate.cargo_paid_cost))
 			return max(0, min(., FLOOR(crate.cargo_paid_cost * 0.1, 1)))
+
+/datum/export/large/gas_canister/get_cost(obj/machinery/portable_atmospherics/canister/canister, apply_elastic = TRUE)
+	// Gas sells to traders and contracts, not cargo.
+	return cost
diff --git a/voidcrew/edits/modules/cargo/exports/materials.dm b/voidcrew/edits/modules/cargo/exports/materials.dm
index c691cbc99cf..524d8ef956b 100644
--- a/voidcrew/edits/modules/cargo/exports/materials.dm
+++ b/voidcrew/edits/modules/cargo/exports/materials.dm
@@ -23,3 +23,32 @@
 /datum/export/material/market/plasma
 	message = "cm3 of plasma"
 	material_id = /datum/material/plasma
+
+/datum/material/diamond
+	value_per_unit = 120 / SHEET_MATERIAL_AMOUNT
+
+/datum/material/bluespace
+	value_per_unit = 80 / SHEET_MATERIAL_AMOUNT
+
+/datum/material/gold
+	value_per_unit = 40 / SHEET_MATERIAL_AMOUNT
+
+/datum/material/titanium
+	value_per_unit = 40 / SHEET_MATERIAL_AMOUNT
+
+/datum/material/uranium
+	value_per_unit = 30 / SHEET_MATERIAL_AMOUNT
+
+/datum/material/silver
+	value_per_unit = 15 / SHEET_MATERIAL_AMOUNT
+
+/datum/material/iron
+	value_per_unit = 2 / SHEET_MATERIAL_AMOUNT
+	minimum_value_override = 1 / SHEET_MATERIAL_AMOUNT
+
+/datum/material/glass
+	value_per_unit = 2 / SHEET_MATERIAL_AMOUNT
+	minimum_value_override = 1 / SHEET_MATERIAL_AMOUNT
+
+/datum/stock_market_event
+	price_maximum = SHEET_MATERIAL_AMOUNT * 1.5
diff --git a/voidcrew/edits/modules/cargo/markets/market_items/consumables.dm b/voidcrew/edits/modules/cargo/markets/market_items/consumables.dm
new file mode 100644
index 00000000000..69623b92715
--- /dev/null
+++ b/voidcrew/edits/modules/cargo/markets/market_items/consumables.dm
@@ -0,0 +1,5 @@
+// Voidcrew trader price overrides.
+
+/datum/market_item/consumable/donk_pocket_box
+	price_max = 200
+	price_min = 200
diff --git a/voidcrew/edits/modules/cargo/markets/market_items/misc.dm b/voidcrew/edits/modules/cargo/markets/market_items/misc.dm
new file mode 100644
index 00000000000..61cea5020b3
--- /dev/null
+++ b/voidcrew/edits/modules/cargo/markets/market_items/misc.dm
@@ -0,0 +1,16 @@
+// Voidcrew trader price overrides.
+
+/datum/market_item/misc/cap_gun
+	price_max = 50
+
+/datum/market_item/misc/hat_stabilizer
+	price_max = 300
+	price_min = 300
+
+/datum/market_item/misc/shoulder_holster
+	price_max = 250
+	price_min = 250
+
+/datum/market_item/misc/tanner
+	price_max = 300
+	price_min = 300
diff --git a/voidcrew/edits/modules/cargo/markets/market_items/tools.dm b/voidcrew/edits/modules/cargo/markets/market_items/tools.dm
new file mode 100644
index 00000000000..1099bf0e221
--- /dev/null
+++ b/voidcrew/edits/modules/cargo/markets/market_items/tools.dm
@@ -0,0 +1,9 @@
+// Voidcrew trader price overrides.
+
+/datum/market_item/tool/binoculars
+	price_max = 250
+	price_min = 250
+
+/datum/market_item/tool/fake_scanner
+	price_max = 150
+	price_min = 150
diff --git a/voidcrew/edits/modules/cargo/markets/market_items/weapons.dm b/voidcrew/edits/modules/cargo/markets/market_items/weapons.dm
new file mode 100644
index 00000000000..ba425e94256
--- /dev/null
+++ b/voidcrew/edits/modules/cargo/markets/market_items/weapons.dm
@@ -0,0 +1,8 @@
+// Voidcrew trader price overrides.
+
+/datum/market_item/weapon/bear_trap
+	price_max = 150
+	price_min = 150
+
+/datum/market_item/weapon/emp_grenade
+	price_min = 400
diff --git a/voidcrew/edits/modules/cargo/materials_market.dm b/voidcrew/edits/modules/cargo/materials_market.dm
index f481473f4bf..44d4a8b8497 100644
--- a/voidcrew/edits/modules/cargo/materials_market.dm
+++ b/voidcrew/edits/modules/cargo/materials_market.dm
@@ -1,5 +1,26 @@
 // Voidcrew extensions to code/modules/cargo/materials_market.dm.
 
+/// Buy floors are separate from the live bid used by exports and stock blocks.
+/proc/material_market_buy_price(material_type)
+	var/static/list/floors = list(
+		/datum/material/diamond = MATERIAL_BUY_FLOOR_DIAMOND,
+		/datum/material/bluespace = MATERIAL_BUY_FLOOR_BLUESPACE,
+		/datum/material/gold = MATERIAL_BUY_FLOOR_GOLD,
+		/datum/material/titanium = MATERIAL_BUY_FLOOR_TITANIUM,
+		/datum/material/uranium = MATERIAL_BUY_FLOOR_URANIUM,
+		/datum/material/silver = MATERIAL_BUY_FLOOR_SILVER,
+		/datum/material/plasma = MATERIAL_BUY_FLOOR_PLASMA,
+		/datum/material/iron = MATERIAL_BUY_FLOOR_IRON,
+		/datum/material/glass = MATERIAL_BUY_FLOOR_GLASS,
+	)
+	return max(SSstock_market.materials_prices[material_type], floors[material_type] || 0)
+
+/proc/material_market_buy_quote(list/ordered_materials)
+	var/quote = 0
+	for(var/obj/item/stack/sheet/sheet_type as anything in ordered_materials)
+		quote += material_market_buy_price(initial(sheet_type.material_type)) * ordered_materials[sheet_type]
+	return quote
+
 /// The order list this market files into. Null means it has nowhere to file an order.
 /// `announce_refusal` is TRUE only on the path that is actually placing one, so the override
 /// can say why it is refusing without spamming that message from every ui_data() tick.
diff --git a/voidcrew/edits/modules/cargo/order.dm b/voidcrew/edits/modules/cargo/order.dm
index ac63ec71675..ca53a791518 100644
--- a/voidcrew/edits/modules/cargo/order.dm
+++ b/voidcrew/edits/modules/cargo/order.dm
@@ -1,5 +1,8 @@
 // Voidcrew extensions to code/modules/cargo/order.dm.
 
+/datum/supply_order/disposable/materials/append_order(list/new_contents, cost_increase)
+	return ..(new_contents, material_market_buy_quote(new_contents))
+
 /// Settle a ship order atomically before generating any goods or changing market stock.
 /datum/supply_order/proc/settle_ship_order(datum/bank_account/account)
 	ship_settlement_error = null
diff --git a/voidcrew/edits/modules/cargo/packs/_packs.dm b/voidcrew/edits/modules/cargo/packs/_packs.dm
index ea28fc0ea40..96f2248a865 100644
--- a/voidcrew/edits/modules/cargo/packs/_packs.dm
+++ b/voidcrew/edits/modules/cargo/packs/_packs.dm
@@ -1,5 +1,10 @@
 // Voidcrew extensions to code/modules/cargo/packs/_packs.dm.
 
+// Capture the settled per-sheet asks once. Materials orders bypass later pack/coupon modifiers.
+/datum/supply_pack/custom/minerals/New(purchaser, cost, list/contains)
+	. = ..()
+	src.cost = material_market_buy_quote(contains)
+
 /// Cargo amounts arrive from a client; fractional, negative and unbounded orders are invalid.
 /proc/valid_cargo_order_quantity(quantity, maximum)
 	return isnum(quantity) && quantity >= 1 && quantity <= maximum && quantity == round(quantity)
diff --git a/voidcrew/edits/modules/power/supermatter_anomalies.dm b/voidcrew/edits/modules/power/supermatter_anomalies.dm
new file mode 100644
index 00000000000..3fe088b7eb5
--- /dev/null
+++ b/voidcrew/edits/modules/power/supermatter_anomalies.dm
@@ -0,0 +1,21 @@
+// Supermatter hazards retain their parent effects without generating a recoverable core.
+/obj/effect/anomaly/flux/supermatter
+	anomaly_core = null
+
+/obj/effect/anomaly/grav/supermatter
+	anomaly_core = null
+
+/obj/effect/anomaly/pyro/supermatter
+	anomaly_core = null
+
+/obj/effect/anomaly/hallucination/supermatter/coreless
+	anomaly_core = null
+
+/obj/effect/anomaly/bhole/supermatter
+	anomaly_core = null
+
+/obj/effect/anomaly/bioscrambler/docile/supermatter
+	anomaly_core = null
+
+/obj/effect/anomaly/dimensional/supermatter
+	anomaly_core = null
diff --git a/voidcrew/edits/objects/items/event_horizon_rifle.dm b/voidcrew/edits/objects/items/event_horizon_rifle.dm
new file mode 100644
index 00000000000..eb936606316
--- /dev/null
+++ b/voidcrew/edits/objects/items/event_horizon_rifle.dm
@@ -0,0 +1,9 @@
+// Keep the upstream rifle's behaviour, without its scope.
+/obj/item/gun/energy/event_horizon/Initialize(mapload)
+	. = ..()
+	qdel(GetComponent(/datum/component/scope))
+
+/obj/item/gun/energy/event_horizon/process_fire(atom/target, mob/living/user, message, params, zone_override, bonus_spread)
+	// Deliberately bypass the upstream rifle's scope check, retaining the energy gun's firing chain.
+	. = call(src, /obj/item/gun/energy::process_fire())(arglist(args))
+	message_admins("[ADMIN_LOOKUPFLW(user)] has fired an anti-existential beam at [ADMIN_VERBOSEJMP(user)].")
diff --git a/voidcrew/edits/objects/items/weapon_ladder.dm b/voidcrew/edits/objects/items/weapon_ladder.dm
new file mode 100644
index 00000000000..24c92ef3afa
--- /dev/null
+++ b/voidcrew/edits/objects/items/weapon_ladder.dm
@@ -0,0 +1,147 @@
+/// Work tools and control weapons remain available independently of the gun ladder.
+/proc/is_ladder_combat_gun(item_type)
+	if(!ispath(item_type, /obj/item/gun))
+		return FALSE
+	// Build the shared classification cache on first use.
+	var/static/list/tool_guns
+	if(!tool_guns)
+		tool_guns = typecacheof(list(
+			/obj/item/gun/energy/disabler,
+			/obj/item/gun/energy/floragun,
+			/obj/item/gun/energy/wiremod_gun,
+			/obj/item/gun/energy/plasmacutter,
+			/obj/item/gun/energy/recharge/kinetic_accelerator,
+			/obj/item/gun/energy/recharge/fisher,
+			/obj/item/gun/medbeam,
+			/obj/item/gun/energy/laser/bluetag,
+			/obj/item/gun/energy/laser/redtag,
+			/obj/item/gun/energy/laser/chameleon,
+			/obj/item/gun/ballistic/automatic/toy,
+			/obj/item/gun/ballistic/automatic/pistol/toy,
+			/obj/item/gun/ballistic/shotgun/toy,
+			/obj/item/gun/magic/wand/nothing,
+		))
+	return item_type != /obj/item/gun/syringe && !is_type_in_typecache(item_type, tool_guns)
+
+/// Weapons excluded from starting equipment, cargo and unguarded floor sources.
+/proc/is_ladder_restricted_melee(item_type)
+	if(ispath(item_type, /obj/item/knife/combat/survival) || ispath(item_type, /obj/item/knife/combat/bone) || ispath(item_type, /obj/item/shovel/serrated/dull))
+		return FALSE
+	var/static/list/restricted
+	if(!restricted)
+		restricted = typecacheof(list(
+			/obj/item/knife/combat,
+			/obj/item/knife/bloodletter,
+			/obj/item/knife/hunting/wildhunter,
+			/obj/item/claymore,
+			/obj/item/katana,
+			/obj/item/energy_katana,
+			/obj/item/melee/energy/sword,
+			/obj/item/melee/sabre,
+			/obj/item/melee/cleric_mace,
+			/obj/item/melee/baseball_bat/ablative,
+			/obj/item/melee/parsnip_sabre,
+			/obj/item/melee/supermatter_sword,
+			/obj/item/fireaxe,
+			/obj/item/chainsaw,
+			/obj/item/kinetic_crusher,
+			/obj/item/switchblade,
+			/obj/item/singularityhammer,
+			/obj/item/house_edge,
+			/obj/item/shovel/giant_wrench,
+			/obj/item/shovel/serrated,
+			/obj/item/spear/explosive,
+			/obj/item/spear/grey_tide,
+			/obj/item/shield/riot,
+			/obj/item/shield/kite,
+			/obj/item/shield/buckler,
+			/obj/item/shield/roman,
+			/obj/item/shield/energy,
+			/obj/item/storage/toolbox/mechanical/old/clean,
+		))
+	return is_type_in_typecache(item_type, restricted)
+
+/proc/is_ladder_restricted_production(item_type)
+	return is_ladder_combat_gun(item_type) \
+		|| is_ladder_restricted_melee(item_type) \
+		|| ispath(item_type, /obj/item/weaponcrafting/receiver) \
+		|| ispath(item_type, /obj/item/weaponcrafting/gunkit) \
+		|| ispath(item_type, /obj/item/weaponcrafting/giant_wrench) \
+		|| ispath(item_type, /obj/structure/mounted_gun/pipe) \
+		|| ispath(item_type, /obj/item/disk/design_disk/liberator)
+
+// These are unguarded floor/maintenance sources, including nested random spawners.
+/obj/effect/spawner/random/armory/make_item(spawn_loc, type_path_to_make)
+	return ..(spawn_loc, ladder_floor_replacement(type_path_to_make))
+
+/obj/effect/spawner/random/contraband/make_item(spawn_loc, type_path_to_make)
+	return ..(spawn_loc, ladder_floor_replacement(type_path_to_make))
+
+/obj/effect/spawner/random/exotic/make_item(spawn_loc, type_path_to_make)
+	return ..(spawn_loc, ladder_floor_replacement(type_path_to_make))
+
+/obj/effect/spawner/random/maintenance/make_item(spawn_loc, type_path_to_make)
+	return ..(spawn_loc, ladder_floor_replacement(type_path_to_make))
+
+// These consumers draw from the same global maintenance table without a spawner.
+/datum/shuttle_event/simple_spawner/maintenance/get_type_to_spawn()
+	return ladder_floor_replacement(..())
+
+/datum/adventure_loot_generator/maintenance/generate()
+	. = ..()
+	for(var/index in 1 to length(.))
+		var/atom/movable/item = .[index]
+		var/replacement = ladder_floor_replacement(item.type)
+		if(replacement != item.type)
+			.[index] = new replacement(item.loc)
+			qdel(item)
+
+/proc/ladder_floor_replacement(item_type)
+	if(is_ladder_combat_gun(item_type) || ispath(item_type, /obj/item/weaponcrafting/receiver) || ispath(item_type, /obj/item/weaponcrafting/giant_wrench))
+		return /obj/item/melee/baseball_bat
+	if(!is_ladder_restricted_melee(item_type))
+		return item_type
+	var/static/list/red_melee = typecacheof(list(
+		/obj/item/katana,
+		/obj/item/claymore,
+		/obj/item/energy_katana,
+		/obj/item/melee/energy/sword,
+		/obj/item/knife/bloodletter,
+		/obj/item/chainsaw/doomslayer,
+		/obj/item/singularityhammer,
+		/obj/item/house_edge,
+		/obj/item/shield/energy,
+		/obj/item/storage/toolbox/mechanical/old/clean,
+	))
+	if(is_type_in_typecache(item_type, red_melee) && !ispath(item_type, /obj/item/claymore/shortsword) && !ispath(item_type, /obj/item/claymore/cutlass/old))
+		return /obj/item/spear
+	return /obj/item/knife/combat/survival
+
+// Availability is checked from initial values by SSmarket, including restocks.
+/datum/market_item/weapon/sks_kit
+	availability_prob = 0
+
+/datum/market_item/weapon/chainsaw
+	availability_prob = 0
+
+/datum/market_item/weapon/switchblade
+	availability_prob = 0
+
+/datum/market_item/weapon/giant_wrench_parts
+	availability_prob = 0
+
+/datum/market_item/weapon/liberator
+	availability_prob = 0
+
+/datum/market_item/tool/riot_shield
+	availability_prob = 0
+
+// Rebuilt vendors must inherit the same stock as mapped ones.
+/obj/machinery/vending/games
+	contraband = list(
+		/obj/item/dice/fudge = 9,
+		/obj/item/clothing/shoes/wheelys/skishoes = 4,
+		/obj/item/instrument/musicalmoth = 1,
+		/obj/item/melee/baseball_bat = 1,
+		/obj/item/skillchip/acrobatics = 1,
+	)
diff --git a/voidcrew/edits/objects/structures/ruin_turrets.dm b/voidcrew/edits/objects/structures/ruin_turrets.dm
new file mode 100644
index 00000000000..12eb2cfcce9
--- /dev/null
+++ b/voidcrew/edits/objects/structures/ruin_turrets.dm
@@ -0,0 +1,15 @@
+/// Keep the installed gun's firing properties without leaving a recoverable weapon.
+/obj/machinery/porta_turret/ruin
+	installation = /obj/item/gun/energy/lasercannon
+	uses_stored = FALSE
+
+/obj/machinery/porta_turret/ruin/setup(obj/item/gun/turret_gun)
+	. = ..()
+	QDEL_NULL(stored_gun)
+
+/obj/machinery/porta_turret/ai/ruin
+	uses_stored = FALSE
+
+/obj/machinery/porta_turret/ai/ruin/setup(obj/item/gun/turret_gun)
+	. = ..()
+	QDEL_NULL(stored_gun)
diff --git a/voidcrew/edits/surgery/installed_capacity.dm b/voidcrew/edits/surgery/installed_capacity.dm
new file mode 100644
index 00000000000..76358669b22
--- /dev/null
+++ b/voidcrew/edits/surgery/installed_capacity.dm
@@ -0,0 +1,91 @@
+// Capacity checks run before upstream can evict, consume or move an installed item.
+/obj/item/organ/Insert(mob/living/carbon/receiver, special = FALSE, movement_flags)
+	// Chrome has already checked its install context, including forced admin installs.
+	if(!special && !GetComponent(/datum/component/cyberware) && !cyberware_insert_check(src, receiver))
+		return FALSE
+	. = ..()
+	if(.)
+		cyberware_reevaluate_brownout(receiver)
+
+/obj/item/organ/on_mob_remove(mob/living/carbon/organ_owner, special = FALSE, movement_flags)
+	. = ..()
+	cyberware_reevaluate_brownout(organ_owner)
+
+/obj/item/organ/apply_organ_damage(damage_amount, maximum = maxHealth, required_organ_flag = NONE)
+	. = ..()
+	var/datum/component/cyberware/chrome = GetComponent(/datum/component/cyberware)
+	chrome?.update_failing()
+
+/obj/item/organ/set_organ_damage(damage_amount, required_organ_flag = NONE)
+	. = ..()
+	var/datum/component/cyberware/chrome = GetComponent(/datum/component/cyberware)
+	chrome?.update_failing()
+
+/obj/item/organ/pre_surgical_insertion(mob/living/user, mob/living/carbon/new_owner, target_zone)
+	. = ..()
+	if(.)
+		return cyberware_insert_check(src, new_owner, feedback_to = user)
+
+// Surgery has its own delay, then unequips the organ before calling Insert().
+// Recheck here so a late capacity refusal leaves it in the surgeon's hands.
+/datum/surgery_step/manipulate_organs/success(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
+	if(current_type == "insert" && (QDELETED(target_organ) || !cyberware_insert_check(target_organ, target, feedback_to = user)))
+		return SURGERY_STEP_FAIL
+	return ..()
+
+/obj/item/implant/implant(mob/living/target, mob/user, silent = FALSE, force = FALSE)
+	if(!force && iscarbon(target))
+		var/list/replaced = list()
+		// Upstream combines duplicate implants instead of adding a second object.
+		if(!allow_multiple)
+			for(var/obj/item/implant/incumbent in target.implants)
+				if(istype(incumbent, type))
+					replaced += incumbent
+					break
+		if(!installed_capacity_check(target, list(src), replaced, silent))
+			return FALSE
+	. = ..()
+	if(.)
+		cyberware_reevaluate_brownout(target)
+
+/obj/item/implant/removed(mob/living/source, silent = FALSE, special = 0)
+	. = ..()
+	cyberware_reevaluate_brownout(source)
+
+/// Limbs are free, but the organs carried inside them are not.
+/obj/item/bodypart/proc/installed_capacity_can_attach(mob/living/carbon/receiver)
+	var/list/additions = list(src)
+	var/list/removals = list()
+	var/obj/item/bodypart/incumbent_limb = receiver.get_bodypart(body_zone)
+	if(incumbent_limb != src)
+		removals += incumbent_limb
+	for(var/obj/item/organ/organ in src)
+		additions |= organ
+		removals |= organ.cyberware_get_incumbents(receiver)
+	return installed_capacity_check(receiver, additions, removals)
+
+/obj/item/bodypart/replace_limb(mob/living/carbon/limb_owner, special)
+	if(istype(limb_owner) && !installed_capacity_can_attach(limb_owner))
+		return FALSE
+	return ..()
+
+/obj/item/bodypart/try_attach_limb(mob/living/carbon/new_limb_owner, special, lazy)
+	if(!lazy && !installed_capacity_can_attach(new_limb_owner))
+		return FALSE
+	. = ..()
+	if(.)
+		cyberware_reevaluate_brownout(new_limb_owner)
+
+// Reject before status_effect/on_creation assigns owner: a rejected enhancement
+// must not run bioware_lost() for a benefit it never granted.
+/datum/status_effect/bioware/on_creation(mob/living/new_owner, ...)
+	if(!installed_capacity_check(new_owner, list(src)))
+		qdel(src)
+		return FALSE
+	. = ..()
+	if(.)
+		cyberware_reevaluate_brownout(new_owner)
+
+/datum/status_effect/bioware/on_remove()
+	. = ..()
+	cyberware_reevaluate_brownout(owner)
diff --git a/voidcrew/edits/surgery/reviver.dm b/voidcrew/edits/surgery/reviver.dm
new file mode 100644
index 00000000000..553cb2f7470
--- /dev/null
+++ b/voidcrew/edits/surgery/reviver.dm
@@ -0,0 +1,148 @@
+/obj/item/organ/cyberimp/chest/reviver
+	desc = "A small implant with a faint, steady buzz."
+	/// Removing an active implant must not erase healing it has already paid for.
+	var/resume_healing_cost = FALSE
+	/// Invalidates callbacks when an activation ends, including removal and reinsertion.
+	var/activation_generation = 0
+	var/implantation_generation = 0
+	var/heal_generation = 0
+	var/heal_timer
+	var/heal_due = 0
+
+/// Replaces the upstream activation and healing bodies; do not call their parent.
+/obj/item/organ/cyberimp/chest/reviver/try_heal()
+	if(QDELETED(src) || QDELETED(owner))
+		return
+	if(reviving)
+		if(owner.stat == CONSCIOUS)
+			reviver_cooldown = reviver_time() + revive_cost
+			cancel_activation()
+			to_chat(owner, span_notice("Your reviver implant falls silent."))
+		else if(!heal_timer)
+			queue_heal(3 SECONDS)
+		return
+
+	if(reviver_time() < reviver_cooldown || HAS_TRAIT(owner, TRAIT_SUICIDED))
+		return
+
+	if(owner.stat != CONSCIOUS)
+		if(!resume_healing_cost)
+			revive_cost = 0
+		resume_healing_cost = FALSE
+		reviving = TRUE
+		activation_generation++
+		to_chat(owner, span_notice("You feel a faint buzzing as your reviver implant starts patching your wounds..."))
+		defib_cooldown = reviver_time() + 8 SECONDS // 5 seconds after heal proc delay
+
+/// Overridden by the clock-controlled regression scenario.
+/obj/item/organ/cyberimp/chest/reviver/proc/reviver_time()
+	return world.time
+
+/obj/item/organ/cyberimp/chest/reviver/proc/queue_heal(delay)
+	if(heal_timer || !reviving || QDELETED(src) || QDELETED(owner))
+		return
+	heal_generation++
+	heal_due = reviver_time() + delay
+	heal_timer = addtimer(CALLBACK(src, PROC_REF(heal), WEAKREF(owner), activation_generation, heal_generation), delay, TIMER_STOPPABLE | TIMER_DELETE_ME)
+
+/obj/item/organ/cyberimp/chest/reviver/proc/cancel_activation()
+	activation_generation++
+	reviving = FALSE
+	heal_due = 0
+	if(heal_timer)
+		deltimer(heal_timer)
+		heal_timer = null
+
+/obj/item/organ/cyberimp/chest/reviver/on_mob_remove(mob/living/carbon/organ_owner, special = FALSE, movement_flags)
+	implantation_generation++
+	if(reviving)
+		resume_healing_cost = TRUE
+	cancel_activation()
+	return ..()
+
+/obj/item/organ/cyberimp/chest/reviver/Destroy()
+	cancel_activation()
+	return ..()
+
+/obj/item/organ/cyberimp/chest/reviver/heal(datum/weakref/intended_owner, generation, callback_generation)
+	if(QDELETED(src) || QDELETED(owner) || !reviving || generation != activation_generation || callback_generation != heal_generation || intended_owner?.resolve() != owner || !heal_timer)
+		return
+	var/mob/living/carbon/patient = owner
+	deltimer(heal_timer)
+	heal_timer = null
+	heal_due = 0
+	if(owner.stat == CONSCIOUS)
+		try_heal()
+		return
+
+	/// boolean that stands for if PHYSICAL damage being patched
+	var/body_damage_patched = FALSE
+	var/need_mob_update = FALSE
+	if(patient.getOxyLoss())
+		need_mob_update += patient.adjustOxyLoss(-5, updating_health = FALSE)
+		revive_cost += 5
+	if(patient.getBruteLoss())
+		need_mob_update += patient.adjustBruteLoss(-2, updating_health = FALSE)
+		revive_cost += 40
+		body_damage_patched = TRUE
+	if(patient.getFireLoss())
+		need_mob_update += patient.adjustFireLoss(-2, updating_health = FALSE)
+		revive_cost += 40
+		body_damage_patched = TRUE
+	if(patient.getToxLoss())
+		need_mob_update += patient.adjustToxLoss(-1, updating_health = FALSE)
+		revive_cost += 40
+	if(need_mob_update)
+		patient.updatehealth()
+	if(QDELETED(src) || QDELETED(patient) || owner != patient || generation != activation_generation || !reviving)
+		return
+
+	if(body_damage_patched && prob(35)) // healing is called every few seconds, not every tick
+		patient.visible_message(span_warning("[patient]'s body twitches a bit."), span_notice("You feel like something is patching your injured body."))
+
+	revive_dead()
+	// Previously each mob tick queued a delayed heal. Preserve that cadence without overlap.
+	if(!QDELETED(src) && !QDELETED(patient) && owner == patient && generation == activation_generation && reviving)
+		queue_heal(SSmobs.wait)
+
+/obj/item/organ/cyberimp/chest/reviver/revive_dead()
+	if(QDELETED(src) || QDELETED(owner) || !reviving || reviver_time() < defib_cooldown || owner.stat != DEAD || owner.health <= owner.hardcrit_threshold || owner.can_defib() != DEFIB_POSSIBLE)
+		return FALSE
+	var/mob/living/carbon/patient = owner
+	var/healing_cost = revive_cost
+	var/generation = activation_generation
+	patient.notify_revival("You are being revived by [src]!")
+	patient.grab_ghost()
+	if(QDELETED(src) || QDELETED(patient) || owner != patient || generation != activation_generation || !reviving)
+		return FALSE
+
+	defib_cooldown += 16 SECONDS // delay so it doesn't spam
+
+	patient.set_heartattack(FALSE)
+	if(!patient.revive_from("reviver_implant"))
+		return FALSE
+	if(QDELETED(src))
+		return TRUE
+	revive_cost = healing_cost + 10 MINUTES
+	reviver_cooldown = reviver_time() + revive_cost
+	cancel_activation()
+	if(!QDELETED(patient))
+		patient.visible_message(span_warning("[patient]'s body convulses a bit."))
+		playsound(patient, SFX_BODYFALL, 50, TRUE)
+		playsound(patient, 'sound/machines/defib/defib_zap.ogg', 75, TRUE, -1)
+		patient.emote("gasp")
+		patient.set_jitter_if_lower(200 SECONDS)
+		SEND_SIGNAL(patient, COMSIG_LIVING_MINOR_SHOCK)
+		log_game("[patient] been revived by [src]")
+	return TRUE
+
+
+/obj/item/organ/cyberimp/chest/reviver/undo_heart_attack(datum/weakref/intended_owner, generation)
+	var/mob/living/carbon/human/human_owner = intended_owner?.resolve()
+	if(QDELETED(src) || QDELETED(human_owner) || owner != human_owner || generation != implantation_generation)
+		return
+	human_owner.set_heartattack(FALSE)
+	if(human_owner.stat == CONSCIOUS)
+		to_chat(human_owner, span_notice("You feel your heart beating again!"))
+
+
diff --git a/voidcrew/gamemodes/game_mode.dm b/voidcrew/gamemodes/game_mode.dm
index 3c793391425..364d138b285 100644
--- a/voidcrew/gamemodes/game_mode.dm
+++ b/voidcrew/gamemodes/game_mode.dm
@@ -1,5 +1,21 @@
-/// Voidcrew: a completed bluespace jump ends the round, on top of the usual endgame conditions.
+/// Timed rounds defer ordinary early endings; explicit admin endings remain available.
+/datum/controller/subsystem/ticker/fire()
+	if(SSovermap.round_end_time && force_ending == FORCE_END_ROUND)
+		force_ending = END_ROUND_AS_NORMAL
+	return ..()
+
+/// Voidcrew: a completed fleet jump ends the round through the usual completion report.
 /datum/controller/subsystem/ticker/check_finished()
 	if(SSovermap.jump_mode == BS_JUMP_COMPLETED)
 		return TRUE
+	if(SSovermap.round_end_time)
+		return FALSE
 	return ..()
+
+/// The End Round verb otherwise uses the same flag as player votes and round-ending events.
+/datum/admin_verb/end_round/__avd_do_verb(client/user)
+	var/confirm = tgui_alert(user, "End the round and restart the game world?", "End Round", list("Yes", "Cancel"))
+	if(confirm != "Yes")
+		return
+	SSticker.force_ending = ADMIN_FORCE_END_ROUND
+	BLACKBOX_LOG_ADMIN_VERB("End Round")
diff --git a/voidcrew/machinery/suit_storage_unit.dm b/voidcrew/machinery/suit_storage_unit.dm
index ebf63ae4f0b..1849b5f09c7 100644
--- a/voidcrew/machinery/suit_storage_unit.dm
+++ b/voidcrew/machinery/suit_storage_unit.dm
@@ -1,3 +1,79 @@
+/// Uniform base-tier suit stock shared by machines and the loose ruin spawner.
+GLOBAL_LIST_INIT(base_tier_modsuits, list(
+	/obj/item/mod/control/pre_equipped/standard,
+	/obj/item/mod/control/pre_equipped/civilian,
+	/obj/item/mod/control/pre_equipped/engineering,
+	/obj/item/mod/control/pre_equipped/atmospheric,
+	/obj/item/mod/control/pre_equipped/mining,
+	/obj/item/mod/control/pre_equipped/medical,
+))
+
+/obj/machinery/suit_storage_unit/base_tier
+
+/obj/machinery/suit_storage_unit/base_tier/Initialize(mapload)
+	mod_type = pick(GLOB.base_tier_modsuits)
+	return ..()
+
+/obj/effect/spawner/random/modsuit/base_tier
+	name = "base MODsuit spawner"
+	icon_state = "circuit"
+
+/obj/effect/spawner/random/modsuit/base_tier/Initialize(mapload)
+	loot = GLOB.base_tier_modsuits.Copy()
+	return ..()
+
+/obj/machinery/suit_storage_unit/ruin_zone
+	/// Pinned before parent initialization; moving the machine never changes its tier.
+	var/turf/stock_spawn_turf
+	/// A resolved or checkpoint-scrubbed unit can never create stock again.
+	var/stock_consumed = FALSE
+	/// Keep retrieval blocked throughout suit initialization, even if it yields.
+	var/stock_resolving = FALSE
+
+/obj/machinery/suit_storage_unit/ruin_zone/Initialize(mapload)
+	stock_spawn_turf = get_turf(src)
+	mod_type = null
+	suit_type = null
+	helmet_type = null
+	. = ..()
+	return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/suit_storage_unit/ruin_zone/LateInitialize()
+	. = ..()
+	if(!stock_consumed)
+		new /datum/zone_resolver(stock_spawn_turf, CALLBACK(src, PROC_REF(stock_for_zone)))
+
+/obj/machinery/suit_storage_unit/ruin_zone/Destroy()
+	stock_spawn_turf = null
+	return ..()
+
+/obj/machinery/suit_storage_unit/ruin_zone/proc/stock_for_zone(zone_type)
+	if(QDELETED(src) || stock_consumed || stock_resolving)
+		return
+	stock_resolving = TRUE
+	stock_spawn_turf = null
+	switch(zone_type)
+		if(ZONE_RED)
+			mod_type = /obj/item/mod/control/pre_equipped/nuclear/unrestricted
+		if(ZONE_YELLOW)
+			mod_type = /obj/item/mod/control/pre_equipped/security
+		else
+			mod_type = pick(GLOB.base_tier_modsuits)
+	var/obj/item/mod/control/reward = new mod_type(src)
+	stock_resolving = FALSE
+	// A checkpoint scrub or deletion may have happened during initialization.
+	if(QDELETED(src) || stock_consumed)
+		qdel(reward)
+		return
+	stock_consumed = TRUE
+	mod = reward
+	update_appearance()
+
+/obj/machinery/suit_storage_unit/ruin_zone/check_interactable(mob/user)
+	if(!stock_consumed || stock_resolving)
+		return FALSE
+	return ..()
+
 /obj/machinery/suit_storage_unit/ert
 	mask_type = /obj/item/clothing/mask/gas/atmos/centcom
 	storage_type = /obj/item/tank/jetpack/oxygen/captain
@@ -23,4 +99,3 @@
 
 /obj/machinery/suit_storage_unit/ert/chaplain
 	mod_type = /obj/item/mod/control/pre_equipped/responsory/chaplain
-
diff --git a/voidcrew/mapping/ship_crew/bogatyr.dm b/voidcrew/mapping/ship_crew/bogatyr.dm
index 32917c46744..dd5eac8c914 100644
--- a/voidcrew/mapping/ship_crew/bogatyr.dm
+++ b/voidcrew/mapping/ship_crew/bogatyr.dm
@@ -25,6 +25,7 @@
 	head = /obj/item/clothing/head/costume/ushanka
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch
 	suit_store = null
+	backpack_contents = list(/obj/item/evidencebag = 1, /obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_bogatyr_job_12/pre_equip(mob/living/carbon/human/H, visuals_only = FALSE)
 	. = ..()
@@ -32,6 +33,7 @@
 	head = /obj/item/clothing/head/costume/ushanka
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch
 	suit_store = null
+	backpack_contents = list(/obj/item/evidencebag = 1, /obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_bogatyr_job_13
 	parent_type = /datum/outfit/job/engineer
@@ -61,6 +63,7 @@
 	belt = /obj/item/modular_computer/pda/clear
 	id = /obj/item/card/id/advanced/rainbow
 	suit_store = null
+	backpack_contents = list(/obj/item/evidencebag = 1, /obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_bogatyr_job_14/pre_equip(mob/living/carbon/human/H, visuals_only = FALSE)
 	. = ..()
@@ -70,6 +73,7 @@
 	belt = /obj/item/modular_computer/pda/clear
 	id = /obj/item/card/id/advanced/rainbow
 	suit_store = null
+	backpack_contents = list(/obj/item/evidencebag = 1, /obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_bogatyr_job_1
 	parent_type = /datum/outfit/job/engineer
@@ -87,6 +91,7 @@
 	head = /obj/item/clothing/head/costume/ushanka
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch
 	suit_store = null
+	backpack_contents = list(/obj/item/evidencebag = 1, /obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_bogatyr_job_3/pre_equip(mob/living/carbon/human/H, visuals_only = FALSE)
 	. = ..()
@@ -94,6 +99,7 @@
 	head = /obj/item/clothing/head/costume/ushanka
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch
 	suit_store = null
+	backpack_contents = list(/obj/item/evidencebag = 1, /obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_bogatyr_job_4
 	parent_type = /datum/outfit/job/engineer
@@ -111,6 +117,7 @@
 	head = /obj/item/clothing/head/costume/ushanka
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch
 	suit_store = null
+	backpack_contents = list(/obj/item/evidencebag = 1, /obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_bogatyr_job_29/pre_equip(mob/living/carbon/human/H, visuals_only = FALSE)
 	. = ..()
@@ -118,6 +125,7 @@
 	head = /obj/item/clothing/head/costume/ushanka
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch
 	suit_store = null
+	backpack_contents = list(/obj/item/evidencebag = 1, /obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_bogatyr_job_33
 	parent_type = /datum/outfit/job/engineer
@@ -135,6 +143,7 @@
 	head = /obj/item/clothing/head/costume/ushanka
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch
 	suit_store = null
+	backpack_contents = list(/obj/item/evidencebag = 1, /obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_bogatyr_job_34/pre_equip(mob/living/carbon/human/H, visuals_only = FALSE)
 	. = ..()
@@ -142,6 +151,7 @@
 	head = /obj/item/clothing/head/costume/ushanka
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch
 	suit_store = null
+	backpack_contents = list(/obj/item/evidencebag = 1, /obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_bogatyr_job_37
 	parent_type = /datum/outfit/job/engineer
diff --git a/voidcrew/mapping/ship_crew/hiryu_class_carrier.dm b/voidcrew/mapping/ship_crew/hiryu_class_carrier.dm
index 7ea936e0678..26529e7bab4 100644
--- a/voidcrew/mapping/ship_crew/hiryu_class_carrier.dm
+++ b/voidcrew/mapping/ship_crew/hiryu_class_carrier.dm
@@ -60,7 +60,7 @@
 	l_hand = null
 	r_hand = null
 	accessory = /obj/item/clothing/accessory/maidapron
-	backpack_contents = list(/obj/item/knife/combat = 1, /obj/item/sharpener = 1, /obj/item/storage/box/ingredients/carnivore = 3)
+	backpack_contents = list(/obj/item/knife/kitchen = 1, /obj/item/storage/box/ingredients/carnivore = 3)
 
 /datum/outfit/job/workshop_hiryu_class_carrier_job_21/pre_equip(mob/living/carbon/human/H, visuals_only = FALSE)
 	. = ..()
@@ -74,7 +74,7 @@
 	l_hand = null
 	r_hand = null
 	accessory = /obj/item/clothing/accessory/maidapron
-	backpack_contents = list(/obj/item/knife/combat = 1, /obj/item/sharpener = 1, /obj/item/storage/box/ingredients/carnivore = 3)
+	backpack_contents = list(/obj/item/knife/kitchen = 1, /obj/item/storage/box/ingredients/carnivore = 3)
 
 /datum/outfit/job/workshop_hiryu_class_carrier_job_9
 	parent_type = /datum/outfit/job/cook
@@ -88,7 +88,7 @@
 	l_pocket = null
 	l_hand = /obj/item/kitchen/tongs
 	r_hand = /obj/item/reagent_containers/cup/soda_cans/beer
-	backpack_contents = list(/obj/item/knife/kitchen = 1, /obj/item/sharpener = 1, /obj/item/storage/box/ingredients/carnivore = 3)
+	backpack_contents = list(/obj/item/knife/kitchen = 1, /obj/item/storage/box/ingredients/carnivore = 3)
 
 /datum/outfit/job/workshop_hiryu_class_carrier_job_9/pre_equip(mob/living/carbon/human/H, visuals_only = FALSE)
 	. = ..()
@@ -101,7 +101,7 @@
 	l_pocket = null
 	l_hand = /obj/item/kitchen/tongs
 	r_hand = /obj/item/reagent_containers/cup/soda_cans/beer
-	backpack_contents = list(/obj/item/knife/kitchen = 1, /obj/item/sharpener = 1, /obj/item/storage/box/ingredients/carnivore = 3)
+	backpack_contents = list(/obj/item/knife/kitchen = 1, /obj/item/storage/box/ingredients/carnivore = 3)
 
 /datum/outfit/job/workshop_hiryu_class_carrier_job_15
 	parent_type = /datum/outfit/job/cook
@@ -115,7 +115,7 @@
 	l_pocket = null
 	l_hand = /obj/item/kitchen/tongs
 	r_hand = /obj/item/reagent_containers/cup/soda_cans/beer
-	backpack_contents = list(/obj/item/knife/kitchen = 1, /obj/item/sharpener = 1, /obj/item/storage/box/ingredients/carnivore = 3)
+	backpack_contents = list(/obj/item/knife/kitchen = 1, /obj/item/storage/box/ingredients/carnivore = 3)
 
 /datum/outfit/job/workshop_hiryu_class_carrier_job_15/pre_equip(mob/living/carbon/human/H, visuals_only = FALSE)
 	. = ..()
@@ -128,7 +128,7 @@
 	l_pocket = null
 	l_hand = /obj/item/kitchen/tongs
 	r_hand = /obj/item/reagent_containers/cup/soda_cans/beer
-	backpack_contents = list(/obj/item/knife/kitchen = 1, /obj/item/sharpener = 1, /obj/item/storage/box/ingredients/carnivore = 3)
+	backpack_contents = list(/obj/item/knife/kitchen = 1, /obj/item/storage/box/ingredients/carnivore = 3)
 
 /datum/outfit/job/workshop_hiryu_class_carrier_job_16
 	parent_type = /datum/outfit/job/doctor
@@ -244,7 +244,7 @@
 	r_pocket = /obj/item/modular_computer/pda/security
 	l_hand = null
 	accessory = /obj/item/clothing/accessory/medal/silver/security
-	backpack_contents = list(/obj/item/clothing/head/utility/welding = 1, /obj/item/weldingtool/hugetank = 1)
+	backpack_contents = list(/obj/item/clothing/head/utility/welding = 1, /obj/item/weldingtool/hugetank = 1, /obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_hiryu_class_carrier_job_18/pre_equip(mob/living/carbon/human/H, visuals_only = FALSE)
 	. = ..()
@@ -257,7 +257,7 @@
 	r_pocket = /obj/item/modular_computer/pda/security
 	l_hand = null
 	accessory = /obj/item/clothing/accessory/medal/silver/security
-	backpack_contents = list(/obj/item/clothing/head/utility/welding = 1, /obj/item/weldingtool/hugetank = 1)
+	backpack_contents = list(/obj/item/clothing/head/utility/welding = 1, /obj/item/weldingtool/hugetank = 1, /obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_hiryu_class_carrier_job_8
 	parent_type = /datum/outfit/job/security
@@ -271,7 +271,7 @@
 	r_pocket = /obj/item/modular_computer/pda/security
 	l_hand = null
 	accessory = /obj/item/clothing/accessory/medal/silver/security
-	backpack_contents = list(/obj/item/clothing/head/utility/welding = 1, /obj/item/weldingtool/hugetank = 1)
+	backpack_contents = list(/obj/item/clothing/head/utility/welding = 1, /obj/item/weldingtool/hugetank = 1, /obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_hiryu_class_carrier_job_8/pre_equip(mob/living/carbon/human/H, visuals_only = FALSE)
 	. = ..()
@@ -284,7 +284,7 @@
 	r_pocket = /obj/item/modular_computer/pda/security
 	l_hand = null
 	accessory = /obj/item/clothing/accessory/medal/silver/security
-	backpack_contents = list(/obj/item/clothing/head/utility/welding = 1, /obj/item/weldingtool/hugetank = 1)
+	backpack_contents = list(/obj/item/clothing/head/utility/welding = 1, /obj/item/weldingtool/hugetank = 1, /obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_hiryu_class_carrier_job_5
 	parent_type = /datum/outfit/job/security
@@ -300,7 +300,7 @@
 	r_pocket = /obj/item/modular_computer/pda/security
 	l_hand = null
 	accessory = /obj/item/clothing/accessory/medal/silver/security
-	backpack_contents = list(/obj/item/clothing/head/utility/welding = 1, /obj/item/weldingtool/hugetank = 1)
+	backpack_contents = list(/obj/item/clothing/head/utility/welding = 1, /obj/item/weldingtool/hugetank = 1, /obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_hiryu_class_carrier_job_5/pre_equip(mob/living/carbon/human/H, visuals_only = FALSE)
 	. = ..()
@@ -315,7 +315,7 @@
 	r_pocket = /obj/item/modular_computer/pda/security
 	l_hand = null
 	accessory = /obj/item/clothing/accessory/medal/silver/security
-	backpack_contents = list(/obj/item/clothing/head/utility/welding = 1, /obj/item/weldingtool/hugetank = 1)
+	backpack_contents = list(/obj/item/clothing/head/utility/welding = 1, /obj/item/weldingtool/hugetank = 1, /obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_hiryu_class_carrier_job_28
 	parent_type = /datum/outfit/job/captain
diff --git a/voidcrew/mapping/ship_crew/nanobead.dm b/voidcrew/mapping/ship_crew/nanobead.dm
index 6584adbe317..6fccb4fc6c0 100644
--- a/voidcrew/mapping/ship_crew/nanobead.dm
+++ b/voidcrew/mapping/ship_crew/nanobead.dm
@@ -1003,7 +1003,7 @@
 	belt = /obj/item/storage/belt/security/full
 	l_pocket = /obj/item/modular_computer/pda/heads/hos
 	accessory = /obj/item/clothing/accessory/armband/deputy
-	backpack_contents = list()
+	backpack_contents = list(/obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_ship_nanobead_job_52/pre_equip(mob/living/carbon/human/H, visuals_only = FALSE)
 	. = ..()
@@ -1017,7 +1017,7 @@
 	belt = /obj/item/storage/belt/security/full
 	l_pocket = /obj/item/modular_computer/pda/heads/hos
 	accessory = /obj/item/clothing/accessory/armband/deputy
-	backpack_contents = list()
+	backpack_contents = list(/obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_ship_nanobead_job_20
 	parent_type = /datum/outfit/job/security
@@ -1032,7 +1032,7 @@
 	belt = /obj/item/storage/belt/security/full
 	l_pocket = /obj/item/modular_computer/pda/heads/hos
 	accessory = /obj/item/clothing/accessory/armband/deputy
-	backpack_contents = list()
+	backpack_contents = list(/obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_ship_nanobead_job_20/pre_equip(mob/living/carbon/human/H, visuals_only = FALSE)
 	. = ..()
@@ -1046,7 +1046,7 @@
 	belt = /obj/item/storage/belt/security/full
 	l_pocket = /obj/item/modular_computer/pda/heads/hos
 	accessory = /obj/item/clothing/accessory/armband/deputy
-	backpack_contents = list()
+	backpack_contents = list(/obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_ship_nanobead_job_68
 	parent_type = /datum/outfit/job/security
@@ -1061,7 +1061,7 @@
 	belt = /obj/item/storage/belt/security/full
 	l_pocket = /obj/item/modular_computer/pda/heads/hos
 	accessory = /obj/item/clothing/accessory/armband/deputy
-	backpack_contents = list()
+	backpack_contents = list(/obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_ship_nanobead_job_68/pre_equip(mob/living/carbon/human/H, visuals_only = FALSE)
 	. = ..()
@@ -1075,7 +1075,7 @@
 	belt = /obj/item/storage/belt/security/full
 	l_pocket = /obj/item/modular_computer/pda/heads/hos
 	accessory = /obj/item/clothing/accessory/armband/deputy
-	backpack_contents = list()
+	backpack_contents = list(/obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_ship_nanobead_job_36
 	parent_type = /datum/outfit/job/security
@@ -1090,7 +1090,7 @@
 	belt = /obj/item/storage/belt/security/full
 	l_pocket = /obj/item/modular_computer/pda/heads/hos
 	accessory = /obj/item/clothing/accessory/armband/deputy
-	backpack_contents = list()
+	backpack_contents = list(/obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_ship_nanobead_job_36/pre_equip(mob/living/carbon/human/H, visuals_only = FALSE)
 	. = ..()
@@ -1104,7 +1104,7 @@
 	belt = /obj/item/storage/belt/security/full
 	l_pocket = /obj/item/modular_computer/pda/heads/hos
 	accessory = /obj/item/clothing/accessory/armband/deputy
-	backpack_contents = list()
+	backpack_contents = list(/obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_ship_nanobead_job_46
 	parent_type = /datum/outfit/job/assistant
diff --git a/voidcrew/mapping/ship_crew/squab.dm b/voidcrew/mapping/ship_crew/squab.dm
index b29dc28d1e2..1b050899354 100644
--- a/voidcrew/mapping/ship_crew/squab.dm
+++ b/voidcrew/mapping/ship_crew/squab.dm
@@ -29,11 +29,13 @@
 	name = "Squab — Security Detail"
 	uniform = /obj/item/clothing/under/rank/security/officer/grey
 	head = /obj/item/clothing/head/beret/sec
+	backpack_contents = list(/obj/item/evidencebag = 1, /obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_squab_job_15/pre_equip(mob/living/carbon/human/H, visuals_only = FALSE)
 	. = ..()
 	uniform = /obj/item/clothing/under/rank/security/officer/grey
 	head = /obj/item/clothing/head/beret/sec
+	ladder_add_survival_knife()
 
 /datum/outfit/job/workshop_squab_job_16
 	parent_type = /datum/outfit/job/engineer
@@ -70,11 +72,13 @@
 	name = "Squab — Security Detail"
 	uniform = /obj/item/clothing/under/rank/security/officer/grey
 	head = /obj/item/clothing/head/beret/sec
+	backpack_contents = list(/obj/item/evidencebag = 1, /obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_squab_job_9/pre_equip(mob/living/carbon/human/H, visuals_only = FALSE)
 	. = ..()
 	uniform = /obj/item/clothing/under/rank/security/officer/grey
 	head = /obj/item/clothing/head/beret/sec
+	ladder_add_survival_knife()
 
 /datum/outfit/job/workshop_squab_job_10
 	parent_type = /datum/outfit/job/engineer
@@ -109,11 +113,13 @@
 	name = "Squab — Security Detail"
 	uniform = /obj/item/clothing/under/rank/security/officer/grey
 	head = /obj/item/clothing/head/beret/sec
+	backpack_contents = list(/obj/item/evidencebag = 1, /obj/item/knife/combat/survival = 1)
 
 /datum/outfit/job/workshop_squab_job_19/pre_equip(mob/living/carbon/human/H, visuals_only = FALSE)
 	. = ..()
 	uniform = /obj/item/clothing/under/rank/security/officer/grey
 	head = /obj/item/clothing/head/beret/sec
+	ladder_add_survival_knife()
 
 /datum/outfit/job/workshop_squab_job_20
 	parent_type = /datum/outfit/job/engineer
diff --git a/voidcrew/modules/admin/feature_testing.dm b/voidcrew/modules/admin/feature_testing.dm
index 240093a93b8..e94ae8f3a08 100644
--- a/voidcrew/modules/admin/feature_testing.dm
+++ b/voidcrew/modules/admin/feature_testing.dm
@@ -10,7 +10,7 @@
  *   spawn every rare-loot unique at once.
  * - Dynamic events: fire a chosen event at a chosen ship.
  * - Missions: hand a chosen mission type to a ship, force-resolve any active one.
- * - Trade: grant vouchers, reveal rare rumor-chart ruins, spawn gun blueprints.
+ * - Trade: grant vouchers, reveal rare rumor-chart ruins.
  * - Overmap: spawn gas nebulas (ram scoop testing), surface a contested cache.
  *
  * Complements the per-module verbs that already exist: colosseum match control
@@ -651,6 +651,113 @@ ADMIN_VERB(force_resolve_mission, R_ADMIN|R_DEBUG, "Missions: Resolve Mission",
 
 // ===== TRADE =====
 
+/// Includes crews with no surviving hull or connected member.
+/proc/voidcrew_admin_pick_crew_record(client/user)
+	var/list/choices = list()
+	for(var/datum/voidcrew_crew_record/record in GLOB.voidcrew_crew_records)
+		choices["Crew #[record.crew_id]: [voidcrew_zone_permission_name(record.get_zone_permission())], [length(record.teams)] hulls, [length(record.ckeys)] members"] = record
+	if(!length(choices))
+		to_chat(user, span_warning("No crew records exist."))
+		return null
+	var/choice = tgui_input_list(user, "Select a round crew record:", "Crew Reputation", sort_list(choices))
+	var/datum/voidcrew_crew_record/selected = choices[choice]
+	return QDELETED(selected) ? null : selected
+
+/// Keep totals derived from bounded family contributions, even for admin edits.
+/datum/voidcrew_crew_record/proc/admin_set_zone_family(family, band, amount)
+	if(QDELETED(src) || !(src in GLOB.voidcrew_crew_records) || !(family in zone_reputation_families()) \
+		|| !(band in list(ZONE_GREEN, ZONE_YELLOW, ZONE_RED)) || !isnum(amount))
+		return FALSE
+	var/cap = band == ZONE_GREEN ? ZONE_REPUTATION_GREEN_FAMILY_CAP : ZONE_REPUTATION_DANGER_FAMILY_CAP
+	if(amount != round(amount) || amount < 0 || amount > cap)
+		return FALSE
+	var/list/families = zone_families["[band]"]
+	families[family] = amount
+	var/total = 0
+	for(var/canonical_family in zone_reputation_families())
+		total += families[canonical_family]
+	zone_totals["[band]"] = total
+	return TRUE
+
+/// Reset the live shared balance in place. Settled encounters remain spent, including aliases.
+/datum/voidcrew_crew_record/proc/admin_reset_zone_record()
+	if(QDELETED(src) || !(src in GLOB.voidcrew_crew_records))
+		return FALSE
+	for(var/band in list(ZONE_GREEN, ZONE_YELLOW, ZONE_RED))
+		var/list/families = zone_families["[band]"]
+		for(var/family in zone_reputation_families())
+			families[family] = 0
+		zone_totals["[band]"] = 0
+	trader_favor.Cut()
+	favor_unique_purchases.Cut()
+	return TRUE
+
+/datum/voidcrew_crew_record/proc/admin_zone_report()
+	var/list/lines = list("<h2>Crew #[crew_id]: [voidcrew_zone_permission_name(get_zone_permission())]</h2>")
+	lines += "<p>Roster: [html_encode(ckeys.Join(", "))]<br>Claimed encounters: [length(settlement_claims)]</p>"
+	for(var/datum/team/voidcrew/team in teams)
+		if(!QDELETED(team.ship))
+			lines += "<p>Hull: [html_encode(team.ship.name)]</p>"
+	lines += "<table border='1'><tr><th>Band</th><th>Total</th>"
+	for(var/family in zone_reputation_families())
+		lines += "<th>[family]</th>"
+	lines += "</tr>"
+	for(var/band in list(ZONE_GREEN, ZONE_YELLOW, ZONE_RED))
+		var/list/families = zone_families["[band]"]
+		lines += "<tr><td>[metric_zone_name(band)]</td><td>[zone_totals["[band]"]]</td>"
+		for(var/family in zone_reputation_families())
+			lines += "<td>[families[family]]</td>"
+		lines += "</tr>"
+	lines += "</table><h3>Trader favor</h3>"
+	for(var/trader in trader_favor)
+		lines += "<p>[html_encode("[trader]")]: [trader_favor[trader]]</p>"
+	lines += "<h3>Unique purchases</h3>"
+	for(var/sku in favor_unique_purchases)
+		lines += "<p>[html_encode("[sku]")]: [favor_unique_purchases[sku]]</p>"
+	return lines.Join("")
+
+ADMIN_VERB(zone_crew_reputation, R_ADMIN|R_DEBUG, "Zones: Crew Reputation", "Inspect, set family contributions or reset a continuing crew's shared record.", ADMIN_CATEGORY_DEBUG)
+	var/datum/voidcrew_crew_record/record = voidcrew_admin_pick_crew_record(user)
+	if(!record)
+		return
+	var/action = tgui_input_list(user, "Crew #[record.crew_id]", "Crew Reputation", list("Inspect", "Set family", "Reset record"))
+	if(!action || QDELETED(record) || !check_rights_for(user, R_ADMIN|R_DEBUG))
+		return
+	if(action == "Inspect")
+		var/datum/browser/popup = new(user.mob, "crewreputation", "Crew Reputation", 760, 600)
+		popup.set_content(record.admin_zone_report())
+		popup.open()
+		return
+	var/family
+	var/band
+	var/amount
+	if(action == "Set family")
+		band = voidcrew_admin_pick_zone_band(user, "Crew Reputation")
+		if(isnull(band) || QDELETED(record))
+			return
+		family = tgui_input_list(user, "Which family?", "Crew Reputation", zone_reputation_families())
+		if(!family || QDELETED(record))
+			return
+		var/list/families = record.zone_families["[band]"]
+		var/cap = band == ZONE_GREEN ? ZONE_REPUTATION_GREEN_FAMILY_CAP : ZONE_REPUTATION_DANGER_FAMILY_CAP
+		amount = tgui_input_number(user, "Lifetime contribution (0-[cap]):", "Crew Reputation", families[family], cap, 0)
+		if(isnull(amount))
+			return
+	else if(tgui_alert(user, "Reset Crew #[record.crew_id]'s zone contributions, trader favor and unique purchase counts? Membership and spent encounter claims stay intact.", "Reset Crew Record", list("Reset", "Cancel")) != "Reset")
+		return
+	// Every prompt yields; check rights and registry membership again before touching the ledger.
+	if(QDELETED(record) || !(record in GLOB.voidcrew_crew_records) || !check_rights_for(user, R_ADMIN|R_DEBUG))
+		return
+	var/list/before = record.zone_totals.Copy()
+	var/changed = action == "Set family" ? record.admin_set_zone_family(family, band, amount) : record.admin_reset_zone_record()
+	if(!changed)
+		return
+	var/operation = action == "Set family" ? "set [metric_zone_name(band)]/[family] to [amount]" : "reset balances and purchase counts"
+	message_admins("[key_name_admin(user)] [operation] for crew #[record.crew_id].")
+	log_admin("[key_name(user)] [operation] for crew #[record.crew_id]; zone totals [json_encode(before)] -> [json_encode(record.zone_totals)].")
+	record_metric(METRIC_MISSION, "zone_record_admin_changed", ckey = metric_ckey(user.mob), subject = "crew_[record.crew_id]", details = list("crew_id" = record.crew_id, "operation" = operation, "totals_before" = before, "totals_after" = record.zone_totals.Copy()))
+	BLACKBOX_LOG_ADMIN_VERB("Crew Reputation")
+
 ADMIN_VERB(give_trade_vouchers, R_ADMIN|R_DEBUG, "Trade: Give Vouchers", "Put a stack of trade vouchers in a player's hands.", ADMIN_CATEGORY_DEBUG)
 	var/mob/living/target = voidcrew_admin_pick_player(user, "Give Trade Vouchers")
 	if(!target)
@@ -701,29 +808,6 @@ ADMIN_VERB(reveal_rare_ruin, R_ADMIN|R_DEBUG, "Trade: Reveal Rare Ruin", "Spawn
 	log_admin("[key_name(user)] revealed rare ruin '[template.name]'.")
 	BLACKBOX_LOG_ADMIN_VERB("Reveal Rare Ruin")
 
-ADMIN_VERB(spawn_gun_blueprint, R_ADMIN|R_DEBUG, "Trade: Spawn Blueprint", "Spawn a specific weapons-bench gun blueprint at your feet.", ADMIN_CATEGORY_DEBUG)
-	var/turf/drop_turf = get_turf(user.mob)
-	if(!drop_turf)
-		to_chat(user, span_warning("You need a physical location to spawn a blueprint at."))
-		return
-	var/list/choices = list()
-	for(var/obj/item/blueprint/blueprint_type as anything in subtypesof(/obj/item/blueprint))
-		if(blueprint_type == /obj/item/blueprint/gun)
-			continue
-		choices[initial(blueprint_type.name)] = blueprint_type
-	var/choice = tgui_input_list(user, "Which blueprint?", "Spawn Blueprint", sort_list(choices))
-	if(!choice)
-		return
-	var/blueprint_type = choices[choice]
-	var/obj/item/blueprint/blueprint = new blueprint_type(drop_turf)
-	var/mob/living/admin_mob = user.mob
-	if(isliving(admin_mob))
-		admin_mob.put_in_hands(blueprint)
-	to_chat(user, span_notice("[blueprint] spawned."))
-	message_admins("[key_name_admin(user)] spawned blueprint '[blueprint]'.")
-	log_admin("[key_name(user)] spawned blueprint '[blueprint]'.")
-	BLACKBOX_LOG_ADMIN_VERB("Spawn Gun Blueprint")
-
 // ===== OVERMAP / GAS ECONOMY =====
 
 ADMIN_VERB(spawn_gas_nebula, R_ADMIN|R_DEBUG, "Overmap: Spawn Nebula", "Spawn a gas nebula on the overmap, under a ship for instant ram scoop testing, or on an empty square.", ADMIN_CATEGORY_DEBUG)
diff --git a/voidcrew/modules/ambient_npcs/ambient_subsystem.dm b/voidcrew/modules/ambient_npcs/ambient_subsystem.dm
index 397eecaafcf..76c4ad07c88 100644
--- a/voidcrew/modules/ambient_npcs/ambient_subsystem.dm
+++ b/voidcrew/modules/ambient_npcs/ambient_subsystem.dm
@@ -800,6 +800,9 @@ SUBSYSTEM_DEF(ambient_npcs)
 	for(var/turf/tile as anything in floor)
 		if(passages[tile] || (locate(/obj/machinery/door) in tile))
 			continue
+		// Nobody stands about in the checkpoint lobby (outpost_checkpoint.dm)
+		if(istype(tile.loc, /area/voidcrew/trader_outpost/checkpoint))
+			continue
 		var/skip = FALSE
 		for(var/cdir in GLOB.cardinals)
 			var/turf/next = get_step(tile, cdir)
@@ -1088,6 +1091,8 @@ SUBSYSTEM_DEF(ambient_npcs)
 	npc.role = type
 	npc.set_place(place)
 	npc.fade_in()
+	// Off the lift on the lobby side of the weapons checkpoint: through it first (outpost_checkpoint_npcs.dm)
+	ambient_cross_checkpoint_on_arrival(npc, place?.outpost())
 	return npc
 
 /**
diff --git a/voidcrew/modules/ambient_npcs/outpost_patrons.dm b/voidcrew/modules/ambient_npcs/outpost_patrons.dm
index 6b12874386b..78f33a7124c 100644
--- a/voidcrew/modules/ambient_npcs/outpost_patrons.dm
+++ b/voidcrew/modules/ambient_npcs/outpost_patrons.dm
@@ -179,6 +179,9 @@
 /proc/ambient_outpost_tile_avoided(turf/tile, datum/ambient_place/place, counter_business = FALSE)
 	if(!tile || istype(tile, /turf/open/water) || ambient_by_a_door(tile))
 		return TRUE
+	// The checkpoint lobby is for passing through (outpost_checkpoint.dm)
+	if(istype(tile.loc, /area/voidcrew/trader_outpost/checkpoint))
+		return TRUE
 	var/datum/ambient_place/outpost/outpost_place = place
 	var/obj/structure/overmap/trader_outpost/outpost = istype(outpost_place) ? outpost_place.outpost() : null
 	for(var/turf/alcove as anything in outpost?.lobby_alcove_turfs)
diff --git a/voidcrew/modules/ambient_npcs/outpost_workers.dm b/voidcrew/modules/ambient_npcs/outpost_workers.dm
index e6e43087ae4..fec79e7269c 100644
--- a/voidcrew/modules/ambient_npcs/outpost_workers.dm
+++ b/voidcrew/modules/ambient_npcs/outpost_workers.dm
@@ -858,9 +858,11 @@
 	var/mob/living/basic/ambient_npc/drunk = anchor()
 	if(!drunk || drunk.fading || drunk.stat != CONSCIOUS || !istype(drunk.activity, /datum/ambient_activity/leave))
 		return AMBIENT_STEP_DONE
-	// They can manage the last few steps to the lift; the barback stays off it
+	// They can manage the last few steps to the lift; the barback stays off it, and on this side of the checkpoint
 	var/mob/living/basic/ambient_npc/outpost/barback = doer
 	var/obj/structure/overmap/trader_outpost/outpost = istype(barback) ? barback.get_outpost() : null
+	if(length(outpost?.checkpoints) && !outpost.is_secured_turf(get_turf(drunk)))
+		return AMBIENT_STEP_DONE
 	for(var/turf/alcove as anything in outpost?.lobby_alcove_turfs)
 		if(alcove.z == drunk.z && get_dist(alcove, drunk) <= 2)
 			return AMBIENT_STEP_DONE
@@ -950,9 +952,10 @@
 	return ..()
 
 /**
- * Unloading the convoy: sealed crates from beside the lift to the loading area in front of the
- * depot's counter, a few trips over about a minute and a half. The crates are part of the look:
- * they go when they are set down, and the shelves are the convoy's business, not theirs.
+ * Unloading the convoy: sealed crates from beside the lift (just inside the weapons checkpoint, where
+ * there is one) to the loading area in front of the depot's counter, a few trips over about a
+ * minute and a half. The crates are part of the look: they go when they are set down, and the
+ * shelves are the convoy's business, not theirs.
  */
 /datum/ambient_activity/convoy_unload
 	name = "unloading the convoy"
@@ -961,7 +964,7 @@
 	var/trips_left = WORKER_CONVOY_TRIPS
 	/// A crate in their arms
 	var/carrying = FALSE
-	/// Beside the lift
+	/// Beside the lift, or just inside the weapons checkpoint
 	var/turf/pickup
 	/// In front of the counter, out of the customers' way
 	var/turf/dropoff
@@ -982,10 +985,17 @@
 	if(!trader)
 		return FALSE
 	var/list/lift_spots = list()
-	for(var/turf/alcove as anything in outpost.lobby_alcove_turfs)
-		var/turf/spot = ambient_waiting_spot(doer, alcove, 2, 3, failed_spots, loiter = FALSE)
-		if(spot)
+	// Past a weapons checkpoint the crates are handed through it, and picked up on this side
+	var/datum/outpost_checkpoint/checkpoint = outpost.lobby_checkpoint(doer)
+	if(checkpoint?.secured_turf)
+		var/turf/spot = ambient_waiting_spot(doer, checkpoint.secured_turf, 2, 3, failed_spots, loiter = FALSE)
+		if(spot && outpost.is_secured_turf(spot))
 			lift_spots += spot
+	else
+		for(var/turf/alcove as anything in outpost.lobby_alcove_turfs)
+			var/turf/spot = ambient_waiting_spot(doer, alcove, 2, 3, failed_spots, loiter = FALSE)
+			if(spot)
+				lift_spots += spot
 	pickup = ambient_nearest_tile(doer, lift_spots)
 	dropoff = ambient_waiting_spot(doer, trader, 3, 4, failed_spots, loiter = FALSE)
 	if(!pickup || !dropoff)
diff --git a/voidcrew/modules/ambient_npcs/planet_peddler.dm b/voidcrew/modules/ambient_npcs/planet_peddler.dm
index 1411c751398..e1c78d6472d 100644
--- a/voidcrew/modules/ambient_npcs/planet_peddler.dm
+++ b/voidcrew/modules/ambient_npcs/planet_peddler.dm
@@ -210,7 +210,7 @@
 
 /datum/shop_sku/peddler/odd/lighter
 	item_path = /obj/item/lighter
-	price_credits = 80
+	price_credits = 50
 
 /datum/shop_sku/peddler/odd/whiskey
 	item_path = /obj/item/reagent_containers/cup/glass/bottle/whiskey
@@ -816,18 +816,7 @@
 	for(var/i in 1 to count)
 		var/turf/where = ambient_free_turf_near(landing, 2) || landing
 		var/raider_type = i == 3 ? /mob/living/basic/trooper/pirate/faction/grey/ranged : pick_weight(raiders - /mob/living/basic/trooper/pirate/faction/grey/ranged)
-		var/mob/living/raider = new raider_type(where)
-		// Not the planet's own: it comes for the caravan, and is kept near it
-		var/list/kept = list()
-		for(var/faction_token in raider.faction)
-			if(!findtext("[faction_token]", "planetary_"))
-				kept += faction_token
-		raider.faction = kept
-		raider.AddComponent(/datum/component/leash, doer, AMBIENT_AMBUSH_LEASH)
-		raider.AddElement(/datum/element/relay_attackers)
-		RegisterSignal(raider, COMSIG_ATOM_WAS_ATTACKED, PROC_REF(on_pack_attacked))
-		if(bait)
-			raider.ai_controller?.set_blackboard_key(BB_BASIC_MOB_CURRENT_TARGET, bait)
+		var/mob/living/raider = spawn_raider(raider_type, where, bait)
 		var/datum/weakref/ref = WEAKREF(raider)
 		pack += ref
 		pack_refs += ref
@@ -837,6 +826,25 @@
 		SSplanet_mobs.total_managed_mobs += count
 	return count
 
+/// Ready each ambusher against the caravan site before applying its profile.
+/datum/ambient_activity/caravan_ambush/proc/spawn_raider(raider_type, turf/where, mob/living/bait)
+	var/datum/ambient_place/site/site = doer.place
+	var/datum/npc_spawn_context/context = new(site, site.band, source_turf = get_turf(doer))
+	var/mob/living/raider = spawn_npc_in_zone(raider_type, where, context, FALSE)
+	// Not the planet's own: it comes for the caravan, and is kept near it.
+	var/list/kept = list()
+	for(var/faction_token in raider.faction)
+		if(!findtext("[faction_token]", "planetary_"))
+			kept += faction_token
+	raider.faction = kept
+	raider.AddComponent(/datum/component/leash, doer, AMBIENT_AMBUSH_LEASH)
+	raider.AddElement(/datum/element/relay_attackers)
+	RegisterSignal(raider, COMSIG_ATOM_WAS_ATTACKED, PROC_REF(on_pack_attacked))
+	if(bait)
+		raider.ai_controller?.set_blackboard_key(BB_BASIC_MOB_CURRENT_TARGET, bait)
+	context.finalize()
+	return raider
+
 /// Someone hit the pack: their crew gets the helpers' price
 /datum/ambient_activity/caravan_ambush/proc/on_pack_attacked(datum/source, atom/attacker, attack_flags)
 	SIGNAL_HANDLER
diff --git a/voidcrew/modules/ambient_npcs/recruit.dm b/voidcrew/modules/ambient_npcs/recruit.dm
index 89ce467fd36..e4b9a61554d 100644
--- a/voidcrew/modules/ambient_npcs/recruit.dm
+++ b/voidcrew/modules/ambient_npcs/recruit.dm
@@ -420,6 +420,7 @@ GLOBAL_LIST_EMPTY(ambient_ship_places)
 		stray_state = STRAY_WILD
 		REMOVE_TRAIT(src, TRAIT_SPACEWALK, STRAY_TRAIT)
 		return FALSE
+	exempt_npc_zone()
 	on_joined(ship)
 	speak_context("accepted", leader, force = TRUE)
 	log_game("AMBIENT: [src] agreed to join the [ship.name], asked by [key_name(leader)] at [AREACOORD(src)]")
diff --git a/voidcrew/modules/anomalies/core_rewards.dm b/voidcrew/modules/anomalies/core_rewards.dm
new file mode 100644
index 00000000000..2336f9338b7
--- /dev/null
+++ b/voidcrew/modules/anomalies/core_rewards.dm
@@ -0,0 +1,77 @@
+#define PLANET_ICE_DEMON_CORE_CAP 2
+
+/obj/structure/overmap/planet
+	/// Shared by both demon variants, retained when the surface unloads or relocates.
+	var/ice_demon_cores_emitted = 0
+
+/// Remember the source at spawn, before a demon can be carried to another site.
+/datum/component/ice_demon_core_reward
+	var/datum/weakref/source_planet_ref
+	/// Preloaded surfaces get their overmap owner after their mapped mobs initialize.
+	var/turf/pending_spawn_turf
+	var/core_type
+	var/drop_chance
+	/// A failed first roll is final too; revival cannot buy another attempt.
+	var/attempted = FALSE
+
+/datum/component/ice_demon_core_reward/Initialize(core_type, drop_chance)
+	if(!isliving(parent))
+		return COMPONENT_INCOMPATIBLE
+	src.core_type = core_type
+	src.drop_chance = drop_chance
+	var/turf/spawn_turf = get_turf(parent)
+	bind_source(spawn_turf)
+	if(!source_planet_ref && !SSovermap.initialized)
+		pending_spawn_turf = spawn_turf
+		RegisterSignal(SSovermap, COMSIG_SUBSYSTEM_POST_INITIALIZE, PROC_REF(on_overmap_initialized))
+
+/datum/component/ice_demon_core_reward/proc/bind_source(turf/spawn_turf)
+	var/datum/map_footprint/footprint = map_region_for_turf(spawn_turf)
+	if(istype(footprint) && istype(footprint.owner, /obj/structure/overmap/planet))
+		source_planet_ref = WEAKREF(footprint.owner)
+
+/datum/component/ice_demon_core_reward/proc/on_overmap_initialized(datum/source)
+	SIGNAL_HANDLER
+	UnregisterSignal(SSovermap, COMSIG_SUBSYSTEM_POST_INITIALIZE)
+	bind_source(pending_spawn_turf)
+	pending_spawn_turf = null
+
+/datum/component/ice_demon_core_reward/RegisterWithParent()
+	RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(on_death))
+
+/datum/component/ice_demon_core_reward/UnregisterFromParent()
+	UnregisterSignal(parent, COMSIG_LIVING_DEATH)
+
+/datum/component/ice_demon_core_reward/Destroy(force)
+	UnregisterSignal(SSovermap, COMSIG_SUBSYSTEM_POST_INITIALIZE)
+	pending_spawn_turf = null
+	source_planet_ref = null
+	return ..()
+
+/datum/component/ice_demon_core_reward/proc/on_death(mob/living/source, gibbed)
+	SIGNAL_HANDLER
+	if(attempted)
+		return
+	attempted = TRUE
+	if(!prob(drop_chance) || pending_spawn_turf)
+		return
+	var/obj/structure/overmap/planet/source_planet = source_planet_ref?.resolve()
+	// A deleted source cannot turn a transported demon into an unrestricted reward.
+	if(source_planet_ref && (!source_planet || source_planet.ice_demon_cores_emitted >= PLANET_ICE_DEMON_CORE_CAP))
+		return
+	var/atom/destination = source.drop_location()
+	if(!destination)
+		return
+	var/obj/item/core = new core_type(destination)
+	if(!QDELETED(core) && source_planet)
+		source_planet.ice_demon_cores_emitted++
+
+/mob/living/basic/mining/ice_demon/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/ice_demon_core_reward, /obj/item/raw_anomaly_core/bluespace, 5)
+
+/mob/living/simple_animal/hostile/asteroid/old_demon/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/ice_demon_core_reward, /obj/item/assembly/signaler/anomaly/bluespace, 20)
+
+#undef PLANET_ICE_DEMON_CORE_CAP
diff --git a/voidcrew/modules/antag_ruins/ascension_mech.dm b/voidcrew/modules/antag_ruins/ascension_mech.dm
index d31fe93b958..b8fab656eb6 100644
--- a/voidcrew/modules/antag_ruins/ascension_mech.dm
+++ b/voidcrew/modules/antag_ruins/ascension_mech.dm
@@ -330,6 +330,7 @@
 
 /mob/living/basic/vestige_warframe/Initialize(mapload)
 	. = ..()
+	npc_red_weapon_drop = npc_ladder_red_drop()
 	add_traits(list(TRAIT_NOFIRE, TRAIT_NOBREATH, TRAIT_RESISTHIGHPRESSURE, TRAIT_RESISTLOWPRESSURE), INNATE_TRAIT)
 
 	AddElement(/datum/element/footstep, FOOTSTEP_MOB_HEAVY)
@@ -627,9 +628,8 @@
 /**
  * The drops.
  *
- * Same shape as the Matriarch's: one guaranteed piece so the kill is always worth
- * something, then a jackpot rolled from a pool where both entries hand you a piece of
- * what just beat you. The capstone itself is paid out by the ascension run, not here.
+ * The blade is rolled once at construction. The utility prize and ascension
+ * capstone keep their separate reward paths.
  */
 /mob/living/basic/vestige_warframe/proc/drop_the_match()
 	if(loot_dropped)
@@ -638,7 +638,8 @@
 	if(isnull(spot))
 		return
 	loot_dropped = TRUE
-	new /obj/item/sparring_blade(spot)
+	if(npc_red_weapon_drop)
+		new /obj/item/sparring_blade(spot)
 	var/static/list/jackpot_pool = list(
 		/obj/item/warframe_contact_plate,
 		/obj/item/warframe_actuator,
diff --git a/voidcrew/modules/antag_ruins/theme_cult.dm b/voidcrew/modules/antag_ruins/theme_cult.dm
index 55ab06aed55..42ff4681059 100644
--- a/voidcrew/modules/antag_ruins/theme_cult.dm
+++ b/voidcrew/modules/antag_ruins/theme_cult.dm
@@ -238,9 +238,11 @@
 		paid = TRUE
 	votive.forceMove(get_turf(user))
 	votive.anchored = TRUE
+	votive.get_npc_spawn_context()
 	running = TRUE
 	for(var/index in 1 to 3)
-		var/mob/living/basic/carp/vestige_clot/clot = new(pick_n_take(places))
+		var/datum/npc_spawn_context/context = new(votive)
+		var/mob/living/basic/carp/vestige_clot/clot = spawn_npc_in_zone(/mob/living/basic/carp/vestige_clot, pick_n_take(places), context)
 		clots += clot
 		RegisterSignal(clot, COMSIG_LIVING_DEATH, PROC_REF(clot_died))
 	refresh_tracker()
diff --git a/voidcrew/modules/antag_ruins/theme_dragon.dm b/voidcrew/modules/antag_ruins/theme_dragon.dm
index cf5c9ede3b7..5983795e341 100644
--- a/voidcrew/modules/antag_ruins/theme_dragon.dm
+++ b/voidcrew/modules/antag_ruins/theme_dragon.dm
@@ -423,6 +423,7 @@
 
 /// Wakes the watch: the egg warms, the ground is chosen, and the first tide is heralded
 /obj/structure/vestige_dragon_egg/proc/begin_assault(mob/living/user)
+	get_npc_spawn_context()
 	assault_underway = TRUE
 	START_PROCESSING(SSobj, src)
 	color = "#d8905a" // the cold gives way
@@ -459,9 +460,12 @@
 		return
 	wave_lost = FALSE
 	stage++
+	get_npc_spawn_context()
 	for(var/i in 1 to 2)
-		var/mob/living/basic/carp/vestige_brood/hunter = new(wave_perch)
+		var/datum/npc_spawn_context/context = new(src)
+		var/mob/living/basic/carp/vestige_brood/hunter = spawn_npc_in_zone(/mob/living/basic/carp/vestige_brood, wave_perch, context, FALSE)
 		enlist(hunter, egg_bound = (i % 2 == 0))
+		context.finalize()
 	visible_message(span_boldwarning("The brood pours from the announced approach and turns toward [src]!"))
 	playsound(src, 'sound/effects/magic/wand_teleport.ogg', 70, TRUE)
 	var/datum/vestige_trial/broodwatch/trial = get_bound_trial()
@@ -651,6 +655,7 @@
  * hunts, and tamed to the keeper by the constructor's tamer argument.
  */
 /mob/living/basic/carp/pet/vestige_hatchling
+	npc_zone_exempt = TRUE
 	name = "dragonet"
 	desc = "A carp the colour of banked embers, fresh from a shell it had no business fitting inside. It is extremely certain it is a dragon. Nothing so far has dared correct it."
 	gender = NEUTER
diff --git a/voidcrew/modules/antag_ruins/theme_spider.dm b/voidcrew/modules/antag_ruins/theme_spider.dm
index 6bd2cee52e6..c19801ceb4f 100644
--- a/voidcrew/modules/antag_ruins/theme_spider.dm
+++ b/voidcrew/modules/antag_ruins/theme_spider.dm
@@ -1125,7 +1125,9 @@
 		next_send_at = world.time + VESTIGE_TREMOR_RESPITE
 		return
 	next_send_at = world.time + VESTIGE_TREMOR_RESPITE // floor, so an instant kill can't machine-gun the night
-	var/mob/living/basic/vestige_silk_thief/filcher = new(pick(perches))
+	line.get_npc_spawn_context()
+	var/datum/npc_spawn_context/context = new(line)
+	var/mob/living/basic/vestige_silk_thief/filcher = spawn_npc_in_zone(/mob/living/basic/vestige_silk_thief, pick(perches), context, FALSE)
 	thieves[filcher] = line
 	line.pinged = FALSE // every new thief must announce its own first bite
 	register_loan(filcher)
@@ -1134,6 +1136,7 @@
 	// The lifespan rides the THIEF, not the trial. Orphans always clean themselves up
 	addtimer(CALLBACK(filcher, TYPE_PROC_REF(/mob/living/basic/vestige_silk_thief, dissolve)), VESTIGE_TREMOR_THIEF_LIFESPAN)
 	filcher.ai_controller?.set_blackboard_key(BB_BASIC_MOB_CURRENT_TARGET, line)
+	context.finalize()
 	if(isliving(keeper))
 		to_chat(keeper, span_warning("The web shivers. Something small is moving near your line to the [dir2text(get_dir(keeper, line)) || "very spot you stand on"]."))
 		playsound(keeper, 'sound/effects/snap.ogg', 25, TRUE)
diff --git a/voidcrew/modules/antag_ruins/theme_xeno.dm b/voidcrew/modules/antag_ruins/theme_xeno.dm
index 8c0e4abef47..b2957c75f53 100644
--- a/voidcrew/modules/antag_ruins/theme_xeno.dm
+++ b/voidcrew/modules/antag_ruins/theme_xeno.dm
@@ -402,6 +402,7 @@
 
 /// Begins the season: the shell warms and the first work-gang is heralded
 /obj/structure/vestige_comb_egg/proc/begin_season(mob/living/user)
+	get_npc_spawn_context()
 	assault_underway = TRUE
 	START_PROCESSING(SSobj, src)
 	color = "#e0c47f" // the warmth takes
@@ -436,12 +437,15 @@
 		visible_message(span_warning("The approach has closed. Clear it and touch the shell to call the gang again."))
 		return
 	squad_lost = FALSE
+	get_npc_spawn_context()
 	var/list/gang_sizes = list(1, 2, 2, 3)
 	var/squad_size = gang_sizes[squads_landed + 1]
 	for(var/i in 1 to squad_size)
-		var/mob/living/basic/hivebot/vestige_comb_chewer/vermin = new(squad_perch)
+		var/datum/npc_spawn_context/context = new(src)
+		var/mob/living/basic/hivebot/vestige_comb_chewer/vermin = spawn_npc_in_zone(/mob/living/basic/hivebot/vestige_comb_chewer, squad_perch, context, FALSE)
 		do_sparks(3, TRUE, vermin)
 		enlist(vermin, egg_bound = TRUE)
+		context.finalize()
 	squads_landed++
 	visible_message(span_boldwarning("The salvage gang clatters from the announced approach, cutters spinning!"))
 	var/datum/vestige_trial/warm_season/trial = get_bound_trial()
diff --git a/voidcrew/modules/bounties/bounty_activities.dm b/voidcrew/modules/bounties/bounty_activities.dm
index ebe45351ea1..894fd6f1026 100644
--- a/voidcrew/modules/bounties/bounty_activities.dm
+++ b/voidcrew/modules/bounties/bounty_activities.dm
@@ -1310,6 +1310,9 @@
 		return entry[2]
 	var/list/floor = list()
 	for(var/turf/tile as anything in bounty_outpost_public_floor(outpost))
+		// Not the weapons checkpoint's lobby or chambers (outpost_checkpoint.dm): they blend in past it
+		if(istype(tile.loc, /area/voidcrew/trader_outpost/checkpoint))
+			continue
 		floor[tile] = TRUE
 	if(!length(floor))
 		floor = null
diff --git a/voidcrew/modules/bounties/bounty_admin.dm b/voidcrew/modules/bounties/bounty_admin.dm
index b8bb991cd77..721a17dfc7e 100644
--- a/voidcrew/modules/bounties/bounty_admin.dm
+++ b/voidcrew/modules/bounties/bounty_admin.dm
@@ -868,7 +868,8 @@ ADMIN_VERB(bounty_panel, R_ADMIN, "Bounty Panel", "Spawn, post, give out, list a
 	var/datum/criminal_bounty/posting = wanted.posting()
 	if(posting && (posting.placement_kind != BOUNTY_PLACEMENT_TRADER_OUTPOST || posting.outpost_site?.resolve() != outpost))
 		posting = null
-	var/mob/living/basic/bounty_criminal/decoy/decoy = new(decoy_spot(center))
+	var/datum/npc_spawn_context/context = wanted.bounty_profile_context()
+	var/mob/living/basic/bounty_criminal/decoy/decoy = spawn_npc_in_zone(/mob/living/basic/bounty_criminal/decoy, decoy_spot(center), context, FALSE)
 	decoy.outpost_become(wanted, decoy_record, posting, outpost, bounty_outpost_display_name(outpost), bounty_outpost_display_desc(outpost), bounty_outpost_outfit(outpost))
 	if(posting)
 		posting.decoys += WEAKREF(decoy)
diff --git a/voidcrew/modules/bounties/bounty_ai_normal.dm b/voidcrew/modules/bounties/bounty_ai_normal.dm
index 4290542b1ff..70aa025207e 100644
--- a/voidcrew/modules/bounties/bounty_ai_normal.dm
+++ b/voidcrew/modules/bounties/bounty_ai_normal.dm
@@ -349,6 +349,7 @@
 	if(HAS_TRAIT(src, TRAIT_BOUNTY_SURRENDERED) || stat == DEAD)
 		return
 	ADD_TRAIT(src, TRAIT_BOUNTY_SURRENDERED, BOUNTY_TRAIT)
+	body_note_state()
 	ai_stop_aiming()
 	ai_suspend_activity()
 	ai_set_mode(BOUNTY_AI_CALM)
diff --git a/voidcrew/modules/bounties/bounty_boss.dm b/voidcrew/modules/bounties/bounty_boss.dm
index 2d66ba67a9a..94d389fabdf 100644
--- a/voidcrew/modules/bounties/bounty_boss.dm
+++ b/voidcrew/modules/bounties/bounty_boss.dm
@@ -191,7 +191,7 @@ GLOBAL_LIST_EMPTY(bounty_boss_barricades)
 	if(attack_sound)
 		playsound(target, attack_sound, 50, TRUE)
 	target.visible_message(span_danger("[src] [attack_verb_continuous] [target]!"))
-	boss_hit(target, rand(melee_damage_lower, melee_damage_upper), melee_damage_type, MELEE, 0, armour_penetration)
+	boss_hit(target, rand(melee_damage_lower, melee_damage_upper), melee_damage_type, MELEE, 0, armour_penetration, TRUE)
 	SEND_SIGNAL(src, COMSIG_HOSTILE_POST_ATTACKINGTARGET, target, TRUE)
 	if(!ignore_cooldown)
 		changeNext_move(melee_attack_cooldown)
@@ -473,8 +473,11 @@ GLOBAL_LIST_EMPTY(bounty_boss_barricades)
 	if(!length(table) || !count)
 		return FALSE
 	var/wanted = table[clamp(count, 1, length(table))]
+	var/raw_health = wanted
+	wanted *= npc_zone_health_factor
 	if(wanted <= maxHealth)
 		return FALSE
+	npc_zone_original_max_health = raw_health
 	var/share = maxHealth > 0 ? health / maxHealth : 1
 	setMaxHealth(wanted)
 	if(boss_tired)
@@ -553,7 +556,8 @@ GLOBAL_LIST_EMPTY(bounty_boss_barricades)
  * One hit from an ability on `victim`: `damage` of `damage_type` against `armour_flag` armour, and
  * a knockdown. A mech takes it on its hull (H2).
  */
-/mob/living/basic/bounty_criminal/boss/proc/boss_hit(atom/victim, damage, damage_type = BRUTE, armour_flag = MELEE, knockdown = 0, armour_penetration = 0)
+/mob/living/basic/bounty_criminal/boss/proc/boss_hit(atom/victim, damage, damage_type = BRUTE, armour_flag = MELEE, knockdown = 0, armour_penetration = 0, already_scaled = FALSE)
+	damage = npc_zone_damage(damage, src, already_scaled)
 	if(ismecha(victim))
 		var/obj/vehicle/sealed/mecha/mech = victim
 		mech.take_damage(damage, damage_type, armour_flag, TRUE, get_dir(mech, src), armour_penetration)
@@ -1160,6 +1164,7 @@ GLOBAL_LIST_EMPTY(bounty_boss_barricades)
 	var/list/turfs
 	/// The boss whose fire it is, for who it may hurt
 	var/datum/weakref/boss_ref
+	var/damage_factor = 1
 
 /obj/effect/bounty_boss_fire_pool/Initialize(mapload, list/fire_turfs, lifetime, mob/living/basic/bounty_criminal/boss/boss, landing_damage = 0)
 	. = ..()
@@ -1174,6 +1179,7 @@ GLOBAL_LIST_EMPTY(bounty_boss_barricades)
 	if(!length(turfs))
 		return INITIALIZE_HINT_QDEL
 	boss_ref = boss ? WEAKREF(boss) : null
+	damage_factor = boss ? boss.get_npc_zone_damage_factor() : 1
 	// Invisible, but the light comes from here: sit it where the fire is.
 	var/turf/middle = turfs[round((length(turfs) + 1) / 2)]
 	if(middle != loc)
@@ -1205,13 +1211,13 @@ GLOBAL_LIST_EMPTY(bounty_boss_barricades)
 				continue
 			if(ismecha(thing))
 				var/obj/vehicle/sealed/mecha/mech = thing
-				mech.take_damage(max(damage, BOUNTY_BOSS_BURNING_DAMAGE), BURN, FIRE, FALSE)
+				mech.take_damage(npc_zone_damage(max(damage, BOUNTY_BOSS_BURNING_DAMAGE), damage_factor), BURN, FIRE, FALSE)
 				continue
 			var/mob/living/victim = thing
 			if(damage > 0)
-				victim.apply_damage(damage, BURN, blocked = victim.run_armor_check(null, FIRE, silent = TRUE), spread_damage = TRUE)
+				victim.apply_damage(npc_zone_damage(damage, damage_factor), BURN, blocked = victim.run_armor_check(null, FIRE, silent = TRUE), spread_damage = TRUE)
 				to_chat(victim, span_userdanger("You're caught in the flames!"))
-			victim.apply_status_effect(/datum/status_effect/bounty_boss_burning)
+			victim.apply_status_effect(/datum/status_effect/bounty_boss_burning, damage_factor)
 
 /obj/effect/bounty_boss_fire_pool/proc/burn_out()
 	qdel(src)
@@ -1229,6 +1235,15 @@ GLOBAL_LIST_EMPTY(bounty_boss_barricades)
 	alert_type = null
 	/// The flames on them
 	var/mutable_appearance/flames
+	var/damage_factor = 1
+
+/datum/status_effect/bounty_boss_burning/on_creation(mob/living/new_owner, factor = 1)
+	damage_factor = factor
+	return ..()
+
+/datum/status_effect/bounty_boss_burning/refresh(mob/living/new_owner, factor = 1)
+	damage_factor = factor
+	return ..()
 
 /datum/status_effect/bounty_boss_burning/on_apply()
 	if(owner.stat != CONSCIOUS || HAS_TRAIT(owner, TRAIT_NOFIRE))
@@ -1241,7 +1256,7 @@ GLOBAL_LIST_EMPTY(bounty_boss_barricades)
 	if(owner.stat != CONSCIOUS)
 		qdel(src)
 		return
-	owner.apply_damage(BOUNTY_BOSS_BURNING_DAMAGE, BURN, blocked = owner.run_armor_check(null, FIRE, silent = TRUE), spread_damage = TRUE)
+	owner.apply_damage(npc_zone_damage(BOUNTY_BOSS_BURNING_DAMAGE, damage_factor), BURN, blocked = owner.run_armor_check(null, FIRE, silent = TRUE), spread_damage = TRUE)
 
 /datum/status_effect/bounty_boss_burning/on_remove()
 	if(flames)
diff --git a/voidcrew/modules/bounties/bounty_boss_kits.dm b/voidcrew/modules/bounties/bounty_boss_kits.dm
index 2b70bce6227..22bfcd86bb2 100644
--- a/voidcrew/modules/bounties/bounty_boss_kits.dm
+++ b/voidcrew/modules/bounties/bounty_boss_kits.dm
@@ -673,6 +673,7 @@
 	/// Who it catches, and how hard
 	var/radius = BOUNTY_DEMOLITIONIST_GRENADE_RADIUS
 	var/damage = BOUNTY_DEMOLITIONIST_GRENADE_DAMAGE
+	var/damage_factor = 1
 	var/knockdown = BOUNTY_DEMOLITIONIST_GRENADE_KNOCKDOWN
 	/// What it breaks, and how hard
 	var/object_radius = BOUNTY_DEMOLITIONIST_GRENADE_OBJECT_RADIUS
@@ -688,6 +689,7 @@
 		return INITIALIZE_HINT_QDEL
 	GLOB.bounty_boss_explosives += src
 	boss_ref = boss ? WEAKREF(boss) : null
+	damage_factor = boss ? boss.get_npc_zone_damage_factor() : 1
 	structure_tally = list(BOUNTY_BOSS_ABILITY_STRUCTURE_CAP)
 	ring = new(get_turf(src), fuse, COLOR_RED, "target_circle")
 	ring.transform = matrix() * (radius * 2 + 1)
@@ -729,12 +731,12 @@
 		if(!(isliving(victim) || ismecha(victim)) || !may_hit(victim, boss) || !bounty_boss_clear_line(here, get_turf(victim)))
 			continue
 		if(boss)
-			boss.boss_hit(victim, damage, BRUTE, BOMB, knockdown)
+			boss.boss_hit(victim, npc_zone_damage(damage, damage_factor), BRUTE, BOMB, knockdown, already_scaled = TRUE)
 		else if(ismecha(victim))
-			victim.take_damage(damage, BRUTE, BOMB, FALSE)
+			victim.take_damage(npc_zone_damage(damage, damage_factor), BRUTE, BOMB, FALSE)
 		else
 			var/mob/living/person = victim
-			person.apply_damage(damage, BRUTE, BODY_ZONE_CHEST, person.run_armor_check(BODY_ZONE_CHEST, BOMB, silent = TRUE))
+			person.apply_damage(npc_zone_damage(damage, damage_factor), BRUTE, BODY_ZONE_CHEST, person.run_armor_check(BODY_ZONE_CHEST, BOMB, silent = TRUE))
 			if(knockdown)
 				person.Knockdown(knockdown)
 	qdel(src)
@@ -841,7 +843,7 @@
 /mob/living/basic/bounty_criminal/boss/ghost/proc/boss_cut(mob/living/victim)
 	if(QDELETED(victim) || victim.stat == DEAD)
 		return
-	victim.apply_status_effect(/datum/status_effect/bounty_boss_bleed)
+	victim.apply_status_effect(/datum/status_effect/bounty_boss_bleed, get_npc_zone_damage_factor())
 	boss_cuts++
 	if(boss_cuts >= BOUNTY_GHOST_CUTS_BEFORE_BREAKOFF)
 		boss_cuts = 0
@@ -1022,7 +1024,7 @@
 		boss.boss_hit(victim, BOUNTY_GHOST_DASH_DAMAGE, BRUTE, MELEE, 0, BOUNTY_GHOST_DASH_AP)
 		return
 	var/mob/living/person = victim
-	person.apply_damage(BOUNTY_GHOST_DASH_DAMAGE, BRUTE, BODY_ZONE_CHEST, person.run_armor_check(BODY_ZONE_CHEST, MELEE, armour_penetration = BOUNTY_GHOST_DASH_AP, silent = TRUE), sharpness = SHARP_EDGED)
+	person.apply_damage(npc_zone_damage(BOUNTY_GHOST_DASH_DAMAGE, boss), BRUTE, BODY_ZONE_CHEST, person.run_armor_check(BODY_ZONE_CHEST, MELEE, armour_penetration = BOUNTY_GHOST_DASH_AP, silent = TRUE), sharpness = SHARP_EDGED)
 	boss.boss_cut(person)
 
 /// Cloak: the air around it shimmers, then it fades to a faint distortion that half of all hits miss
@@ -1060,11 +1062,17 @@
 	alert_type = null
 	/// Cuts bleeding
 	var/cuts = 1
+	var/damage_factor = 1
+
+/datum/status_effect/bounty_boss_bleed/on_creation(mob/living/new_owner, factor = 1)
+	damage_factor = factor
+	return ..()
 
 /datum/status_effect/bounty_boss_bleed/on_apply()
 	return owner.stat == CONSCIOUS
 
-/datum/status_effect/bounty_boss_bleed/refresh(effect, ...)
+/datum/status_effect/bounty_boss_bleed/refresh(mob/living/new_owner, factor = 1)
+	damage_factor = factor
 	. = ..()
 	cuts++
 
@@ -1073,7 +1081,7 @@
 		qdel(src)
 		return
 	var/rate = min(cuts * BOUNTY_GHOST_BLEED_PER_CUT, BOUNTY_GHOST_BLEED_CAP)
-	owner.apply_damage(rate, BRUTE, spread_damage = TRUE)
+	owner.apply_damage(npc_zone_damage(rate, damage_factor), BRUTE, spread_damage = TRUE)
 	owner.bleed(rate)
 
 // ===== HEAVY =====
diff --git a/voidcrew/modules/bounties/bounty_criminal.dm b/voidcrew/modules/bounties/bounty_criminal.dm
index e4ef0fc148d..e8f95e0702f 100644
--- a/voidcrew/modules/bounties/bounty_criminal.dm
+++ b/voidcrew/modules/bounties/bounty_criminal.dm
@@ -163,8 +163,11 @@
 	if(!where)
 		return null
 	var/criminal_type = bounty_criminal_type(record, posting)
-	var/mob/living/basic/bounty_criminal/criminal = new criminal_type(where)
+	var/atom/site = posting?.site_ref?.resolve()
+	var/datum/npc_spawn_context/context = new(site || where, null, "ordinary", source_turf = site ? get_turf(site) : where)
+	var/mob/living/basic/bounty_criminal/criminal = spawn_npc_in_zone(criminal_type, where, context, FALSE)
 	criminal.body_setup(record, posting)
+	context.finalize()
 	return criminal
 
 /// The criminal type for `record` wanted on `posting`: meek, normal, or the mini-boss of its kit. A mini-boss never goes to a trader outpost; a normal criminal stands in (D-A8).
@@ -275,9 +278,24 @@
 /mob/living/basic/bounty_criminal/proc/body_match(mob/living/basic/bounty_criminal/other)
 	if(QDELETED(other) || other == src)
 		return
-	maxHealth = other.maxHealth
-	setBruteLoss(other.getBruteLoss())
+	// Copy raw stats before finalizing the inherited profile, never its scaled pool.
+	var/datum/npc_spawn_context/context = npc_spawn_context
+	if(!context || context.source_id != other.npc_spawn_context?.source_id)
+		context = other.bounty_profile_context()
+	if(npc_zone_applied)
+		UnregisterSignal(src, COMSIG_PROJECTILE_FIRER_BEFORE_FIRE)
+		melee_damage_lower = npc_zone_original_melee_lower
+		melee_damage_upper = npc_zone_original_melee_upper
+	npc_zone_applied = FALSE
+	npc_zone_health_factor = 1
+	npc_zone_damage_factor = 1
+	npc_spawn_context = context
+	maxHealth = other.npc_zone_applied ? other.npc_zone_original_max_health : other.maxHealth
+	var/health_share = other.maxHealth > 0 ? other.health / other.maxHealth : 1
+	setBruteLoss(maxHealth * (1 - health_share))
 	updatehealth()
+	context.bodies |= WEAKREF(src)
+	context.finalize()
 	set_varspeed(other.speed)
 	damage_coeff[STAMINA] = other.damage_coeff[STAMINA]
 	stamina_regen_time = other.stamina_regen_time
@@ -287,6 +305,11 @@
 		max_stamina_slowdown = other.max_stamina_slowdown
 		make_stamina_slowable()
 
+/// Decoys use the source's selected role before construction, including named boss bodies.
+/mob/living/basic/bounty_criminal/proc/bounty_profile_context()
+	var/role = npc_zone_role || (npc_zone_boss_type(type) ? "boss" : npc_spawn_context?.role || "ordinary")
+	return new /datum/npc_spawn_context(src, null, role)
+
 // ===== THE SITE =====
 
 /**
@@ -570,6 +593,8 @@
 /// Records its capture state in worst_state if it is as bad or worse: once downed or dead, it never gets better (spec 12.1)
 /mob/living/basic/bounty_criminal/proc/body_note_state()
 	var/state = capture_state()
+	if(state != BOUNTY_STATE_FREE)
+		posting()?.board_note_work_zone(src)
 	if(bounty_state_rank(state) <= bounty_state_rank(worst_state))
 		worst_state = state
 
diff --git a/voidcrew/modules/bounties/bounty_kingpin.dm b/voidcrew/modules/bounties/bounty_kingpin.dm
index 75378fd52dc..29ab4fe6b61 100644
--- a/voidcrew/modules/bounties/bounty_kingpin.dm
+++ b/voidcrew/modules/bounties/bounty_kingpin.dm
@@ -715,6 +715,7 @@ GLOBAL_LIST_EMPTY(bounty_kingpin_marks)
 		return
 	kingpin_cancel_aim()
 	ADD_TRAIT(src, TRAIT_BOUNTY_SURRENDERED, BOUNTY_TRAIT)
+	body_note_state()
 	visible_message(span_notice("[src] puts [p_their()] hands up."), vision_distance = BOUNTY_KINGPIN_SIGHT)
 	INVOKE_ASYNC(src, TYPE_PROC_REF(/mob/living, bounty_say), "surrender", null, TRUE)
 
@@ -1236,7 +1237,9 @@ GLOBAL_LIST_EMPTY(bounty_kingpin_marks)
 /datum/bounty_kingpin_crew/proc/spawn_goon(turf/post, weapon = BOUNTY_GOON_WEAPON_PISTOL)
 	if(!post)
 		return null
-	var/mob/living/basic/bounty_kingpin_goon/goon = new(post)
+	var/mob/living/basic/bounty_criminal/kingpin/kingpin = kingpin_ref?.resolve()
+	var/datum/npc_spawn_context/context = new(kingpin || post, null, "ordinary", source_turf = post)
+	var/mob/living/basic/bounty_kingpin_goon/goon = spawn_npc_in_zone(/mob/living/basic/bounty_kingpin_goon, post, context, FALSE)
 	goon.goon_weapon = weapon
 	goon.goon_post = post
 	goon.goon_rounds = bounty_kingpin_goon_mag(weapon)
@@ -1255,6 +1258,7 @@ GLOBAL_LIST_EMPTY(bounty_kingpin_marks)
 		goon.goon_post_dir = facing || SOUTH
 		goon.setDir(goon.goon_post_dir)
 	add_goon(goon)
+	context.finalize()
 	return goon
 
 /// Makes `goon` one of the crew
@@ -2469,13 +2473,15 @@ GLOBAL_LIST_EMPTY(bounty_kingpin_marks)
 /proc/bounty_kingpin_setup(turf/seat, list/posts, datum/bounty_record/record)
 	if(!seat)
 		return null
-	var/mob/living/basic/bounty_criminal/kingpin/kingpin = new(seat)
+	var/datum/npc_spawn_context/context = new(seat, null, "boss")
+	var/mob/living/basic/bounty_criminal/kingpin/kingpin = spawn_npc_in_zone(/mob/living/basic/bounty_criminal/kingpin, seat, context, FALSE)
 	kingpin.kingpin_crew = new /datum/bounty_kingpin_crew(kingpin, seat)
 	kingpin.body_setup(record, null)
 	var/obj/structure/overmap/trader_outpost/outpost = get_trader_outpost_for_turf(seat)
 	if(outpost)
 		kingpin.body_set_site(outpost)
 	kingpin.kingpin_sit()
+	context.finalize()
 	for(var/list/post as anything in posts)
 		kingpin.kingpin_crew.crew_posts += list(post.Copy())
 		kingpin.kingpin_crew.spawn_goon(post[1], post[2])
@@ -2934,3 +2940,7 @@ SUBSYSTEM_DEF(bounty_kingpin)
 	if(!posting)
 		return panel.refuse(user, "The kingpin couldn't be posted.")
 	return "post the kingpin bounty on [posting.record?.name || "nobody"] at [posting.board_site_name || "the black market"]"
+
+/// His lounge faction stays neutral; his explicit boss encounter is still profiled.
+/mob/living/basic/bounty_criminal/kingpin/is_npc_zone_exempt()
+	return npc_zone_exempt || npc_spawn_context?.exempt || client || mind
diff --git a/voidcrew/modules/bounties/bounty_lair.dm b/voidcrew/modules/bounties/bounty_lair.dm
index 35e63a6382f..8feb24f1dfc 100644
--- a/voidcrew/modules/bounties/bounty_lair.dm
+++ b/voidcrew/modules/bounties/bounty_lair.dm
@@ -77,6 +77,12 @@
 /datum/criminal_bounty/kill_only/board_arm()
 	return FALSE
 
+/datum/criminal_bounty/kill_only/board_reputation_family()
+	return ZONE_FAMILY_LAIR
+
+/datum/criminal_bounty/kill_only/board_reputation_difficulty()
+	return MISSION_DIFFICULTY_HARD
+
 /// Its site is fixed, so a lost site or a lost trophy ends it instead of moving it
 /datum/criminal_bounty/kill_only/relist(reason)
 	if(!is_open())
@@ -185,6 +191,7 @@
 /datum/criminal_bounty/kill_only/proc/kill_publish(obj/structure/overmap/site, zone, vouchers, lifetime)
 	placement_kind = SScriminal_bounties.board_kind_of_site(site) || BOUNTY_PLACEMENT_RUIN
 	board_zone = zone
+	record.board_work_zone = zone
 	value = SScriminal_bounties.board_value_for(record.base_value, zone)
 	board_vouchers = vouchers
 	board_posted_at = world.time
@@ -302,6 +309,13 @@
 	lair_kind = null
 	return ..()
 
+/// The existing atomic claim closes the bounty before returning its successful pay.
+/datum/criminal_bounty/kill_only/lair/board_claim(obj/structure/overmap/ship/ship, obj/machinery/mission_pad/pad, atom/movable/target, state, mob/user)
+	var/prize_zone = board_zone
+	. = ..()
+	if(islist(.) && !QDELETED(ship))
+		ship.award_guarded_prize("lair", prize_zone, pad, type)
+
 /// Its clock also waits while anyone is inside the lair: a crew deep in it never loses the bounty to the clock
 /datum/criminal_bounty/kill_only/lair/board_clock_held(now = world.time)
 	if(..())
@@ -538,7 +552,10 @@
 		if(!ispath(boss_type, /mob/living))
 			log_mapping("BOUNTY LAIR: [name] has a boss landmark with no mob type at [AREACOORD(home)]")
 			continue
-		lair_adopt_boss(new boss_type(home))
+		var/datum/npc_spawn_context/context = new(src, null, "boss")
+		var/mob/living/boss = spawn_npc_in_zone(boss_type, home, context, FALSE)
+		lair_adopt_boss(boss)
+		context.finalize()
 
 	for(var/obj/effect/landmark/bounty_lair_gatekeeper/mark as anything in keeper_marks)
 		if(QDELETED(mark))
@@ -551,7 +568,10 @@
 		if(!ispath(keeper_type, /mob/living))
 			log_mapping("BOUNTY LAIR: [name] has a gatekeeper landmark with no mob type at [AREACOORD(home)]")
 			continue
-		lair_add_gatekeeper(new keeper_type(home))
+		var/datum/npc_spawn_context/context = new(src, null, "boss")
+		var/mob/living/keeper = spawn_npc_in_zone(keeper_type, home, context, FALSE)
+		lair_add_gatekeeper(keeper)
+		context.finalize()
 
 	lair_leash_goons()
 	lair_goon_timer = addtimer(CALLBACK(src, PROC_REF(lair_leash_goons)), BOUNTY_LAIR_GOON_LEASH_DELAY, TIMER_STOPPABLE)
diff --git a/voidcrew/modules/bounties/bounty_lair_mafia.dm b/voidcrew/modules/bounties/bounty_lair_mafia.dm
index 3c2913c6004..796e4eb45f9 100644
--- a/voidcrew/modules/bounties/bounty_lair_mafia.dm
+++ b/voidcrew/modules/bounties/bounty_lair_mafia.dm
@@ -573,7 +573,7 @@ GLOBAL_LIST_EMPTY(bounty_mafia_rooms)
 	for(var/mob/living/pilot in suit.occupants)
 		if(rocket_volley)
 			rocket_volley[REF(pilot)] = TRUE
-	return suit.take_damage(BOUNTY_MECH_ROCKET_EXOSUIT_DAMAGE, BRUTE, BULLET, TRUE, get_dir(suit, src))
+	return suit.take_damage(npc_zone_damage(BOUNTY_MECH_ROCKET_EXOSUIT_DAMAGE, npc_zone_damage_factor), BRUTE, BULLET, TRUE, get_dir(suit, src))
 
 /obj/projectile/bullet/bounty_mafia_rocket/on_hit(atom/target, blocked = 0, pierce_hit)
 	. = ..()
@@ -614,7 +614,7 @@ GLOBAL_LIST_EMPTY(bounty_mafia_rooms)
 		if(rocket_volley)
 			rocket_volley[key] = TRUE
 		var/blocked = victim.run_armor_check(BODY_ZONE_CHEST, BULLET, silent = TRUE)
-		victim.apply_damage(damage, BRUTE, BODY_ZONE_CHEST, blocked)
+		victim.apply_damage(npc_zone_damage(damage, npc_zone_damage_factor, npc_zone_damage_scaled), BRUTE, BODY_ZONE_CHEST, blocked)
 		victim.Knockdown(BOUNTY_MECH_ROCKET_KNOCKDOWN)
 		to_chat(victim, span_userdanger("A rocket bursts right at your feet!"))
 		. += victim
@@ -1112,14 +1112,11 @@ GLOBAL_LIST_EMPTY(bounty_mafia_rooms)
 
 /**
  * The club's goons. On P11's map every room has one of these; its room (the marker's area) fixes the crew
- * (bounty_mafia_room_crew()). Anywhere else it rolls 3-5 from the zone table like any other theme. Goons
+ * (bounty_mafia_room_crew()). Each marker rolls 1-2 from its room's weighted roster. Goons
  * only spawn on tiles of the marker's own room.
  */
 /obj/effect/zone_mobs/mafia
 	name = "zone mob spawner (mafia)"
-	count_green = list(3, 4)
-	count_yellow = list(3, 5)
-	count_red = list(4, 5)
 	scatter_radius = 3
 	mobs_green = list(
 		/mob/living/basic/trooper/russian/mafia = 4,
@@ -1143,10 +1140,11 @@ GLOBAL_LIST_EMPTY(bounty_mafia_rooms)
 	if(!crew)
 		return ..()
 	var/list/open_turfs = get_scatter_turfs()
-	for(var/mob_path in crew)
-		for(var/i in 1 to crew[mob_path])
-			var/turf/spot = length(open_turfs) ? pick_n_take(open_turfs) : get_turf(src)
-			new mob_path(spot)
+	for(var/i in 1 to rand(1, 2))
+		var/mob_path = pick_weight(crew)
+		var/turf/spot = length(open_turfs) ? pick_n_take(open_turfs) : get_turf(src)
+		var/datum/npc_spawn_context/context = new(src, zone_type, "ordinary")
+		spawn_npc_in_zone(mob_path, spot, context)
 
 /obj/effect/zone_mobs/mafia/get_scatter_turfs()
 	var/area/room = get_area(src)
@@ -1516,8 +1514,11 @@ GLOBAL_LIST_EMPTY(bounty_mafia_rooms)
 		return FALSE
 	var/list/table = mech_health_table()
 	var/wanted = table[clamp(count, 1, length(table))]
+	var/raw_health = wanted
+	wanted *= npc_zone_health_factor
 	if(wanted <= maxHealth)
 		return FALSE
+	npc_zone_original_max_health = raw_health
 	setMaxHealth(wanted)
 	updatehealth()
 	if(announce && count > 1)
@@ -1595,8 +1596,7 @@ GLOBAL_LIST_EMPTY(bounty_mafia_rooms)
 	mech_engaged = list()
 	mech_grudge = list()
 	adjust_health(-getBruteLoss())
-	setMaxHealth(BOUNTY_MECH_HEALTH_1)
-	updatehealth()
+	set_npc_zone_health(BOUNTY_MECH_HEALTH_1)
 	ai_controller?.clear_blackboard_key(BB_BASIC_MOB_CURRENT_TARGET)
 	visible_message(span_notice("[src] vents steam as its repair arms fold away. It looks as good as new."))
 
@@ -1877,7 +1877,8 @@ GLOBAL_LIST_EMPTY(bounty_mafia_rooms)
 	var/obj/structure/bounty_mafia_wreck/wreck = new(spot)
 	wreck.setDir(dir)
 	var/turf/exit = mech_exit_turf(spot)
-	var/mob/living/basic/bounty_lair_boss/mafia_don/don = new(exit || spot)
+	var/datum/npc_spawn_context/context = new(src, null, "boss")
+	var/mob/living/basic/bounty_lair_boss/mafia_don/don = spawn_npc_in_zone(/mob/living/basic/bounty_lair_boss/mafia_don, exit || spot, context, FALSE)
 	don.posting_ref = posting_ref
 	don.don_wreck_ref = WEAKREF(wreck)
 	// Whoever broke his machine, he knows
@@ -1891,6 +1892,7 @@ GLOBAL_LIST_EMPTY(bounty_mafia_rooms)
 		don.real_name = posting.record.name
 	SEND_SIGNAL(src, COMSIG_BOUNTY_MAFIA_DON_EJECTED, don)
 	don.don_on_eject()
+	context.finalize()
 	return don
 
 /// The open tile beside `wreck_spot`, in its arena, farthest from the hunters
diff --git a/voidcrew/modules/bounties/bounty_outpost.dm b/voidcrew/modules/bounties/bounty_outpost.dm
index 0f7f8ccb82b..0773a31fac1 100644
--- a/voidcrew/modules/bounties/bounty_outpost.dm
+++ b/voidcrew/modules/bounties/bounty_outpost.dm
@@ -207,7 +207,8 @@ GLOBAL_LIST_INIT(bounty_outpost_trader_react_lines, list(
 		// If a line ever names a crime, it names the same one for everybody
 		if(decoy_record)
 			decoy_record.crime = record.crime
-		var/mob/living/basic/bounty_criminal/decoy/decoy = new(spot)
+		var/datum/npc_spawn_context/context = fugitive.bounty_profile_context()
+		var/mob/living/basic/bounty_criminal/decoy/decoy = spawn_npc_in_zone(/mob/living/basic/bounty_criminal/decoy, spot, context, FALSE)
 		var/atom/anchor = (length(free_stools) && prob(50)) ? pick_n_take(free_stools) : null
 		decoy.outpost_become(fugitive, decoy_record, src, outpost, display_name, display_desc, outfit, anchor)
 		decoys += WEAKREF(decoy)
@@ -330,6 +331,10 @@ GLOBAL_LIST_INIT(bounty_outpost_trader_react_lines, list(
 		return list()
 	var/list/floor = bounty_outpost_public_floor(outpost)
 	floor -= outpost.lobby_alcove_turfs
+	// Nobody blends in at the checkpoint (outpost_checkpoint.dm): the hunt is past it
+	for(var/turf/checkpoint_tile as anything in floor.Copy())
+		if(istype(checkpoint_tile.loc, /area/voidcrew/trader_outpost/checkpoint))
+			floor -= checkpoint_tile
 	var/turf/near_turf = get_turf(near)
 	if(near_turf)
 		floor -= near_turf
diff --git a/voidcrew/modules/bounties/bounty_posting.dm b/voidcrew/modules/bounties/bounty_posting.dm
index 5b3ebf319cd..8876ae3f231 100644
--- a/voidcrew/modules/bounties/bounty_posting.dm
+++ b/voidcrew/modules/bounties/bounty_posting.dm
@@ -414,6 +414,8 @@
 	site_ref = null
 	// Whoever turns up at the next site is a fresh sighting
 	board_worst_state = BOUNTY_STATE_FREE
+	if(record)
+		record.board_work_zone = null
 	for(var/obj/structure/overmap/ship/hunter as anything in hunter_ships())
 		hunter.remove_waypoint(board_waypoint_key())
 		hunter.ship_notify("WANTED: [record?.name] [reason || "slipped away"].","MISSION CONTROL", SHIP_NOTIFY_WARNING, 'voidcrew/sound/notify2.ogg', 50)
diff --git a/voidcrew/modules/bounties/bounty_turn_in.dm b/voidcrew/modules/bounties/bounty_turn_in.dm
index 9f6dd6c2e9a..3fcbfe55af8 100644
--- a/voidcrew/modules/bounties/bounty_turn_in.dm
+++ b/voidcrew/modules/bounties/bounty_turn_in.dm
@@ -35,6 +35,42 @@
 
 // ===== TURNING IN =====
 
+/// Bind field work before the criminal or its proof can be carried to another band.
+/datum/criminal_bounty/proc/board_note_work_zone(mob/living/basic/bounty_criminal/target)
+	if(!is_open() || !record || record.board_work_zone || target != criminal() || record.status != BOUNTY_RECORD_WANTED)
+		return
+	var/band = get_zone_type_for_player_turf(get_turf(target))
+	if(band in list(ZONE_GREEN, ZONE_YELLOW, ZONE_RED))
+		record.board_work_zone = band
+
+/datum/criminal_bounty/proc/board_reputation_family()
+	return ZONE_FAMILY_CRIMINAL_BOUNTY
+
+/datum/criminal_bounty/proc/board_reputation_difficulty()
+	if(record?.archetype == BOUNTY_ARCHETYPE_BOSS)
+		return MISSION_DIFFICULTY_HARD
+	switch(record?.tier)
+		if(BOUNTY_TIER_PETTY)
+			return MISSION_DIFFICULTY_EASY
+		if(BOUNTY_TIER_WANTED)
+			return MISSION_DIFFICULTY_MEDIUM
+		if(BOUNTY_TIER_MOST_WANTED)
+			return MISSION_DIFFICULTY_HARD
+	return null
+
+/// Called only by the successful paying claim, before detachment, closing signals or rewards.
+/datum/criminal_bounty/proc/board_claim_zone_work(obj/structure/overmap/ship/ship)
+	if(!record || record.board_reputation_claimed || record.status != BOUNTY_RECORD_WANTED \
+		|| !(record.board_work_zone in list(ZONE_GREEN, ZONE_YELLOW, ZONE_RED)))
+		return 0
+	var/difficulty = board_reputation_difficulty()
+	var/datum/voidcrew_crew_record/crew = ship.get_crew_record()
+	if(!difficulty || QDELETED(crew))
+		return 0
+	var/family = board_reputation_family()
+	record.board_reputation_claimed = TRUE
+	return crew.claim_zone_work(family, record.board_work_zone, difficulty, "bounty:[record.id]:[family]")
+
 /**
  * `ship` turns this bounty in at `pad`: the criminal (or its proof of death) on the pad's own tile,
  * the pad bolted and aboard. Returns list(credits, vouchers) paid, or why not (a short phrase).
@@ -127,6 +163,8 @@
 	// Closing lets go of the record and the hunters, so everything read from them is read now
 	var/poster_text = (live && share >= 100 && claimed?.tier >= BOUNTY_TIER_WANTED) ? board_poster_text(ship) : null
 	var/list/already_told = most_wanted ? hunter_ships() : null
+	if(pay[1] > 0 || pay[2] > 0)
+		board_claim_zone_work(ship)
 
 	// Take it: the criminal is frozen for the beam and stops being this bounty's, so closing the bounty doesn't remove it
 	if(criminal)
diff --git a/voidcrew/modules/bounties/bounty_types.dm b/voidcrew/modules/bounties/bounty_types.dm
index f98ca75c327..6af790269ea 100644
--- a/voidcrew/modules/bounties/bounty_types.dm
+++ b/voidcrew/modules/bounties/bounty_types.dm
@@ -86,6 +86,10 @@ GLOBAL_LIST_EMPTY(bounty_prisoner_pool)
 	var/status = BOUNTY_RECORD_WANTED
 	/// world.time the record was made
 	var/created_at = 0
+	/// First capture/death band (or fixed lair band), retained across body/proof changes.
+	var/board_work_zone
+	/// Shared by every posting/body alias, including after a prison escape.
+	var/board_reputation_claimed = FALSE
 	/// Their mugshot, a base64 PNG built once and cached here (bounty_record_mugshot())
 	var/mugshot
 	/// How they looked when the mugshot was taken, if that differs from how they look now (a trader-outpost fugitive has changed their hair or clothes). P1 fills it (make_old_look()); the mugshot uses it when set.
diff --git a/voidcrew/modules/bounties/bounty_weapons.dm b/voidcrew/modules/bounties/bounty_weapons.dm
index b173c94c03b..d4f4fac0902 100644
--- a/voidcrew/modules/bounties/bounty_weapons.dm
+++ b/voidcrew/modules/bounties/bounty_weapons.dm
@@ -192,8 +192,7 @@ GLOBAL_LIST_EMPTY(bounty_real_weapons)
 /// Puts its hand numbers on `fighter`'s own blow. The blow's timing stays the fighter's.
 /datum/bounty_real_weapon/proc/apply_melee(mob/living/basic/fighter)
 	read_melee()
-	fighter.melee_damage_lower = force_low
-	fighter.melee_damage_upper = force_high
+	fighter.set_npc_zone_melee(force_low, force_high)
 	fighter.melee_damage_type = damage_type
 	fighter.sharpness = sharpness
 	fighter.wound_bonus = wound_bonus
diff --git a/voidcrew/modules/captain_management/captain_management.dm b/voidcrew/modules/captain_management/captain_management.dm
index 3d1aa301718..98032b29c07 100644
--- a/voidcrew/modules/captain_management/captain_management.dm
+++ b/voidcrew/modules/captain_management/captain_management.dm
@@ -135,6 +135,8 @@
 	data["is_captain"] = ship.is_ship_captain(captain)
 
 	// Crew list
+	var/datum/mind/crew_leader = ship.get_crew_record()?.leader
+	data["crew_leader"] = crew_leader?.current?.real_name || crew_leader?.name || "None"
 	data["crew"] = list()
 	if(ship.ship_team)
 		for(var/datum/mind/member in ship.ship_team.members)
@@ -353,21 +355,19 @@
 	if(!ship || QDELETED(ship))
 		to_chat(player, span_warning("The ship no longer exists!"))
 		return
+	return accept_crew_invite(player)
 
-	// Check if player is already on a ship team - remove them first
-	for(var/datum/team/voidcrew/old_team in player.mind.ship_teams)
-		if(old_team != ship.ship_team)
-			old_team.remove_member(player.mind)
-
-	// Add player to ship team
-	if(ship.ship_team)
-		ship.ship_team.add_member(player.mind)
-		ship.manifest += player.real_name
+/// Final invitation transaction, revalidated after the player's prompt.
+/datum/captain_management_ui/proc/accept_crew_invite(mob/living/player)
+	if(QDELETED(ship) || !ship.is_ship_captain(captain) || !player?.mind)
+		return FALSE
+	if(!ship.enlist_crewmember(player))
+		return FALSE
 
 	// Remember the captain's invitation across respawns until the password changes
 	// or the captain resets join access.
-	if(ckey)
-		ship.password_cleared_ckeys[ckey] = TRUE
+	if(player.ckey)
+		ship.password_cleared_ckeys[player.ckey] = TRUE
 
 	// Humans can pick up a ship headset. A silicon's radio is built in, so point it at
 	// this ship's channel the way a silicon crew spawn does.
@@ -382,6 +382,7 @@
 	to_chat(player, span_notice("You have joined the crew of [ship.name]!"))
 	ship.ship_notify("[player.real_name] has joined the crew.", "CREW UPDATE", SHIP_NOTIFY_NOTICE, 'voidcrew/sound/notify.ogg', 50)
 	log_game("[key_name(captain)] invited [key_name(player)] to ship [ship.name]")
+	return TRUE
 
 // ===== CREW MANAGEMENT =====
 
@@ -395,7 +396,7 @@
 
 	// Remove from ship team
 	if(ship.ship_team)
-		ship.ship_team.remove_member(target)
+		target.leave_reputation_crew()
 
 	// Remove from manifest
 	ship.manifest -= kicked_name
diff --git a/voidcrew/modules/cargo/anomaly_packs.dm b/voidcrew/modules/cargo/anomaly_packs.dm
new file mode 100644
index 00000000000..86a28ed4be7
--- /dev/null
+++ b/voidcrew/modules/cargo/anomaly_packs.dm
@@ -0,0 +1,32 @@
+/**
+ * Raw anomaly cores are off the cargo catalogue.
+ *
+ * The anomaly core cap is lifted in this fork (voidcrew/modules/research/edits/
+ * _experiments.dm), so a 2000 cr crate per core made them a routine order.
+ * Boffin at the Quartermain Depot is now the only store that sells raw cores,
+ * on a small rotating shelf, with anomaly charts as the other way to hunt one
+ * (shop_catalog_outfitter_vendors.dm, anomaly_charts.dm).
+ *
+ * SSshuttle only registers packs with a non-null `contains`. Overriding the var
+ * to null does not work for these: upstream sets `contains = list(...)`, and a
+ * list default is built at New() time, after the null has been applied, so the
+ * pack comes back with its contents. Clearing it in New() drops each crate from
+ * every console without touching the upstream definitions.
+ */
+GLOBAL_LIST_INIT(voidcrew_removed_supply_packs, typecacheof(list(
+	/datum/supply_pack/science/raw_flux_anomaly,
+	/datum/supply_pack/science/raw_hallucination_anomaly,
+	/datum/supply_pack/science/raw_grav_anomaly,
+	/datum/supply_pack/science/raw_vortex_anomaly,
+	/datum/supply_pack/science/raw_ectoplasm_anomaly,
+	/datum/supply_pack/science/raw_bluespace_anomaly,
+	/datum/supply_pack/science/raw_pyro_anomaly,
+	/datum/supply_pack/science/raw_bioscrambler_anomaly,
+	/datum/supply_pack/science/raw_dimensional_anomaly,
+)))
+
+// Chains onto the upstream New.
+/datum/supply_pack/New()
+	. = ..()
+	if(GLOB.voidcrew_removed_supply_packs[type])
+		contains = null
diff --git a/voidcrew/modules/cargo/bank_machine.dm b/voidcrew/modules/cargo/bank_machine.dm
index 0022d5d9edd..176b205208f 100644
--- a/voidcrew/modules/cargo/bank_machine.dm
+++ b/voidcrew/modules/cargo/bank_machine.dm
@@ -84,7 +84,7 @@
 		balloon_alert(user, "no ship account connected")
 		return FALSE
 	// Join-password clearance also covers former lives; banking requires the current mind.
-	if(!user.mind || !(user.mind in ship.ship_team?.members))
+	if(!ship.is_ship_crew(user))
 		balloon_alert(user, "ship crew only")
 		return FALSE
 	if(card.registered_account == synced_bank_account)
diff --git a/voidcrew/modules/cargo/exports.dm b/voidcrew/modules/cargo/exports.dm
index 5f93b893cf9..08954e677aa 100644
--- a/voidcrew/modules/cargo/exports.dm
+++ b/voidcrew/modules/cargo/exports.dm
@@ -93,7 +93,7 @@
 // ========== NANITE TECHNOLOGY ==========
 
 /datum/export/nanite_disk
-	cost = 200
+	cost = 0
 	unit_name = "nanite program disk"
 	export_types = list(/obj/item/disk/nanite_program)
 
diff --git a/voidcrew/modules/cargo/shipping/_shuttle_loan.dm b/voidcrew/modules/cargo/shipping/_shuttle_loan.dm
index 408ab0144ae..4c65362bace 100644
--- a/voidcrew/modules/cargo/shipping/_shuttle_loan.dm
+++ b/voidcrew/modules/cargo/shipping/_shuttle_loan.dm
@@ -194,12 +194,30 @@ GLOBAL_LIST_INIT(voidcrew_shuttle_loans, list(
 	var/thanks_msg = "Your shuttle will return with our cargo. Payment has been transferred."
 	/// Description for logging
 	var/logging_desc = "generic loan"
+	/// One captured host band for all hostile cargo in this delivery.
+	var/datum/npc_spawn_context/npc_source
 
 /// Spawns items on the shuttle when it arrives
 /datum/voidcrew_shuttle_loan/proc/spawn_items(datum/voidcrew_cargo_shuttle/shuttle)
 	SHOULD_CALL_PARENT(FALSE)
 	CRASH("Unimplemented spawn_items() on [src.type].")
 
+/// Loan deliveries use packs without passing through the order catalog.
+/datum/voidcrew_shuttle_loan/proc/spawn_supply_pack(datum/supply_pack/pack, turf/destination)
+	var/obj/structure/closet/crate/delivery = pack.generate(destination)
+	for(var/obj/item/item in delivery.get_all_contents())
+		if(is_ladder_restricted_production(item.type))
+			qdel(item)
+	return delivery
+
+/// The cargo bay can be off-map; its host ship supplies the encounter band.
+/datum/voidcrew_shuttle_loan/proc/spawn_hostile(mob_type, turf/location, datum/voidcrew_cargo_shuttle/shuttle)
+	if(!npc_source)
+		var/turf/source_turf = get_turf(shuttle.target_ship)
+		npc_source = new(shuttle, SSovermap_zones.get_zone_type_anywhere(source_turf) || ZONE_GREEN, source_turf = source_turf)
+	var/datum/npc_spawn_context/context = new(shuttle, npc_source.zone_type, "ordinary", source_turf = npc_source.source_turf)
+	return spawn_npc_in_zone(mob_type, location, context)
+
 /// Department resupply - free supplies, no bonus
 /datum/voidcrew_shuttle_loan/department_resupply
 	sender = "Nanotrasen Supply Division"
@@ -221,7 +239,7 @@ GLOBAL_LIST_INIT(voidcrew_shuttle_loans, list(
 	for(var/crate_type in crate_types)
 		var/datum/supply_pack/pack = SSshuttle.supply_packs[crate_type]
 		if(pack && length(cargo_turfs))
-			pack.generate(pick_n_take(cargo_turfs))
+			spawn_supply_pack(pack, pick_n_take(cargo_turfs))
 
 /// Salvage recovery - mixed loot and danger
 /datum/voidcrew_shuttle_loan/salvage_recovery
@@ -343,7 +361,7 @@ GLOBAL_LIST_INIT(voidcrew_shuttle_loans, list(
 	// Medical supplies
 	var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/medical/supplies]
 	if(pack)
-		pack.generate(pick_n_take(cargo_turfs))
+		spawn_supply_pack(pack, pick_n_take(cargo_turfs))
 
 	var/list/extra_supplies = list(
 		/obj/item/storage/medkit/regular,
@@ -425,19 +443,19 @@ GLOBAL_LIST_INIT(voidcrew_shuttle_loans, list(
 	// Spawn special ops crate
 	var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/imports/specialops]
 	if(pack && length(cargo_turfs))
-		pack.generate(pick_n_take(cargo_turfs))
+		spawn_supply_pack(pack, pick_n_take(cargo_turfs))
 
 	// Spawn syndicate infiltrators
 	for(var/i in 1 to 2)
 		if(!length(cargo_turfs))
 			break
-		new /mob/living/basic/trooper/syndicate/ranged/infiltrator(pick_n_take(cargo_turfs))
+		spawn_hostile(/mob/living/basic/trooper/syndicate/ranged/infiltrator, pick_n_take(cargo_turfs), shuttle)
 
 	// Chance for more
 	if(prob(75) && length(cargo_turfs))
-		new /mob/living/basic/trooper/syndicate/ranged/infiltrator(pick_n_take(cargo_turfs))
+		spawn_hostile(/mob/living/basic/trooper/syndicate/ranged/infiltrator, pick_n_take(cargo_turfs), shuttle)
 	if(prob(50) && length(cargo_turfs))
-		new /mob/living/basic/trooper/syndicate/ranged/infiltrator(pick_n_take(cargo_turfs))
+		spawn_hostile(/mob/living/basic/trooper/syndicate/ranged/infiltrator, pick_n_take(cargo_turfs), shuttle)
 
 /// Lots of bees - Toxic bees and beekeeping equipment
 /datum/voidcrew_shuttle_loan/lots_of_bees
@@ -456,7 +474,7 @@ GLOBAL_LIST_INIT(voidcrew_shuttle_loans, list(
 	// Beekeeping crate
 	var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/organic/hydroponics/beekeeping_fullkit]
 	if(pack && length(cargo_turfs))
-		pack.generate(pick_n_take(cargo_turfs))
+		spawn_supply_pack(pack, pick_n_take(cargo_turfs))
 
 	// Corpses from the incident
 	var/list/corpse_types = list(
@@ -470,12 +488,6 @@ GLOBAL_LIST_INIT(voidcrew_shuttle_loans, list(
 			break
 		new corpse_type(pick_n_take(cargo_turfs))
 
-	// Weapons from the fight
-	if(length(cargo_turfs))
-		new /obj/item/gun/ballistic/automatic/pistol/no_mag(pick_n_take(cargo_turfs))
-	if(length(cargo_turfs))
-		new /obj/item/gun/ballistic/automatic/pistol/m1911/no_mag(pick_n_take(cargo_turfs))
-
 	// Beekeeping stuff
 	for(var/i in 1 to 3)
 		if(!length(cargo_turfs))
@@ -492,7 +504,7 @@ GLOBAL_LIST_INIT(voidcrew_shuttle_loans, list(
 	for(var/i in 1 to 8)
 		if(!length(cargo_turfs))
 			break
-		new /mob/living/basic/bee/toxin(pick_n_take(cargo_turfs))
+		spawn_hostile(/mob/living/basic/bee/toxin, pick_n_take(cargo_turfs), shuttle)
 
 	// Blood and bug guts
 	for(var/i in 1 to 5)
@@ -564,21 +576,21 @@ GLOBAL_LIST_INIT(voidcrew_shuttle_loans, list(
 	// Party supplies
 	var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/service/party]
 	if(pack && length(cargo_turfs))
-		pack.generate(pick_n_take(cargo_turfs))
+		spawn_supply_pack(pack, pick_n_take(cargo_turfs))
 
 	// The Russians
 	if(length(cargo_turfs))
-		new /mob/living/basic/trooper/russian(pick_n_take(cargo_turfs))
+		spawn_hostile(/mob/living/basic/trooper/russian, pick_n_take(cargo_turfs), shuttle)
 	if(length(cargo_turfs))
-		new /mob/living/basic/trooper/russian/ranged(pick_n_take(cargo_turfs)) // This one drops a mateba
+		spawn_hostile(/mob/living/basic/trooper/russian/ranged, pick_n_take(cargo_turfs), shuttle) // This one drops a mateba
 	if(length(cargo_turfs))
-		new /mob/living/basic/bear/russian(pick_n_take(cargo_turfs))
+		spawn_hostile(/mob/living/basic/bear/russian, pick_n_take(cargo_turfs), shuttle)
 
 	// Chance for more
 	if(prob(75) && length(cargo_turfs))
-		new /mob/living/basic/trooper/russian(pick_n_take(cargo_turfs))
+		spawn_hostile(/mob/living/basic/trooper/russian, pick_n_take(cargo_turfs), shuttle)
 	if(prob(50) && length(cargo_turfs))
-		new /mob/living/basic/bear/russian(pick_n_take(cargo_turfs))
+		spawn_hostile(/mob/living/basic/bear/russian, pick_n_take(cargo_turfs), shuttle)
 
 /// Spider gift - Giant spiders from the Spider Clan
 /datum/voidcrew_shuttle_loan/spider_gift
@@ -597,17 +609,17 @@ GLOBAL_LIST_INIT(voidcrew_shuttle_loans, list(
 	// Special ops crate (the "gift")
 	var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/imports/specialops]
 	if(pack && length(cargo_turfs))
-		pack.generate(pick_n_take(cargo_turfs))
+		spawn_supply_pack(pack, pick_n_take(cargo_turfs))
 
 	// THE SPIDERS
 	if(length(cargo_turfs))
-		new /mob/living/basic/spider/giant(pick_n_take(cargo_turfs))
+		spawn_hostile(/mob/living/basic/spider/giant, pick_n_take(cargo_turfs), shuttle)
 	if(length(cargo_turfs))
-		new /mob/living/basic/spider/giant(pick_n_take(cargo_turfs))
+		spawn_hostile(/mob/living/basic/spider/giant, pick_n_take(cargo_turfs), shuttle)
 	if(length(cargo_turfs))
-		new /mob/living/basic/spider/giant/nurse(pick_n_take(cargo_turfs))
+		spawn_hostile(/mob/living/basic/spider/giant/nurse, pick_n_take(cargo_turfs), shuttle)
 	if(prob(50) && length(cargo_turfs))
-		new /mob/living/basic/spider/giant/hunter(pick_n_take(cargo_turfs))
+		spawn_hostile(/mob/living/basic/spider/giant/hunter, pick_n_take(cargo_turfs), shuttle)
 
 	// Victim remains
 	if(length(cargo_turfs))
diff --git a/voidcrew/modules/cargo/shipping/cargo_console.dm b/voidcrew/modules/cargo/shipping/cargo_console.dm
index a0ad90a3db6..88421e64c5c 100644
--- a/voidcrew/modules/cargo/shipping/cargo_console.dm
+++ b/voidcrew/modules/cargo/shipping/cargo_console.dm
@@ -209,7 +209,7 @@
 	data["supplies"] = list()
 	for(var/pack_id in SSshuttle.supply_packs)
 		var/datum/supply_pack/pack = SSshuttle.supply_packs[pack_id]
-		if(!data["supplies"][pack.group])
+		if(can_order_pack(pack) && !data["supplies"][pack.group])
 			data["supplies"][pack.group] = list(
 				"name" = pack.group,
 				"packs" = get_packs_data(pack.group),
@@ -223,7 +223,28 @@
 /obj/machinery/computer/voidcrew_cargo/proc/can_order_pack(datum/supply_pack/pack)
 	if(!pack)
 		return FALSE
-	if((pack.hidden && !(obj_flags & EMAGGED)) || (pack.special && !pack.special_enabled) || pack.drop_pod_only)
+	var/static/list/forbidden_packs = typecacheof(list(
+		/datum/supply_pack/security,
+		/datum/supply_pack/goody/mars_single,
+		/datum/supply_pack/goody/ballistic_single,
+		/datum/supply_pack/goody/disabler_single,
+		/datum/supply_pack/goody/energy_single,
+		/datum/supply_pack/goody/laser_single,
+		/datum/supply_pack/goody/thermal_single,
+		/datum/supply_pack/goody/double_barrel,
+		/datum/supply_pack/goody/hell_single,
+		/datum/supply_pack/imports/mafia,
+		/datum/supply_pack/imports/abandoned,
+		/datum/supply_pack/imports/russian,
+	))
+	if(is_type_in_typecache(pack, forbidden_packs))
+		return FALSE
+	for(var/item_type in pack.contains)
+		if(is_ladder_restricted_production(item_type))
+			return FALSE
+	// The materials market files hidden custom packs into this same cart.
+	var/material_order = istype(pack, /datum/supply_pack/custom/minerals) && valid_material_order_contents(pack.contains)
+	if((pack.hidden && !material_order && !(obj_flags & EMAGGED)) || (pack.special && !pack.special_enabled) || pack.drop_pod_only)
 		return FALSE
 	return !pack.contraband || contraband
 
@@ -511,6 +532,12 @@
 						say("Error: No orders in cart.")
 						return TRUE
 
+					// Outpost freight reserves payment during dispatch, before buy().
+					for(var/datum/supply_order/order as anything in checkout_list)
+						if(!can_order_pack(order.pack))
+							say("Order unavailable.")
+							return TRUE
+
 					// Check if we have enough credits for the order
 					var/total_cost = get_cart_total()
 					// A siphon on the account freezes ordering: shipping the balance out
diff --git a/voidcrew/modules/cargo/shipping/cargo_shuttle.dm b/voidcrew/modules/cargo/shipping/cargo_shuttle.dm
index 6e775ef6352..3be0a71505d 100644
--- a/voidcrew/modules/cargo/shipping/cargo_shuttle.dm
+++ b/voidcrew/modules/cargo/shipping/cargo_shuttle.dm
@@ -84,18 +84,24 @@
  * Returns TRUE if accepted successfully
  */
 /datum/voidcrew_cargo_shuttle/proc/accept_loan()
-	if(!pending_loan)
+	if(!pending_loan || loan_accepted)
 		return FALSE
 	if(state != CARGO_SHUTTLE_AWAY)
 		return FALSE
 
+	var/datum/bank_account/receiving_account = linked_console?.bank_account_holder?.synced_bank_account
+	if(pending_loan.bonus_credits > 0 && QDELETED(receiving_account))
+		return FALSE
+
 	loan_accepted = TRUE
 
 	// Add bonus credits to the linked bank account
-	if(linked_console?.bank_account_holder?.synced_bank_account && pending_loan.bonus_credits > 0)
-		linked_console.bank_account_holder.synced_bank_account.adjust_money(pending_loan.bonus_credits)
+	if(pending_loan.bonus_credits > 0)
+		if(!receiving_account.adjust_money(pending_loan.bonus_credits))
+			loan_accepted = FALSE
+			return FALSE
 		record_transaction("loan", pending_loan.logging_desc, 1, pending_loan.bonus_credits)
-		metric_cargo_loan(pending_loan, linked_console.bank_account_holder.synced_bank_account, usr)
+		metric_cargo_loan(pending_loan, receiving_account, usr)
 
 	// Announce acceptance
 	if(target_ship)
diff --git a/voidcrew/modules/cargo/shipping/purchasing.dm b/voidcrew/modules/cargo/shipping/purchasing.dm
index 71696dc0e6f..2c2ed7c1ac3 100644
--- a/voidcrew/modules/cargo/shipping/purchasing.dm
+++ b/voidcrew/modules/cargo/shipping/purchasing.dm
@@ -31,6 +31,8 @@
 
 	// Iterate a copy: paid orders leave checkout_list inside the loop.
 	for(var/datum/supply_order/spawning_order as anything in checkout_list.Copy())
+		if(!can_order_pack(spawning_order.pack))
+			continue
 		// The cart quote is also the debit. Material stock is checked in full before
 		// payment and consumed only after payment, never partially at a pooled price.
 		if(!spawning_order.settle_ship_order(bank_account_holder.synced_bank_account))
diff --git a/voidcrew/modules/colosseum/colosseum_controller.dm b/voidcrew/modules/colosseum/colosseum_controller.dm
index cd20cd9065a..ff55e0ba644 100644
--- a/voidcrew/modules/colosseum/colosseum_controller.dm
+++ b/voidcrew/modules/colosseum/colosseum_controller.dm
@@ -853,11 +853,11 @@
 		return
 	var/static/list/weapon_weights = list(
 		/obj/item/spear = 25,
-		/obj/item/knife/combat = 20,
+		/obj/item/knife/combat/survival = 20,
 		/obj/item/melee/baseball_bat = 20,
 		/obj/item/shield/riot = 10,
 		/obj/item/gun/ballistic/shotgun/doublebarrel = 10,
-		/obj/item/gun/energy/laser = 10,
+		/obj/item/gun/ballistic/automatic/pistol/m1911 = 10,
 		/obj/item/restraints/legcuffs/beartrap = 5,
 	)
 	var/obj/structure/closet/crate/weapon_crate = new()
diff --git a/voidcrew/modules/colosseum/colosseum_modifiers.dm b/voidcrew/modules/colosseum/colosseum_modifiers.dm
index b58a5b36fbb..49cca25abf5 100644
--- a/voidcrew/modules/colosseum/colosseum_modifiers.dm
+++ b/voidcrew/modules/colosseum/colosseum_modifiers.dm
@@ -108,8 +108,10 @@
 		if(QDELETED(spot))
 			continue
 		var/beast_type = pick_weight(beast_weights)
-		var/mob/living/beast = new beast_type(spot)
+		var/datum/npc_spawn_context/context = new(controller.site, role = "exempt")
+		var/mob/living/beast = spawn_npc_in_zone(beast_type, spot, context, FALSE)
 		beast.faction = list("colosseum") // beasts side with beasts, and nobody else
+		context.finalize()
 		beasts += beast
 		RegisterSignal(beast, COMSIG_LIVING_DEATH, PROC_REF(on_beast_death))
 		RegisterSignal(beast, COMSIG_QDELETING, PROC_REF(on_beast_gone))
diff --git a/voidcrew/modules/colosseum/colosseum_shop.dm b/voidcrew/modules/colosseum/colosseum_shop.dm
index af3662fe185..5438fccda88 100644
--- a/voidcrew/modules/colosseum/colosseum_shop.dm
+++ b/voidcrew/modules/colosseum/colosseum_shop.dm
@@ -108,7 +108,7 @@
 /datum/shop_sku/colosseum/pit_satchel
 	category = "Pit Kit"
 	item_path = /obj/item/storage/medkit/pit_doctor
-	price_credits = 1500
+	price_credits = 1000
 	stock_min = 2
 	stock_max = 3
 
@@ -122,7 +122,7 @@
 /datum/shop_sku/colosseum/rotating/sandstriders
 	category = "Panoply"
 	item_path = /obj/item/clothing/shoes/sandal/sandstrider
-	price_credits = 2400
+	price_credits = 800
 
 /datum/shop_sku/colosseum/rotating/parmula
 	category = "Armaments"
@@ -151,8 +151,8 @@
 /datum/shop_sku/colosseum/rare/laurel
 	category = "Panoply"
 	item_path = /obj/item/clothing/head/costume/crown/laurel
-	price_vouchers = 2
-	price_credits = 4500
+	price_vouchers = 0
+	price_credits = 2000
 
 // =========================================================================
 // THE LANISTA
diff --git a/voidcrew/modules/crew_management/admin_crew_panel.dm b/voidcrew/modules/crew_management/admin_crew_panel.dm
index b2097acc1f3..488d5ba12b3 100644
--- a/voidcrew/modules/crew_management/admin_crew_panel.dm
+++ b/voidcrew/modules/crew_management/admin_crew_panel.dm
@@ -185,7 +185,7 @@ ADMIN_VERB(manage_ship_crews, R_ADMIN, "Manage Ship Crews", "View and manage eve
 	// team.remove_member() already retires their Ship Management button for this hull
 	if(ship.claimed_captain == target)
 		ship.claimed_captain = null
-	ship.ship_team?.remove_member(target)
+	target.leave_reputation_crew()
 	ship.manifest -= kicked_name
 
 	if(target.current)
diff --git a/voidcrew/modules/cyberware/chrome_cradle.dm b/voidcrew/modules/cyberware/chrome_cradle.dm
index 9304e582ed8..904bb0d0899 100644
--- a/voidcrew/modules/cyberware/chrome_cradle.dm
+++ b/voidcrew/modules/cyberware/chrome_cradle.dm
@@ -236,10 +236,14 @@
  */
 /obj/machinery/chrome_cradle/proc/begin_install(obj/item/organ/ware)
 	var/mob/living/carbon/patient = occupant
+	if(!istype(patient) || QDELETED(ware))
+		return
+	var/datum/component/cyberware/chrome = ware.GetComponent(/datum/component/cyberware)
+	if(!chrome || !cyberware_insert_check(ware, patient))
+		return
 	if(ware.loc != src && !patient.transferItemToLoc(ware, src))
 		balloon_alert(patient, "[ware.name] is stuck to you!")
 		return
-	var/datum/component/cyberware/chrome = ware.GetComponent(/datum/component/cyberware)
 	busy = TRUE
 	busy_action = "install"
 	busy_ware = ware
@@ -282,8 +286,18 @@
 	var/datum/component/cyberware/chrome = ware.GetComponent(/datum/component/cyberware)
 	if(!chrome)
 		return
+	// Recheck the final set after the sequence delay, while every incumbent is
+	// still installed. An intervening install or lost Governor must not evict it.
+	if(!cyberware_insert_check(ware, patient))
+		tray |= ware
+		balloon_alert(patient, "install refused!")
+		playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 40, TRUE)
+		wake_patient(patient)
+		SStgui.update_uis(src)
+		return
 	// Same-slot incumbents come out into the tray first, never the floor.
-	for(var/obj/item/organ/incumbent in ware.cyberware_get_incumbents(patient))
+	var/list/incumbents = ware.cyberware_get_incumbents(patient)
+	for(var/obj/item/organ/incumbent in incumbents)
 		incumbent.Remove(patient, special = TRUE)
 		incumbent.forceMove(src)
 		tray += incumbent
@@ -291,10 +305,16 @@
 	tray -= ware
 	chrome.grant_install_context(patient)
 	if(!ware.Insert(patient))
-		tray += ware
+		chrome.clear_install_context()
+		// Preserve the old installation even if a later insertion gate refuses.
+		for(var/obj/item/organ/incumbent in incumbents)
+			if(!QDELETED(incumbent) && incumbent.Insert(patient, special = TRUE))
+				tray -= incumbent
+		tray |= ware
 		balloon_alert(patient, "install refused!")
 		playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 40, TRUE)
 		wake_patient(patient)
+		SStgui.update_uis(src)
 		return
 	do_sparks(3, FALSE, src)
 	patient.flash_act(visual = 1)
@@ -644,11 +664,9 @@
 		projected_capacity += chrome.capacity_bonus
 		for(var/obj/item/organ/incumbent in selected_ware.cyberware_get_incumbents(patient))
 			evicts += incumbent.name
+			projected_load -= get_installed_capacity_cost(incumbent)
 			var/datum/component/cyberware/incumbent_chrome = incumbent.GetComponent(/datum/component/cyberware)
-			if(!incumbent_chrome)
-				continue
-			projected_load -= incumbent_chrome.chrome_load
-			projected_capacity -= incumbent_chrome.capacity_bonus
+			projected_capacity -= incumbent_chrome?.capacity_bonus
 	return list(
 		"load" = projected_load,
 		"capacity" = projected_capacity,
diff --git a/voidcrew/modules/cyberware/cradle_ui.dm b/voidcrew/modules/cyberware/cradle_ui.dm
index 889222f0bfd..7ad8beda7ad 100644
--- a/voidcrew/modules/cyberware/cradle_ui.dm
+++ b/voidcrew/modules/cyberware/cradle_ui.dm
@@ -18,7 +18,7 @@
  * somewhere even before it gets a home.
  */
 GLOBAL_LIST_INIT(cyberware_ui_groups, list(
-	list("id" = "cortex", "name" = "Frontal Cortex", "region" = "head", "slots" = list(ORGAN_SLOT_CYBERWARE_GOVERNOR, ORGAN_SLOT_CYBERWARE_RIGGER, ORGAN_SLOT_CYBERWARE_REGISTRY)),
+	list("id" = "cortex", "name" = "Frontal Cortex", "region" = "head", "slots" = list(ORGAN_SLOT_CYBERWARE_RIGGER, ORGAN_SLOT_CYBERWARE_REGISTRY)),
 	list("id" = "ocular", "name" = "Ocular System", "region" = "head", "slots" = list(ORGAN_SLOT_EYES)),
 	list("id" = "aural", "name" = "Auditory System", "region" = "head", "slots" = list(ORGAN_SLOT_CYBERWARE_EARS, ORGAN_SLOT_CYBERWARE_LARYNX)),
 	list("id" = "os", "name" = "Operating System", "region" = "torso", "slots" = list(ORGAN_SLOT_CYBERWARE_OS)),
diff --git a/voidcrew/modules/cyberware/cyberware_base.dm b/voidcrew/modules/cyberware/cyberware_base.dm
index 921b8d4eb16..367f077f491 100644
--- a/voidcrew/modules/cyberware/cyberware_base.dm
+++ b/voidcrew/modules/cyberware/cyberware_base.dm
@@ -74,7 +74,6 @@
 
 /obj/item/organ/cyberimp/cyberware/examine(mob/user)
 	. = ..()
-	. += span_notice("Neural load: <b>[chrome_load]</b>[chrome_capacity_bonus ? ", grants +[chrome_capacity_bonus] chrome capacity" : ""]. Tier [tier] chrome, install at a Chrome Cradle or through organ-manipulation surgery.")
 	. += cyberware_emp_examine_line()
 
 /obj/item/organ/cyberimp/cyberware/Insert(mob/living/carbon/receiver, special = FALSE, movement_flags)
@@ -151,8 +150,6 @@
 
 /obj/item/organ/eyes/robotic/cyberware/examine(mob/user)
 	. = ..()
-	. += span_notice("Neural load: <b>[chrome_load]</b>. Tier [tier] chrome, install at a Chrome Cradle or through organ-manipulation surgery.")
-	. += span_notice("Diagnostic bus: [chrome_scan_resolution >= CYBERWARE_SCAN_ITEMIZED ? "reads a body's chrome piece by piece" : "counts a body's chrome signatures, but can't name them"].")
 	. += cyberware_emp_examine_line()
 
 /obj/item/organ/eyes/robotic/cyberware/Insert(mob/living/carbon/receiver, special = FALSE, movement_flags)
@@ -223,7 +220,6 @@
 
 /obj/item/organ/cyberimp/arm/toolkit/cyberware/examine(mob/user)
 	. = ..()
-	. += span_notice("Neural load: <b>[chrome_load]</b>. Tier [tier] chrome, install at a Chrome Cradle or through organ-manipulation surgery.")
 	. += cyberware_emp_examine_line()
 
 /obj/item/organ/cyberimp/arm/toolkit/cyberware/Insert(mob/living/carbon/receiver, special = FALSE, movement_flags)
@@ -250,6 +246,9 @@
 // (Fixer's Fingers picking a tool off the radial, the Rockjaw drill, blades,
 // launchers) lights the bearer up on the way out and on the way back in.
 /obj/item/organ/cyberimp/arm/toolkit/cyberware/Extend(obj/item/augment)
+	var/datum/component/cyberware/chrome = GetComponent(/datum/component/cyberware)
+	if(!chrome?.is_running())
+		return
 	. = ..()
 	// The parent assigns active_item before it knows whether a hand is free
 	// (augments_arms.dm), so "did it deploy" is "did it leave us", not "is it set".
@@ -297,24 +296,10 @@
 /proc/cyberware_insert_check(obj/item/organ/ware, mob/living/carbon/target, silent = FALSE, mob/feedback_to)
 	if(!iscarbon(target))
 		return FALSE
-	var/datum/component/cyberware/chrome = ware.GetComponent(/datum/component/cyberware)
-	if(!chrome)
+	if(installed_capacity_check(target, list(ware), ware.cyberware_get_incumbents(target), silent))
 		return TRUE
-	var/projected_load = get_chrome_load(target) + chrome.chrome_load
-	var/projected_capacity = get_chrome_capacity(target) + chrome.capacity_bonus
-	for(var/obj/item/organ/incumbent in ware.cyberware_get_incumbents(target))
-		var/datum/component/cyberware/incumbent_chrome = incumbent.GetComponent(/datum/component/cyberware)
-		if(!incumbent_chrome)
-			continue
-		projected_load -= incumbent_chrome.chrome_load
-		projected_capacity -= incumbent_chrome.capacity_bonus
-	if(projected_load <= projected_capacity)
-		return TRUE
-	if(!silent)
-		target.balloon_alert(target, "no neural headroom!")
-		to_chat(target, span_warning("Your nervous system is already maxed out. [ware] needs [projected_load - projected_capacity] more chrome capacity."))
-		if(feedback_to && feedback_to != target)
-			to_chat(feedback_to, span_warning("[target]'s nervous system can't take [ware], [projected_load - projected_capacity] over capacity."))
+	if(!silent && feedback_to && feedback_to != target)
+		feedback_to.balloon_alert(feedback_to, "no neural headroom!")
 	return FALSE
 
 /**
@@ -381,7 +366,7 @@
 /// weakness was always in the design and never legible on the item itself;
 /// now that it actually bites (BAL-4), it says so where people read it.
 /proc/cyberware_emp_examine_line()
-	return span_notice("Electromagnetic pulses scramble chrome. An EMP knocks this offline for up to [DisplayTimeText(CYBERWARE_EMP_DOWNTIME)] and everything it was doing for you stops until it reboots; a Chrome Cradle tune-up clears it early.")
+	return span_notice("The shielding is thin and worn.")
 
 // ---- Ink bus -----------------------------------------------------------
 
@@ -458,11 +443,10 @@
 	. = ..()
 	if(!.)
 		return
-	if(!organ?.owner)
-		return FALSE
-	if(organ.organ_flags & ORGAN_FAILING)
+	var/datum/component/cyberware/chrome = organ?.GetComponent(/datum/component/cyberware)
+	if(!chrome?.is_running())
 		if(feedback)
-			organ.owner.balloon_alert(organ.owner, "chrome offline!")
+			organ?.owner?.balloon_alert(organ.owner, "chrome offline!")
 		return FALSE
 	return TRUE
 
diff --git a/voidcrew/modules/cyberware/cyberware_component.dm b/voidcrew/modules/cyberware/cyberware_component.dm
index 56456fb7f8d..36aa2c2692d 100644
--- a/voidcrew/modules/cyberware/cyberware_component.dm
+++ b/voidcrew/modules/cyberware/cyberware_component.dm
@@ -26,7 +26,7 @@
 	/// CYBERWARE_TIER_*, drives accent colours and Splice's bedside manner.
 	var/tier = CYBERWARE_TIER_1
 	/// Chrome capacity this ware ADDS to its bearer while installed, the
-	/// Overclock Governor hook. Load 0 + bonus 6 is a Governor.
+	/// Governor Delete hook. Load 0 + bonus 15 is a Governor.
 	var/capacity_bonus = 0
 	/// TRUE while the bearer is over capacity and this ware is browned out.
 	var/browned_out = FALSE
@@ -186,9 +186,10 @@
  */
 /datum/component/cyberware/proc/settle_passives(mob/living/carbon/bearer)
 	var/obj/item/organ/ware = parent
-	var/installed_here = !QDELETED(ware) && bearer && ware.owner == bearer
-	var/ware_running = !browned_out && !emp_down && !(ware.organ_flags & ORGAN_FAILING)
-	var/should_be_online = installed_here && ware_running
+	var/should_be_online = bearer && ware.owner == bearer && is_running()
+	if(!should_be_online && istype(ware, /obj/item/organ/cyberimp/arm/toolkit/cyberware))
+		var/obj/item/organ/cyberimp/arm/toolkit/cyberware/arm = ware
+		arm.Retract()
 	if(passives_online == !!should_be_online)
 		return
 	passives_online = !!should_be_online
@@ -201,7 +202,12 @@
 /// settle (see the registration comment in on_implanted()).
 /datum/component/cyberware/proc/on_owner_life(mob/living/carbon/source, seconds_per_tick, times_fired)
 	SIGNAL_HANDLER
-	settle_passives(source)
+	update_failing()
+
+/// Read our own failure sources: organ healing can clear the shared failing bit mid-reboot.
+/datum/component/cyberware/proc/is_running()
+	var/obj/item/organ/ware = parent
+	return !QDELETED(ware) && ware.owner && !browned_out && !emp_down && ware.damage < ware.maxHealth && !(ware.organ_flags & ORGAN_FAILING)
 
 // ---- Install context ---------------------------------------------------
 // Cyberware refuses Insert() outside a legit context: organ-manipulation
@@ -243,20 +249,86 @@
 		if(organ.GetComponent(/datum/component/cyberware))
 			. += organ
 
-/// Chrome load of a single organ; 0 for anything that isn't chrome.
+/// Compatibility helper for callers quoting an organ's installed load.
 /proc/get_organ_chrome_load(obj/item/organ/ware)
-	var/datum/component/cyberware/chrome = ware?.GetComponent(/datum/component/cyberware)
-	return chrome ? chrome.chrome_load : 0
+	return get_installed_capacity_cost(ware)
+
+/// All non-chrome costs. Ordinary anatomy is free; chrome retains its component's cost.
+GLOBAL_LIST_INIT(installed_capacity_costs, list(
+	"implant" = 1,
+	"robotic_organ" = 1,
+	"bioware" = 1,
+	"prosthetic_limb" = 0,
+))
 
-/// The target's total neural load, summed live off the installed organs.
+/proc/get_installed_capacity_cost(datum/installed)
+	if(QDELETED(installed))
+		return 0
+	if(isorgan(installed))
+		var/obj/item/organ/organ = installed
+		var/datum/component/cyberware/chrome = organ.GetComponent(/datum/component/cyberware)
+		if(chrome)
+			return chrome.chrome_load
+		return (IS_ROBOTIC_ORGAN(organ) || istype(organ, /obj/item/organ/cyberimp)) ? GLOB.installed_capacity_costs["robotic_organ"] : 0
+	if(istype(installed, /obj/item/implant))
+		return GLOB.installed_capacity_costs["implant"]
+	if(istype(installed, /datum/status_effect/bioware))
+		return GLOB.installed_capacity_costs["bioware"]
+	if(istype(installed, /obj/item/bodypart))
+		return GLOB.installed_capacity_costs["prosthetic_limb"]
+	if(istype(installed, /datum/nanite_program))
+		var/datum/nanite_program/program = installed
+		return program.capacity_cost()
+	return 0
+
+/// A set of installed objects, so chrome never also counts as a generic robotic organ.
+/proc/get_installed_capacity_items(mob/living/carbon/target)
+	var/list/installed = list()
+	if(!iscarbon(target))
+		return installed
+	installed |= target.organs
+	if(target.implants)
+		installed |= target.implants
+	installed |= target.bodyparts
+	for(var/datum/status_effect/bioware/enhancement in target.status_effects)
+		installed |= enhancement
+	var/datum/component/nanites/nanites = target.GetComponent(/datum/component/nanites)
+	if(nanites && !QDELETED(nanites))
+		installed |= nanites.programs
+	return installed
+
+/// Check the complete resulting body before mutating it. Removal and load-neutral recovery stay possible.
+/proc/installed_capacity_check(mob/living/carbon/target, list/additions, list/removals, silent = FALSE)
+	if(!iscarbon(target))
+		return TRUE
+	var/list/projected = get_installed_capacity_items(target)
+	if(removals)
+		projected -= removals
+	if(additions)
+		projected |= additions
+	var/load = 0
+	var/capacity = CYBERWARE_BASE_CAPACITY
+	var/addition_cost = 0
+	for(var/datum/item in additions)
+		addition_cost += get_installed_capacity_cost(item)
+	for(var/datum/item in projected)
+		load += get_installed_capacity_cost(item)
+		if(isorgan(item))
+			var/datum/component/cyberware/chrome = item.GetComponent(/datum/component/cyberware)
+			capacity += chrome?.capacity_bonus
+	if(load <= capacity || (!addition_cost && load <= get_chrome_load(target) && capacity >= get_chrome_capacity(target)))
+		return TRUE
+	if(!silent)
+		target.balloon_alert(target, "no neural headroom!")
+	return FALSE
+
+/// The target's total installed load, including disabled programs.
 /proc/get_chrome_load(mob/living/carbon/target)
 	. = 0
 	if(!iscarbon(target))
 		return
-	for(var/obj/item/organ/organ in target.organs)
-		var/datum/component/cyberware/chrome = organ.GetComponent(/datum/component/cyberware)
-		if(chrome)
-			. += chrome.chrome_load
+	for(var/datum/item in get_installed_capacity_items(target))
+		. += get_installed_capacity_cost(item)
 
 /// The target's chrome capacity: the body's baseline plus every installed
 /// ware's capacity bonus (the Governor hook).
@@ -291,9 +363,9 @@
 	if(!iscarbon(target) || QDELETED(target))
 		return
 	var/list/installed = get_installed_cyberware(target)
-	if(!length(installed))
-		return
 	var/over = get_chrome_load(target) > get_chrome_capacity(target)
+	var/datum/component/nanites/nanites = target.GetComponent(/datum/component/nanites)
+	nanites?.settle_capacity(over)
 	var/newly_tripped = FALSE
 	var/any_recovered = FALSE
 	for(var/obj/item/organ/ware as anything in installed)
@@ -306,7 +378,7 @@
 			any_recovered = TRUE
 	if(newly_tripped)
 		target.balloon_alert(target, "chrome brownout!")
-		to_chat(target, span_boldwarning("Your chrome browns out. Too much load on the wetware. Shed some ware to bring it back."))
+		to_chat(target, span_boldwarning("Your chrome goes dark."))
 		do_sparks(2, TRUE, target)
 	else if(any_recovered)
 		target.balloon_alert(target, "chrome back online")
diff --git a/voidcrew/modules/cyberware/ripperdoc_catalog.dm b/voidcrew/modules/cyberware/ripperdoc_catalog.dm
index b7b379946ef..eba6111bed5 100644
--- a/voidcrew/modules/cyberware/ripperdoc_catalog.dm
+++ b/voidcrew/modules/cyberware/ripperdoc_catalog.dm
@@ -3,10 +3,8 @@
  *
  * The Undertow's chrome parlor: a vendor stall (own stock, own voice, own
  * ledger) fronted by Splice, who sits behind the counter in the neon annex off
- * the Dregs. He sells cyberware and nothing else, the whole roster, tiered up
- * the voucher ladder, with the flagships always on the shelf so the chase is
- * plannable. Ammunition for the arm weapons is parlor-only: the return-visit
- * hook.
+ * the Dregs. He sells utility chrome, limited melee implants and ammunition
+ * for salvaged gun arms.
  *
  * Balance shape mirrors Vex's counter: credits buy the street and pro-utility
  * ware, vouchers gate everything that changes how you fight. Splice's intake
@@ -92,11 +90,9 @@
 		/datum/shop_sku/ripperdoc/atlas,
 		/datum/shop_sku/ripperdoc/gorilla,
 		/datum/shop_sku/ripperdoc/monowire,
-		/datum/shop_sku/ripperdoc/ronin,
 		/datum/shop_sku/ripperdoc/rigger,
 		/datum/shop_sku/ripperdoc/slabskin,
 		/datum/shop_sku/ripperdoc/mantis,
-		/datum/shop_sku/ripperdoc/bunker_buster,
 		/datum/shop_sku/ripperdoc/ghostskin,
 		/datum/shop_sku/ripperdoc/lazarus,
 		// ---- Legend Chrome (the chase, always listed) ----
@@ -152,11 +148,6 @@
 			"Sawbones does organs. I do upgrades. We don't compete. We share a supplier.",
 			"The mirror's there for after. Everyone looks. Take your time.",
 			"The bar watches installs through that window. Dram charges them for the seat.",
-			"EMP will drop your chrome for a few seconds. It comes back. You might not. Plan around it.",
-			"Capacity's not a suggestion. Your spine carries twenty points of load. After that, things brown out.",
-			"Trade-ins get you half list on the street grades. Military chrome I don't buy back. Nobody sells it anyway.",
-			"A courier once asked me to hide two kilos in his chest. The cavity's one slot. Read the tag.",
-			"Borging shreds every implant in the body. Cloning leaves them on the corpse. Bring the corpse.",
 			"I don't do discounts. I do work that doesn't need discounts.",
 		),
 		TRADER_LINE_RESTOCK = list(
@@ -176,7 +167,7 @@
 
 /datum/shop_sku/ripperdoc/chromatic_dermis
 	category = "Street Chrome"
-	desc = "Programmable circuit-tattoos under the skin. They flare when you take a hit, strobe when your chrome fires, and go dim when you're starving. Pure show, and worth every credit."
+	desc = "Programmable circuit tattoos beneath the skin."
 	item_path = /obj/item/organ/cyberimp/cyberware/chromatic_dermis
 	price_credits = 400
 	stock_min = 2
@@ -184,7 +175,7 @@
 
 /datum/shop_sku/ripperdoc/gastro
 	category = "Street Chrome"
-	desc = "A furnace where your stomach was. Eats anything that qualifies as food, and it's generous about qualifying. Immune to whatever the Dregs calls a special."
+	desc = "A reinforced synthetic stomach with an industrial lining."
 	item_path = /obj/item/organ/cyberimp/cyberware/gastro
 	price_credits = 400
 	stock_min = 2
@@ -199,7 +190,7 @@
 
 /datum/shop_sku/ripperdoc/nightshade
 	category = "Street Chrome"
-	desc = "Sees in the dark, and doesn't blind you when someone pops a flash. The printed thermals can't say that. Diagnostic bus is stock, so you'll read how much chrome the other guy is carrying, but never what."
+	desc = "A pair of chrome low-light optics."
 	item_path = /obj/item/organ/eyes/robotic/cyberware/nightshade
 	price_credits = 600
 	stock_min = 1
@@ -208,7 +199,7 @@
 /datum/shop_sku/ripperdoc/scrapper
 	category = "Street Chrome"
 	name = "Scrapper's Knuckles (pair)"
-	desc = "Reinforced knuckle plating for both hands. Hits people harder, hits machines and doors a lot harder. Sold as a set; install one side at a time."
+	desc = "A cased pair of reinforced knuckle plates."
 	item_path = /obj/item/storage/case/cyberware/scrapper
 	price_credits = 800
 	stock_min = 1
@@ -230,7 +221,7 @@
 
 /datum/shop_sku/ripperdoc/cargo_cavity
 	category = "Street Chrome"
-	desc = "One sealed slot behind the sternum. Scanners skip it and pat-downs miss it. I don't ask what goes in."
+	desc = "A concealed storage cavity behind the sternum."
 	item_path = /obj/item/organ/cyberimp/cyberware/cargo_cavity
 	price_credits = 1000
 	stock_min = 1
@@ -288,7 +279,7 @@
 
 /datum/shop_sku/ripperdoc/icepick
 	category = "Pro Chrome"
-	desc = "A data spike for the doors and turrets that won't open or stand down when asked. Outpost defenses ignore it, before you get ideas."
+	desc = "A chrome forearm with a retractable data spike."
 	item_path = /obj/item/organ/cyberimp/arm/toolkit/cyberware/icepick
 	price_vouchers = 1
 
@@ -327,58 +318,93 @@
 // =========================================================================
 
 /datum/shop_sku/ripperdoc/atlas
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "Military Chrome"
 	item_path = /obj/item/organ/cyberimp/cyberware/atlas
 	price_vouchers = 2
 
 /datum/shop_sku/ripperdoc/gorilla
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "Military Chrome"
 	name = "Gorilla Arms (pair)"
-	desc = "A pair of chrome forearms that punch through people, doors, and rock in that order. Sold cased; install one side at a time."
+	desc = "A cased pair of heavy chrome forearms."
 	item_path = /obj/item/cyberware_pair_case/gorilla_arms
 	price_vouchers = 3
+	stock_min = 1
+	stock_max = 1
+	restock_interval = INFINITY
+	fixed_price = TRUE
+	contract_reward = FALSE
 
 /datum/shop_sku/ripperdoc/monowire
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "Military Chrome"
 	item_path = /obj/item/organ/cyberimp/arm/toolkit/cyberware/monowire
 	price_vouchers = 3
+	stock_min = 1
+	stock_max = 1
+	restock_interval = INFINITY
+	fixed_price = TRUE
+	contract_reward = FALSE
 
 /datum/shop_sku/ripperdoc/ronin
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "Military Chrome"
-	desc = "A submachine gun that folds into your forearm. Feeds a proprietary caliber only I sell. See the Ammunition shelf. Nobody is disarming you of it."
+	desc = "A submachine gun folded into a chrome forearm."
 	item_path = /obj/item/organ/cyberimp/arm/toolkit/cyberware/ronin
 	price_vouchers = 3
+	stock_min = 0
+	stock_max = 0
+	restock_interval = INFINITY
+	fixed_price = TRUE
+	contract_reward = FALSE
 
 /datum/shop_sku/ripperdoc/rigger
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "Military Chrome"
-	desc = "Skull jack. Opens your ship's helm wherever you're standing on it: engineering, a corridor, medbay with your hands full. It borrows a real console, so a hull with no helm left gives you nothing, and you're walking, not running, the whole time you're flying."
+	desc = "A skull jack with a ship's control interface."
 	item_path = /obj/item/organ/cyberimp/cyberware/rigger
 	price_vouchers = 3
 
 /datum/shop_sku/ripperdoc/slabskin
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "Military Chrome"
 	item_path = /obj/item/organ/cyberimp/cyberware/slabskin
 	price_vouchers = 3
 
 /datum/shop_sku/ripperdoc/mantis
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "Military Chrome"
 	name = "Mantis Blades (pair)"
-	desc = "A pair of folded blades where your forearms were. The lunge is the selling point; the reaction you get is free. Sold cased, install one side at a time."
+	desc = "A cased pair of folding forearm blades."
 	item_path = /obj/item/cyberware_pair_case/mantis_blades
 	price_vouchers = 4
+	stock_min = 1
+	stock_max = 1
+	restock_interval = INFINITY
+	fixed_price = TRUE
+	contract_reward = FALSE
 
 /datum/shop_sku/ripperdoc/bunker_buster
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "Military Chrome"
-	desc = "A two-shot rocket pod built into the forearm. Reloads are parlor-only. See the Ammunition shelf. Shaped charge, so it won't open your hull. Or theirs. Just whoever's standing in it."
+	desc = "A rocket pod built into a chrome forearm."
 	item_path = /obj/item/organ/cyberimp/arm/toolkit/cyberware/bunker_buster
 	price_vouchers = 4
+	stock_min = 0
+	stock_max = 0
+	restock_interval = INFINITY
+	fixed_price = TRUE
+	contract_reward = FALSE
 
 /datum/shop_sku/ripperdoc/ghostskin
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "Military Chrome"
 	item_path = /obj/item/organ/cyberimp/cyberware/ghostskin
 	price_vouchers = 4
 
 /datum/shop_sku/ripperdoc/lazarus
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "Military Chrome"
 	item_path = /obj/item/organ/cyberimp/cyberware/lazarus
 	price_vouchers = 4
@@ -388,14 +414,16 @@
 // =========================================================================
 
 /datum/shop_sku/ripperdoc/governor_delete
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "Legend Chrome"
-	desc = "Firmware surgery. Your capacity governor goes back in believing your spine can carry six more points of load, and it holds. Everything else on this shelf needs it."
+	desc = "A factory neural governor with its limiter firmware stripped out."
 	item_path = /obj/item/organ/cyberimp/cyberware/governor_delete
 	price_vouchers = 5
 	stock_min = 1
 	stock_max = 1
 
 /datum/shop_sku/ripperdoc/redline
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "Legend Chrome"
 	item_path = /obj/item/organ/cyberimp/cyberware/redline
 	price_vouchers = 6
@@ -403,8 +431,9 @@
 	stock_max = 1
 
 /datum/shop_sku/ripperdoc/cascade
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "Legend Chrome"
-	desc = "Sandevistan-class reflex lattice. Eight seconds where everyone else may as well be furniture, then a crash that puts you on the floor. The most expensive thing I've ever bolted into a spine."
+	desc = "A Sandevistan reflex lattice in a sealed surgical case."
 	item_path = /obj/item/organ/cyberimp/cyberware/cascade
 	price_vouchers = 8
 	stock_min = 1
@@ -415,6 +444,7 @@
 // =========================================================================
 
 /datum/shop_sku/ripperdoc/ronin_mag
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "Ammunition"
 	name = "Ronin magazine"
 	desc = "Proprietary caliber for the Popup Ronin. Nowhere else stocks it, which is the point."
@@ -424,6 +454,7 @@
 	stock_max = 6
 
 /datum/shop_sku/ripperdoc/buster_rockets
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "Ammunition"
 	name = "Bunker Buster rockets"
 	desc = "A matched pair of shaped micro-rockets for the Bunker Buster pod. Handle them carefully. They're meant to go off at the far end."
diff --git a/voidcrew/modules/cyberware/ware_legend.dm b/voidcrew/modules/cyberware/ware_legend.dm
index 856c4306d2c..aa1c1ec9356 100644
--- a/voidcrew/modules/cyberware/ware_legend.dm
+++ b/voidcrew/modules/cyberware/ware_legend.dm
@@ -576,10 +576,10 @@
 // =========================================================================
 
 /**
- * # Governor Delete (T4, head, governor slot, load 0, +6 capacity)
+ * # Governor Delete (T4, chest OS, load 0, +15 capacity)
  *
  * The enabler: a neural governor with its limiter firmware deleted, worth
- * six points of chrome capacity and nothing else. Deliberately built on the
+ * fifteen points of capacity and nothing else. Deliberately built on the
  * generic chrome base rather than tg's brain-implant subtype, the brain
  * base answers EMP with a 200/severity stun, which on a PvP server would
  * turn a one-voucher grenade into an execution button. Here it browns out
@@ -587,13 +587,13 @@
  */
 /obj/item/organ/cyberimp/cyberware/governor_delete
 	name = "\improper Governor Delete"
-	desc = "A factory neural governor with the governing part surgically removed. It tells your nervous system it has six more points of headroom than it really does, and your nervous system believes it."
+	desc = "A factory neural governor with its limiter firmware stripped out."
 	icon_state = "governor_delete"
-	zone = BODY_ZONE_HEAD
-	slot = ORGAN_SLOT_CYBERWARE_GOVERNOR
+	zone = BODY_ZONE_CHEST
+	slot = ORGAN_SLOT_CYBERWARE_OS
 	w_class = WEIGHT_CLASS_SMALL
 	chrome_load = 0
-	chrome_capacity_bonus = 6
+	chrome_capacity_bonus = 15
 	tier = CYBERWARE_TIER_4
 
 // =========================================================================
@@ -818,14 +818,13 @@
 /datum/action/cooldown/cyberware/piledriver_leap/proc/crush_victim(mob/living/jumper, mob/living/victim)
 	if(QDELETED(victim) || QDELETED(jumper))
 		return
-	var/blocked = victim.run_armor_check(attack_flag = MELEE)
 	if(iscarbon(victim))
 		var/mob/living/carbon/carbon_victim = victim
-		if(prob(CYBERWARE_PILEDRIVER_CRUSH_SPREAD_CHANCE))
+		if(should_spread_crush_damage())
 			carbon_victim.apply_damage(
 				CYBERWARE_PILEDRIVER_CRUSH_DAMAGE,
 				BRUTE,
-				blocked = blocked,
+				blocked = 0, // Forced damage bypasses armor, including nanite armor accounting.
 				forced = TRUE,
 				spread_damage = TRUE,
 				attack_direction = jumper.dir,
@@ -839,7 +838,7 @@
 		victim.apply_damage(
 			CYBERWARE_PILEDRIVER_CRUSH_DAMAGE,
 			BRUTE,
-			blocked = blocked,
+			blocked = 0,
 			forced = TRUE,
 			attack_direction = jumper.dir,
 		)
@@ -853,6 +852,9 @@
 	)
 	log_combat(jumper, victim, "crushed with a Meteor Piledriver landing")
 
+/datum/action/cooldown/cyberware/piledriver_leap/proc/should_spread_crush_damage()
+	return prob(CYBERWARE_PILEDRIVER_CRUSH_SPREAD_CHANCE)
+
 #undef CYBERWARE_CASCADE_WINDOW
 #undef CYBERWARE_CASCADE_CRASH
 #undef CYBERWARE_CASCADE_DODGE_CHANCE
diff --git a/voidcrew/modules/cyberware/ware_military_body.dm b/voidcrew/modules/cyberware/ware_military_body.dm
index 8bd9840fb15..66cd60b4e75 100644
--- a/voidcrew/modules/cyberware/ware_military_body.dm
+++ b/voidcrew/modules/cyberware/ware_military_body.dm
@@ -294,6 +294,8 @@
 	tier = CYBERWARE_TIER_3
 	/// TRUE during the one-second windup.
 	var/jolting = FALSE
+	/// Changes on every windup/cancellation; old callbacks cannot spend a new installation's charge.
+	var/jolt_generation = 0
 	/// The once-per-six-minutes clock.
 	COOLDOWN_DECLARE(jolt_cooldown)
 
@@ -312,6 +314,12 @@
 	. = ..()
 	UnregisterSignal(organ_owner, COMSIG_MOB_STATCHANGE)
 	jolting = FALSE
+	jolt_generation++
+
+/obj/item/organ/cyberimp/cyberware/lazarus/chrome_passives_off(mob/living/carbon/bearer)
+	. = ..()
+	jolting = FALSE
+	jolt_generation++
 
 /**
  * Signal proc for [COMSIG_MOB_STATCHANGE]: fires the windup on the
@@ -322,7 +330,8 @@
 	SIGNAL_HANDLER
 	if(jolting)
 		return
-	if(organ_flags & ORGAN_FAILING)
+	var/datum/component/cyberware/chrome = GetComponent(/datum/component/cyberware)
+	if(source != owner || !chrome?.is_running())
 		return
 	if(new_stat == CONSCIOUS || new_stat == DEAD)
 		return
@@ -331,7 +340,7 @@
 	if(!COOLDOWN_FINISHED(src, jolt_cooldown))
 		return
 	jolting = TRUE
-	COOLDOWN_START(src, jolt_cooldown, CYBERWARE_LAZARUS_COOLDOWN)
+	jolt_generation++
 	source.visible_message(
 		span_boldwarning("[source] seizes, something under [source.p_their()] ribs whines up to full charge!"),
 		span_userdanger("The Lazarus node screams up to charge..."),
@@ -339,20 +348,26 @@
 	playsound(source, 'sound/machines/defib/defib_charge.ogg', 75, TRUE)
 	source.set_jitter_if_lower(4 SECONDS)
 	source.do_jitter_animation(200)
-	addtimer(CALLBACK(src, PROC_REF(jolt)), CYBERWARE_LAZARUS_WINDUP)
+	addtimer(CALLBACK(src, PROC_REF(jolt), jolt_generation, WEAKREF(source)), CYBERWARE_LAZARUS_WINDUP)
 
 /// The discharge: heal to 30%, clear the floor out from under every stun,
 /// and stand the patient up with a thunderclap. Skipped if they died (or
 /// recovered) during the windup, that second belongs to the attacker.
-/obj/item/organ/cyberimp/cyberware/lazarus/proc/jolt()
+/obj/item/organ/cyberimp/cyberware/lazarus/proc/jolt(windup_generation, datum/weakref/intended_patient)
+	if(!jolting || windup_generation != jolt_generation)
+		return
 	jolting = FALSE
-	var/mob/living/carbon/patient = owner
-	if(QDELETED(src) || QDELETED(patient))
+	var/mob/living/carbon/patient = intended_patient?.resolve()
+	if(QDELETED(src) || QDELETED(patient) || patient != owner)
 		return
-	if(organ_flags & ORGAN_FAILING)
+	var/datum/component/cyberware/chrome = GetComponent(/datum/component/cyberware)
+	if(!chrome?.is_running())
 		return
 	if(patient.stat == DEAD || patient.stat == CONSCIOUS)
 		return
+	if(!COOLDOWN_FINISHED(src, jolt_cooldown))
+		return
+	COOLDOWN_START(src, jolt_cooldown, CYBERWARE_LAZARUS_COOLDOWN)
 	var/needed = (patient.maxHealth * CYBERWARE_LAZARUS_HEAL_TO) - patient.health
 	if(needed > 0)
 		var/oxy_heal = min(needed, patient.getOxyLoss())
diff --git a/voidcrew/modules/derelict_outposts/derelict_themes.dm b/voidcrew/modules/derelict_outposts/derelict_themes.dm
index 22a7fd5b41c..4d4175bc53c 100644
--- a/voidcrew/modules/derelict_outposts/derelict_themes.dm
+++ b/voidcrew/modules/derelict_outposts/derelict_themes.dm
@@ -720,7 +720,7 @@
 	// The boss first, at its anchor
 	var/turf/boss_tile = (boss_anchor && hostile_can_start(boss_anchor, generator)) ? boss_anchor : pick_hostile_tile(legal, spawned, boss_anchor, FALSE)
 	if(boss_tile)
-		add_hostile(theme, theme.boss_type, boss_tile, red ? DERELICT_BOSS_HEALTH_MULT_RED : DERELICT_BOSS_HEALTH_MULT_YELLOW, spawned)
+		add_hostile(theme, theme.boss_type, boss_tile, "boss", spawned)
 	else
 		log_mapping("Derelict outpost [site.true_name]: no room for its [theme.name] boss.")
 	// Then the roster, taking the anchors in turn so every cluster is guarded
@@ -741,7 +741,7 @@
 			if(!tile)
 				log_mapping("Derelict outpost [site.true_name]: no room for a [hostile_type].")
 				continue
-			add_hostile(theme, hostile_type, tile, red ? DERELICT_HEALTH_MULT_RED : DERELICT_HEALTH_MULT_YELLOW, spawned)
+			add_hostile(theme, hostile_type, tile, "ordinary", spawned)
 
 /**
  * A start tile for one hostile from `legal`, spaced DERELICT_HOSTILE_SPACING from the others (1 if nothing fits).
@@ -772,19 +772,13 @@
 	return null
 
 /// Spawns one hostile of `hostile_type` on `tile`, readies, scales and leashes it. Returns it, or null.
-/datum/derelict_scene/proc/add_hostile(datum/derelict_theme/theme, hostile_type, turf/tile, multiplier, list/mob/living/spawned)
-	var/mob/living/hostile = new hostile_type(tile)
+/datum/derelict_scene/proc/add_hostile(datum/derelict_theme/theme, hostile_type, turf/tile, role, list/mob/living/spawned)
+	var/datum/npc_spawn_context/context = new(site, site.derelict_band, role)
+	var/mob/living/hostile = spawn_npc_in_zone(hostile_type, tile, context, FALSE)
 	if(QDELETED(hostile))
-		// A mi-go can come out as its rare variant, which takes its place on the tile
-		hostile = null
-		for(var/mob/living/replacement in tile)
-			if(istype(replacement, hostile_type) && !QDELETED(replacement) && !(replacement in spawned))
-				hostile = replacement
-				break
-		if(!hostile)
-			return null
+		return null
 	theme.prepare_hostile(hostile)
-	scale_npc_ship_pirate_health(hostile, multiplier)
+	context.finalize()
 	hostile.AddComponent(/datum/component/derelict_leash, site)
 	site.derelict_hostiles += WEAKREF(hostile)
 	spawned += hostile
diff --git a/voidcrew/modules/dynamic_events/events/anomalies.dm b/voidcrew/modules/dynamic_events/events/anomalies.dm
index 4fe5da0002a..e62e181b613 100644
--- a/voidcrew/modules/dynamic_events/events/anomalies.dm
+++ b/voidcrew/modules/dynamic_events/events/anomalies.dm
@@ -7,7 +7,7 @@
  *
  * ALL OF THESE ARE ADMIN-ONLY. Every control below is weight 0 / max_occurrences 0, and
  * none of them roll naturally. Anomalies now generate on planet surfaces instead, see
- * voidcrew/datums/mapgen/planet_anomalies.dm and the ZONE_PLANET_ANOMALY_BUDGET_* defines.
+ * voidcrew/datums/mapgen/planet_anomalies.dm and the ZONE_PLANET_ANOMALY_CHANCE_* defines.
  *
  * The reason is that a shuttle is the worst possible venue for one. A ship has a single
  * route between compartments, so an anomaly spawned in a corridor is not a hazard the
diff --git a/voidcrew/modules/dynamic_events/events/portal_storm.dm b/voidcrew/modules/dynamic_events/events/portal_storm.dm
index 65a1ce934b2..98b221070a6 100644
--- a/voidcrew/modules/dynamic_events/events/portal_storm.dm
+++ b/voidcrew/modules/dynamic_events/events/portal_storm.dm
@@ -81,6 +81,9 @@
 	var/next_pulse = 0
 	/// Whether the final pulse may spend one spawn slot on a boss.
 	var/boss_pending = FALSE
+	/// Pinned when the event is set up, before later pulses or ship movement.
+	var/npc_spawn_zone
+	var/turf/npc_source_turf
 
 /// Builds plane-correct portal appearances without resolving or retaining turfs.
 /datum/round_event/voidcrew/portal_storm/setup()
@@ -88,6 +91,8 @@
 		kill()
 		return
 
+	npc_source_turf = get_turf(target_ship)
+	npc_spawn_zone = SSovermap_zones.get_zone_type_anywhere(npc_source_turf) || ZONE_GREEN
 	storm_appearances = list()
 	for(var/offset in 0 to SSmapping.max_plane_offset)
 		var/mutable_appearance/storm = mutable_appearance('icons/obj/machines/engine/energy_ball.dmi', "energy_ball_fast", FLY_LAYER)
@@ -159,10 +164,12 @@
 		spawn_slots_remaining--
 
 		var/mob_type
+		var/role = "ordinary"
 		if(boss_pending && pulses_remaining == 1)
 			boss_pending = FALSE
 			if(length(target_ship.get_event_crew()) >= 5)
 				mob_type = pick_weight(boss_types)
+				role = "boss"
 		else
 			mob_type = pick_weight(hostile_types)
 		if(!mob_type)
@@ -171,7 +178,8 @@
 		var/turf/open/floor/spawn_turf = target_ship.get_random_open_ship_turf()
 		if(!spawn_turf || !target_ship.is_aboard(spawn_turf))
 			continue
-		var/mob/living/new_hostile = new mob_type(spawn_turf)
+		var/datum/npc_spawn_context/context = new(target_ship, npc_spawn_zone, role, source_turf = npc_source_turf)
+		var/mob/living/new_hostile = spawn_npc_in_zone(mob_type, spawn_turf, context)
 		if(QDELETED(new_hostile))
 			continue
 		spawned_mobs++
diff --git a/voidcrew/modules/dynamic_events/events/vent_clog.dm b/voidcrew/modules/dynamic_events/events/vent_clog.dm
index ec5cdb534c8..45d864416c4 100644
--- a/voidcrew/modules/dynamic_events/events/vent_clog.dm
+++ b/voidcrew/modules/dynamic_events/events/vent_clog.dm
@@ -74,12 +74,15 @@
 	var/list/filth_spawn_types = list()
 	/// Whether this datum currently has signals registered on vent.
 	var/signals_registered = FALSE
+	/// Capture the owning ship's band, including while docked or in transit.
+	var/datum/npc_spawn_context/npc_source
 
 /datum/round_event/voidcrew/vent_clog/setup()
 	if(!target_valid())
 		finish_event()
 		return
 
+	npc_source = new(target_ship, SSovermap_zones.get_zone_type_anywhere(get_turf(target_ship)) || ZONE_GREEN)
 	vent = get_vent()
 	if(QDELETED(vent) || !target_ship.is_aboard(vent))
 		finish_event()
@@ -205,7 +208,10 @@
 	if(length(living_mobs) >= min(maximum_spawns, crew_scaled_cap))
 		return
 
-	var/mob/living/new_mob = new spawned_mob(vent_loc)
+	var/datum/npc_spawn_context/context = new(target_ship, npc_source.zone_type, source_turf = npc_source.source_turf)
+	var/mob/living/new_mob = spawn_npc_in_zone(spawned_mob, vent_loc, context)
+	if(QDELETED(new_mob))
+		return
 	living_mobs += WEAKREF(new_mob)
 	vent.visible_message(span_warning("[new_mob] crawls out of [vent]!"))
 
diff --git a/voidcrew/modules/lich/lich_abilities.dm b/voidcrew/modules/lich/lich_abilities.dm
index 07c2494cdb2..ba082eb5ac5 100644
--- a/voidcrew/modules/lich/lich_abilities.dm
+++ b/voidcrew/modules/lich/lich_abilities.dm
@@ -250,6 +250,7 @@
 		/mob/living/basic/skeleton/templar,
 	)
 	summon_radius = 2
+	npc_summon_role = "ordinary"
 	summon_amount = 2
 	summon_respects_density = TRUE
 	// Permanent. The cap plus the mob's death cleanup is what keeps this safe, not a
@@ -298,7 +299,6 @@
 		qdel(risen)
 		return
 
-	ilthuun.register_summon(risen)
 	// FACTION_LICH is what makes the ward machines read this thing as its layer's
 	// garrison rather than as somebody's pet, so the gates open when the hall is
 	// actually clear. FACTION_SKELETON is kept so the /mob/living/basic/skeleton types
@@ -309,6 +309,7 @@
 	if(risen_turf)
 		new /obj/effect/temp_visual/small_smoke/halfsecond(risen_turf)
 		playsound(risen_turf, 'sound/effects/magic/RATTLEMEBONES.ogg', 45, vary = TRUE)
+	ilthuun.register_summon(risen)
 
 // ===== DESTRUCTION =====
 
@@ -452,6 +453,8 @@
 	var/burn_interval = 1 SECONDS
 	/// Burn applied per tick to anyone standing on an affected tile.
 	var/burn_per_tick = 5
+	/// Captured at cast time; the patch never depends on a surviving caster for damage.
+	var/npc_damage_factor = 1
 	/// The live patch's ground visuals, so his deletion can snuff them early.
 	var/list/obj/effect/temp_visual/lich_grave_dirt/active_dirt = list()
 	/// Stoppable id of the pending ignition, null outside the telegraph window.
@@ -481,6 +484,7 @@
 	var/turf/center = get_turf(cast_on)
 	if(isnull(center))
 		return
+	npc_damage_factor = isliving(owner) ? npc_zone_damage(1, owner) : 1
 
 	if(owner)
 		owner.visible_message(span_boldwarning("Ilthuun drives a hand downward, and the ground around [cast_on] darkens into turned earth."))
@@ -538,7 +542,7 @@
 		for(var/mob/living/victim in tile)
 			if(!can_burn(victim))
 				continue
-			victim.adjustFireLoss(burn_per_tick)
+			victim.adjustFireLoss(npc_zone_damage(burn_per_tick, npc_damage_factor))
 			to_chat(victim, span_danger("The grave-dirt sears you from below!"))
 	// The first application lands at ignition, so reschedule only while the NEXT one
 	// would still fall inside the window: 7 ticks total, not 8.
@@ -660,11 +664,14 @@
 		var/turf/spot = get_step(cast_on, pick_n_take(directions))
 		if(isnull(spot) || spot.is_blocked_turf(exclude_mobs = TRUE))
 			continue
-		var/mob/living/basic/lich/mirror_image/copy = new(spot)
+		ilthuun.get_npc_spawn_context()
+		var/datum/npc_spawn_context/context = new(ilthuun, role = "ordinary")
+		var/mob/living/basic/lich/mirror_image/copy = spawn_npc_in_zone(/mob/living/basic/lich/mirror_image, spot, context, FALSE)
 		ilthuun.register_summon(copy)
 		copies += copy
 		RegisterSignals(copy, list(COMSIG_QDELETING, COMSIG_LIVING_DEATH), PROC_REF(lost_copy))
 		QDEL_IN(copy, image_lifespan)
+		context.finalize()
 		placed++
 
 	if(!placed)
@@ -833,7 +840,7 @@
 		// mend_the_dead() in lich_spells.dm.
 		victim.heal_overall_damage(brute = 10, burn = 10, forced = TRUE)
 		return
-	victim.adjustToxLoss(8, forced = TRUE)
+	victim.adjustToxLoss(npc_zone_damage(8, npc_zone_damage_factor), forced = TRUE)
 	to_chat(victim, span_danger("Something starts rotting where the bolt went in."))
 
 #undef VERDIGRIS_TINT
diff --git a/voidcrew/modules/lich/lich_loot.dm b/voidcrew/modules/lich/lich_loot.dm
index 516e9ffcfc1..45e055f31d0 100644
--- a/voidcrew/modules/lich/lich_loot.dm
+++ b/voidcrew/modules/lich/lich_loot.dm
@@ -157,6 +157,8 @@ GLOBAL_LIST_INIT(lich_hoard_contents, list(
 
 	var/list/turf/remaining = scatter.Copy()
 	for(var/hoard_type as anything in GLOB.lich_hoard_contents)
+		if(hoard_type == /obj/item/melee/verdigris_staff && (!istype(drop_near, /mob/living/basic/lich) || !drop_near:npc_red_weapon_drop))
+			continue
 		if(!length(remaining))
 			remaining = scatter.Copy()
 		new hoard_type(pick_n_take(remaining))
@@ -671,7 +673,8 @@ GLOBAL_LIST_INIT(lich_hoard_contents, list(
 		refuse_draught()
 		return
 
-	var/came_back = drinker.heal_and_revive(
+	var/came_back = drinker.heal_and_revive_from(
+		"phylactery",
 		LICH_PHYLACTERY_REVIVE_TO,
 		span_boldwarning("[drinker] jerks upright in a wash of green light, and somewhere a jar breaks."),
 	)
diff --git a/voidcrew/modules/lich/lich_mob.dm b/voidcrew/modules/lich/lich_mob.dm
index 028ef65ff41..9940f0a45de 100644
--- a/voidcrew/modules/lich/lich_mob.dm
+++ b/voidcrew/modules/lich/lich_mob.dm
@@ -406,8 +406,12 @@
 /mob/living/basic/lich/proc/register_summon(mob/living/summon)
 	if(QDELETED(summon) || (summon in live_summons))
 		return
+	get_npc_spawn_context()
+	if(!summon.npc_spawn_context)
+		summon.npc_spawn_context = new /datum/npc_spawn_context(src, role = "ordinary")
 	live_summons += summon
 	RegisterSignals(summon, list(COMSIG_QDELETING, COMSIG_LIVING_DEATH), PROC_REF(on_summon_lost))
+	summon.finalize_npc_zone(summon.npc_spawn_context)
 
 /mob/living/basic/lich/proc/on_summon_lost(mob/living/source)
 	SIGNAL_HANDLER
@@ -620,7 +624,7 @@
 	SIGNAL_HANDLER
 	if(attack_flags & (ATTACKER_STAMINA_ATTACK|ATTACKER_SHOVING))
 		return
-	attacker.adjustFireLoss(15)
+	attacker.adjustFireLoss(npc_zone_damage(15, src))
 	to_chat(attacker, span_warning("The image bursts, and something cold pours down your arm!"))
 
 /mob/living/basic/lich/mirror_image/examine(mob/user)
diff --git a/voidcrew/modules/lich/lich_site.dm b/voidcrew/modules/lich/lich_site.dm
index 22503b2c570..2205c7d2ae1 100644
--- a/voidcrew/modules/lich/lich_site.dm
+++ b/voidcrew/modules/lich/lich_site.dm
@@ -331,7 +331,8 @@ GLOBAL_DATUM(lich_lair, /obj/structure/overmap/space_ruin/lich_lair)
 	if(!found_lich && !spent)
 		var/turf/spawn_turf = boss_spawn_turf || get_random_layer_turf(/area/ruin/space/has_grav/powered/lich_lair/sanctum)
 		if(spawn_turf)
-			found_lich = new /mob/living/basic/lich(spawn_turf)
+			var/datum/npc_spawn_context/context = new(src, role = "boss")
+			found_lich = spawn_npc_in_zone(/mob/living/basic/lich, spawn_turf, context)
 			log_mapping("LICH: template placed no lich. Spawned one at ([spawn_turf.x], [spawn_turf.y]).")
 		else
 			log_mapping("LICH: no lich, no boss_spawn landmark and no sanctum turf. The raid has no boss.")
@@ -350,6 +351,8 @@ GLOBAL_DATUM(lich_lair, /obj/structure/overmap/space_ruin/lich_lair)
 /obj/structure/overmap/space_ruin/lich_lair/proc/bind_lich(mob/living/boss)
 	if(QDELETED(boss))
 		return
+	if(!boss.npc_spawn_context)
+		boss.finalize_npc_zone(new /datum/npc_spawn_context(src, role = "boss"))
 	lich_ref = WEAKREF(boss)
 	RegisterSignal(boss, COMSIG_LIVING_DEATH, PROC_REF(on_boss_death), override = TRUE)
 
diff --git a/voidcrew/modules/lich/lich_spells.dm b/voidcrew/modules/lich/lich_spells.dm
index 3ad47797a0a..096c68d95f2 100644
--- a/voidcrew/modules/lich/lich_spells.dm
+++ b/voidcrew/modules/lich/lich_spells.dm
@@ -439,11 +439,14 @@
 	var/list/mob/living/basic/verdigris_mirage/fresh_copies = list()
 	while(length(fresh_copies) < VERDIGRIS_MIRAGE_COUNT && length(free_steps) > 1)
 		var/turf/mirage_turf = pick_n_take(free_steps)
-		var/mob/living/basic/verdigris_mirage/mirage = new(mirage_turf, caster)
+		caster.get_npc_spawn_context()
+		var/datum/npc_spawn_context/context = new(caster)
+		var/mob/living/basic/verdigris_mirage/mirage = spawn_npc_in_zone(/mob/living/basic/verdigris_mirage, mirage_turf, context, FALSE, list(caster))
 		mirages += mirage
 		fresh_copies += mirage
 		RegisterSignals(mirage, list(COMSIG_QDELETING, COMSIG_LIVING_DEATH), PROC_REF(on_mirage_lost))
 		QDEL_IN(mirage, VERDIGRIS_MIRAGE_LIFESPAN)
+		context.finalize()
 
 	if(!length(fresh_copies))
 		to_chat(caster, span_warning("The grave-light gathers, but there's no room for it."))
@@ -633,7 +636,7 @@
 		return
 
 	stung = TRUE
-	attacker.adjustBruteLoss(VERDIGRIS_MIRAGE_STING)
+	attacker.adjustBruteLoss(npc_zone_damage(VERDIGRIS_MIRAGE_STING, src))
 	to_chat(attacker, span_userdanger("The mirage bursts, spraying green light through your arm!"))
 	new /obj/effect/temp_visual/small_smoke/halfsecond(get_turf(src))
 	QDEL_IN(src, 0)
diff --git a/voidcrew/modules/loot/abandoned_crate.dm b/voidcrew/modules/loot/abandoned_crate.dm
index 8638ac4c9eb..1a2e6e7d60d 100644
--- a/voidcrew/modules/loot/abandoned_crate.dm
+++ b/voidcrew/modules/loot/abandoned_crate.dm
@@ -1,59 +1,15 @@
 /**
- * # Abandoned crate loot
- *
- * Replaces tg's `spawn_loot()` (code/modules/mining/abandoned_crates.dm),
- * which was a 1-100 switch that paid a plushie, a balloon, kitty ears or a
- * banhammer-and-bwoink-mines gag roughly seven times in ten. That table is
- * written for a station round where the crate is a bit of maintenance
- * furniture. Out here a crate is a two-jump trip and a bomb you have to
- * out-think, so it pays like one.
- *
- * WHAT THIS IS NOT: a zone cache. The nine themed caches
- * (voidcrew/modules/loot/themes/) are the other channel and they stay the
- * better one, because they are guarded, band-scaled and hold the authored
- * uniques. This crate is the flat one: a shipping container nobody came back
- * for, identical odds in green space and in red. The lock is what it charges
- * instead of a zone (see the header block on the constants in
- * voidcrew/_DEFINES/loot.dm for why that trade is the whole design).
- *
- * The content split follows from that. A themed cache is a PURPOSEFUL
- * stockpile: an armory holds an armory's guns, a lab holds a lab's science, a
- * pirate hoard holds treasure. Freight is COMMERCIAL CARGO, which is to say
- * anything a hauler moves: a pallet of plasteel, a case of medkits, a crate of
- * surplus rifles, a bale of winter coats. Breadth is the identity, not a
- * subject.
- *
- * That extends to the guns, and it is the main thing keeping this table off
- * the armory theme's toes. The armory pays the SEC-ISSUE ladder (vest and
- * helmet, disabler, seclite, baton, riot line). Freight pays what turns up in
- * a container: surplus bolt-actions, hunting doubles, a riot pump, a Makarov,
- * a detective's .38, an uzi, a tommygun. Civilian, surplus and criminal
- * hardware rather than anybody's service weapon, and every ballistic brings a
- * spare reload via GLOB.loot_gun_spare_ammo so a gun roll is never dead.
- *
- * Still excluded, all four the other channel's job: cyberware, authored
- * uniques, themed weapon SETS, and five-figure cash.
- *
- * Tuned against the outpost shelves, which are the certainty channel to this
- * crate's gamble (plasteel x20 = 900cr, jetpack = 2100cr, RCD = 2400cr, the
- * dearest general SKU = 3600cr). A cracked crate averages a couple of hundred
- * credits of loose cash, about one gun, and 5-7 items a crew would otherwise
- * have flown to a trader for. It is a good crate. It is not a round-winning
- * one.
+ * Deca-code freight keeps its lock and 5-7 draws. One draw is a weapon from
+ * its spawn-zone profile; the others retain the nonweapon freight tables.
+ * Freight never pays advanced guns, cyberware or authored unique weapons.
  */
 
-/// Freight bulk: consumables, kit and the surplus long gun off the bottom of
-/// the manifest. A crate that paid nothing but these would still be worth
-/// cracking, which is the bar this tier has to clear.
+/// Nonweapon commercial cargo, drawn without replacement within each tier.
 GLOBAL_LIST_INIT(abandoned_crate_common, list(
 	/obj/item/storage/medkit/regular = 8,
 	/obj/item/stack/sheet/iron/fifty = 8,
-	// the container gun: war-surplus, one shot at a time, and it arrives with
-	// a box of 310 to feed it
-	/obj/item/gun/ballistic/rifle/boltaction/surplus = 7,
 	/obj/item/stack/sheet/glass/fifty = 7,
 	/obj/item/tank/internals/oxygen = 7,
-	/obj/item/knife/combat = 6,
 	/obj/item/reagent_containers/hypospray/medipen = 6,
 	/obj/item/storage/box/donkpockets = 6,
 	/obj/item/food/rationpack = 5,
@@ -75,19 +31,12 @@ GLOBAL_LIST_INIT(abandoned_crate_uncommon, list(
 	/obj/item/stack/sheet/plasteel/twenty = 8,
 	/obj/item/tank/jetpack/oxygen = 7,
 	/obj/item/storage/medkit/advanced = 7,
-	/obj/item/gun/ballistic/shotgun/riot = 6,
 	/obj/item/clothing/suit/armor/vest = 6,
 	/obj/item/stack/spacecash/c500 = 6,
 	/obj/item/stack/sheet/mineral/plasma/thirty = 6,
-	/obj/item/gun/ballistic/automatic/pistol = 5,
-	/obj/item/gun/ballistic/revolver/c38/detective = 5,
-	/obj/item/gun/ballistic/shotgun/doublebarrel = 5,
 	/obj/item/stock_parts/power_store/cell/super = 5,
 	/obj/item/stack/sheet/mineral/titanium/fifty = 5,
 	/obj/item/reagent_containers/hypospray/medipen/survival = 5,
-	// somebody was moving these in a crate marked FARM EQUIPMENT
-	/obj/item/gun/ballistic/automatic/mini_uzi = 4,
-	/obj/item/gun/ballistic/automatic/tommygun = 4,
 	/obj/item/storage/backpack/duffelbag/med = 4,
 	/obj/item/survivalcapsule = 4,
 	/obj/item/wormhole_jaunter = 4,
@@ -97,48 +46,151 @@ GLOBAL_LIST_INIT(abandoned_crate_uncommon, list(
 
 /// The top of freight, and deliberately the top of nothing else. Gear a crew
 /// reorganizes an afternoon around, never gear it reorganizes the round
-/// around: no uniques, no chrome, no five-figure cash. The blueprint is the
-/// one long-odds reach into the weapons-bench pipeline, at the tier the themed
-/// caches already put a mid blueprint on.
+/// around: no uniques, no chrome, no five-figure cash.
 GLOBAL_LIST_INIT(abandoned_crate_prime, list(
 	/obj/item/stack/sheet/plasteel/fifty = 7,
 	/obj/item/ship_parts/combat = 7,
 	/obj/item/construction/rcd/loaded = 6,
-	/obj/item/gun/ballistic/shotgun/automatic/combat = 6,
-	/obj/item/gun/energy/e_gun = 5,
-	/obj/item/gun/ballistic/automatic/pistol/deagle = 5,
 	/obj/item/stock_parts/power_store/cell/hyper = 5,
 	/obj/item/defibrillator/compact = 5,
 	/obj/item/stack/spacecash/c1000 = 5,
 	/obj/item/stack/sheet/mineral/uranium/fifty = 5,
 	/obj/item/stack/sheet/mineral/gold/fifty = 5,
-	/obj/item/gun/energy/laser = 4,
-	/obj/item/gun/ballistic/rifle/boltaction = 4,
 	/obj/item/storage/medkit/surgery = 4,
 	/obj/item/stack/sheet/mineral/diamond/five = 4,
 	/obj/item/clothing/glasses/night = 4,
-	/obj/item/blueprint/gun/wt550 = 3,
 	// a loaded bluespace RPED: ten each of tier-3 parts, enough to re-fit
 	// every machine on a hull in one pass. Tier 4 exists a line above this one
 	// in part_replacer.dm if this plays too weak
 	/obj/item/storage/part_replacer/bluespace/tier3 = 3,
 ))
 
+GLOBAL_LIST_INIT(abandoned_crate_guns_green, list(
+	/obj/item/gun/ballistic/rifle/boltaction/surplus,
+	/obj/item/gun/ballistic/automatic/pistol,
+	/obj/item/gun/ballistic/revolver/c38/detective,
+	/obj/item/gun/ballistic/shotgun/doublebarrel,
+))
+
+GLOBAL_LIST_INIT(abandoned_crate_guns_yellow, list(
+	/obj/item/gun/ballistic/shotgun/riot,
+	/obj/item/gun/ballistic/automatic/tommygun,
+	/obj/item/gun/ballistic/automatic/mini_uzi,
+))
+
+GLOBAL_LIST_INIT(abandoned_crate_melee_green, list(
+	/obj/item/knife/combat/survival,
+	/obj/item/spear,
+	/obj/item/hatchet,
+	/obj/item/melee/baseball_bat,
+))
+
+GLOBAL_LIST_INIT(abandoned_crate_melee_yellow, list(
+	/obj/item/knife/combat,
+	/obj/item/claymore/shortsword,
+	/obj/item/melee/baseball_bat/ablative,
+	/obj/item/fireaxe,
+	/obj/item/melee/cleric_mace,
+	/obj/item/melee/sabre,
+))
+
+GLOBAL_LIST_INIT(abandoned_crate_melee_red, list(
+	/obj/item/claymore,
+	/obj/item/claymore/cutlass,
+	/obj/item/katana,
+	/obj/item/mjollnir,
+	/obj/item/melee/energy/sword/saber,
+	/obj/item/melee/energy/sword/pirate,
+))
+
 /**
- * Fires once, and only from the correct-code branch of attack_hand(). A crate
- * that gets blown, cut or emagged never reaches here, which is why the table
- * can afford to be this good.
- *
- * Draws WITHOUT replacement, so one crate never pays the same line twice, and
- * an exhausted tier walks down rather than wasting the draw (see
- * draw_loot_from_tier in zone_loot.dm). There is no UNIQUE tier here; the
- * odds never select one, and the walk-down handles the missing shelf anyway.
+ * One Bernoulli gun roll, then a class roll in thousandths. Freight folds
+ * the gun ladder's red class into yellow (940/60, 450/550, 150/850).
+ * Melee retains all three classes: 900/99/1, 350/640/10, 100/450/450.
+ * Explicit rolls let tests enumerate the exact distribution without sampling.
  */
+/proc/freight_weapon_pool(zone_type, gun_roll = rand(1, 100), class_roll = rand(1, 1000))
+	var/gun_chance = 8
+	var/gun_green = 940
+	var/melee_green = 900
+	var/melee_through_yellow = 999
+	switch(zone_type)
+		if(ZONE_YELLOW)
+			gun_chance = 19
+			gun_green = 450
+			melee_green = 350
+			melee_through_yellow = 990
+		if(ZONE_RED)
+			gun_chance = 33
+			gun_green = 150
+			melee_green = 100
+			melee_through_yellow = 550
+	if(gun_roll <= gun_chance)
+		return class_roll <= gun_green ? GLOB.abandoned_crate_guns_green : GLOB.abandoned_crate_guns_yellow
+	if(class_roll <= melee_green)
+		return GLOB.abandoned_crate_melee_green
+	if(class_roll <= melee_through_yellow)
+		return GLOB.abandoned_crate_melee_yellow
+	return GLOB.abandoned_crate_melee_red
+
+/obj/structure/closet/crate/secure/loot
+	/// Resolved once at the origin; moving the crate cannot improve it.
+	var/loot_zone
+	var/turf/spawn_turf
+
+/obj/structure/closet/crate/secure/loot/Initialize(mapload)
+	spawn_turf = spawned_loot ? null : get_turf(src)
+	return ..()
+
+/obj/structure/closet/crate/secure/loot/LateInitialize()
+	. = ..()
+	if(!spawned_loot)
+		new /datum/zone_resolver(spawn_turf, CALLBACK(src, PROC_REF(on_freight_zone_resolved)))
+
+/obj/structure/closet/crate/secure/loot/proc/on_freight_zone_resolved(zone_type)
+	if(QDELETED(src) || spawned_loot || !isnull(loot_zone) || isnull(zone_type))
+		return
+	loot_zone = zone_type
+	spawn_turf = null
+
+/// The same latch covers correct-code payout, forced opening and rebuilds.
+/obj/structure/closet/crate/secure/loot/proc/consume_freight_loot()
+	spawned_loot = TRUE
+	spawn_turf = null
+
+/obj/structure/closet/crate/secure/loot/dump_contents()
+	// All opening, break, cut and anti-tamper explosion paths dump contents.
+	// Only the correct-code branch calls spawn_loot() before reaching this.
+	consume_freight_loot()
+	return ..()
+
+/obj/structure/closet/crate/secure/loot/emag_act(mob/user, obj/item/card/emag/emag_card)
+	consume_freight_loot()
+	return ..()
+
+/obj/structure/closet/crate/secure/loot/Destroy()
+	consume_freight_loot()
+	return ..()
+
+/// Replaces upstream's gag table; only a correct code requests this payout.
 /obj/structure/closet/crate/secure/loot/spawn_loot()
+	if(QDELETED(src) || spawned_loot)
+		return
+	// Claim before any item constructor can yield or re-enter this proc.
+	spawned_loot = TRUE
+	if(isnull(loot_zone))
+		loot_zone = SSovermap_zones.get_zone_type_anywhere(spawn_turf)
+	if(isnull(loot_zone))
+		loot_zone = ZONE_GREEN
+	consume_freight_loot()
+	var/weapon_path = pick(freight_weapon_pool(loot_zone))
+	new weapon_path(src)
+	var/spare_ammo = GLOB.loot_gun_spare_ammo[weapon_path]
+	if(spare_ammo)
+		new spare_ammo(src)
 	var/list/pools = list(
 		"[LOOT_TIER_COMMON]" = GLOB.abandoned_crate_common.Copy(),
 		"[LOOT_TIER_UNCOMMON]" = GLOB.abandoned_crate_uncommon.Copy(),
 		"[LOOT_TIER_PRIME]" = GLOB.abandoned_crate_prime.Copy(),
 	)
-	roll_loot_draws(src, pools, rand(ABANDONED_CRATE_DRAWS_MIN, ABANDONED_CRATE_DRAWS_MAX), ABANDONED_CRATE_ODDS)
-	spawned_loot = TRUE
+	roll_loot_draws(src, pools, rand(ABANDONED_CRATE_DRAWS_MIN, ABANDONED_CRATE_DRAWS_MAX) - 1, ABANDONED_CRATE_ODDS)
diff --git a/voidcrew/modules/loot/loot_guns.dm b/voidcrew/modules/loot/loot_guns.dm
index be0a9e4eb6b..6c3401cfb48 100644
--- a/voidcrew/modules/loot/loot_guns.dm
+++ b/voidcrew/modules/loot/loot_guns.dm
@@ -33,20 +33,98 @@
 /obj/item/gun/energy/temperature/unrestricted
 	pin = /obj/item/firing_pin
 
-/**
- * The armory contraband spawner is scattered through a dozen ruins, and its two
- * `/contraband` pistols roll a 1-in-10 clown pin on spawn: usually a gun the
- * finder simply cannot fire, and on the super-ultra roll one that detonates in
- * their hands. Same guns, same odds, without the coin flip.
- */
+// Incidental contraband rolls cannot bypass the guarded weapon ladder.
 /obj/effect/spawner/random/contraband/armory
 	loot = list(
-		/obj/item/gun/ballistic/automatic/pistol = 80,
-		/obj/item/gun/ballistic/shotgun/automatic/combat = 50,
-		/obj/item/storage/box/syndie_kit/throwing_weapons = 30,
-		/obj/item/grenade/clusterbuster/teargas = 20,
-		/obj/item/grenade/clusterbuster = 20,
-		/obj/item/gun/ballistic/automatic/pistol/deagle,
-		/obj/item/gun/ballistic/revolver/mateba = 9,
-		/obj/item/gun/ballistic/revolver/reverse/mateba = 1,
+		/obj/item/knife/combat/survival = 1,
+		/obj/item/spear = 1,
+		/obj/item/hatchet = 1,
+		/obj/item/melee/baseball_bat = 1,
 	)
+
+/// Main entries have equal weight; theme-specific retained variants have weight one.
+GLOBAL_LIST_INIT(loot_gun_pools, list(
+	LOOT_GUN_POOL_ARMORY = list(
+		LOOT_WEAPON_GREEN = list(
+			/obj/item/gun/ballistic/rifle/boltaction/surplus = 10,
+		),
+		LOOT_WEAPON_YELLOW = list(
+			/obj/item/gun/energy/laser = 10,
+			/obj/item/gun/energy/e_gun = 10,
+			/obj/item/gun/ballistic/automatic/wt550 = 10,
+		),
+		LOOT_WEAPON_RED = list(
+			/obj/item/gun/energy/laser/carbine = 10,
+			/obj/item/gun/energy/lasercannon/unrestricted = 10,
+			/obj/item/gun/energy/laser/scatter = 10,
+			/obj/item/gun/ballistic/rifle/sniper_rifle = 10,
+			/obj/item/gun/ballistic/shotgun/automatic/combat = 10,
+		),
+	),
+	LOOT_GUN_POOL_SYNDICATE = list(
+		LOOT_WEAPON_GREEN = list(
+			/obj/item/gun/ballistic/automatic/pistol = 10,
+		),
+		LOOT_WEAPON_YELLOW = list(
+			/obj/item/gun/ballistic/automatic/c20r/unrestricted = 10,
+			/obj/item/gun/ballistic/automatic/mini_uzi = 10,
+		),
+		LOOT_WEAPON_RED = list(
+			/obj/item/gun/ballistic/automatic/l6_saw/unrestricted = 10,
+			/obj/item/gun/energy/xray = 10,
+			/obj/item/gun/energy/e_gun/nuclear = 10,
+		),
+	),
+	LOOT_GUN_POOL_PLUNDER = list(
+		LOOT_WEAPON_GREEN = list(
+			/obj/item/gun/ballistic/revolver/c38/detective = 10,
+			/obj/item/gun/ballistic/shotgun/doublebarrel = 10,
+		),
+		LOOT_WEAPON_YELLOW = list(
+			/obj/item/gun/ballistic/revolver = 10,
+			/obj/item/gun/ballistic/automatic/tommygun = 10,
+		),
+		LOOT_WEAPON_RED = list(
+			/obj/item/gun/ballistic/shotgun/bulldog/unrestricted = 10,
+			/obj/item/gun/energy/laser/hellgun = 10,
+		),
+	),
+	LOOT_GUN_POOL_FREIGHT = list(
+		LOOT_WEAPON_GREEN = list(
+			/obj/item/gun/ballistic/rifle/boltaction/surplus = 10,
+			/obj/item/gun/ballistic/automatic/pistol = 10,
+			/obj/item/gun/ballistic/revolver/c38/detective = 10,
+			/obj/item/gun/ballistic/shotgun/doublebarrel = 10,
+		),
+		LOOT_WEAPON_YELLOW = list(
+			/obj/item/gun/ballistic/shotgun/riot = 10,
+			/obj/item/gun/ballistic/automatic/tommygun = 10,
+			/obj/item/gun/ballistic/automatic/mini_uzi = 10,
+		),
+	),
+))
+
+GLOBAL_LIST_INIT(loot_melee_pools, list(
+	LOOT_WEAPON_GREEN = list(
+		/obj/item/knife/combat/survival = 10,
+		/obj/item/spear = 10,
+		/obj/item/hatchet = 10,
+		/obj/item/melee/baseball_bat = 10,
+	),
+	LOOT_WEAPON_YELLOW = list(
+		/obj/item/knife/combat = 10,
+		/obj/item/claymore/shortsword = 10,
+		/obj/item/melee/baseball_bat/ablative = 10,
+		/obj/item/fireaxe = 10,
+		/obj/item/melee/cleric_mace = 10,
+		/obj/item/melee/sabre = 10,
+	),
+	LOOT_WEAPON_RED = list(
+		/obj/item/claymore = 10,
+		/obj/item/claymore/cutlass = 10,
+		/obj/item/katana = 10,
+		/obj/item/mjollnir = 10,
+		/obj/item/melee/energy/sword/saber = 10,
+		/obj/item/melee/energy/sword/pirate = 10,
+	),
+))
diff --git a/voidcrew/modules/loot/themes/_theme.dm b/voidcrew/modules/loot/themes/_theme.dm
index 033fe3b5be3..e6900d346fc 100644
--- a/voidcrew/modules/loot/themes/_theme.dm
+++ b/voidcrew/modules/loot/themes/_theme.dm
@@ -1,59 +1,24 @@
 /**
- * # Loot themes
+ * Each theme owns four nonweapon tiers plus retained weapon variants.
+ * A cache replaces one draw with the shared gun-or-melee selector. The
+ * spawn zone changes draw counts and odds; every weapon class remains
+ * reachable everywhere. Utility tools and control gear keep their sources.
  *
- * One datum per loot theme (armory, plunder, ...), owning everything the
- * theme hands out and everything defending it: the four tier tables
- * consumed by /obj/structure/closet/crate/zone_loot (zone_loot.dm), plus,
- * by file colocation, the theme's crate subtype and the guard-marker
- * subtypes (/obj/effect/zone_mobs) that watch over it.
- *
- * A theme is ONE pool split by how good the item is, not by where you are.
- * Overmap zone never selects a table. It only decides how many draws a
- * cache gets and how the odds lean across the four tiers (see zone_loot.dm).
- * Every band can reach every tier; deep space just reaches the top of it far
- * more often. This mirrors how zones already scale planet ore, fauna and
- * weather (voidcrew/_DEFINES/overmap_zones.dm): amounts and odds, not kinds.
- *
- * Why a datum instead of vars on the crate subtype (the old shape): the
- * cache weights are hand-tuned against outpost shop prices ("the gamble
- * channel and the certainty channel stay on one curve") and against the
- * theme's own guard tables. Keeping tables, guards and the SKU
- * cross-reference list in one file per theme makes that curve a same-screen
- * edit instead of a comment maintained across three files, and gives the
- * loot audit unit test (code/modules/unit_tests/voidcrew_loot.dm) a single
- * registry to walk.
- *
- * CYBERWARE (2026-08-05): the parlor roster rides these tables the same way
- * the gun blueprints do. The shop is the certainty channel, the caches are
- * the gamble channel, and both sit on one curve. Chrome enters at the tier
- * that matches what Splice charges for it
- * (voidcrew/modules/cyberware/ripperdoc_catalog.dm):
- * - Street chrome (400-2000cr) -> common / uncommon
- * - Pro chrome (2800-3600cr, 1-2 vouchers) -> uncommon / prime
- * - Military chrome (2-4 vouchers) -> the long tail of prime, weight 2-3
- * Two exclusions, both deliberate: Legend chrome (Cascade, Redline, Governor
- * Delete) is the authored chase and is always on Splice's shelf, and the
- * Piledriver is the black market's contract-only reward, neither drops. The
- * Skyhook Wrist is the mirror of that: it has no SKU anywhere, so a cache is
- * the only place it exists (expedition prime).
- *
- * A found piece is not a worn piece. Chrome still installs only at a Chrome
- * Cradle or through organ-manipulation surgery, and it still costs capacity,
- * so a cache pays the hardware and never the seat in the chair.
- *
- * HARD RULE (design): no megafauna anywhere in the zone system, not in
- * guard tables, not as bosses, never as generic cache guards in new maps.
- * Megafauna (including this fork's /mob/living/basic/boss tier, see
- * ismegafauna()) belong to planet apex spawns and to the handful of
- * purpose-built boss-arena ruins enumerated in the unit test's whitelist
- * (blood-drunk shrines, the hierophant arena, the wendigo cave, ...).
- * "Harder versions of normal mobs" (elites, ancients, captains) are the
- * ceiling everywhere else; the unit test enforces this for the tables and
- * for every shipped ruin .dmm.
+ * Weapon extras have weight one against weight ten per main entry. Chrome
+ * weapons belong here too; other implants remain in the nonweapon tiers.
+ * Guards stay colocated with their theme. Megafauna never enter these
+ * guard tables: only the purpose-built arena ruins may place them.
  */
 /datum/loot_theme
 	/// Debug/audit label
 	var/name
+	/// Per-container gun percentages, indexed by ZONE_GREEN/YELLOW/RED.
+	var/list/gun_chance
+	/// Main gun family; each class also accepts the theme's retained variants.
+	var/gun_pool = LOOT_GUN_POOL_ARMORY
+	/// Class -> weighted extra weapon paths, separate from all nonweapon draws.
+	var/list/gun_extras
+	var/list/melee_extras
 	/// Weighted tier tables (typepath -> weight). Bread and butter; what a
 	/// cache pays most of the time in any band.
 	var/list/loot_common
@@ -75,6 +40,10 @@
 	/// audit unit test can walk the curve.
 	var/list/theme_skus
 
+/// Returns a disposable pool. Freight never inherits themed weapon extras.
+/datum/loot_theme/proc/get_weapon_pool(gun, weapon_class, freight = FALSE)
+	return get_cache_weapon_pool(gun, weapon_class, freight ? LOOT_GUN_POOL_FREIGHT : gun_pool, freight ? null : (gun ? gun_extras : melee_extras))
+
 /// theme typepath -> singleton instance; built once at world init
 GLOBAL_LIST_INIT(loot_themes, init_loot_themes())
 
diff --git a/voidcrew/modules/loot/themes/armory.dm b/voidcrew/modules/loot/themes/armory.dm
index a1e3e4c100a..9a0af19267b 100644
--- a/voidcrew/modules/loot/themes/armory.dm
+++ b/voidcrew/modules/loot/themes/armory.dm
@@ -15,6 +15,118 @@
 
 /datum/loot_theme/armory
 	name = "armory"
+	gun_chance = LOOT_GUN_CHANCE_ARMORY
+	gun_pool = LOOT_GUN_POOL_ARMORY
+	gun_extras = list(
+		LOOT_WEAPON_GREEN = list(
+			/obj/item/gun/ballistic/automatic/pistol/m1911 = 1,
+			/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag = 1,
+			/obj/item/gun/ballistic/automatic/pistol/no_mag = 1,
+			/obj/item/gun/ballistic/automatic/pistol/toy = 1,
+			/obj/item/gun/ballistic/automatic/toy = 1,
+			/obj/item/gun/ballistic/bow = 1,
+			/obj/item/gun/ballistic/revolver/c38 = 1,
+			/obj/item/gun/ballistic/revolver/nagant = 1,
+			/obj/item/gun/ballistic/revolver/russian = 1,
+			/obj/item/gun/ballistic/revolver/russian/soul = 1,
+			/obj/item/gun/ballistic/rifle/boltaction/pipegun = 1,
+			/obj/item/gun/ballistic/rifle/boltaction/pipegun/pistol = 1,
+			/obj/item/gun/ballistic/shotgun/doublebarrel/breacherslug = 1,
+			/obj/item/gun/ballistic/shotgun/doublebarrel/slugs = 1,
+			/obj/item/gun/ballistic/shotgun/musket = 1,
+			/obj/item/gun/ballistic/shotgun/toy = 1,
+			/obj/item/gun/ballistic/shotgun/toy/crossbow = 1,
+		),
+		LOOT_WEAPON_YELLOW = list(
+			/obj/item/gun/ballistic/automatic/ar = 1,
+			/obj/item/gun/ballistic/automatic/pistol/aps = 1,
+			/obj/item/gun/ballistic/automatic/pistol/deagle = 1,
+			/obj/item/gun/ballistic/automatic/pistol/deagle/camo = 1,
+			/obj/item/gun/ballistic/automatic/pistol/deagle/gold = 1,
+			/obj/item/gun/ballistic/automatic/smartgun = 1,
+			/obj/item/gun/ballistic/revolver/golden = 1,
+			/obj/item/gun/ballistic/rifle/boltaction = 1,
+			/obj/item/gun/ballistic/rifle/boltaction/donkrifle = 1,
+			/obj/item/gun/ballistic/rifle/boltaction/pipegun/prime = 1,
+			/obj/item/gun/ballistic/rifle/boltaction/prime = 1,
+			/obj/item/gun/ballistic/rifle/rebarxbow/forced = 1,
+			/obj/item/gun/ballistic/shotgun = 1,
+			/obj/item/gun/ballistic/shotgun/lethal = 1,
+			/obj/item/gun/ballistic/shotgun/riot = 1,
+			/obj/item/gun/energy/e_gun/dragnet = 1,
+			/obj/item/gun/energy/e_gun/old = 1,
+			/obj/item/gun/energy/laser/luxurypaywall = 1,
+			/obj/item/gun/energy/laser/retro/old = 1,
+			/obj/item/gun/syringe/rapidsyringe = 1,
+			/obj/item/gun/syringe/syndicate = 1,
+		),
+		LOOT_WEAPON_RED = list(
+			/obj/item/gun/ballistic/automatic/m90/unrestricted = 1,
+			/obj/item/gun/energy/e_gun/hos = 1,
+			/obj/item/gun/energy/e_gun/nuclear = 1,
+			/obj/item/gun/energy/laser/carbine/cybersun/unrestricted = 1,
+		),
+	)
+	melee_extras = list(
+		LOOT_WEAPON_GREEN = list(
+			/obj/item/bambostaff = 1,
+			/obj/item/knife/combat/bone = 1,
+			/obj/item/knife/envy = 1,
+			/obj/item/lead_pipe = 1,
+			/obj/item/spear/bamboospear = 1,
+			/obj/item/spear/bonespear = 1,
+			/obj/item/spear/military = 1,
+			/obj/item/storage/case/cyberware/scrapper = 1,
+			/obj/item/tailclub = 1,
+		),
+		LOOT_WEAPON_YELLOW = list(
+			/obj/item/chainsaw = 1,
+			/obj/item/claymore/cutlass/old = 1,
+			/obj/item/claymore/weak = 1,
+			/obj/item/crowbar/large/twenty_force = 1,
+			/obj/item/fireaxe/boardingaxe = 1,
+			/obj/item/fireaxe/boneaxe = 1,
+			/obj/item/melee/parsnip_sabre = 1,
+			/obj/item/nullrod/claymore = 1,
+			/obj/item/nullrod/claymore/chainsaw_sword = 1,
+			/obj/item/nullrod/claymore/darkblade = 1,
+			/obj/item/nullrod/claymore/glowing = 1,
+			/obj/item/nullrod/claymore/katana = 1,
+			/obj/item/nullrod/claymore/multiverse = 1,
+			/obj/item/nullrod/claymore/saber = 1,
+			/obj/item/nullrod/claymore/saber/pirate = 1,
+			/obj/item/nullrod/claymore/saber/red = 1,
+			/obj/item/nullrod/hypertool = 1,
+			/obj/item/nullrod/vibro = 1,
+			/obj/item/nullrod/vibro/spellblade = 1,
+			/obj/item/nullrod/vibro/talking = 1,
+			/obj/item/pen/edagger = 1,
+			/obj/item/shield/buckler = 1,
+			/obj/item/shield/buckler/parmula = 1,
+			/obj/item/shield/kite = 1,
+			/obj/item/shield/riot = 1,
+			/obj/item/shield/riot/phalanx_buckler = 1,
+			/obj/item/shield/riot/tele = 1,
+			/obj/item/shield/roman = 1,
+			/obj/item/shovel/serrated = 1,
+			/obj/item/spear/grey_tide = 1,
+			/obj/item/switchblade = 1,
+		),
+		LOOT_WEAPON_RED = list(
+			/obj/item/clothing/gloves/knock_knock = 1,
+			/obj/item/cursed_katana = 1,
+			/obj/item/energy_katana = 1,
+			/obj/item/house_edge = 1,
+			/obj/item/melee/energy/sword/saber/blue = 1,
+			/obj/item/melee/energy/sword/saber/purple = 1,
+			/obj/item/melee/energy/sword/saber/red = 1,
+			/obj/item/melee/greykingsword = 1,
+			/obj/item/shield/energy = 1,
+			/obj/item/storage/toolbox/mechanical/old/clean = 1,
+			/obj/item/veilrender = 1,
+			/obj/item/veilrender/vealrender = 1,
+		),
+	)
 	guard_themes = list(
 		/obj/effect/zone_mobs/robot,
 		/obj/effect/zone_mobs/robot/boss,
@@ -35,7 +147,6 @@
 		/obj/item/clothing/suit/armor/vest = 10,
 		/obj/item/clothing/head/helmet/sec = 10,
 		/obj/item/gun/energy/disabler = 7,
-		/obj/item/gun/ballistic/rifle/boltaction/surplus = 7,
 		/obj/item/flashlight/seclite = 7,
 		/obj/item/grenade/flashbang = 6,
 		/obj/item/clothing/glasses/hud/security/sunglasses = 5,
@@ -44,44 +155,22 @@
 	)
 	loot_uncommon = list(
 		/obj/item/clothing/suit/armor/bulletproof = 10,
-		/obj/item/gun/ballistic/automatic/pistol/m1911 = 8,
 		/obj/item/ammo_box/magazine/m45 = 8,
-		/obj/item/gun/ballistic/shotgun/riot = 6,
-		/obj/item/gun/ballistic/automatic/ar = 6,
-		/obj/item/gun/ballistic/automatic/pistol/deagle = 5,
-		/obj/item/shield/riot = 6,
 		/obj/item/clothing/suit/armor/vest/marine = 5,
 		/obj/item/clothing/gloves/combat = 5,
 		/obj/item/clothing/shoes/combat = 5,
-		/obj/item/gun/ballistic/rifle/boltaction = 4,
 		/obj/item/clothing/under/syndicate/tacticool = 3,
 		/obj/item/ship_parts/combat = 7,
-		// issue chrome: subdermal impact weave, and the knuckle set cased as
-		// a matched pair (both halves, one per arm)
+		// Issue chrome: subdermal impact weave.
 		/obj/item/organ/cyberimp/cyberware/dermal_mesh = 4,
-		/obj/item/storage/case/cyberware/scrapper = 3,
 	)
 	loot_prime = list(
 		/obj/item/clothing/suit/armor/riot = 9,
 		/obj/item/clothing/head/helmet/toggleable/riot = 8,
-		/obj/item/gun/energy/laser = 8,
-		/obj/item/gun/ballistic/shotgun/automatic/combat = 6,
-		/obj/item/gun/energy/laser/scatter = 6,
-		// finished blueprint guns, prime only: the garrison's own issued
-		// hardware, not the schematics the shops sell
-		/obj/item/gun/ballistic/automatic/wt550 = 4,
-		/obj/item/gun/energy/laser/carbine = 4,
 		/obj/item/clothing/suit/armor/laserproof = 6,
 		/obj/item/clothing/head/helmet/marine = 6,
 		/obj/item/storage/belt/military/assault = 5,
-		/obj/item/gun/energy/e_gun = 4,
-		/obj/item/gun/ballistic/rifle/boltaction/prime = 3,
-		/obj/item/shield/riot/tele = 3,
 		/obj/item/clothing/suit/armor/heavy = 2,
-		// the deepest slice of the theme, previously reachable only through
-		// a sealed cache: now the long tail of prime, open to any band
-		/obj/item/gun/ballistic/rifle/sniper_rifle = 3,
-		/obj/item/gun/energy/lasercannon/unrestricted = 3,
 		// the back room's chrome, all voucher-grade at the parlor: ceramic
 		// plate, the targeting link, and the truss that keeps limbs attached
 		/obj/item/organ/cyberimp/cyberware/slabskin = 3,
@@ -95,8 +184,6 @@
 		/obj/item/clothing/mask/whistle/sergeants = 3,
 		/obj/item/handloaders_vise = 3,
 		/obj/item/clothing/glasses/sunglasses/marksmans_cant = 2,
-		/obj/item/shield/riot/phalanx_buckler = 2,
-		/obj/item/clothing/gloves/knock_knock = 1,
 		/obj/item/garrison_standard = 1,
 	)
 
diff --git a/voidcrew/modules/loot/themes/expedition.dm b/voidcrew/modules/loot/themes/expedition.dm
index 2d6e8bde8bf..5dfa9fbb1a7 100644
--- a/voidcrew/modules/loot/themes/expedition.dm
+++ b/voidcrew/modules/loot/themes/expedition.dm
@@ -17,6 +17,20 @@
 
 /datum/loot_theme/expedition
 	name = "expedition"
+	gun_chance = LOOT_GUN_CHANCE_EXPEDITION
+	gun_pool = LOOT_GUN_POOL_ARMORY
+	gun_extras = list(
+		LOOT_WEAPON_YELLOW = list(
+			/obj/item/gun/ballistic/rifle/boltaction = 1,
+			/obj/item/gun/ballistic/rifle/boltaction/prime = 1,
+			/obj/item/gun/ballistic/shotgun/riot = 1,
+		),
+	)
+	melee_extras = list(
+		LOOT_WEAPON_YELLOW = list(
+			/obj/item/kinetic_crusher = 1,
+		),
+	)
 	guard_themes = list(
 		/obj/effect/zone_mobs/wildlife,
 		/obj/effect/zone_mobs/wildlife/boss,
@@ -31,8 +45,6 @@
 	)
 	loot_common = list(
 		/obj/item/clothing/suit/hooded/explorer = 10,
-		/obj/item/knife/combat/survival = 9,
-		/obj/item/gun/ballistic/rifle/boltaction/surplus = 8,
 		/obj/item/gps/mining = 8,
 		/obj/item/flashlight/flare = 8,
 		/obj/item/stack/marker_beacon/thirty = 6,
@@ -50,9 +62,6 @@
 		/obj/item/pickaxe/diamond = 7,
 		/obj/item/t_scanner/adv_mining_scanner/lesser = 6,
 		/obj/item/wormhole_jaunter = 6,
-		// wildlife stoppers: the KA is a mining tool first, these are not
-		/obj/item/gun/ballistic/shotgun/riot = 6,
-		/obj/item/gun/ballistic/rifle/boltaction = 5,
 		/obj/item/survivalcapsule = 5,
 		/obj/item/clothing/suit/hooded/cloak/goliath = 4,
 		/obj/item/gun/energy/plasmacutter = 4,
@@ -67,14 +76,8 @@
 		/obj/item/clothing/shoes/bhop = 7,
 		/obj/item/resonator = 7,
 		/obj/item/gun/energy/plasmacutter/adv = 6,
-		/obj/item/gun/ballistic/shotgun/automatic/combat = 6,
-		/obj/item/gun/energy/laser = 5,
-		/obj/item/kinetic_crusher = 5,
 		/obj/item/clothing/glasses/heat = 4,
 		/obj/item/clothing/suit/hooded/cloak/drake = 2,
-		// the deepest slice of the theme, previously reachable only through
-		// a sealed cache: now the long tail of prime, open to any band
-		/obj/item/gun/ballistic/rifle/boltaction/prime = 5,
 		// top-end survey chrome: eyes that pulse ore through rock, the wrist
 		// winch that exists nowhere else, and four tiles of standing jump
 		/obj/item/organ/eyes/robotic/cyberware/prospector = 3,
@@ -128,9 +131,6 @@
 /// tendril chest, the cache they guard is the prize.
 /obj/effect/zone_mobs/wildlife/boss
 	name = "zone mob spawner (wildlife boss)"
-	count_green = list(1, 1)
-	count_yellow = list(1, 1)
-	count_red = list(1, 1)
 	mobs_green = list(
 		/mob/living/basic/mining/goliath = 1,
 	)
diff --git a/voidcrew/modules/loot/themes/industrial.dm b/voidcrew/modules/loot/themes/industrial.dm
index 09dfcb318a6..b9d65961ebb 100644
--- a/voidcrew/modules/loot/themes/industrial.dm
+++ b/voidcrew/modules/loot/themes/industrial.dm
@@ -16,6 +16,20 @@
 
 /datum/loot_theme/industrial
 	name = "industrial"
+	gun_chance = LOOT_GUN_CHANCE_INDUSTRIAL
+	gun_pool = LOOT_GUN_POOL_ARMORY
+	gun_extras = list(
+		LOOT_WEAPON_YELLOW = list(
+			/obj/item/gun/ballistic/automatic/proto/unrestricted = 1,
+			/obj/item/gun/energy/ionrifle = 1,
+			/obj/item/gun/energy/ionrifle/carbine = 1,
+		),
+	)
+	melee_extras = list(
+		LOOT_WEAPON_RED = list(
+			/obj/item/cyberware_pair_case/gorilla_arms = 1,
+		),
+	)
 	guard_themes = list(/obj/effect/zone_mobs/robot, /obj/effect/zone_mobs/robot/boss)
 	theme_skus = list(
 		/datum/shop_sku/skunk/capacitor,
@@ -39,8 +53,6 @@
 		/obj/item/stock_parts/matter_bin/adv = 6,
 		/obj/item/storage/toolbox/mechanical = 5,
 		/obj/item/weldingtool/largetank = 5,
-		// the line's own prototype SMG, never finished, still fires
-		/obj/item/gun/ballistic/automatic/proto/unrestricted = 5,
 		/obj/item/stock_parts/power_store/cell/high = 4,
 		/obj/item/stack/sheet/plasteel/twenty = 4,
 	)
@@ -54,9 +66,6 @@
 		/obj/item/stock_parts/matter_bin/super = 6,
 		/obj/item/stock_parts/power_store/cell/super = 5,
 		/obj/item/storage/part_replacer = 4,
-		// asset-denial kit, and the answer to this theme's own hivebot
-		// guards: ion weapons wreck automation
-		/obj/item/gun/energy/ionrifle/carbine = 6,
 		/obj/item/circuitboard/machine/autolathe = 4,
 		/obj/item/flamethrower/full = 3,
 		/obj/item/stack/sheet/mineral/gold/fifty = 3,
@@ -75,14 +84,11 @@
 		/obj/item/stock_parts/matter_bin/bluespace = 6,
 		/obj/item/stack/sheet/mineral/diamond/five = 6,
 		/obj/item/stock_parts/power_store/cell/hyper = 5,
-		/obj/item/gun/energy/ionrifle = 6,
 		/obj/item/stack/sheet/bluespace_crystal = 4,
 		/obj/item/construction/rcd = 3,
 		/obj/item/stack/sheet/mineral/diamond/fifty = 2,
-		// hot-work and heavy-lift chrome: a body-wide coolant loop, and the
-		// cased myomer arm pair (both halves, one per arm)
+		// Hot-work chrome: a body-wide coolant loop.
 		/obj/item/organ/cyberimp/cyberware/coolant = 3,
-		/obj/item/cyberware_pair_case/gorilla_arms = 2,
 	)
 	// One-of-a-kind authored prizes, drawn as the fourth tier from any
 	// band (weight = how shallow the item used to sit: 3 was reachable
@@ -123,9 +129,6 @@
 
 /obj/effect/zone_mobs/robot/boss
 	name = "zone mob spawner (robot boss)"
-	count_green = list(1, 1)
-	count_yellow = list(1, 1)
-	count_red = list(1, 2)
 	mobs_green = list(
 		/mob/living/basic/hivebot/strong = 1,
 	)
diff --git a/voidcrew/modules/loot/themes/medical.dm b/voidcrew/modules/loot/themes/medical.dm
index 6674e250886..42af4e43537 100644
--- a/voidcrew/modules/loot/themes/medical.dm
+++ b/voidcrew/modules/loot/themes/medical.dm
@@ -16,6 +16,14 @@
 
 /datum/loot_theme/medical
 	name = "medical"
+	gun_chance = LOOT_GUN_CHANCE_MEDICAL
+	gun_pool = LOOT_GUN_POOL_ARMORY
+	gun_extras = list(
+		LOOT_WEAPON_YELLOW = list(
+			/obj/item/gun/ballistic/shotgun/riot = 1,
+			/obj/item/gun/energy/e_gun/mini = 1,
+		),
+	)
 	guard_themes = list(/obj/effect/zone_mobs/undead, /obj/effect/zone_mobs/undead/boss)
 	theme_skus = list(
 		/datum/shop_sku/black_market/tactical_medkit,
@@ -40,9 +48,6 @@
 		/obj/item/storage/pill_bottle/multiver = 5,
 		/obj/item/healthanalyzer = 4,
 		/obj/item/reagent_containers/cup/bottle/salglu_solution = 4,
-		// the ward's own enforcement locker: a quarantine that stopped
-		// answering was a quarantine somebody had to hold by force
-		/obj/item/gun/energy/e_gun/mini = 5,
 		// cheapest thing on the parlor's shelf and the one piece of chrome a
 		// clinic would actually stock: it replaces a stomach
 		/obj/item/organ/cyberimp/cyberware/gastro = 4,
@@ -59,8 +64,6 @@
 		/obj/item/reagent_containers/cup/bottle/atropine = 5,
 		/obj/item/storage/pill_bottle/penacid = 5,
 		/obj/item/defibrillator = 4,
-		/obj/item/gun/energy/laser = 5,
-		/obj/item/gun/ballistic/shotgun/riot = 4,
 		/obj/item/healthanalyzer/advanced = 4,
 		/obj/item/storage/medkit/tactical_lite = 4,
 		/obj/item/organ/eyes/robotic/basic = 3,
@@ -76,8 +79,6 @@
 		/obj/item/reagent_containers/hypospray/medipen/atropine = 7,
 		/obj/item/reagent_containers/hypospray/medipen/penthrite = 6,
 		/obj/item/defibrillator/compact = 6,
-		/obj/item/gun/ballistic/shotgun/automatic/combat = 5,
-		/obj/item/gun/energy/laser/scatter = 4,
 		/obj/item/storage/medkit/tactical = 5,
 		/obj/item/reagent_containers/hypospray/medipen/survival = 5,
 		/obj/item/organ/heart/cybernetic = 4,
diff --git a/voidcrew/modules/loot/themes/occult.dm b/voidcrew/modules/loot/themes/occult.dm
index 0188b8b4325..67dad562b7a 100644
--- a/voidcrew/modules/loot/themes/occult.dm
+++ b/voidcrew/modules/loot/themes/occult.dm
@@ -25,6 +25,21 @@
 
 /datum/loot_theme/occult
 	name = "occult"
+	gun_chance = LOOT_GUN_CHANCE_OCCULT
+	gun_pool = LOOT_GUN_POOL_PLUNDER
+	gun_extras = list(
+		LOOT_WEAPON_GREEN = list(
+			/obj/item/gun/ballistic/rifle/boltaction/surplus = 1,
+		),
+		LOOT_WEAPON_YELLOW = list(
+			/obj/item/gun/energy/laser/retro = 1,
+		),
+	)
+	melee_extras = list(
+		LOOT_WEAPON_RED = list(
+			/obj/item/knife/bloodletter = 1,
+		),
+	)
 	guard_themes = list(
 		/obj/effect/zone_mobs/cult,
 		/obj/effect/zone_mobs/cult/boss,
@@ -41,8 +56,6 @@
 		/obj/item/reagent_containers/cup/glass/bottle/holywater = 6,
 		/obj/item/book/bible = 6,
 		/obj/item/coin/gold = 5,
-		// the grave-robber's rifle: old, ugly, still kills what walks
-		/obj/item/gun/ballistic/rifle/boltaction/surplus = 6,
 		/obj/item/toy/cards/deck/tarot = 5,
 		/obj/item/reagent_containers/cup/glass/bottle/wine = 4,
 	)
@@ -50,7 +63,6 @@
 		/obj/item/statuebust = 8,
 		/obj/item/flashlight/lantern = 7,
 		/obj/item/ectoplasm = 6,
-		/obj/item/gun/energy/laser/retro = 6,
 		/obj/item/clothing/suit/chaplainsuit/bishoprobe = 5,
 		/obj/item/clothing/head/chaplain/bishopmitre = 5,
 		/obj/item/toy/cards/deck/tarot/haunted = 4,
@@ -65,17 +77,12 @@
 		/obj/item/stack/sheet/mineral/gold/fifty = 6,
 		/obj/item/stack/sheet/mineral/silver/fifty = 6,
 		/obj/item/clothing/suit/armor/riot/knight = 5,
-		/obj/item/gun/energy/laser/hellgun = 5,
-		/obj/item/knife/bloodletter = 3,
 		/obj/item/soulstone/anybody/purified = 3,
 		// the deepest slice of the theme, previously reachable only through
 		// a sealed cache: now the long tail of prime, open to any band
 		/obj/item/book/granter/action/spell/sacredflame = 2,
-		/obj/item/gun/magic/staff/chaos = 2,
-		/obj/item/mjollnir = 2,
 		/obj/item/book/granter/action/spell/fireball = 1,
 		/obj/item/book/granter/action/spell/random = 1,
-		/obj/item/his_grace = 1,
 	)
 	// One-of-a-kind authored prizes, drawn as the fourth tier from any
 	// band (weight = how shallow the item used to sit: 3 was reachable
@@ -114,9 +121,6 @@
 
 /obj/effect/zone_mobs/cult/boss
 	name = "zone mob spawner (cult boss)"
-	count_green = list(1, 1)
-	count_yellow = list(1, 1)
-	count_red = list(1, 1)
 	mobs_green = list(
 		/mob/living/basic/construct/artificer/hostile = 1,
 	)
@@ -147,9 +151,6 @@
 
 /obj/effect/zone_mobs/undead/boss
 	name = "zone mob spawner (undead boss)"
-	count_green = list(1, 1)
-	count_yellow = list(1, 1)
-	count_red = list(1, 1)
 	mobs_green = list(
 		/mob/living/basic/skeleton/templar = 1,
 	)
diff --git a/voidcrew/modules/loot/themes/plunder.dm b/voidcrew/modules/loot/themes/plunder.dm
index 7dee57694e0..ea2a1067b3d 100644
--- a/voidcrew/modules/loot/themes/plunder.dm
+++ b/voidcrew/modules/loot/themes/plunder.dm
@@ -13,11 +13,32 @@
 
 /datum/loot_theme/plunder
 	name = "plunder"
+	gun_chance = LOOT_GUN_CHANCE_PLUNDER
+	gun_pool = LOOT_GUN_POOL_PLUNDER
+	gun_extras = list(
+		LOOT_WEAPON_YELLOW = list(
+			/obj/item/gun/ballistic/automatic/mini_uzi = 1,
+			/obj/item/gun/ballistic/automatic/pistol/deagle = 1,
+			/obj/item/gun/ballistic/revolver/mateba = 1,
+			/obj/item/gun/ballistic/shotgun/musket/no_quarter = 1,
+			/obj/item/gun/magic/hook/marlinspike = 1,
+		),
+		LOOT_WEAPON_RED = list(
+			/obj/item/gun/ballistic/shotgun/automatic/combat = 1,
+			/obj/item/organ/cyberimp/arm/toolkit/cyberware/bunker_buster = 1,
+			/obj/item/organ/cyberimp/arm/toolkit/cyberware/ronin = 1,
+		),
+	)
+	melee_extras = list(
+		LOOT_WEAPON_RED = list(
+			/obj/item/claymore/cutlass/parley = 1,
+			/obj/item/cyberware_pair_case/mantis_blades = 1,
+			/obj/item/heave_ho = 1,
+		),
+	)
 	guard_themes = list(/obj/effect/zone_mobs/pirate, /obj/effect/zone_mobs/pirate/boss)
 	theme_skus = list(
 		/datum/shop_sku/black_market/rotating/mateba,
-		/datum/shop_sku/black_market/bulldog_blueprint,
-		/datum/shop_sku/outfitter/carbine_blueprint,
 		/datum/shop_sku/ripperdoc/gecko,
 		/datum/shop_sku/ripperdoc/mantis,
 		/datum/shop_sku/ripperdoc/ronin,
@@ -31,23 +52,16 @@
 		/obj/item/clothing/glasses/eyepatch = 6,
 		/obj/item/clothing/head/costume/pirate/bandana = 6,
 		/obj/item/coin/gold/doubloon = 5,
-		/obj/item/gun/ballistic/revolver/c38/detective = 5,
-		/obj/item/knife/combat = 4,
 		/obj/item/toy/cards/deck = 4,
 	)
 	loot_uncommon = list(
 		/obj/item/stack/spacecash/c500 = 10,
-		/obj/item/gun/ballistic/shotgun/doublebarrel = 7,
 		/obj/item/storage/box/lethalshot = 7,
-		/obj/item/gun/ballistic/revolver = 6,
-		/obj/item/gun/ballistic/automatic/tommygun = 6,
-		/obj/item/gun/ballistic/automatic/mini_uzi = 5,
 		/obj/item/ammo_box/a357 = 6,
 		/obj/item/stack/sheet/mineral/gold = 5,
 		/obj/item/clothing/head/costume/pirate/armored = 4,
 		/obj/item/clothing/suit/costume/pirate/armored = 4,
 		/obj/item/reagent_containers/cup/glass/bottle/rum/aged = 4,
-		/obj/item/blueprint/gun/laser_carbine = 3,
 		/obj/item/ship_parts/combat = 7,
 		// boarder's palms: your hands clamp shut on your gun when you go
 		// down, and tables stop being furniture
@@ -55,26 +69,11 @@
 	)
 	loot_prime = list(
 		/obj/item/stack/spacecash/c1000 = 9,
-		/obj/item/gun/ballistic/revolver/mateba = 5,
-		/obj/item/gun/ballistic/shotgun/automatic/combat = 5,
-		/obj/item/gun/ballistic/automatic/pistol/deagle = 5,
-		// finished blueprint gun, prime only: boarding hardware nobody
-		// filed a schematic for
-		/obj/item/gun/ballistic/shotgun/bulldog/unrestricted = 4,
-		/obj/item/melee/energy/sword/pirate = 4,
 		/obj/item/stack/sheet/mineral/diamond = 4,
 		/obj/item/reagent_containers/cup/glass/bottle/absinthe/premium = 4,
 		/obj/item/clothing/suit/costume/pirate/captain/armored = 3,
 		/obj/item/clothing/head/costume/pirate/captain = 3,
-		/obj/item/blueprint/gun/bulldog = 3,
 		/obj/item/stack/spacecash/c10000 = 2,
-		// the captain's cut, all of it voucher-grade chrome: the cased blade
-		// pair, the arm gun nobody can disarm you of, and the rocket pod.
-		// Both weapon pieces are parlor-fed. The crate pays what's loaded in
-		// them and no more, so reloads still mean a trip to Splice
-		/obj/item/cyberware_pair_case/mantis_blades = 3,
-		/obj/item/organ/cyberimp/arm/toolkit/cyberware/ronin = 3,
-		/obj/item/organ/cyberimp/arm/toolkit/cyberware/bunker_buster = 2,
 	)
 	// One-of-a-kind authored prizes, drawn as the fourth tier from any
 	// band (weight = how shallow the item used to sit: 3 was reachable
@@ -83,10 +82,6 @@
 		/obj/item/reagent_containers/cup/glass/bottle/bottomless_ration = 3,
 		/obj/item/toy/cards/deck/cheats = 3,
 		/obj/item/clothing/glasses/eyepatch/fences_eye = 2,
-		/obj/item/gun/magic/hook/marlinspike = 2,
-		/obj/item/claymore/cutlass/parley = 1,
-		/obj/item/gun/ballistic/shotgun/musket/no_quarter = 1,
-		/obj/item/heave_ho = 1,
 	)
 
 /obj/structure/closet/crate/zone_loot/plunder
@@ -121,9 +116,6 @@
 /// The pirate setpiece: a captain holding the vault, a proper boss in the red.
 /obj/effect/zone_mobs/pirate/boss
 	name = "zone mob spawner (pirate boss)"
-	count_green = list(1, 1)
-	count_yellow = list(1, 1)
-	count_red = list(1, 1)
 	mobs_green = list(
 		/mob/living/basic/trooper/pirate/faction/grey/captain = 1,
 		/mob/living/basic/trooper/pirate/faction/skeleton/captain = 1,
diff --git a/voidcrew/modules/loot/themes/research.dm b/voidcrew/modules/loot/themes/research.dm
index d3d145dd4c2..dffb832ac37 100644
--- a/voidcrew/modules/loot/themes/research.dm
+++ b/voidcrew/modules/loot/themes/research.dm
@@ -12,9 +12,28 @@
 
 /datum/loot_theme/research
 	name = "research"
+	gun_chance = LOOT_GUN_CHANCE_RESEARCH
+	gun_pool = LOOT_GUN_POOL_SYNDICATE
+	gun_extras = list(
+		LOOT_WEAPON_YELLOW = list(
+			/obj/item/gun/energy/e_gun/mini = 1,
+			/obj/item/gun/energy/laser/retro = 1,
+		),
+		LOOT_WEAPON_RED = list(
+			/obj/item/gun/energy/event_horizon = 1,
+			/obj/item/gun/energy/laser/carbine = 1,
+			/obj/item/gun/energy/lasercannon/unrestricted = 1,
+			/obj/item/gun/energy/recharge/ebow = 1,
+			/obj/item/gun/energy/temperature/unrestricted = 1,
+		),
+	)
+	melee_extras = list(
+		LOOT_WEAPON_RED = list(
+			/obj/item/singularityhammer = 1,
+		),
+	)
 	guard_themes = list(/obj/effect/zone_mobs/bug, /obj/effect/zone_mobs/bug/boss)
 	theme_skus = list(
-		/datum/shop_sku/outfitter/carbine_blueprint,
 		/datum/shop_sku/ripperdoc/doppler,
 		/datum/shop_sku/ripperdoc/rigger,
 	)
@@ -27,8 +46,6 @@
 		/obj/item/petri_dish = 6,
 		/obj/item/experi_scanner = 5,
 		/obj/item/research_notes/loot/tiny = 5,
-		// containment sidearm: every lab that kept specimens kept one
-		/obj/item/gun/energy/e_gun/mini = 5,
 		/obj/item/stack/ore/bluespace_crystal/artificial = 4,
 	)
 	loot_uncommon = list(
@@ -40,11 +57,7 @@
 		/obj/item/slime_extract/gold = 5,
 		/obj/item/clothing/glasses/night = 5,
 		/obj/item/research_notes/loot/small = 5,
-		/obj/item/gun/energy/laser/retro = 6,
-		/obj/item/gun/energy/recharge/ebow = 4,
 		/obj/item/reagent_containers/cup/beaker/noreact = 4,
-		/obj/item/raw_anomaly_core/random = 4,
-		/obj/item/blueprint/gun/laser_carbine = 3,
 		/obj/item/ship_parts/science = 7,
 		// lab hardware worn instead of carried: a sonar transceiver socketed
 		// into the bone behind the ear, reading movement through walls
@@ -52,6 +65,7 @@
 	)
 	loot_prime = list(
 		/obj/item/stack/ore/bluespace_crystal/refined = 10,
+		/obj/item/raw_anomaly_core/random = 4,
 		/obj/item/stock_parts/capacitor/super = 8,
 		/obj/item/stock_parts/micro_laser/ultra = 8,
 		/obj/item/stock_parts/matter_bin/super = 7,
@@ -59,10 +73,6 @@
 		/obj/item/slime_extract/adamantine = 5,
 		/obj/item/research_notes/loot/medium = 5,
 		/obj/item/clothing/shoes/bhop = 4,
-		/obj/item/gun/energy/xray = 4,
-		// finished blueprint gun, prime only: the annex built its own
-		/obj/item/gun/energy/laser/carbine = 4,
-		/obj/item/gun/energy/temperature/unrestricted = 4,
 		/obj/item/reagent_containers/cup/beaker/bluespace = 3,
 		/obj/item/assembly/signaler/anomaly/grav = 3,
 		/obj/item/storage/backpack/holding = 2,
@@ -70,11 +80,8 @@
 		// a sealed cache: now the long tail of prime, open to any band
 		/obj/item/stock_parts/matter_bin/bluespace = 6,
 		/obj/item/research_notes/loot/big = 4,
-		/obj/item/gun/energy/lasercannon/unrestricted = 3,
 		/obj/item/book/granter/action/spell/charge = 2,
-		/obj/item/gun/magic/wand/polymorph = 2,
 		/obj/item/research_notes/loot/genius = 2,
-		/obj/item/singularityhammer = 2,
 		// the annex's own interface work: a skull jack that flies a ship from
 		// anywhere aboard it, as long as the hull still has a helm console
 		/obj/item/organ/cyberimp/cyberware/rigger = 2,
@@ -116,9 +123,6 @@
 
 /obj/effect/zone_mobs/bug/boss
 	name = "zone mob spawner (bug boss)"
-	count_green = list(1, 1)
-	count_yellow = list(1, 1)
-	count_red = list(1, 1)
 	mobs_green = list(
 		/mob/living/basic/spider/giant/hunter = 1,
 	)
diff --git a/voidcrew/modules/loot/themes/syndicate.dm b/voidcrew/modules/loot/themes/syndicate.dm
index e63595fc913..1f63090058e 100644
--- a/voidcrew/modules/loot/themes/syndicate.dm
+++ b/voidcrew/modules/loot/themes/syndicate.dm
@@ -6,11 +6,6 @@
 // TODO: review/balance-pass all four tiers: first-draft weights and
 // contents, never playtested. Tune weights against the black-market voucher
 // prices in shop_catalog_black_market.dm.
-// Weapon blueprints are seeded across both channels: the outfitter sells the
-// c20r/wt550/carbine schematics (uncommon-tier), the black market sells the
-// l6_saw/sniper/bulldog three (prime-tier), the same blueprints ride these
-// cache tables at matching tiers. Craft them from the recipe anywhere, once
-// you have the part and a firing pin (modules/weapons_bench/blueprint.dm).
 // Cyberware rides the same two channels: the parlor's smuggling cavity and
 // door spike sit at uncommon, and the three voucher-only pieces an operative
 // would carry (cloak weave, wire, reflex shunt) sit at the bottom of prime.
@@ -18,20 +13,33 @@
 
 /datum/loot_theme/syndicate
 	name = "syndicate"
+	gun_chance = LOOT_GUN_CHANCE_SYNDICATE
+	gun_pool = LOOT_GUN_POOL_SYNDICATE
+	gun_extras = list(
+		LOOT_WEAPON_YELLOW = list(
+			/obj/item/gun/ballistic/automatic/pistol/deagle = 1,
+			/obj/item/gun/ballistic/revolver = 1,
+			/obj/item/gun/ballistic/revolver/c38/housecall = 1,
+		),
+		LOOT_WEAPON_RED = list(
+			/obj/item/gun/ballistic/rifle/sniper_rifle = 1,
+			/obj/item/gun/ballistic/shotgun/automatic/combat = 1,
+		),
+	)
+	melee_extras = list(
+		LOOT_WEAPON_RED = list(
+			/obj/item/knife/understudy = 1,
+			/obj/item/organ/cyberimp/arm/toolkit/cyberware/monowire = 1,
+		),
+	)
 	guard_themes = list(/obj/effect/zone_mobs/syndicate, /obj/effect/zone_mobs/syndicate/boss)
 	theme_skus = list(
 		/datum/shop_sku/black_market/emag,
 		/datum/shop_sku/black_market/tactical_medkit,
-		/datum/shop_sku/black_market/saw_blueprint,
-		/datum/shop_sku/black_market/sniper_blueprint,
-		/datum/shop_sku/black_market/bulldog_blueprint,
 		/datum/shop_sku/black_market/mystery_cache,
 		/datum/shop_sku/black_market/mystery_cache_rare,
 		/datum/shop_sku/black_market/rare/energy_sword,
 		/datum/shop_sku/general/rotating/freight_crate,
-		/datum/shop_sku/outfitter/smg_blueprint,
-		/datum/shop_sku/outfitter/wt550_blueprint,
-		/datum/shop_sku/outfitter/carbine_blueprint,
 		/datum/shop_sku/ripperdoc/cargo_cavity,
 		/datum/shop_sku/ripperdoc/icepick,
 		/datum/shop_sku/ripperdoc/slipwire,
@@ -41,9 +49,7 @@
 	loot_common = list(
 		/obj/item/soap/syndie = 10,
 		/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 10,
-		/obj/item/knife/combat = 8,
 		/obj/item/ammo_box/magazine/m9mm = 8,
-		/obj/item/gun/ballistic/automatic/pistol = 7,
 		/obj/item/suppressor = 6,
 		/obj/item/encryptionkey/syndicate = 6,
 		/obj/item/grenade/empgrenade = 5,
@@ -51,16 +57,10 @@
 	)
 	loot_uncommon = list(
 		/obj/item/grenade/c4 = 6,
-		/obj/item/gun/ballistic/automatic/mini_uzi = 6,
 		/obj/item/ammo_box/a357 = 5,
-		/obj/item/gun/ballistic/automatic/pistol/deagle = 4,
-		/obj/item/gun/ballistic/revolver = 4,
 		/obj/item/card/id/advanced/chameleon = 4,
 		/obj/item/clothing/shoes/chameleon/noslip = 4,
 		/obj/item/clothing/glasses/thermal/syndi = 3,
-		/obj/item/blueprint/gun/c20r = 4,
-		/obj/item/blueprint/gun/wt550 = 3,
-		/obj/item/blueprint/gun/laser_carbine = 3,
 		/obj/item/ship_parts/combat = 8,
 		// courier chrome: a shielded rib compartment scanners read past, and
 		// a wrist spike for door motors and turret IFF
@@ -68,25 +68,11 @@
 		/obj/item/organ/cyberimp/arm/toolkit/cyberware/icepick = 3,
 	)
 	loot_prime = list(
-		/obj/item/gun/ballistic/shotgun/automatic/combat = 5,
-		/obj/item/melee/energy/sword/saber = 4,
-		// finished blueprint gun, prime only: an operative's issued weapon,
-		// not the schematic the black market fences
-		/obj/item/gun/ballistic/automatic/c20r/unrestricted = 4,
 		/obj/item/pen/sleepy = 4,
 		/obj/item/grenade/syndieminibomb = 3,
 		/obj/item/card/emag = 2,
-		/obj/item/blueprint/gun/l6_saw = 3,
-		/obj/item/blueprint/gun/sniper_rifle = 3,
-		/obj/item/blueprint/gun/bulldog = 3,
-		// the deepest slice of the theme, previously reachable only through
-		// a sealed cache: now the long tail of prime, open to any band
-		/obj/item/gun/ballistic/automatic/l6_saw/unrestricted = 3,
-		/obj/item/gun/ballistic/rifle/sniper_rifle = 3,
-		// operative chrome, 2-4 vouchers over the counter: the reflex shunt,
-		// the wire, and the refraction weave that drops the moment you swing
+		// Operative chrome: the reflex shunt and refraction weave.
 		/obj/item/organ/cyberimp/cyberware/slipwire = 3,
-		/obj/item/organ/cyberimp/arm/toolkit/cyberware/monowire = 3,
 		/obj/item/organ/cyberimp/cyberware/ghostskin = 2,
 	)
 	// One-of-a-kind authored prizes, drawn as the fourth tier from any
@@ -95,10 +81,8 @@
 	loot_uniques = list(
 		/obj/item/clothing/gloves/courier = 3,
 		/obj/item/radio/listening_coin = 3,
-		/obj/item/gun/ballistic/revolver/c38/housecall = 2,
 		/obj/item/static_cuff = 2,
 		/obj/item/clothing/suit/hooded/cloak/second_shadow = 1,
-		/obj/item/knife/understudy = 1,
 	)
 
 /obj/structure/closet/crate/zone_loot/syndicate
@@ -108,25 +92,15 @@
 	base_icon_state = "syndicrate"
 	theme = /datum/loot_theme/syndicate
 
-/// The black market's premium cache SKU (shop_catalog_black_market.dm). Same
-/// tables as any other syndicate cache. It is simply packed fuller, which is
-/// what the extra vouchers buy.
-/obj/structure/closet/crate/zone_loot/syndicate/reinforced
-	name = "reinforced syndicate cache"
-	desc = "A matte-black drop crate in an extra layer of plating. Whatever's inside, somebody thought it was worth the postage."
-	bonus_draws = 2
-
 /// Syndicate holdouts: operatives left guarding whatever the base was for.
 /obj/effect/zone_mobs/syndicate
 	name = "zone mob spawner (syndicate)"
 	mobs_green = list(
-		/mob/living/basic/trooper/syndicate/melee = 10,
-		/mob/living/basic/trooper/syndicate/melee/sword = 4,
+		/mob/living/basic/trooper/syndicate/melee = 14,
 	)
 	mobs_yellow = list(
 		/mob/living/basic/trooper/syndicate/melee/sword = 8,
-		/mob/living/basic/trooper/syndicate/ranged = 8,
-		/mob/living/basic/trooper/syndicate/ranged/smg = 4,
+		/mob/living/basic/trooper/syndicate/ranged = 12,
 	)
 	mobs_red = list(
 		/mob/living/basic/trooper/syndicate/ranged/smg = 8,
@@ -137,15 +111,11 @@
 
 /obj/effect/zone_mobs/syndicate/boss
 	name = "zone mob spawner (syndicate boss)"
-	count_green = list(1, 1)
-	count_yellow = list(1, 1)
-	count_red = list(1, 1)
 	mobs_green = list(
-		/mob/living/basic/trooper/syndicate/melee/sword = 1,
+		/mob/living/basic/trooper/syndicate/melee = 1,
 	)
 	mobs_yellow = list(
-		/mob/living/basic/trooper/syndicate/ranged/shotgun = 1,
-		/mob/living/basic/trooper/syndicate/ranged/smg = 1,
+		/mob/living/basic/trooper/syndicate/ranged = 2,
 	)
 	mobs_red = list(
 		/mob/living/basic/trooper/syndicate/ranged/smg/space/stormtrooper = 1,
diff --git a/voidcrew/modules/loot/themes/wardrobe.dm b/voidcrew/modules/loot/themes/wardrobe.dm
index d3d014b91be..e71f26a4b9e 100644
--- a/voidcrew/modules/loot/themes/wardrobe.dm
+++ b/voidcrew/modules/loot/themes/wardrobe.dm
@@ -13,6 +13,21 @@
 
 /datum/loot_theme/wardrobe
 	name = "wardrobe"
+	gun_chance = LOOT_GUN_CHANCE_WARDROBE
+	gun_pool = LOOT_GUN_POOL_PLUNDER
+	gun_extras = list(
+		LOOT_WEAPON_GREEN = list(
+			/obj/item/gun/ballistic/automatic/pistol/m1911 = 1,
+		),
+		LOOT_WEAPON_YELLOW = list(
+			/obj/item/gun/ballistic/automatic/pistol/deagle = 1,
+		),
+	)
+	melee_extras = list(
+		LOOT_WEAPON_RED = list(
+			/obj/item/veilrender/honkrender = 1,
+		),
+	)
 	guard_themes = list(/obj/effect/zone_mobs/undead, /obj/effect/zone_mobs/undead/boss)
 	theme_skus = list(
 		/datum/shop_sku/ripperdoc/chromatic_dermis,
@@ -30,8 +45,6 @@
 		/obj/item/clothing/suit/hooded/wintercoat = 5,
 		/obj/item/clothing/suit/costume/hawaiian = 4,
 		/obj/item/clothing/neck/scarf/red = 4,
-		// what was in the coat pocket when the liner went down
-		/obj/item/gun/ballistic/revolver/c38/detective = 5,
 		// somebody's unused parlor appointment: tattoo ink you wear under
 		// the skin, colour and pattern set at a Cradle
 		/obj/item/organ/cyberimp/cyberware/chromatic_dermis = 4,
@@ -44,8 +57,6 @@
 		/obj/item/clothing/under/costume/soviet = 6,
 		/obj/item/clothing/suit/costume/judgerobe = 5,
 		/obj/item/clothing/gloves/tackler/combat = 5,
-		/obj/item/gun/ballistic/automatic/pistol/m1911 = 5,
-		/obj/item/gun/ballistic/automatic/tommygun = 4,
 		/obj/item/clothing/under/rank/prisoner = 4,
 		/obj/item/clothing/mask/gas/sechailer/swat = 4,
 		/obj/item/ship_parts/trade = 6,
@@ -58,15 +69,12 @@
 		/obj/item/clothing/suit/armor/vest/warden/alt = 8,
 		/obj/item/clothing/head/helmet/knight = 7,
 		/obj/item/clothing/head/cowboy/black/syndicate = 6,
-		/obj/item/gun/ballistic/automatic/pistol/deagle = 5,
 		// the helmet is the suit's hood, it comes with it. never rolled alone
 		/obj/item/clothing/suit/hooded/berserker = 4,
 		// the deepest slice of the theme, previously reachable only through
 		// a sealed cache: now the long tail of prime, open to any band
 		/obj/item/clothing/shoes/clown_shoes/banana_shoes/combat = 2,
-		/obj/item/gun/magic/staff/honk = 2,
 		/obj/item/megaphone/clown = 2,
-		/obj/item/veilrender/honkrender = 1,
 	)
 	// One-of-a-kind authored prizes, drawn as the fourth tier from any
 	// band (weight = how shallow the item used to sit: 3 was reachable
diff --git a/voidcrew/modules/loot/uniques/medical.dm b/voidcrew/modules/loot/uniques/medical.dm
index f8dfd616c5e..9623cdc8675 100644
--- a/voidcrew/modules/loot/uniques/medical.dm
+++ b/voidcrew/modules/loot/uniques/medical.dm
@@ -537,7 +537,7 @@
 	patient.updatehealth()
 	patient.set_heartattack(FALSE)
 	patient.grab_ghost()
-	patient.revive()
+	patient.revive_from("meridian_heart")
 	patient.emote("gasp")
 	patient.set_jitter_if_lower(200 SECONDS)
 	SEND_SIGNAL(patient, COMSIG_LIVING_MINOR_SHOCK)
@@ -729,7 +729,7 @@
 
 	target.grab_ghost(force = TRUE)
 	target.fully_heal(HEAL_ALL) // also cures husk, unconditionally - see /mob/living/proc/fully_heal
-	target.revive(force_grab_ghost = TRUE)
+	target.revive_from("lazarus_line", force_grab_ghost = TRUE)
 	if(target.stat == DEAD)
 		to_chat(user, span_warning("[target] convulses, then lies still. It didn't take."))
 		return FALSE
diff --git a/voidcrew/modules/loot/uniques/plunder.dm b/voidcrew/modules/loot/uniques/plunder.dm
index 7cf16af4e20..4ffe5e85d4f 100644
--- a/voidcrew/modules/loot/uniques/plunder.dm
+++ b/voidcrew/modules/loot/uniques/plunder.dm
@@ -761,19 +761,19 @@
 //
 // CHANGED: the reload used to take a full minute and demand a table, and its
 // ammunition existed nowhere in the game. Reloading is now a flat 5 seconds
-// anywhere, and the gun arrives with a bandolier of cartridges and the
-// schematic to make more.
+// anywhere, and the gun arrives with a bandolier of craftable cartridges.
 // =========================================================================
 
 #define NO_QUARTER_RELOAD_TIME (5 SECONDS)
 #define NO_QUARTER_THROW_RANGE 6
 #define NO_QUARTER_BANDOLIER_SHELLS 12
+#define NO_QUARTER_CALIBER "heavy cartridge"
 
 /// One shot: breaches a normal wall outright, or throws a person six tiles.
 /// Five seconds to load the next cartridge.
 /obj/item/gun/ballistic/shotgun/musket/no_quarter
 	name = "\"No Quarter\""
-	desc = "A flintlock hand cannon dressed up as a boltloading musket. One shot: it punches a hole in a normal wall, or throws a person 6 tiles. Loading the next cartridge takes 5 seconds."
+	desc = "A flintlock hand cannon dressed up as a boltloading musket."
 	icon = 'voidcrew/modules/loot/icons/uniques.dmi'
 	icon_state = "no_quarter"
 	// base musket sets inhand_icon_state = "donk_musket", override so the
@@ -792,8 +792,8 @@
 
 /**
  * The gun is worthless without cartridges and there is nowhere else in the
- * game to get them, so it never arrives alone: a full bandolier and the
- * schematic for more land wherever the gun did (in the cache it rolled in, or
+ * game to find them, so it never arrives alone: a full bandolier
+ * lands wherever the gun did (in the cache it rolled in, or
  * on the floor next to an admin who spawned it).
  */
 /obj/item/gun/ballistic/shotgun/musket/no_quarter/Initialize(mapload)
@@ -807,11 +807,6 @@
 		kit_location = get_turf(src)
 	if(kit_location)
 		new /obj/item/storage/belt/bandolier/no_quarter(kit_location)
-		new /obj/item/blueprint/no_quarter_cartridge(kit_location)
-
-/obj/item/gun/ballistic/shotgun/musket/no_quarter/examine(mob/user)
-	. = ..()
-	. += span_notice("Loading a cartridge takes 5 seconds and can be done anywhere.")
 
 /// Slows the normal ammo-loading flow down to a five-second job, once that's
 /// done, the real (unmodified) chambering logic takes over.
@@ -834,17 +829,29 @@
 /obj/item/ammo_box/magazine/internal/shot/single/no_quarter
 	name = "\"No Quarter\" chamber"
 	ammo_type = /obj/item/ammo_casing/shotgun/no_quarter
+	caliber = NO_QUARTER_CALIBER
 
-/// "Gunpowder and a metal slug, twisted shut", the one cartridge type
-/// No Quarter feeds on. Subtypes the real shotgun slug casing (icon/caliber/
-/// materials inherited verbatim) and just swaps the projectile it fires.
+/// The hand cannon also retains its ordinary shotgun loads.
+/obj/item/ammo_box/magazine/internal/shot/single/no_quarter/give_round(obj/item/ammo_casing/new_round)
+	if(new_round?.caliber != CALIBER_SHOTGUN)
+		return ..()
+	var/obj/item/ammo_casing/current_round = get_round()
+	if(current_round?.loaded_projectile)
+		return FALSE
+	if(current_round)
+		current_round.forceMove(get_turf(src))
+	stored_ammo += new_round
+	new_round.forceMove(src)
+	return TRUE
+
+/// A paper cartridge for the hand cannon, with the ordinary slug's icon and materials.
 /obj/item/ammo_casing/shotgun/no_quarter
 	name = "heavy cartridge"
-	desc = "A paper cartridge bulging with gunpowder and a single lead slug, twisted shut. Only \"No Quarter\" takes them."
+	desc = "A paper cartridge bulging with gunpowder and a single lead slug, twisted shut."
+	caliber = NO_QUARTER_CALIBER
 	projectile_type = /obj/projectile/bullet/shotgun_slug/no_quarter
 
-/// The bandolier the gun turns up with. Twelve cartridges, then you make
-/// your own off the schematic.
+/// The bandolier the gun turns up with. Twelve cartridges, then you craft your own.
 /obj/item/storage/belt/bandolier/no_quarter
 	name = "hand cannon bandolier"
 	desc = "A worn leather bandolier of heavy cartridges, cut wide for a hand cannon's bore."
@@ -853,15 +860,7 @@
 	for(var/i in 1 to NO_QUARTER_BANDOLIER_SHELLS)
 		new /obj/item/ammo_casing/shotgun/no_quarter(src)
 
-/// Carrying this puts the cartridge recipe in your crafting menu; an outpost
-/// neural imprinter can burn it in for the round instead.
-/obj/item/blueprint/no_quarter_cartridge
-	name = "weapon schematic (heavy cartridge)"
-	schematic_name = "heavy cartridge"
-	recipe_type = /datum/crafting_recipe/blueprint/no_quarter_cartridge
-	tier = BLUEPRINT_TIER_RED
-
-/datum/crafting_recipe/blueprint/no_quarter_cartridge
+/datum/crafting_recipe/no_quarter_cartridge
 	name = "Heavy Cartridge"
 	result = /obj/item/ammo_casing/shotgun/no_quarter
 	category = CAT_WEAPON_AMMO
@@ -899,6 +898,7 @@
 	wall_target.dismantle_wall(devastated = TRUE)
 
 #undef NO_QUARTER_BANDOLIER_SHELLS
+#undef NO_QUARTER_CALIBER
 #undef NO_QUARTER_THROW_RANGE
 #undef NO_QUARTER_RELOAD_TIME
 
diff --git a/voidcrew/modules/loot/uniques/research.dm b/voidcrew/modules/loot/uniques/research.dm
index bff0bf2ee50..44a9a7ec5d7 100644
--- a/voidcrew/modules/loot/uniques/research.dm
+++ b/voidcrew/modules/loot/uniques/research.dm
@@ -640,7 +640,7 @@
 	user.setOxyLoss(snap["oxy"])
 	user.setStaminaLoss(snap["stamina"])
 	if(user.stat == DEAD)
-		user.revive(NONE)
+		user.revive_from("temporal_rewind", NONE)
 
 	user.visible_message(span_warning("[user]'s wrist brace flares and cracks in half, and suddenly [user.p_theyre()] standing somewhere else!"), \
 		span_userdanger("The last ten seconds unwind. You're back where you were, and the splint is scrap."))
diff --git a/voidcrew/modules/loot/zone_loot.dm b/voidcrew/modules/loot/zone_loot.dm
index d4af25276ec..9fcf87af226 100644
--- a/voidcrew/modules/loot/zone_loot.dm
+++ b/voidcrew/modules/loot/zone_loot.dm
@@ -1,7 +1,7 @@
 /**
  * # Zone-Aware Loot Cache
  *
- * One generic container that rolls its contents when it spawns. Every cache
+ * One generic container that rolls its contents on first opening or break. Every cache
  * of a theme draws from the SAME four-tier pool no matter where it sits; the
  * overmap zone decides only how many draws it gets and how the odds lean
  * across those tiers. A green cache can pay the top of its theme, it just
@@ -29,8 +29,8 @@
  * (themes/<theme>.dm) that owns the four tier tables, the guard-marker
  * pairing and the shop-SKU cross-references.
  *
- * Contents roll WITHOUT replacement within one cache: a single cache can
- * never pay the same prize twice. Uniqueness is per-cache only, there is
+ * One draw pays a weapon; remaining nonweapon draws roll WITHOUT
+ * replacement within one cache. Uniqueness is per-cache only, there is
  * deliberately no global already-dropped registry, so a long round can hand
  * two crews the same one-of-a-kind item.
  *
@@ -96,6 +96,14 @@ GLOBAL_LIST_INIT(loot_gun_spare_ammo, list(
 	/// prize rather than scenery (a bought premium cache, a jackpot drop).
 	/// Scales AMOUNT only, a bonus cache reaches no content a plain one can't.
 	var/bonus_draws = 0
+	/// Purchased caches keep themed supplies but use the freight weapon profile.
+	var/freight_weapons = FALSE
+	/// Claim before spawning anything, including on direct population calls.
+	var/loot_consumed = FALSE
+
+/obj/structure/closet/crate/zone_loot/Initialize(mapload)
+	spawn_turf = get_turf(src)
+	return ..()
 
 /obj/structure/closet/crate/zone_loot/Destroy()
 	spawn_turf = null
@@ -103,7 +111,8 @@ GLOBAL_LIST_INIT(loot_gun_spare_ammo, list(
 
 /obj/structure/closet/crate/zone_loot/LateInitialize()
 	. = ..()
-	spawn_turf = get_turf(src)
+	if(loot_consumed)
+		return
 	new /datum/zone_resolver(spawn_turf, CALLBACK(src, PROC_REF(on_zone_resolved)))
 
 /**
@@ -117,6 +126,9 @@ GLOBAL_LIST_INIT(loot_gun_spare_ammo, list(
 	spawn_turf = null
 
 /obj/structure/closet/crate/zone_loot/PopulateContents()
+	if(loot_consumed)
+		return
+	loot_consumed = TRUE
 	. = ..()
 	// Last chance: resolve against the spawn point (NOT the current
 	// position, moving the cache must never change its value), else it
@@ -154,7 +166,8 @@ GLOBAL_LIST_INIT(loot_gun_spare_ammo, list(
 			draws_max = ZONE_LOOT_DRAWS_MAX_YELLOW
 			tier_odds = ZONE_LOOT_ODDS_YELLOW
 
-	roll_loot_draws(src, pools, rand(draws_min, draws_max) + bonus_draws, tier_odds)
+	roll_cache_weapon(src, loot_zone, loot_theme, freight_weapons)
+	roll_loot_draws(src, pools, rand(draws_min, draws_max) - 1 + bonus_draws, tier_odds)
 
 /**
  * Rolls `draws` prizes out of `pools` and spawns them inside `destination`.
@@ -172,12 +185,97 @@ GLOBAL_LIST_INIT(loot_gun_spare_ammo, list(
 		var/loot_path = draw_loot_from_tier(pools, pick_weight(tier_odds))
 		if(!loot_path)
 			return
-		new loot_path(destination)
-		// a looted ballistic brings one spare reload with it; energy guns
-		// aren't in the map and need nothing
-		var/spare_ammo = GLOB.loot_gun_spare_ammo[loot_path]
-		if(spare_ammo)
-			new spare_ammo(destination)
+		spawn_loot_prize(destination, loot_path)
+
+/// Shared by themed caches and freight. The caller replaces one existing draw.
+/proc/roll_cache_weapon(atom/destination, zone, datum/loot_theme/theme, freight = FALSE)
+	var/loot_path = select_cache_weapon(zone, theme, freight)
+	spawn_loot_prize(destination, loot_path)
+	return loot_path
+
+/// The two independent rolls are exposed so tests can enumerate every outcome.
+/proc/select_cache_weapon(zone, datum/loot_theme/theme, freight = FALSE, gun_roll = rand(1, 100), class_roll = rand(1, 1000))
+	var/gun = gun_roll <= get_cache_gun_chance(zone, theme, freight)
+	var/weapon_class = get_cache_weapon_class(zone, gun, class_roll)
+	var/list/pool = theme ? theme.get_weapon_pool(gun, weapon_class, freight) : get_cache_weapon_pool(gun, weapon_class, LOOT_GUN_POOL_FREIGHT)
+	return pick_weight(pool)
+
+/proc/get_cache_gun_chance(zone, datum/loot_theme/theme, freight = FALSE)
+	if(zone != ZONE_YELLOW && zone != ZONE_RED)
+		zone = ZONE_GREEN
+	var/list/chances = freight || !theme ? LOOT_GUN_CHANCE_FREIGHT : theme.gun_chance
+	return chances[zone]
+
+/// Normalize every class distribution to 1000 integer outcomes.
+/proc/get_cache_weapon_class(zone, gun, roll = rand(1, 1000))
+	var/list/odds
+	switch(zone)
+		if(ZONE_YELLOW)
+			odds = gun ? LOOT_GUN_CLASSES_YELLOW : LOOT_MELEE_CLASSES_YELLOW
+		if(ZONE_RED)
+			odds = gun ? LOOT_GUN_CLASSES_RED : LOOT_MELEE_CLASSES_RED
+		else
+			odds = gun ? LOOT_GUN_CLASSES_GREEN : LOOT_MELEE_CLASSES_GREEN
+	var/cumulative = 0
+	for(var/weapon_class in odds)
+		cumulative += odds[weapon_class]
+		if(roll <= cumulative)
+			return weapon_class
+
+/proc/get_cache_weapon_pool(gun, weapon_class, family, list/extras)
+	if(gun && family == LOOT_GUN_POOL_FREIGHT && weapon_class == LOOT_WEAPON_RED)
+		weapon_class = LOOT_WEAPON_YELLOW
+	var/list/main_pools = gun ? GLOB.loot_gun_pools[family] : GLOB.loot_melee_pools
+	var/list/pool = main_pools[weapon_class]
+	pool = pool.Copy()
+	var/list/extra_pool = extras?[weapon_class]
+	for(var/entry in extra_pool)
+		// A main entry always keeps its weight, even if an extra repeats it.
+		if(!(entry in pool))
+			pool[entry] = extra_pool[entry]
+	return pool
+
+/// One prize plus one matching ballistic reload; reloads never consume a draw.
+/proc/spawn_loot_prize(atom/destination, loot_path)
+	if(!loot_path)
+		return
+	var/atom/movable/prize = new loot_path(destination)
+	. = prize
+	var/spare_ammo = GLOB.loot_gun_spare_ammo[loot_path]
+	if(spare_ammo)
+		new spare_ammo(destination)
+		return
+	if(!istype(prize, /obj/item/gun/ballistic))
+		return
+	var/obj/item/gun/ballistic/gun = prize
+	// These authored kits already create their own matching reloads.
+	if(istype(gun, /obj/item/gun/ballistic/revolver/c38/housecall) || istype(gun, /obj/item/gun/ballistic/shotgun/musket/no_quarter))
+		return
+	if(!gun.internal_magazine)
+		var/magazine_path = gun.accepted_magazine_type
+		new magazine_path(destination)
+		return
+	// Retained specialist weapons may have no boxed ammunition. Give one
+	// cylinder/tube of their actual rounds, rather than an incompatible box.
+	var/round_path = gun.magazine.ammo_type
+	for(var/round in 1 to gun.magazine.max_ammo)
+		new round_path(destination)
+
+// Stamp purchased caches before they can be opened, even when dispensed aboard a ship.
+/datum/shop_sku/general/rotating/freight_crate/dispense(mob/living/user, mob/living/basic/outpost_trader/vendor)
+	. = ..()
+	var/obj/structure/closet/crate/zone_loot/cache = .
+	cache.freight_weapons = TRUE
+
+/datum/shop_sku/black_market/mystery_cache/dispense(mob/living/user, mob/living/basic/outpost_trader/vendor)
+	. = ..()
+	var/obj/structure/closet/crate/zone_loot/cache = .
+	cache.freight_weapons = TRUE
+
+/datum/shop_sku/black_market/mystery_cache_rare/dispense(mob/living/user, mob/living/basic/outpost_trader/vendor)
+	. = ..()
+	var/obj/structure/closet/crate/zone_loot/cache = .
+	cache.freight_weapons = TRUE
 
 /**
  * Pulls one entry out of `pools` at the requested tier, removing it so the
diff --git a/voidcrew/modules/loot/zone_mobs.dm b/voidcrew/modules/loot/zone_mobs.dm
index e73d3437723..284115aa4f7 100644
--- a/voidcrew/modules/loot/zone_mobs.dm
+++ b/voidcrew/modules/loot/zone_mobs.dm
@@ -20,7 +20,7 @@
  * back to green (the weakest table), so a broken resolution can never flood
  * a ruin.
  *
- * The /boss variants are single-slot setpiece markers: green gets the
+ * The /boss variants are setpiece markers: green gets the
  * theme's lieutenant, red gets the real monster. "Real monster" tops out at
  * elite-tier ("harder versions of normal mobs"). Megafauna are BANNED from
  * the zone system, and from ruin maps outside the purpose-built boss-arena
@@ -44,22 +44,26 @@
 	var/list/mobs_yellow
 	var/list/mobs_red
 	/// Spawn count ranges per zone: list(min, max)
-	var/list/count_green = list(0, 1)
+	var/list/count_green = list(1, 2)
 	var/list/count_yellow = list(1, 2)
-	var/list/count_red = list(2, 3)
+	var/list/count_red = list(1, 2)
+	/// Explicit setpiece role; shared mob types must not infer it from their name.
+	var/npc_role = "auto"
 	/// How far spawns scatter from the marker
 	var/scatter_radius = 2
 
 /**
  * Runtime spawns (mission waves) can pass a count override:
  * new /obj/effect/zone_mobs/pirate(T, list(1, 2)) guarantees 1-2 spawns in
- * green/yellow and one extra in red, regardless of the theme's defaults.
+ * every band, regardless of the theme's defaults.
  */
 /obj/effect/zone_mobs/Initialize(mapload, list/count_override)
+	if(npc_role == "auto" && npc_zone_boss_type(type))
+		npc_role = "boss"
 	if(islist(count_override) && length(count_override) >= 2)
 		count_green = count_override
 		count_yellow = count_override
-		count_red = list(count_override[1] + 1, count_override[2] + 1)
+		count_red = count_override
 	. = ..()
 	return INITIALIZE_HINT_LATELOAD
 
@@ -102,7 +106,8 @@
 		if(!mob_path)
 			continue
 		var/turf/spot = length(open_turfs) ? pick_n_take(open_turfs) : get_turf(src)
-		new mob_path(spot)
+		var/datum/npc_spawn_context/context = new(src, zone_type, npc_role)
+		spawn_npc_in_zone(mob_path, spot, context)
 
 /**
  * Open, unblocked turfs around the marker the pack can scatter onto.
diff --git a/voidcrew/modules/loot/zone_resolution.dm b/voidcrew/modules/loot/zone_resolution.dm
index 9f544b36845..68fa4eb5c40 100644
--- a/voidcrew/modules/loot/zone_resolution.dm
+++ b/voidcrew/modules/loot/zone_resolution.dm
@@ -6,12 +6,10 @@
  * still be registering (planet mapzones attach only after their template
  * load returns). Fires the callback exactly once with the resolved zone
  * type, or null if every attempt failed. The consumer picks its own
- * fallback (both current consumers fall back to ZONE_GREEN, the weakest
+ * fallback (loot and guard consumers fall back to ZONE_GREEN, the weakest
  * table, so a broken resolution can never inflate a payout).
  *
- * Used by the zone loot caches (zone_loot.dm) and the zone mob markers
- * (zone_mobs.dm), which previously each carried their own copy of this
- * retry loop.
+ * Used by zone loot caches, freight crates and zone mob markers.
  */
 
 /// How many times a resolver re-attempts zone resolution
diff --git a/voidcrew/modules/metrics/combat_metrics.dm b/voidcrew/modules/metrics/combat_metrics.dm
index 23c544ae907..724781e299d 100644
--- a/voidcrew/modules/metrics/combat_metrics.dm
+++ b/voidcrew/modules/metrics/combat_metrics.dm
@@ -49,8 +49,8 @@
 //   revived             A dead player's body came back to life. ckey, ship, zone, quantity = 1,
 //                       points = seconds dead, subject = method: defibrillator,
 //                       reviver_implant, nanites, legion_core, strange_reagent, surgery,
-//                       reagent, admin, cloning_vat or other. details: via = the proc that
-//                       called revive(), read off the call stack.
+//                       reagent, admin, phylactery, meridian_heart, lazarus_line,
+//                       temporal_rewind, cloning_vat or other. Methods are explicit at the call site.
 //   revived_repeat      Tallied in place of revived for revive loops, same limit as deaths.
 //                       ckey, zone, subject = method, quantity = revivals,
 //                       points = seconds dead summed.
@@ -72,6 +72,9 @@ GLOBAL_DATUM_INIT(combat_metrics, /datum/combat_metrics, new)
 // Per-mob state. Only numbers, text and typepaths, never references, so nothing here can hold
 // a deleted atom. Unset vars cost no memory per mob.
 /mob/living
+	/// Scoped to synchronous revival calls; never inferred from callers.
+	var/metric_revival_method
+	var/metric_revive_was_dead = FALSE
 	/// ckey of the player who last hit this mob. Null when the last hit came from an NPC.
 	var/metric_hit_ckey
 	/// Type of the mob that last hit this mob.
@@ -243,45 +246,40 @@ GLOBAL_DATUM_INIT(combat_metrics, /datum/combat_metrics, new)
 		return "toxin"
 	return "brute"
 
-/**
- * Finds what called revive(), by walking up the call stack from a COMSIG_LIVING_REVIVE handler
- * to the first proc above revive() and heal_and_revive(). Returns list(that proc's src, its name,
- * its path), or null. Only runs when a dead player comes back, so the walk is cheap enough.
- */
-/proc/metric_revive_site()
-	var/callee/frame = caller
-	var/seen_revive = FALSE
-	for(var/depth in 1 to 16)
-		if(isnull(frame))
-			return null
-		var/path = "[frame.proc]"
-		var/proc_name = copytext(path, findlasttext(path, "/") + 1)
-		if(proc_name == "revive" || proc_name == "heal_and_revive")
-			seen_revive = TRUE
-		else if(seen_revive)
-			return list(frame.src, proc_name, path)
-		frame = frame.caller
-	return null
+/// Retain the state from before revive() sends its signal, including unclassified calls.
+/mob/living/revive(full_heal_flags = NONE, excess_healing = 0, force_grab_ghost = FALSE)
+	var/previous_was_dead = metric_revive_was_dead
+	metric_revive_was_dead = stat == DEAD
+	try
+		. = ..()
+	catch(var/exception/error)
+		metric_revive_was_dead = previous_was_dead
+		throw error
+	metric_revive_was_dead = previous_was_dead
 
-/// Names the revival method from metric_revive_site()'s src and proc name.
-/proc/metric_revive_method(datum/site_src, proc_name)
-	if(proc_name == "do_strange_reagent_revival")
-		return "strange_reagent"
-	if(istype(site_src, /obj/item/shockpaddles))
-		return "defibrillator"
-	if(istype(site_src, /obj/item/organ/cyberimp/chest/reviver))
-		return "reviver_implant"
-	if(istype(site_src, /datum/nanite_program))
-		return "nanites"
-	if(istype(site_src, /obj/item/organ/monster_core/regenerative_core))
-		return "legion_core"
-	if(istype(site_src, /datum/surgery_step))
-		return "surgery"
-	if(istype(site_src, /datum/reagent))
-		return "reagent"
-	if(istype(site_src, /datum/admins) || istype(site_src, /datum/admin_verb) || istype(site_src, /datum/secrets_menu))
-		return "admin"
-	return "other"
+/// Attribute only this body's synchronous revival, restoring any enclosing scope even on failure.
+/mob/living/proc/revive_from(method, full_heal_flags = NONE, excess_healing = 0, force_grab_ghost = FALSE)
+	var/previous_method = metric_revival_method
+	metric_revival_method = method
+	try
+		. = revive(full_heal_flags, excess_healing, force_grab_ghost)
+	catch(var/exception/error)
+		metric_revival_method = previous_method
+		throw error
+	metric_revival_method = previous_method
+
+/mob/living/proc/heal_and_revive_from(method, heal_to = 50, revive_message)
+	var/previous_method = metric_revival_method
+	metric_revival_method = method
+	try
+		if(args.len < 2)
+			. = heal_and_revive() // Preserve subtype defaults when the caller omitted heal_to.
+		else
+			. = heal_and_revive(heal_to, revive_message)
+	catch(var/exception/error)
+		metric_revival_method = previous_method
+		throw error
+	metric_revival_method = previous_method
 
 /// A cloning vat woke a dead player up in a fresh body. Called from /obj/machinery/cloning_vat/proc/claim().
 /proc/metric_clone_revival(mob/living/clone, mob/old_body)
@@ -448,7 +446,7 @@ GLOBAL_DATUM_INIT(combat_metrics, /datum/combat_metrics, new)
 /// Registered on a dead player's body. revive() sends this for every heal, dead or not.
 /datum/combat_metrics/proc/on_revive(mob/living/source, full_heal_flags)
 	SIGNAL_HANDLER
-	if(source.stat == DEAD)
+	if(source.stat == DEAD || !source.metric_revive_was_dead)
 		return
 	UnregisterSignal(source, COMSIG_LIVING_REVIVE)
 	// A new life starts without the old killer.
@@ -462,18 +460,16 @@ GLOBAL_DATUM_INIT(combat_metrics, /datum/combat_metrics, new)
 	var/player_ckey = metric_ckey(source)
 	if(!player_ckey)
 		return
-	var/list/site = metric_revive_site()
-	var/method = metric_revive_method(site?[1], site?[2])
-	record_revival(source, player_ckey, method, world.time - source.timeofdeath, site?[3])
+	record_revival(source, player_ckey, source.metric_revival_method || "other", world.time - source.timeofdeath)
 
 /// Writes a revival, or tallies it when this body keeps coming back.
-/datum/combat_metrics/proc/record_revival(mob/living/body, player_ckey, method, deciseconds_dead, via)
+/datum/combat_metrics/proc/record_revival(mob/living/body, player_ckey, method, deciseconds_dead)
 	last_death_by_ckey -= player_ckey
 	var/seconds_dead = max(0, round(deciseconds_dead / 10))
 	if(over_burst_limit(body, revival = TRUE))
 		tally_metric(METRIC_DEATH, "revived_repeat", ckey = player_ckey, zone = metric_cached_zone(body), subject = method, points = seconds_dead)
 		return
-	record_metric(METRIC_DEATH, "revived", ckey = player_ckey, subject = method, points = seconds_dead, quantity = 1, details = via ? list("via" = via) : null, actor = body)
+	record_metric(METRIC_DEATH, "revived", ckey = player_ckey, subject = method, points = seconds_dead, quantity = 1, actor = body)
 
 /// A player joined a crew. If they died and were never revived, that's a respawn.
 /datum/combat_metrics/proc/on_crewmember_joined(datum/source, mob/living/character, rank)
diff --git a/voidcrew/modules/metrics/economy_metrics.dm b/voidcrew/modules/metrics/economy_metrics.dm
index 85799405a43..8f703b81304 100644
--- a/voidcrew/modules/metrics/economy_metrics.dm
+++ b/voidcrew/modules/metrics/economy_metrics.dm
@@ -59,10 +59,9 @@
 //   subject = item type, credits and vouchers = paid out, quantity = items, details: name,
 //   shop, sales.
 // * mod_bench_upgrade: subject = upgrade id, details: name.
-// * neural_imprint: subject = schematic name, details: from_cash (paid from loaded cash).
 // * chrome_cradle_service: subject = service, details: from_cash.
 // * locker_rental: subject = locker type.
-//   The four above are paid outpost services: ckey = customer, ship, zone, credits and
+//   The three above are paid outpost services: ckey = customer, ship, zone, credits and
 //   vouchers = minus the fee.
 // * outpost_advert: an outpost broadcast, paid from the outpost treasury. ckey = who bought it,
 //   subject = outpost name, credits = minus the cost. No ship.
diff --git a/voidcrew/modules/metrics/metrics_helpers.dm b/voidcrew/modules/metrics/metrics_helpers.dm
index ccc4bc2b448..69054da55f9 100644
--- a/voidcrew/modules/metrics/metrics_helpers.dm
+++ b/voidcrew/modules/metrics/metrics_helpers.dm
@@ -71,12 +71,9 @@ GLOBAL_VAR_INIT(metric_ship_count, 0)
 		return ckey(player.mind.key)
 	return null
 
-/// The ship a mob crews. Falls back to the ship they are standing on.
+/// Use the same current affiliation/hull selection as services, including ambiguous fleets.
 /proc/metric_crew_ship(mob/player)
-	for(var/datum/team/voidcrew/team as anything in player.mind?.ship_teams)
-		if(team.ship)
-			return team.ship
-	return get_ship_from_atom(player)
+	return get_crew_ship(player)
 
 /// "green", "yellow" or "red" for where an atom is, counting a ship's interior as the ship's tile.
 /// Null when the place isn't tied to the overmap.
diff --git a/voidcrew/modules/metrics/mission_metrics.dm b/voidcrew/modules/metrics/mission_metrics.dm
index 6e6a9eb910c..e380c77223f 100644
--- a/voidcrew/modules/metrics/mission_metrics.dm
+++ b/voidcrew/modules/metrics/mission_metrics.dm
@@ -9,6 +9,15 @@
 //
 // EVENT CATALOG
 //
+// Lifecycle details also carry the accepting crew_id and immutable work_receipt_serial,
+// work_family, work_band and work_difficulty when present. Hull changes never redirect these.
+// zone_work_claimed - one diagnostic row per settled receipt, including fully capped work.
+//     points: credited gain. details: attempted_gain, capped_gain, permission_before/after.
+// zone_permission_crossed - one diagnostic row per newly opened permission; subject: its
+//     internal name. The row's round_seconds gives the access time across replacement hulls.
+//     These rows move no money. Use zone_work_claimed.points for progression totals; the
+//     mission_completed.details.zone_gain mirror must not be added to it.
+//
 // mission_accepted - a crew takes a mission from its board, or a contract from an outpost
 //     trader. Hook: /datum/mission/start_mission().
 //     ckey: the player who accepted. details: board ("ship" or "outpost"), difficulty,
@@ -42,6 +51,10 @@
 //     Hook: /obj/structure/overmap/trader_outpost/ensure_shop_offers().
 // board_refreshed - a crew rerolled its mission board. ckey, ship. quantity: offers thrown
 //     away. Hook: the mission board's "refresh" action.
+// mission_quote_posted - the quoted cash, vouchers, research and package value of one offer.
+// guarded_prize_paid - diagnostic item row for a suit or gadget, including its family, quote
+//     zone and first_suit_s. Console/contract mission_completed.total_value already includes
+//     this prize; do not add this diagnostic row a second time to mission receipts.
 // pirate_bounty_accepted - a crew took a bounty on an NPC pirate ship from its mission board.
 //     ckey, ship. subject: the pirate ship's typepath. zone: where the pirate is.
 //     details: reward, heavy.
@@ -61,6 +74,8 @@
 /datum/mission
 	/// ckey of the player who accepted this mission
 	var/metric_accepted_by
+	/// Continuing crew id captured at acceptance, including after admin disposal of its record.
+	var/metric_crew_id
 	/// ship_id, ship_name and ship_class when the mission was accepted, for rows written while
 	/// the ship itself is being deleted
 	var/list/metric_ship_fields
@@ -75,6 +90,23 @@
 	/// refunded straight away writes neither the post nor the refund
 	var/metric_posted = FALSE
 
+/datum/mission_work_receipt
+	/// Shared by encounter aliases, so completion logging cannot duplicate a claim/crossing.
+	var/metric_recorded = FALSE
+
+/// Internal labels, used only in metrics and admin diagnostics.
+/proc/voidcrew_zone_permission_name(permission)
+	switch(permission)
+		if(ZONE_PERMISSION_PUBLIC)
+			return "Public"
+		if(ZONE_PERMISSION_YELLOW)
+			return "Yellow"
+		if(ZONE_PERMISSION_ADVANCED)
+			return "Advanced"
+		if(ZONE_PERMISSION_ELITE)
+			return "Elite"
+	return "Unknown"
+
 /// The ckey of the player whose action is running this proc chain. Only trust it on paths that
 /// start with a player's click or UI action; timers and subsystems have no usr.
 /proc/metric_acting_ckey()
@@ -88,6 +120,8 @@
 
 /// The zone name of this mission's target, or null when it has none.
 /datum/mission/proc/metric_target_zone()
+	if(!isnull(quote_zone))
+		return metric_zone_name(quote_zone)
 	var/zone_type = target?.get_zone_type()
 	if(!isnull(zone_type))
 		return metric_zone_name(zone_type)
@@ -113,6 +147,13 @@
 		"difficulty" = get_difficulty_name(),
 		"archetype" = get_archetype(),
 	)
+	if(metric_crew_id || !QDELETED(accepting_crew))
+		details["crew_id"] = metric_crew_id || accepting_crew.crew_id
+	if(work_receipt)
+		details["work_receipt_serial"] = work_receipt.serial
+		details["work_family"] = work_receipt.family
+		details["work_band"] = metric_zone_name(work_receipt.band)
+		details["work_difficulty"] = work_receipt.difficulty
 	if(shop)
 		details["outpost"] = shop.outpost_name
 		details["trader"] = shop.trader_name
@@ -147,7 +188,12 @@
  * a back-room prize at CONTRACT_EXCLUSIVE_VALUE. Called once, when the contract is generated.
  */
 /datum/mission/proc/note_metric_item_value()
-	if(!shop || !SSmetrics.accepting)
+	if(!SSmetrics.accepting)
+		return
+	if(!shop)
+		metric_item_value = 0
+		for(var/reward_type in get_reward_types())
+			metric_item_value += mission_utility_value(reward_type)
 		return
 	var/list/reward_types = get_reward_types()
 	if(!length(reward_types))
@@ -165,6 +211,27 @@
 			total += sku_values[reward_type] || 0
 	metric_item_value = total
 
+/// Value utility at its catalog price without constructing shops or consuming stock.
+/proc/mission_utility_value(item_type)
+	var/static/list/prices
+	if(isnull(prices))
+		prices = list()
+		for(var/datum/shop_sku/sku_type as anything in subtypesof(/datum/shop_sku))
+			var/item_path = initial(sku_type.item_path)
+			var/price = initial(sku_type.price_credits) + initial(sku_type.price_vouchers) * VOUCHER_CREDIT_VALUE
+			if(!item_path || price <= 0)
+				continue
+			if(!prices[item_path] || price < prices[item_path])
+				prices[item_path] = price
+	return prices[item_type] || 0
+
+/// One row per actual named prize, shared by console, outpost kills and bounty lairs.
+/proc/record_guarded_prize(obj/structure/overmap/ship/ship, family, category, zone, prize_type, source_type)
+	var/list/details = list("family" = family, "prize_type" = category, "source" = source_type, "item_value" = category == "suit" ? 9000 : 3600)
+	if(category == "suit")
+		details["first_suit_s"] = ship.mission_first_suit_seconds
+	record_metric(METRIC_MISSION, "guarded_prize_paid", ship = ship, zone = metric_zone_name(zone), subject = prize_type, quantity = 1, details = details)
+
 /// Remembers the ship parts in a prize crate this mission just paid.
 /datum/mission/proc/note_metric_ship_parts(obj/structure/closet/crate/prize)
 	if(!prize || !SSmetrics.accepting)
@@ -178,6 +245,7 @@
 	if(!SSmetrics.accepting)
 		return
 	metric_accepted_by = metric_acting_ckey()
+	metric_crew_id = QDELETED(accepting_crew) ? null : accepting_crew.crew_id
 	if(servant)
 		var/list/ship_row = SSmetrics.build_row(METRIC_MISSION, null, null, null, servant, null, null, 0, 0, 0, 0, null)
 		metric_ship_fields = list(
@@ -205,6 +273,7 @@
 /datum/mission/proc/record_metric_completed(atom/reward_anchor, favor_gain)
 	if(!SSmetrics.accepting)
 		return
+	var/recorded_work = record_metric_work_receipt()
 	var/paid_goods = servant && get_turf(reward_anchor)
 	var/paid_credits = (servant?.ship_account && value > 0) ? value : 0
 	var/paid_vouchers = (paid_goods && voucher_count > 0) ? voucher_count : 0
@@ -224,6 +293,8 @@
 			item_count++
 
 	var/list/details = metric_base_details()
+	details["zone_claimed"] = recorded_work
+	details["zone_gain"] = recorded_work ? work_receipt.credited : 0
 	details["seconds"] = metric_seconds_active()
 	var/turned_in_by = metric_acting_ckey() || metric_accepted_by
 	if(metric_accepted_by && metric_accepted_by != turned_in_by)
@@ -235,6 +306,12 @@
 	var/item_value = paid_goods ? metric_item_value : 0
 	if(item_value > 0)
 		details["item_value"] = item_value
+	if(paid_goods && guarded_prize)
+		var/prize_value = ispath(guarded_prize, /obj/item/mod/control) ? 9000 : 3600
+		details["prize"] = guarded_prize
+		details["prize_value"] = prize_value
+		item_value += prize_value
+		item_count++
 	details["total_value"] = paid_credits + item_value + paid_vouchers * VOUCHER_CREDIT_VALUE
 	if(favor)
 		details["favor"] = favor
@@ -244,6 +321,34 @@
 	metric_completion_details(details)
 	record_mission_metric("mission_completed", turned_in_by, paid_credits, paid_vouchers, paid_points, item_count, details)
 
+/// Consume Z2's settled diagnostics only. This never claims work or changes standing.
+/datum/mission/proc/record_metric_work_receipt()
+	if(!SSmetrics.accepting || !work_receipt?.claimed || work_receipt.metric_recorded || QDELETED(accepting_crew) \
+		|| work_receipt.crew != accepting_crew || isnull(work_receipt.permission_before) || isnull(work_receipt.permission_after))
+		return FALSE
+	work_receipt.metric_recorded = TRUE
+	var/list/details = metric_base_details()
+	var/attempted_gain = zone_work_reward(work_receipt.difficulty)
+	details["attempted_gain"] = attempted_gain
+	details["capped_gain"] = max(0, attempted_gain - work_receipt.credited)
+	details["permission_before"] = work_receipt.permission_before
+	details["permission_after"] = work_receipt.permission_after
+	var/acting_ckey = metric_acting_ckey() || metric_accepted_by
+	record_mission_metric("zone_work_claimed", acting_ckey, points = work_receipt.credited, quantity = 1, details = details)
+	if(work_receipt.permission_after > work_receipt.permission_before)
+		for(var/permission in (work_receipt.permission_before + 1) to work_receipt.permission_after)
+			var/list/crossing = details.Copy()
+			crossing["permission"] = permission
+			var/obj/structure/overmap/ship/ship = QDELETED(servant) ? null : servant
+			// Use the same ship snapshot fallback as the mission lifecycle rows.
+			var/list/row = SSmetrics.build_row(METRIC_MISSION, "zone_permission_crossed", acting_ckey, null, ship, metric_zone_name(work_receipt.band), voidcrew_zone_permission_name(permission), 0, 0, 0, 1, crossing)
+			if(!ship && metric_ship_fields)
+				row["ship_id"] = metric_ship_fields["ship_id"]
+				row["ship_name"] = metric_ship_fields["ship_name"]
+				row["ship_class"] = metric_ship_fields["ship_class"]
+			SSmetrics.queue_row(row)
+	return TRUE
+
 /**
  * mission_failed or mission_expired. Called from fail() before any state changes. Offers that
  * die on the board were never accepted and write nothing. on_timeout() clears timeout_timer
@@ -276,6 +381,15 @@
 	if(!SSmetrics.accepting || QDELETED(offer))
 		return
 	tally_metric(METRIC_MISSION, event, ship = ship, zone = offer.metric_target_zone(), subject = offer.type)
+	if(event == "mission_offered" || event == "contract_offered")
+		var/list/details = offer.metric_base_details()
+		if(ship && !QDELETED(ship.get_crew_record()))
+			details["crew_id"] = ship.get_crew_record().crew_id
+		details["item_value"] = offer.metric_item_value
+		details["offer"] = offer.value
+		details["vouchers"] = offer.voucher_count
+		details["research"] = offer.research_reward
+		record_metric(METRIC_MISSION, "mission_quote_posted", ship = ship, zone = offer.metric_target_zone(), subject = offer.type, details = details)
 
 /// board_refreshed. Called before the board is cleared, so the count is what was thrown away.
 /proc/record_mission_board_refreshed(obj/structure/overmap/ship/ship, mob/user)
diff --git a/voidcrew/modules/mining/edits/order_consumables.dm b/voidcrew/modules/mining/edits/order_consumables.dm
index 884c913073c..7834622f387 100644
--- a/voidcrew/modules/mining/edits/order_consumables.dm
+++ b/voidcrew/modules/mining/edits/order_consumables.dm
@@ -13,3 +13,8 @@
 /datum/orderable_item/consumables/rescue_hook
 	category_index = CATEGORY_MINING
 	cost_per_order = 350
+
+/datum/orderable_item/consumables/space_cash
+	purchase_path = /obj/item/stack/spacecash/c500
+	desc = "A 500-credit bill."
+	cost_per_order = 2000
diff --git a/voidcrew/modules/mining/lavaland/edits/necropolis_chests.dm b/voidcrew/modules/mining/lavaland/edits/necropolis_chests.dm
index 8559a0163ea..f71ff4b3be1 100644
--- a/voidcrew/modules/mining/lavaland/edits/necropolis_chests.dm
+++ b/voidcrew/modules/mining/lavaland/edits/necropolis_chests.dm
@@ -56,3 +56,19 @@
 	if(!contents.len)
 		CRASH("Failed to generate loot. loot number: [loot][mod ? "subloot: [mod]" : null]")
 	spawned_loot = TRUE
+
+/obj/structure/closet/crate/necropolis/colossus
+	/// Replaced with the original Colossus's roll when it creates this chest.
+	var/ladder_weapon_drop
+
+/obj/structure/closet/crate/necropolis/colossus/Initialize(mapload)
+	. = ..()
+	ladder_weapon_drop = npc_ladder_red_drop()
+
+/obj/structure/closet/crate/necropolis/colossus/PopulateContents()
+	// Replace upstream's unconditional weapon constructor; do not spawn then delete it.
+	var/crystal_type = pick(subtypesof(/obj/machinery/anomalous_crystal))
+	new crystal_type(src)
+	new /obj/item/organ/vocal_cords/colossus(src)
+	if(ladder_weapon_drop)
+		new /obj/item/cain_and_abel(src)
diff --git a/voidcrew/modules/mining/ore_profiles.dm b/voidcrew/modules/mining/ore_profiles.dm
new file mode 100644
index 00000000000..4c95ca03b1e
--- /dev/null
+++ b/voidcrew/modules/mining/ore_profiles.dm
@@ -0,0 +1,104 @@
+/// Return copies: neither callers nor the expanded wall cache may mutate the profiles.
+/proc/ordinary_ore_weights(zone_type)
+	var/static/list/profiles = list(
+		list(110, 40, 16, 16, 8, 5, 2, 2, 1),
+		list(80, 40, 20, 20, 16, 12, 6, 4, 2),
+		list(50, 36, 24, 24, 24, 20, 12, 8, 2),
+	)
+	var/static/list/ores = list(
+		/obj/item/stack/ore/iron,
+		/obj/item/stack/ore/plasma,
+		/obj/item/stack/ore/silver,
+		/obj/item/stack/ore/titanium,
+		/obj/item/stack/ore/gold,
+		/obj/item/stack/ore/uranium,
+		/obj/item/stack/ore/diamond,
+		/obj/item/stack/ore/bluespace_crystal,
+		/obj/item/stack/ore/bananium,
+	)
+	var/list/weights = profiles[ordinary_ore_zone(zone_type)]
+	var/list/result = list()
+	for(var/index in 1 to length(ores))
+		result[ores[index]] = weights[index]
+	return result
+
+/proc/ordinary_ore_zone(zone_type)
+	return (zone_type == ZONE_YELLOW || zone_type == ZONE_RED) ? zone_type : ZONE_GREEN
+
+/proc/is_ordinary_ore(ore_type)
+	// Proc statics are initialized at world creation; the profile's own lists may not exist yet.
+	var/static/list/ores
+	if(isnull(ores))
+		ores = ordinary_ore_weights(ZONE_GREEN)
+	return ore_type in ores
+
+/obj/structure/overmap/planet/proc/ore_zone()
+	if(!isnull(zone_band))
+		return ordinary_ore_zone(zone_band)
+	var/turf/chart = get_turf(src)
+	if(!istype(chart, /turf/open/overmap))
+		return ZONE_GREEN
+	return ordinary_ore_zone(SSovermap_zones?.resolve_zone_for_overmap_turf(chart))
+
+/// Resolve the wall's own site, including during terrain generation. Never cache by z.
+/turf/closed/mineral/proc/ore_profile_zone()
+	var/obj/structure/overmap/holder = SSovermap_zones?.get_overmap_object_for_turf(src)
+	if(istype(holder, /obj/structure/overmap/planet))
+		var/obj/structure/overmap/planet/planet = holder
+		return planet.ore_zone()
+	if(holder)
+		var/turf/chart = get_turf(holder)
+		return istype(chart, /turf/open/overmap) ? ordinary_ore_zone(SSovermap_zones.resolve_zone_for_overmap_turf(chart)) : ZONE_GREEN
+	return ordinary_ore_zone(SSmapping.get_planet_zone_band_for_turf(src))
+
+/turf/closed/mineral/random/proc/ore_roll_chance()
+	switch(ore_profile_zone())
+		if(ZONE_YELLOW)
+			return 12
+		if(ZONE_RED)
+			return 16
+	return 8
+
+/// A supplied percentile lets tests exercise the same boundary used by initialization.
+/turf/closed/mineral/random/proc/ore_initial_roll(percentile = rand(1, 100))
+	return percentile <= ore_roll_chance()
+
+/turf/closed/mineral/random/proc/ore_spawn_choices()
+	var/static/list/choices_by_profile = list()
+	var/zone_type = ore_profile_zone()
+	var/key = "[zone_type]:[type]"
+	if(isnull(choices_by_profile[key]))
+		var/list/weights = mineral_chances()
+		if(!istype(src, /turf/closed/mineral/random/labormineral))
+			// Replace only ordinary ore entries; authored special veins keep their weights.
+			var/list/ordinary = ordinary_ore_weights(zone_type)
+			for(var/ore in ordinary)
+				weights[ore] = ordinary[ore]
+		choices_by_profile[key] = expand_weights(weights)
+	return choices_by_profile[key]
+
+/// Only ordinary ore uses the new range. Gibtonite and gulag bookkeeping stay separate.
+/turf/closed/mineral/proc/ordinary_ore_amount(ore_type)
+	if(!is_ordinary_ore(ore_type))
+		return mineralAmt
+	if(istype(src, /turf/closed/mineral/random/asteroid_field))
+		switch(ore_profile_zone())
+			if(ZONE_YELLOW)
+				return rand(1, 3)
+			if(ZONE_RED)
+				return rand(2, 3)
+		return rand(1, 2)
+	return rand(1, 3)
+
+// The generator chooses these types before Initialize(), so there is only one ore roll.
+/turf/closed/mineral/random/asteroid_field/ore_roll_chance()
+	return 12
+
+/turf/closed/mineral/random/asteroid_field/minor/ore_roll_chance()
+	return 10
+
+/turf/closed/mineral/random/asteroid_field/majour/ore_roll_chance()
+	return 15
+
+/turf/closed/mineral/random/labormineral/ore_roll_chance()
+	return mineralChance
diff --git a/voidcrew/modules/mining/ore_redemption.dm b/voidcrew/modules/mining/ore_redemption.dm
index e5c6a09eba3..4e60fcd125f 100644
--- a/voidcrew/modules/mining/ore_redemption.dm
+++ b/voidcrew/modules/mining/ore_redemption.dm
@@ -1,3 +1,17 @@
 // Ship ore redemption uses local storage and does not require an ore silo.
 /obj/machinery/mineral/ore_redemption
 	requires_silo = FALSE
+
+/obj/item/stack/ore/titanium
+	points = 40
+
+// Boulder machinery applies MINING_POINT_MACHINE_MULTIPLIER to this material rate.
+/datum/material/titanium
+	points_per_unit = 50 / SHEET_MATERIAL_AMOUNT
+
+/// Quote the raw ore payout, including this ORM's point upgrade.
+/obj/machinery/mineral/ore_redemption/proc/get_ore_points(datum/material/material)
+	var/obj/item/stack/ore/ore_type = material.ore_type
+	if(!ispath(ore_type, /obj/item/stack/ore))
+		return 0
+	return initial(ore_type.points) * point_upgrade
diff --git a/voidcrew/modules/mining/ore_vents.dm b/voidcrew/modules/mining/ore_vents.dm
new file mode 100644
index 00000000000..3b4e121b1cf
--- /dev/null
+++ b/voidcrew/modules/mining/ore_vents.dm
@@ -0,0 +1,175 @@
+/// This datum belongs to the persistent planet, never its disposable surface.
+/datum/planet_ore_reserve
+	var/sheets_remaining
+
+/datum/planet_ore_reserve/New(zone_type)
+	. = ..()
+	switch(ordinary_ore_zone(zone_type))
+		if(ZONE_YELLOW)
+			sheets_remaining = 6000
+		if(ZONE_RED)
+			sheets_remaining = 10000
+		else
+			sheets_remaining = 3000
+
+/obj/structure/overmap/planet
+	var/datum/planet_ore_reserve/ore_reserve
+
+/obj/structure/overmap/planet/Destroy()
+	QDEL_NULL(ore_reserve)
+	return ..()
+
+/obj/structure/overmap/planet/proc/get_ore_reserve()
+	if(!ore_reserve)
+		ore_reserve = new(ore_zone())
+	return ore_reserve
+
+/datum/controller/subsystem/ore_generation
+	/// Vents that stopped producing but can still have boulders awaiting retrieval.
+	var/list/obj/structure/ore_vent/exhausted_vents = list()
+
+/datum/controller/subsystem/ore_generation/fire(resumed)
+	. = ..()
+	// Exhaustion can make the parent's final produce_boulder() return null.
+	available_boulders -= null
+	// The parent rebuilds stock from producing vents; exhausted vents only supply existing rocks.
+	for(var/obj/structure/ore_vent/vent in exhausted_vents)
+		for(var/obj/item/boulder/rock in vent.loc)
+			available_boulders |= rock
+
+/obj/structure/ore_vent
+	desc = "A fissure in the rock."
+	/// Binding is permanent, including if the source is subsequently deleted.
+	var/ore_source_bound = FALSE
+	var/datum/weakref/ore_source_ref
+	/// Unowned vents use a finite green reserve of their own.
+	var/datum/planet_ore_reserve/unowned_ore_reserve
+	var/boulders_remaining
+
+/obj/structure/ore_vent/Initialize(mapload)
+	. = ..()
+	bind_ore_reserve()
+
+/obj/structure/ore_vent/Destroy()
+	SSore_generation.exhausted_vents -= src
+	ore_source_ref = null
+	QDEL_NULL(unowned_ore_reserve)
+	return ..()
+
+/obj/structure/ore_vent/examine(mob/user)
+	. = ..()
+	if(!can_produce_ore())
+		. += span_notice("The seam is spent.")
+
+/obj/structure/ore_vent/attack_hand(mob/living/user, list/modifiers)
+	if(HAS_TRAIT(user, TRAIT_BOULDER_BREAKER) && !can_produce_ore())
+		balloon_alert(user, "seam spent")
+		return
+	return ..()
+
+/obj/structure/ore_vent/proc/bind_ore_reserve()
+	if(ore_source_bound)
+		return
+	ore_source_bound = TRUE
+	var/turf/location = get_turf(src)
+	var/obj/structure/overmap/planet/source = location ? SSovermap_zones?.get_overmap_object_for_turf(location) : null
+	var/zone_type = ZONE_GREEN
+	if(istype(source))
+		ore_source_ref = WEAKREF(source)
+		source.get_ore_reserve()
+		zone_type = source.ore_zone()
+	else
+		unowned_ore_reserve = new(ZONE_GREEN)
+	switch(ordinary_ore_zone(zone_type))
+		if(ZONE_YELLOW)
+			boulders_remaining = 30
+		if(ZONE_RED)
+			boulders_remaining = 40
+		else
+			boulders_remaining = 20
+
+/obj/structure/ore_vent/proc/bound_ore_reserve()
+	bind_ore_reserve()
+	if(unowned_ore_reserve)
+		return unowned_ore_reserve
+	var/obj/structure/overmap/planet/source = ore_source_ref?.resolve()
+	return source?.ore_reserve
+
+/obj/structure/ore_vent/proc/can_produce_ore()
+	var/datum/planet_ore_reserve/reserve = bound_ore_reserve()
+	if(boulders_remaining <= 0 || !reserve || reserve.sheets_remaining < 1)
+		stop_ore_production()
+		return FALSE
+	return !isnull(get_turf(src))
+
+/// Preserve discovery for vents whose boulders were available during automatic production.
+/obj/structure/ore_vent/proc/stop_ore_production()
+	if(src in SSore_generation.processed_vents)
+		SSore_generation.exhausted_vents |= src
+		SSore_generation.processed_vents -= src
+
+/// Truncate to whole sheets of contained material, before refinery efficiency bonuses.
+/// No sleeps between rechecking the shared balance, debiting it, and debiting the vent.
+/obj/structure/ore_vent/proc/commit_ore_payload(list/materials)
+	if(!can_produce_ore())
+		return FALSE
+	var/datum/planet_ore_reserve/reserve = bound_ore_reserve()
+	var/remaining = reserve.sheets_remaining
+	var/spent = 0
+	for(var/material in materials.Copy())
+		var/sheets = min(remaining, max(0, round(materials[material] / SHEET_MATERIAL_AMOUNT)))
+		if(!sheets)
+			materials -= material
+			continue
+		materials[material] = sheets * SHEET_MATERIAL_AMOUNT
+		remaining -= sheets
+		spent += sheets
+	if(!spent)
+		return FALSE
+	reserve.sheets_remaining -= spent
+	boulders_remaining--
+	if(!boulders_remaining)
+		stop_ore_production()
+	if(reserve.sheets_remaining < 1)
+		for(var/obj/structure/ore_vent/vent in SSore_generation.processed_vents.Copy())
+			if(vent.bound_ore_reserve() == reserve)
+				vent.stop_ore_production()
+	return TRUE
+
+/// The finite allocation pool stores counts, not just membership.
+/obj/structure/ore_vent/proc/take_vent_allocation(list/pool)
+	for(var/material in pool.Copy())
+		if(pool[material] <= 0)
+			pool -= material
+	if(!length(pool))
+		return null
+	var/material = pick_weight(pool)
+	pool[material]--
+	if(pool[material] <= 0)
+		pool -= material
+	return material
+
+/obj/structure/ore_vent/proc/select_vent_mineral(map_loading)
+	var/list/pool = SSore_generation.ore_vent_minerals
+	for(var/material in pool.Copy())
+		if(pool[material] <= 0)
+			pool -= material
+	var/list/available = map_loading ? pool.Copy() : GLOB.ore_vent_minerals_lavaland.Copy()
+	available -= mineral_breakdown
+	if(length(available))
+		var/material = pick_weight(available)
+		if(map_loading)
+			pool[material]--
+			if(pool[material] <= 0)
+				pool -= material
+		return material
+	if(!map_loading || !length(pool))
+		return null
+	// This vent already contains every remaining allocation. Spend one allocation,
+	// but obtain its additional material from the weighted fallback pool.
+	var/list/fallback = GLOB.ore_vent_minerals_lavaland.Copy()
+	fallback -= mineral_breakdown
+	if(!length(fallback))
+		return null
+	take_vent_allocation(pool)
+	return pick_weight(fallback)
diff --git a/voidcrew/modules/missions/_missions.dm b/voidcrew/modules/missions/_missions.dm
index d0e14bac212..6ccb55b4529 100644
--- a/voidcrew/modules/missions/_missions.dm
+++ b/voidcrew/modules/missions/_missions.dm
@@ -1,3 +1,30 @@
+GLOBAL_VAR_INIT(mission_work_serial, 0)
+
+/// One generated objective encounter. Aliases retain this datum, never a proof's ref.
+/// Rewinds, revival, replacement proof and same-band retargets keep this identity.
+/datum/mission_work_receipt
+	var/serial
+	var/family
+	var/band
+	var/difficulty
+	var/datum/voidcrew_crew_record/crew
+	var/claimed = FALSE
+	/// Settlement diagnostics consumed by mission metrics.
+	var/credited = 0
+	var/permission_before
+	var/permission_after
+
+/datum/mission_work_receipt/New(family, band, difficulty)
+	. = ..()
+	serial = ++GLOB.mission_work_serial
+	src.family = family
+	src.band = band
+	src.difficulty = difficulty
+
+/datum/mission_work_receipt/Destroy()
+	crew = null
+	return ..()
+
 /**
  * # Mission Datum (shell)
  *
@@ -94,14 +121,31 @@
 	var/list/datum/mission_objective/objectives = list()
 	/// Index (1-based) of the current objective
 	var/objective_index = 1
+	/// Lifetime kill progress; resetting the site's objectives cannot undo it.
+	var/named_kill_completed = FALSE
+	/// Shared by every incarnation of this mission's named pirate target.
+	var/boss_cash_issued = FALSE
+	/// Reward band fixed when posted, independent of ask difficulty.
+	var/quote_zone
+	/// Original service affiliation, including routine work that only earns favor.
+	var/datum/voidcrew_crew_record/accepting_crew
+	var/datum/mission_work_receipt/work_receipt
+	/// Generation context only; shared trader offers leave this unset.
+	var/list/eligible_target_zones
+	/// Only the scheduled useful-family batch may create a field contact.
+	var/create_field_contact = FALSE
+	var/zone_scaling_applied = FALSE
+	/// Family eligible for a completion prize; null for unguarded work.
+	var/guarded_prize_family
+	var/guarded_prize_rolled = FALSE
+	var/guarded_prize
+	/// Prevent reentrant partial handovers as well as final settlements.
+	var/turning_in = FALSE
 
 	// ===== TARGET =====
 	/// Where the mission points on the overmap, if anywhere
 	var/datum/mission_target/target
-	/// Zone band (ZONE_*) this offer would rather point at, or null for no
-	/// preference. Set by whoever posts the offer - SSmissions steers boards on
-	/// ships with no combat research toward Neutral space. The target honours it
-	/// where it can and ignores it where it can't, so it never fails generation.
+	/// Required target band, or null to select from the eligible pool.
 	var/preferred_zone
 	/// Display name of the target's zone at generation time
 	var/target_zone_name = MISSION_ZONE_UNKNOWN
@@ -142,14 +186,18 @@
 	/// linked later still gets the full set and cleanup drops every tag.
 	var/list/aux_gps_beacons
 
-/datum/mission/New(datum/outpost_shop/shop, preferred_zone)
+/datum/mission/New(datum/outpost_shop/shop, preferred_zone, posting_zone, list/eligible_target_zones, create_field_contact = FALSE)
 	. = ..()
 	src.shop = shop
 	// Has to land before generate_mission_details(): setup_target() builds the
 	// target datum, which copies this off us in its own New().
 	src.preferred_zone = preferred_zone
+	src.eligible_target_zones = eligible_target_zones?.Copy()
+	src.create_field_contact = create_field_contact
+	quote_zone = posting_zone
 	posted_at = world.time
 	generate_mission_details()
+	create_field_contact = FALSE // Retargeting and UI actions cannot mint opportunities.
 
 /datum/mission/Destroy()
 	record_metric_dropped() // round metrics, voidcrew/modules/metrics/mission_metrics.dm
@@ -173,6 +221,11 @@
 	// only thing collecting those, once every 30 seconds, and it skipped entries while it ran.
 	SSmissions.all_active_missions -= src
 	shop = null
+	if(accepting_crew)
+		UnregisterSignal(accepting_crew, COMSIG_QDELETING)
+	accepting_crew = null
+	work_receipt = null
+	eligible_target_zones = null
 	return ..()
 
 // =========================================================================
@@ -191,14 +244,26 @@
 		return
 
 	if(target)
-		var/zone_type = target.get_zone_type()
-		if(!isnull(zone_type))
-			apply_zone_scaling(zone_type)
+		quote_zone = target.get_zone_type()
+		if(!target.is_valid() || !target.zone_is_eligible(quote_zone))
+			generation_failed = TRUE
+			return
+		if(!isnull(quote_zone))
+			// Board quotes and the drug run keep their existing generation hooks.
+			if(shop)
+				apply_zone_scaling(quote_zone)
+			else
+				set_zone_details(quote_zone)
 
 	generate_details()
 	if(generation_failed)
 		return
 
+	if(!shop)
+		if(!isnull(quote_zone))
+			apply_zone_scaling(quote_zone)
+		roll_posted_rewards()
+
 	build_objectives()
 	if(generation_failed)
 		return
@@ -211,6 +276,7 @@
 		author = generate_mission_author()
 	if(gps_tag_prefix)
 		gps_tag = "[gps_tag_prefix]-[uppertext(random_string(3, GLOB.hex_characters))]"
+	prepare_work_receipt()
 	note_metric_item_value() // round metrics, voidcrew/modules/metrics/mission_metrics.dm
 	update_text()
 
@@ -221,6 +287,73 @@
 /datum/mission/proc/setup_target()
 	return TRUE
 
+/// Resolve the six server-owned families once, before the offer can be accepted.
+/datum/mission/proc/prepare_work_receipt()
+	if(work_receipt || !target || !target.is_valid())
+		return
+	var/family = zone_reputation_family(type)
+	var/band = target.get_zone_type()
+	if(family && band == quote_zone && band in list(ZONE_GREEN, ZONE_YELLOW, ZONE_RED))
+		work_receipt = new(family, band, difficulty)
+
+/// Used by views and again by start_mission; ship.accept_mission also checks live bands.
+/datum/mission/proc/can_accept_work(obj/structure/overmap/ship/ship)
+	if(QDELETED(src) || generation_failed || active || failed || completed || QDELETED(ship))
+		return FALSE
+	if(!target)
+		return !work_receipt // Routine asks keep posted pay, never an admission band.
+	if(work_receipt?.crew && work_receipt.crew != ship.get_crew_record())
+		return FALSE
+	var/band = target.get_zone_type()
+	if(!target.is_valid() || band != quote_zone || !ship.get_crew_record()?.can_work_in_zone(band))
+		return FALSE
+	if(work_receipt && (work_receipt.band != band || work_receipt.family != zone_reputation_family(type)))
+		return FALSE
+	return TRUE
+
+/// The claim and capped gain happen before finalizers or any reward spawning can yield.
+/datum/mission/proc/claim_work_receipt()
+	if(!completed || failed || !work_receipt || work_receipt.claimed || QDELETED(accepting_crew) || work_receipt.crew != accepting_crew \
+		|| work_receipt.family != zone_reputation_family(type) || work_receipt.band != quote_zone)
+		return 0
+	work_receipt.claimed = TRUE
+	work_receipt.permission_before = accepting_crew.get_zone_permission()
+	work_receipt.credited = accepting_crew.claim_zone_work(work_receipt.family, work_receipt.band, work_receipt.difficulty, "[work_receipt.serial]:[work_receipt.family]")
+	work_receipt.permission_after = accepting_crew.get_zone_permission()
+	return work_receipt.credited
+
+/// Admin/round disposal must not leave a deleted record retained by accepted missions.
+/datum/mission/proc/on_accepting_crew_deleted(datum/source)
+	SIGNAL_HANDLER
+	UnregisterSignal(source, COMSIG_QDELETING)
+	if(!isnull(contract_quote) && contract_stock_reserved)
+		for(var/item_path in contract_stock.Copy())
+			drop_contract_line(item_path)
+		metric_item_value = 0
+		set_contract_currency(contract_quote)
+	release_contract_stock()
+	accepting_crew = null
+	if(work_receipt)
+		work_receipt.crew = null
+
+/// Choose content from eligible sites first; the scheduled batch may seed a missing biome.
+/datum/mission/proc/get_work_biomes(list/tables)
+	var/list/biomes = list()
+	var/datum/mission_target/criteria = new(src)
+	for(var/obj/structure/overmap/planet/candidate in GLOB.overmap_planets)
+		if(QDELETED(candidate) || !(candidate.planet in tables) || candidate.mission_exclusive \
+			|| !istype(get_turf(candidate), /turf/open/overmap) \
+			|| !criteria.zone_is_eligible(SSovermap_zones?.get_zone_type(get_turf(candidate))))
+			continue
+		if((exclusive_site || create_field_contact) && (candidate.loaded || candidate.loading || candidate.mission_claims > 0))
+			continue
+		biomes |= candidate.planet
+	qdel(criteria)
+	if(!length(biomes) && create_field_contact)
+		for(var/biome in tables)
+			biomes += biome
+	return biomes
+
 /// Per-type generation rolls (names, asks, rewards). May set generation_failed.
 /datum/mission/proc/generate_details()
 	return
@@ -242,32 +375,41 @@
 	objectives += objective
 	return objective
 
-/**
- * The zone scaling service: one table mapping the target's zone to
- * difficulty, zone name, pay multiplier and a red-zone voucher bonus.
- * Types tune pay by setting their green-zone value band.
- */
+/// Targeted work takes its difficulty from the site; asks keep their own.
+/datum/mission/proc/set_zone_details(zone_type)
+	quote_zone = zone_type
+	switch(zone_type)
+		if(ZONE_YELLOW)
+			target_zone_name = ZONE_NAME_YELLOW
+		if(ZONE_RED)
+			target_zone_name = ZONE_NAME_RED
+		else
+			target_zone_name = ZONE_NAME_GREEN
+	if(target || shop)
+		difficulty = zone_type
+
+/// Scale only once, after the chosen ask and hazard have set their base bands.
 /datum/mission/proc/apply_zone_scaling(zone_type)
-	var/static/list/zone_scaling = list(
-		"[ZONE_GREEN]" = list("name" = ZONE_NAME_GREEN, "difficulty" = MISSION_DIFFICULTY_EASY, "value_mult" = 1, "research_mult" = 1, "voucher_bonus" = 0),
-		"[ZONE_YELLOW]" = list("name" = ZONE_NAME_YELLOW, "difficulty" = MISSION_DIFFICULTY_MEDIUM, "value_mult" = 1.7, "research_mult" = 1.4, "voucher_bonus" = 0),
-		"[ZONE_RED]" = list("name" = ZONE_NAME_RED, "difficulty" = MISSION_DIFFICULTY_HARD, "value_mult" = 2.6, "research_mult" = 1.8, "voucher_bonus" = 1),
-	)
-	var/list/row = zone_scaling["[zone_type]"] || zone_scaling["[ZONE_GREEN]"]
-	target_zone_name = row["name"]
-	difficulty = row["difficulty"]
-	value_min = round(value_min * row["value_mult"], 10)
-	value_max = round(value_max * row["value_mult"], 10)
-	// Points scale slower than credits on purpose. Credits are spent and gone, so a
-	// deep-band contract can pay several times a green one without distorting
-	// anything; research is permanent progress on a tree the whole ship shares, and
-	// riding the 2.6x credit multiplier put one Lawless contract ahead of every other
-	// point faucet in the game combined. The danger premium is paid in credits and
-	// vouchers - the band (MISSION_RESEARCH_PAY_*) is what sets the science.
+	if(zone_scaling_applied)
+		return
+	zone_scaling_applied = TRUE
+	set_zone_details(zone_type)
+	if(shop)
+		return // M1 packages and currency already define the complete board quote.
+	var/value_mult = zone_type == ZONE_RED ? 2.2 : (zone_type == ZONE_YELLOW ? 1.5 : 1)
+	var/research_mult = zone_type == ZONE_RED ? 1.8 : (zone_type == ZONE_YELLOW ? 1.4 : 1)
+	if(!istype(src, /datum/mission/delivery) && !istype(src, /datum/mission/suppression))
+		value_min = round(value_min * value_mult, 10)
+		value_max = round(value_max * value_mult, 10)
 	if(research_reward > 0)
-		research_reward = round(research_reward * row["research_mult"], 10)
-	if(voucher_count > 0)
-		voucher_count += row["voucher_bonus"]
+		research_reward = round(research_reward * research_mult, 10)
+
+/// One posting-time voucher roll; utility rewards override this hook too.
+/datum/mission/proc/roll_posted_rewards()
+	if(istype(src, /datum/mission/prospect_stake))
+		voucher_count = 1
+	else if(guarded_prize_family || istype(src, /datum/mission/suppression))
+		voucher_count = prob(quote_zone == ZONE_RED ? 75 : (quote_zone == ZONE_YELLOW ? 50 : 25)) ? 1 : 0
 
 /**
  * Rebuilds name/desc from current state. Called at the end of generation and
@@ -301,14 +443,25 @@
 /datum/mission/proc/start_mission(obj/structure/overmap/ship/ship)
 	if(!ship)
 		return FALSE
-	if(active)
+	if(QDELETED(src) || active || failed || completed)
 		return FALSE
 
 	// The target may have died while the mission sat on the board
 	if(target && !target.is_valid())
-		if(!target.resolve())
+		if(!resolve_quoted_target())
 			return FALSE
 		update_text()
+	if(!can_accept_work(ship))
+		return FALSE
+	prepare_work_receipt()
+	var/datum/voidcrew_crew_record/record = ship.get_crew_record()
+	if(work_receipt?.crew && work_receipt.crew != record)
+		return FALSE
+	accepting_crew = record
+	if(record)
+		RegisterSignal(record, COMSIG_QDELETING, PROC_REF(on_accepting_crew_deleted))
+	if(work_receipt)
+		work_receipt.crew = record
 
 	servant = ship
 	active = TRUE
@@ -387,6 +540,25 @@
 	if(objective?.active)
 		objective.deactivate()
 
+/// Re-arm the site, resuming a completed hunt at proof recovery rather than setup.
+/datum/mission/proc/restart_objectives()
+	deactivate_objectives()
+	objective_index = 1
+	if(named_kill_completed)
+		for(var/datum/mission_objective/field/kill_named/hunt in objectives)
+			objective_index = objectives.Find(hunt)
+			break
+	for(var/index in objective_index to length(objectives))
+		var/datum/mission_objective/objective = objectives[index]
+		objective.reset()
+
+/// Claim before creating cash, regardless of death-handler ordering or retargets.
+/datum/mission/proc/claim_boss_cash()
+	if(failed || completed || boss_cash_issued)
+		return FALSE
+	boss_cash_issued = TRUE
+	return TRUE
+
 /**
  * Marks the mission as failed.
  * * reason - Optional reason for failure (shown to crew)
@@ -535,6 +707,9 @@
 /datum/mission/proc/on_target_moved()
 	if(failed || completed)
 		return
+	if(!isnull(quote_zone) && target?.get_zone_type() != quote_zone)
+		handle_quest_loss()
+		return
 	update_text()
 	if(active)
 		push_waypoint()
@@ -566,8 +741,8 @@
  * So this rewinds rather than retargets. The watch on whatever is standing in
  * the dead site is dropped before the wipe can fire it (otherwise the wipe reads
  * as a destroyed objective and burns a retarget re-rolling to a ruin the crew
- * has no reason to be at), the objective chain resets, and the field step
- * re-arms on the load signal - so docking there again lays the job out fresh.
+ * has no reason to be at). A completed hunt re-arms only its proof recovery;
+ * other chains restart from setup when the interior loads again.
  *
  * Anything the crew already carried out is untouched: it isn't in the site, so
  * the contract is still on its delivery step and nothing here applies.
@@ -578,20 +753,17 @@
 	if(!quest_atom || !is_quest_atom_stranded())
 		return
 
-	UnregisterSignal(quest_atom, COMSIG_QDELETING)
-	quest_atom = null
-	quest_atom_bounds = null
+	forget_quest_atom(quest_atom)
+	if(named_kill_completed)
+		binding_serial++ // stranded proof must not match its replacement
 
-	deactivate_objectives()
-	for(var/datum/mission_objective/objective as anything in objectives)
-		objective.reset()
-	objective_index = 1
+	restart_objectives()
 	activate_current_objective()
 	push_waypoint()
-	servant?.ship_notify("[name]: the site powered down before we recovered anything, and our gear went with it. The contract stands - it will be set up again next time you dock at ([target.target_x], [target.target_y]).", "MISSION UPDATE", SHIP_NOTIFY_WARNING, 'voidcrew/sound/notify2.ogg', 50)
+	servant?.ship_notify("[name]: contact lost. The contract stands.", "MISSION UPDATE", SHIP_NOTIFY_WARNING, 'voidcrew/sound/notify2.ogg', 50)
 
 /**
- * Re-picks the target and restarts the objective chain from step one.
+ * Re-picks the target and restarts unfinished work, preserving completed kills.
  * Free while the mission sits on the board; budgeted while active.
  */
 /datum/mission/proc/retarget(reason = "Target lost - contract void.")
@@ -606,14 +778,11 @@
 		if(retargets_left < 0)
 			fail(reason)
 			return
-	if(!target?.resolve())
+	if(!resolve_quoted_target())
 		fail(reason)
 		return
 
-	deactivate_objectives()
-	for(var/datum/mission_objective/objective as anything in objectives)
-		objective.reset()
-	objective_index = 1
+	restart_objectives()
 	update_text()
 
 	if(active)
@@ -621,6 +790,16 @@
 		push_waypoint()
 		servant?.ship_notify("[name]: target signal relocated to ([target.target_x], [target.target_y]), [target_zone_name].", "MISSION UPDATE", SHIP_NOTIFY_WARNING, 'voidcrew/sound/notify2.ogg', 50)
 
+/// Target preferences may fall back across zones; a fixed quote may not.
+/datum/mission/proc/resolve_quoted_target()
+	if(!target)
+		return FALSE
+	if(!isnull(quote_zone))
+		target.preferred_zone = quote_zone
+	if(!target.resolve())
+		return FALSE
+	return (quote_zone in list(ZONE_GREEN, ZONE_YELLOW, ZONE_RED)) && target.get_zone_type() == quote_zone
+
 // =========================================================================
 // COMPLETION & TURN-IN
 // =========================================================================
@@ -736,8 +915,18 @@
  * (it is qdeleted by then) or just advanced a counted hand-over.
  */
 /datum/mission/proc/turn_in(atom/reward_anchor, obj/item/turned_in_item, force = FALSE)
-	if(failed || completed)
+	if(QDELETED(src) || failed || completed || turning_in)
+		return FALSE
+	if(target?.is_valid() && target.get_zone_type() != quote_zone)
 		return FALSE
+	// Console handovers validate the account before consuming even a partial ask.
+	if(!shop && (QDELETED(servant) || QDELETED(servant.ship_account) || !active || !get_turf(reward_anchor) || !can_turn_in_at(reward_anchor)))
+		return FALSE
+	turning_in = TRUE
+	. = settle_turn_in(reward_anchor, turned_in_item, force)
+	turning_in = FALSE
+
+/datum/mission/proc/settle_turn_in(atom/reward_anchor, obj/item/turned_in_item, force = FALSE)
 
 	if(!force)
 		if(requires_item)
@@ -745,6 +934,8 @@
 				return FALSE
 			var/datum/mission_objective/objective = current_objective()
 			var/result = objective.accept_item(turned_in_item, reward_anchor)
+			if(result == MISSION_ITEM_REFUSED)
+				return FALSE
 			if(result == MISSION_ITEM_PROGRESS)
 				return TRUE // partial hand-over; mission continues
 			if(!all_objectives_satisfied())
@@ -760,8 +951,14 @@
  * The mission is done: run objective finalizers, pay out, notify, clean up.
  */
 /datum/mission/proc/finish_mission(atom/reward_anchor)
+	if(QDELETED(src) || failed || completed)
+		return
+	var/work_satisfied = active && !QDELETED(servant) && !QDELETED(servant.ship_account) \
+		&& get_turf(reward_anchor) && all_objectives_satisfied()
 	completed = TRUE
 	active = FALSE
+	if(work_satisfied)
+		claim_work_receipt()
 
 	if(timeout_timer)
 		deltimer(timeout_timer)
@@ -778,8 +975,9 @@
 
 	// Standing with the posting trader (board contracts only; see trader_favor.dm)
 	var/favor_gain = get_favor_reward()
-	if(favor_gain > 0 && servant && shop)
-		shop.grant_favor(servant, favor_gain)
+	if(favor_gain > 0 && !QDELETED(accepting_crew) && shop)
+		var/key = shop.favor_key()
+		accepting_crew.trader_favor[key] = (accepting_crew.trader_favor[key] || 0) + favor_gain
 
 	record_metric_completed(reward_anchor, favor_gain) // round metrics, voidcrew/modules/metrics/mission_metrics.dm
 
@@ -794,8 +992,6 @@
 			reward_parts += "[research_reward] research points"
 		if(voucher_count > 0)
 			reward_parts += "[voucher_count] trade voucher[voucher_count > 1 ? "s" : ""]"
-		if(favor_gain > 0 && shop)
-			reward_parts += "+[favor_gain] standing with [shop.favor_trader_name()]"
 		var/reward_text = length(reward_parts) ? reward_parts.Join(" + ") : "settled"
 		servant.ship_notify("[name] completed! Reward: [reward_text]", "MISSION COMPLETE", SHIP_NOTIFY_NOTICE, 'voidcrew/sound/notify.ogg', 50)
 		servant.active_missions -= src
@@ -939,13 +1135,12 @@
 		. += mission_rewards
 
 /**
- * Human-readable summary of the item rewards, e.g. "a standard missile, 2×
- * light warhead and an ablative vest". Returns "goods" when nothing is set.
+ * Human-readable item summary, empty when the settlement is currency only.
  */
 /datum/mission/proc/get_reward_summary()
 	var/list/types = get_reward_types()
 	if(!length(types))
-		return "goods"
+		return ""
 	// Collapse duplicates into counts so a bundle reads "2× light missile"
 	var/list/counts = list()
 	for(var/reward_type in types)
@@ -961,13 +1156,16 @@
 
 /**
  * The whole of what an outpost contract pays, goods and scrip together, e.g.
- * "a laser gun and 2× stimpack + 2 trade vouchers". Board contracts never pay
- * credits, so the item bundle plus any voucher top-up is the entire settlement.
+ * "a laser gun and 2× stimpack + 2 trade vouchers + 50 cr".
  */
 /datum/mission/proc/get_contract_pay_summary()
-	var/list/parts = list(get_reward_summary())
+	var/list/parts = list()
+	if(length(get_reward_types()))
+		parts += get_reward_summary()
 	if(voucher_count > 0)
 		parts += "[voucher_count] trade voucher[voucher_count > 1 ? "s" : ""]"
+	if(value > 0)
+		parts += "[value] cr"
 	return parts.Join(" + ")
 
 /**
@@ -991,10 +1189,9 @@
 		for(var/reward_type in reward_types)
 			// Stacks carry their bundled count, matching what the shelf sells
 			var/stack_amount = LAZYACCESS(reward_amounts, reward_type)
-			if(stack_amount > 1 && ispath(reward_type, /obj/item/stack))
-				new reward_type(reward_turf, stack_amount)
-			else
-				new reward_type(reward_turf)
+			var/atom/movable/reward = create_trader_goods(reward_type, reward_turf, stack_amount)
+			// Paid out past a trader outpost's checkpoint, a gun comes sealed (outpost_trespass.dm)
+			mark_trader_goods(outpost_seal_goods(reward))
 		flash_reward_anchor(reward_anchor)
 
 	// Research payouts are physical: a dossier the crew has to carry to an R&D
@@ -1010,6 +1207,10 @@
 		new /obj/item/stack/trade_voucher(reward_turf, voucher_count)
 		flash_reward_anchor(reward_anchor)
 
+	if(completed && !failed && guarded_prize_family && !guarded_prize_rolled)
+		guarded_prize_rolled = TRUE
+		guarded_prize = servant.award_guarded_prize(guarded_prize_family, quote_zone, reward_anchor, type)
+
 /**
  * Turn-in visual: pads get their teleport effect, other anchors stay quiet
  * (the outpost board plays its own sounds).
@@ -1097,10 +1298,12 @@
 /**
  * Returns mission data for TGUI display.
  */
-/datum/mission/proc/get_ui_data()
+/datum/mission/proc/get_ui_data(datum/voidcrew_crew_record/viewing_crew)
+	var/list/package = get_effective_contract_package(active ? accepting_crew : viewing_crew)
+	var/list/shown_rewards = package ? package["items"] : get_reward_types()
 	// Every reward in the bundle, each with its own sprite and a rarity accent
 	var/list/reward_items = list()
-	for(var/reward_type in get_reward_types())
+	for(var/reward_type in shown_rewards)
 		var/atom/reward_cast = reward_type
 		var/stack_amount = LAZYACCESS(reward_amounts, reward_type) || 1
 		reward_items += list(list(
@@ -1123,7 +1326,7 @@
 		"name" = name,
 		"desc" = desc,
 		"author" = author,
-		"value" = value,
+		"value" = package ? package["credits"] : value,
 		"reward_items" = reward_items,
 		"reward_item" = first_reward ? first_reward["name"] : null,
 		"reward_item_icon" = first_reward ? first_reward["icon"] : null,
@@ -1142,9 +1345,7 @@
 		"zone_name" = (target_zone_name == MISSION_ZONE_UNKNOWN) ? null : target_zone_name,
 		"zone_color" = get_zone_color(),
 		"requires_item" = requires_item,
-		"voucher_count" = voucher_count,
+		"voucher_count" = package ? package["vouchers"] : voucher_count,
 		"research_reward" = research_reward,
 		"archetype" = get_archetype(),
-		"favor_reward" = get_favor_reward(),
-		"favor_trader" = shop ? shop.favor_trader_name() : null,
 	)
diff --git a/voidcrew/modules/missions/code/controllers/subsystem/missions.dm b/voidcrew/modules/missions/code/controllers/subsystem/missions.dm
index 948716f3c90..845f81ba5d2 100644
--- a/voidcrew/modules/missions/code/controllers/subsystem/missions.dm
+++ b/voidcrew/modules/missions/code/controllers/subsystem/missions.dm
@@ -45,38 +45,114 @@ SUBSYSTEM_DEF(missions)
 		CHECK_TICK
 
 /**
- * Fills a ship's available missions list up to the default count.
+ * Replaces a ship's fixed offer set only when its scheduled refresh is due.
  * * ship - The ship to refresh missions for
  */
 /datum/controller/subsystem/missions/proc/refresh_ship_missions(obj/structure/overmap/ship/ship)
-	if(!ship)
+	if(QDELETED(ship) || ship.abandoned)
 		return
 	// NPC ships never read their board; don't generate (and churn ruin refs) for them
 	if(istype(ship, /obj/structure/overmap/ship/npc))
 		return
+	var/has_living_crew = FALSE
+	for(var/datum/mind/member in ship.ship_team?.members)
+		var/mob/living/body = member.current
+		if(isliving(body) && !QDELETED(body) && body.stat != DEAD)
+			has_living_crew = TRUE
+			break
+	if(!has_living_crew)
+		return FALSE
 
-	// Remove deleted missions and rotate out offers that sat unaccepted too long
+	// Deletion leaves a vacancy, not a retained reference or an early replacement.
+	for(var/index in length(ship.available_missions) to 1 step -1)
+		if(QDELETED(ship.available_missions[index]))
+			ship.available_missions.Cut(index, index + 1)
+	if(world.time < ship.next_mission_refresh)
+		return FALSE
+	// Claim the schedule before generation, so console rebuilds and vacant slots cannot reroll it.
+	ship.next_mission_refresh = world.time + MISSION_REFRESH_COOLDOWN
+	ship.last_mission_refresh = world.time
 	for(var/datum/mission/mission as anything in ship.available_missions)
-		if(QDELETED(mission))
-			ship.available_missions -= mission
-			continue
-		if(world.time - mission.posted_at > MISSION_BOARD_EXPIRY)
-			ship.available_missions -= mission
+		if(!QDELETED(mission))
 			tally_mission_offer(mission, ship, "mission_offer_expired") // round metrics, voidcrew/modules/metrics/mission_metrics.dm
 			qdel(mission)
+	ship.available_missions = list()
 
 	// Reserve one of the existing slots before rolling the rest of the board.
 	ensure_safe_exploration_offer(ship)
-	// Fill up to default count
-	var/missions_needed = DEFAULT_AVAILABLE_MISSIONS - length(ship.available_missions)
+	var/reserved_vacancies = reserve_useful_family_offers(ship)
+	var/list/eligible_zones = eligible_work_bands(ship)
 	// Asked once and reused: the lookup walks the hull for an R&D server the
 	// first time it misses, and five offers is five walks.
 	var/unarmed = !ship.has_ship_combat_research()
-	for(var/i in 1 to missions_needed)
-		var/datum/mission/new_mission = generate_random_mission(roll_offer_zone_preference(unarmed))
+	var/posting_zone = SSovermap_zones?.get_zone_type(get_turf(ship))
+	// Resolve failed rolls inside this scheduled batch; never retry vacancies afterward.
+	var/attempts_left = DEFAULT_AVAILABLE_MISSIONS * 10
+	while(length(ship.available_missions) + reserved_vacancies < DEFAULT_AVAILABLE_MISSIONS && attempts_left-- > 0)
+		var/datum/mission/new_mission = generate_random_mission(roll_offer_zone_preference(unarmed), posting_zone, eligible_zones)
 		if(new_mission)
 			ship.available_missions += new_mission
 			tally_mission_offer(new_mission, ship, "mission_offered") // round metrics, voidcrew/modules/metrics/mission_metrics.dm
+	return TRUE
+
+/datum/controller/subsystem/missions/proc/eligible_work_bands(obj/structure/overmap/ship/ship)
+	var/list/bands = list(ZONE_GREEN)
+	var/datum/voidcrew_crew_record/record = ship.get_crew_record()
+	for(var/band in list(ZONE_YELLOW, ZONE_RED))
+		if(record?.can_work_in_zone(band))
+			bands += band
+	return bands
+
+/// Earliest unmet cumulative band; elite crews no longer need reserved work.
+/datum/controller/subsystem/missions/proc/next_work_band(datum/voidcrew_crew_record/record)
+	switch(record?.get_zone_permission())
+		if(ZONE_PERMISSION_YELLOW)
+			return ZONE_YELLOW
+		if(ZONE_PERMISSION_ADVANCED)
+			return ZONE_RED
+		if(ZONE_PERMISSION_ELITE)
+			return null
+	return ZONE_GREEN
+
+/// Returns reserved vacancies, which ordinary rolls must not silently replace.
+/datum/controller/subsystem/missions/proc/reserve_useful_family_offers(obj/structure/overmap/ship/ship)
+	var/datum/voidcrew_crew_record/record = ship.get_crew_record()
+	var/band = next_work_band(record)
+	if(isnull(band))
+		return 0
+	var/list/families = list()
+	var/list/contributions = record?.zone_families["[band]"]
+	var/cap = band == ZONE_GREEN ? ZONE_REPUTATION_GREEN_FAMILY_CAP : ZONE_REPUTATION_DANGER_FAMILY_CAP
+	for(var/mission_type in mission_types)
+		var/family = zone_reputation_family(mission_type)
+		if(!family || (contributions && contributions[family] >= cap) || !mission_type_within_limit(mission_type))
+			continue
+		LAZYINITLIST(families[family])
+		families[family] += mission_type
+	var/reserved_slots = min(3, length(families))
+	var/filled_slots = 0
+	// Exhaust the remaining useful families in this batch before leaving any reserved slot vacant.
+	while(length(families) && filled_slots < reserved_slots)
+		var/family = pick(families)
+		var/list/types = families[family]
+		families -= family
+		var/datum/mission/offer
+		var/attempts = 8
+		while(!offer && attempts-- > 0)
+			var/mission_type = pick(types)
+			if(!mission_type_within_limit(mission_type))
+				types -= mission_type
+				if(!length(types))
+					break
+				continue
+			offer = create_mission(mission_type, band, null, list(band), TRUE)
+		if(!offer)
+			log_mapping("SSmissions: ship [REF(ship)] reserved [family] in band [band] has no eligible offer after bounded retries")
+			continue
+		ship.available_missions += offer
+		filled_slots++
+		tally_mission_offer(offer, ship, "mission_offered")
+	return reserved_slots - filled_slots
 
 /**
  * The zone band the next offer should prefer, rolled per offer.
@@ -96,11 +172,11 @@ SUBSYSTEM_DEF(missions)
  * Returns a new mission datum, or null if none available.
  * * preferred_zone - ZONE_* band the offer should aim at where it can, or null
  */
-/datum/controller/subsystem/missions/proc/generate_random_mission(preferred_zone)
+/datum/controller/subsystem/missions/proc/generate_random_mission(preferred_zone, posting_zone, list/eligible_zones)
 	var/mission_type = get_weighted_mission_type()
 	if(!mission_type)
 		return null
-	return create_mission(mission_type, preferred_zone)
+	return create_mission(mission_type, preferred_zone, posting_zone, eligible_zones)
 
 /**
  * Selects a random mission type based on weight.
@@ -114,16 +190,8 @@ SUBSYSTEM_DEF(missions)
 	for(var/mission_type in mission_types)
 		var/datum/mission/M = mission_type
 		var/type_weight = initial(M.weight)
-		var/type_limit = initial(M.mission_limit)
-
-		// Check mission limit
-		if(type_limit > 0)
-			var/active_count = 0
-			for(var/datum/mission/active in all_active_missions)
-				if(active.type == mission_type)
-					active_count++
-			if(active_count >= type_limit)
-				continue
+		if(!mission_type_within_limit(mission_type))
+			continue
 
 		weighted_types[mission_type] = type_weight
 
@@ -136,10 +204,10 @@ SUBSYSTEM_DEF(missions)
  * Creates a new mission of the specified type.
  * * mission_type - The type path of the mission to create
  */
-/datum/controller/subsystem/missions/proc/create_mission(mission_type, preferred_zone)
+/datum/controller/subsystem/missions/proc/create_mission(mission_type, preferred_zone, posting_zone, list/eligible_zones, create_field_contact = FALSE)
 	if(!mission_type)
 		return null
-	var/datum/mission/mission = new mission_type(null, preferred_zone)
+	var/datum/mission/mission = new mission_type(null, preferred_zone, posting_zone, eligible_zones, create_field_contact)
 	// Some mission types (e.g. recovery) can fail generation if no valid target exists
 	if(mission.generation_failed)
 		qdel(mission)
@@ -147,21 +215,14 @@ SUBSYSTEM_DEF(missions)
 	return mission
 
 /**
- * Force-generates new available missions for a specific ship.
- * Clears existing available missions and generates fresh ones.
+ * Requests a scheduled refresh for a specific ship; never bypasses its timer.
  * * ship - The ship to regenerate missions for
  */
 /datum/controller/subsystem/missions/proc/force_refresh_ship_missions(obj/structure/overmap/ship/ship)
 	if(!ship || istype(ship, /obj/structure/overmap/ship/npc))
 		return
 
-	// Delete existing available missions
-	for(var/datum/mission/mission as anything in ship.available_missions)
-		if(!QDELETED(mission))
-			qdel(mission)
-	ship.available_missions = list()
-
-	refresh_ship_missions(ship)
+	return refresh_ship_missions(ship)
 
 /// Retain or reserve one valid green travel job; never exceed the board's five slots.
 /datum/controller/subsystem/missions/proc/ensure_safe_exploration_offer(obj/structure/overmap/ship/ship)
diff --git a/voidcrew/modules/missions/mission_board.dm b/voidcrew/modules/missions/mission_board.dm
index 2228c4b2308..b37438c2fa1 100644
--- a/voidcrew/modules/missions/mission_board.dm
+++ b/voidcrew/modules/missions/mission_board.dm
@@ -113,7 +113,7 @@
 		balloon_alert(user, "[live_beacons] beacon[live_beacons > 1 ? "s" : ""] linked")
 		playsound(src, 'sound/machines/ding.ogg', 50, TRUE)
 	else if(linked)
-		balloon_alert(user, "linked - no objective marked yet")
+		balloon_alert(user, "signal pending")
 	else
 		// A hunt at a trader outpost has no tracker by design: say so rather than sound broken
 		var/why_none = bounty_gps_refusal(ship)
@@ -139,14 +139,14 @@
 	data["active_count"] = length(ship.active_missions)
 	data["has_pad"] = !!linked_pad
 	data["has_mod_gps"] = !!get_worn_mod_gps(user)
-	data["refresh_cooldown_remaining"] = max(0, round((MISSION_REFRESH_COOLDOWN - (world.time - ship.last_mission_refresh)) / 10))
+	data["refresh_cooldown_remaining"] = max(0, round((ship.next_mission_refresh - world.time) / 10))
 
 	// Available missions
 	data["available_missions"] = list()
 	for(var/datum/mission/mission as anything in ship.available_missions)
-		if(QDELETED(mission))
+		if(QDELETED(mission) || !mission.can_accept_work(ship))
 			continue
-		data["available_missions"] += list(mission.get_ui_data())
+		data["available_missions"] += list(mission.get_ui_data(ship.get_crew_record()))
 
 	// Active missions
 	data["active_missions"] = list()
@@ -188,6 +188,11 @@
 	if(!ship)
 		balloon_alert(usr, "console not on a ship!")
 		return TRUE
+	if(!is_operational || !ui.user.can_perform_action(src, FORBID_TELEKINESIS_REACH))
+		return TRUE
+	if(!ship.is_ship_crew(ui.user))
+		balloon_alert(ui.user, "Crew access only.")
+		return TRUE
 
 	switch(action)
 		if("link_mod_gps")
@@ -232,11 +237,9 @@
 			return TRUE
 
 		if("refresh")
-			var/cooldown_remaining = MISSION_REFRESH_COOLDOWN - (world.time - ship.last_mission_refresh)
-			if(cooldown_remaining > 0)
-				balloon_alert(usr, "wait [round(cooldown_remaining / 10)]s")
+			if(world.time < ship.next_mission_refresh)
+				balloon_alert(usr, "Offer closed.")
 				return TRUE
-			ship.last_mission_refresh = world.time
 			record_mission_board_refreshed(ship, usr) // round metrics, voidcrew/modules/metrics/mission_metrics.dm
 			SSmissions.force_refresh_ship_missions(ship)
 			balloon_alert(usr, "missions refreshed!")
@@ -322,7 +325,7 @@
 
 			var/obj/item/ship_key/key = locate() in linked_pad.get_items_on_pad()
 			if(!key)
-				balloon_alert(usr, "place captain's key on pad!")
+				balloon_alert(usr, "captain's key missing!")
 				return TRUE
 
 			// Find what bounty this ship is hunting (ships can only have one)
@@ -470,7 +473,7 @@
 			// Get items on pad
 			var/list/items_on_pad = linked_pad.get_items_on_pad()
 			if(!length(items_on_pad))
-				balloon_alert(usr, "place items on pad first!")
+				balloon_alert(usr, "shipment missing!")
 				return TRUE
 
 			// Create the offer
diff --git a/voidcrew/modules/missions/mission_target.dm b/voidcrew/modules/missions/mission_target.dm
index 688609ce9c2..00f7d84bc2c 100644
--- a/voidcrew/modules/missions/mission_target.dm
+++ b/voidcrew/modules/missions/mission_target.dm
@@ -82,24 +82,19 @@
 /datum/mission_target/proc/refresh_coords()
 	return
 
-/**
- * Narrows a resolved candidate list down to the objects sitting in
- * preferred_zone, if a preference was asked for and anything matches.
- *
- * This is a preference and never a filter that can fail: with no preference set,
- * no live zone controller, or nothing in the wanted band, the full list comes
- * back untouched. A board offer would rather point somewhere dangerous than not
- * exist, and the shallow-band bias is there to shape what a new crew usually
- * sees, not to guarantee it.
- */
+/// Unknown bands and unavailable requested bands never fall back to another zone.
+/datum/mission_target/proc/zone_is_eligible(band)
+	return (band in list(ZONE_GREEN, ZONE_YELLOW, ZONE_RED)) \
+		&& (isnull(preferred_zone) || band == preferred_zone) \
+		&& (isnull(mission?.eligible_target_zones) || (band in mission.eligible_target_zones))
+
+/// Apply before occupancy preferences, so an ineligible cold site cannot hide an eligible one.
 /datum/mission_target/proc/filter_by_preferred_zone(list/candidates)
-	if(isnull(preferred_zone) || !length(candidates) || !SSovermap_zones?.zones_active)
-		return candidates
 	var/list/matching = list()
-	for(var/atom/movable/candidate as anything in candidates)
-		if(SSovermap_zones.get_zone_type(get_turf(candidate)) == preferred_zone)
+	for(var/atom/movable/candidate in candidates)
+		if(!QDELETED(candidate) && zone_is_eligible(SSovermap_zones?.get_zone_type(get_turf(candidate))))
 			matching += candidate
-	return length(matching) ? matching : candidates
+	return matching
 
 /// Helper: relative overmap coords of an overmap object
 /datum/mission_target/proc/cache_coords_from(atom/movable/object)
@@ -146,6 +141,10 @@
 			continue
 		if(!istype(get_turf(candidate), /turf/open/overmap))
 			continue
+		if(!zone_is_eligible(SSovermap_zones?.get_zone_type(get_turf(candidate))))
+			continue
+		if(mission?.create_field_contact && (candidate.loaded || candidate.loading || candidate.mission_claims > 0))
+			continue
 		candidates += candidate
 		// A ruin is only ever loaded because somebody is there or has just left.
 		// Picking one spawns the objective into the deck the accepting crew is
@@ -157,6 +156,12 @@
 		cold += candidate
 		if(candidate.mission_claims <= 0)
 			cold_unclaimed += candidate
+	if(!length(candidates) && mission?.create_field_contact)
+		var/obj/structure/overmap/space_ruin/contact = SSovermap.spawn_mission_ruin(preferred_zone)
+		if(contact)
+			candidates += contact
+			cold += contact
+			cold_unclaimed += contact
 	if(!length(candidates))
 		return FALSE
 	var/list/pool = candidates
@@ -174,9 +179,6 @@
 		if(!length(cold_unclaimed))
 			return FALSE
 		pool = cold_unclaimed
-	// Applied last, to the pool the occupancy tiers already settled on: a cold
-	// unclaimed ruin in the wrong band still beats a hot one in the right band.
-	pool = filter_by_preferred_zone(pool)
 	ruin = pick(pool)
 	ruin.mission_claims++
 	if(exclusive)
@@ -261,6 +263,11 @@
 // PLANET: the same interface pointed at a planet surface
 // =========================================================================
 
+// Planet work uses the same site bookkeeping as space-ruin work.
+/obj/structure/overmap/planet
+	var/mission_claims = 0
+	var/mission_exclusive = FALSE
+
 /datum/mission_target/planet
 	/// The planet this mission targets
 	var/obj/structure/overmap/planet/planet
@@ -271,6 +278,7 @@
 	/// runs more than one planet of that type (SSovermap.dynamic_planets_per_type).
 	/// Filtered missions should still use the FAIL loss policy.
 	var/wanted_planet
+	var/holds_exclusive = FALSE
 
 /datum/mission_target/planet/resolve()
 	var/obj/structure/overmap/planet/previous = planet
@@ -285,10 +293,22 @@
 			continue
 		if(!istype(get_turf(candidate), /turf/open/overmap))
 			continue
+		if(!zone_is_eligible(SSovermap_zones?.get_zone_type(get_turf(candidate))) || candidate.mission_exclusive)
+			continue
+		if((mission?.exclusive_site || mission?.create_field_contact) && (candidate.loaded || candidate.loading || candidate.mission_claims > 0))
+			continue
 		candidates += candidate
+	if(!length(candidates) && mission?.create_field_contact)
+		var/obj/structure/overmap/planet/contact = SSovermap.spawn_mission_planet(preferred_zone, wanted_planet)
+		if(contact)
+			candidates += contact
 	if(!length(candidates))
 		return FALSE
-	planet = pick(filter_by_preferred_zone(candidates))
+	planet = pick(candidates)
+	planet.mission_claims++
+	if(mission?.exclusive_site)
+		planet.mission_exclusive = TRUE
+		holds_exclusive = TRUE
 	cache_coords_from(planet)
 	RegisterSignal(planet, COMSIG_QDELETING, PROC_REF(on_planet_deleted))
 	// Planets never delete on unload - they relocate. Track the move so the
@@ -301,8 +321,12 @@
 
 /datum/mission_target/planet/unhook()
 	if(planet)
+		planet.mission_claims = max(0, planet.mission_claims - 1)
+		if(holds_exclusive)
+			planet.mission_exclusive = FALSE
 		UnregisterSignal(planet, list(COMSIG_QDELETING, COMSIG_MOVABLE_MOVED, COMSIG_VOIDCREW_PLANET_LOADED))
 		planet = null
+	holds_exclusive = FALSE
 
 /datum/mission_target/planet/get_zone_type()
 	if(!planet)
@@ -465,6 +489,8 @@
 	if(!SSovermap_zones)
 		return FALSE
 	zone_type = pick_zone_band()
+	if(!zone_is_eligible(zone_type))
+		return FALSE
 	var/datum/overmap_zone/zone = SSovermap_zones.get_zone_datum(zone_type)
 	if(!zone || !length(zone.turfs))
 		return FALSE
@@ -500,18 +526,13 @@
 /datum/mission_target/coords/is_valid()
 	return valid_coordinates(resolved_turf)
 
-/**
- * The band this contract points at. A coordinate target has no object to filter,
- * so the preference is applied to the roll instead: take the preferred band
- * outright when the type's own table lists it, otherwise roll the table as
- * normal. Types that deliberately never offer a band (a deep-space survey with
- * no Neutral entry) keep that shape - the preference can only pick from what the
- * type already advertises.
- */
+/// Coordinate rolls use only advertised bands allowed by this offer's context.
 /datum/mission_target/coords/proc/pick_zone_band()
-	if(!isnull(preferred_zone) && zone_weights["[preferred_zone]"] > 0)
-		return preferred_zone
-	return text2num(pick_weight(zone_weights)) || ZONE_GREEN
+	var/list/eligible_weights = list()
+	for(var/band in zone_weights)
+		if(zone_is_eligible(text2num(band)) && zone_weights[band] > 0)
+			eligible_weights[band] = zone_weights[band]
+	return length(eligible_weights) ? text2num(pick_weight(eligible_weights)) : null
 
 /datum/mission_target/coords/get_zone_type()
 	return zone_type
@@ -534,9 +555,10 @@
 			continue
 		candidates += candidate
 	outpost = null
+	candidates = filter_by_preferred_zone(candidates)
 	if(!length(candidates))
 		return FALSE
-	outpost = pick(filter_by_preferred_zone(candidates))
+	outpost = pick(candidates)
 	cache_coords_from(outpost)
 	RegisterSignal(outpost, COMSIG_QDELETING, PROC_REF(on_outpost_deleted))
 	return TRUE
diff --git a/voidcrew/modules/missions/missions/big_game_hunt.dm b/voidcrew/modules/missions/missions/big_game_hunt.dm
index 7420129e29c..ce3d5d7a760 100644
--- a/voidcrew/modules/missions/missions/big_game_hunt.dm
+++ b/voidcrew/modules/missions/missions/big_game_hunt.dm
@@ -23,17 +23,18 @@
 
 /datum/mission/big_game_hunt
 	name = "Big Game Hunt"
+	guarded_prize_family = "hunt"
 	weight = 7
 	mission_limit = 1
 	duration = 40 MINUTES
-	voucher_count = 2
+	voucher_count = 0
 	quest_lost_policy = MISSION_QUEST_LOST_FAIL
 	gps_tag_prefix = "TROPHY"
 	// Green-band pay a notch over field_expedition: staking a lure and killing
 	// an apex beast beats pulling a probe core. The zone table makes a
 	// Lawless-zone hunt a serious payday.
-	value_min = 1000
-	value_max = 1400
+	value_min = 650
+	value_max = 850
 
 	/// Per-planet hunt tables, keyed by /datum/overmap/planet typepath:
 	/// the apex beast, its entourage pool, its possible names, the trophy the
@@ -114,16 +115,7 @@
 	return "bounty"
 
 /datum/mission/big_game_hunt/setup_target()
-	// Only offer hunts for planet types actually on the overmap this round
-	var/list/present_types = list()
-	for(var/obj/structure/overmap/planet/candidate as anything in GLOB.overmap_planets)
-		if(QDELETED(candidate))
-			continue
-		if(!istype(get_turf(candidate), /turf/open/overmap))
-			continue
-		if(!candidate.planet || !hunt_tables[candidate.planet])
-			continue
-		present_types |= candidate.planet
+	var/list/present_types = get_work_biomes(hunt_tables)
 	if(!length(present_types))
 		return FALSE
 	hunt_planet_type = pick(present_types)
@@ -163,7 +155,7 @@
 
 /datum/mission/big_game_hunt/build_objectives()
 	var/datum/mission_objective/goto_coords/approach = new
-	approach.arrival_message = "On station over the hunting ground. Take the lure down to the surface and stake it in open ground."
+	approach.arrival_message = "On station over the hunting ground."
 	add_objective(approach)
 
 	lure = new
@@ -197,12 +189,7 @@
 	var/datum/mission_target/planet/planet_target = target
 	var/planet_name = istype(planet_target) ? (planet_target.planet?.name || "the planet") : "the planet"
 	name = "Big Game Hunt: [objective_name]"
-	desc = "[flavor_line] \
-		[objective_name] holds the [hunt_row["ground"]] of the [planet_name] at ([target.target_x], [target.target_y]) in the [target_zone_name]. \
-		A hunting lure lands on your mission pad when you accept. Fly out, use the lure in hand to stake it in open ground on the surface, and kill [objective_name] when it arrives. \
-		The guild pays on the [trophy_part] - bring it back to the mission pad. \
-		Payment includes [voucher_count] trade voucher[voucher_count > 1 ? "s" : ""]. \
-		Tap a GPS unit on the mission board to follow the hunt's beacon ([gps_tag])."
+	desc = "Hunt [objective_name] on [planet_name] at ([target.target_x], [target.target_y]) in the [target_zone_name]. The guild wants its [trophy_part]."
 
 /datum/mission/big_game_hunt/waypoint_label()
 	return "Hunt: [objective_name]"
@@ -251,7 +238,7 @@
 	kit.objective_ref = WEAKREF(src)
 	// Losing the lure voids the hunt (and points the GPS chain at it meanwhile)
 	mission.register_quest_atom(kit)
-	notify_crew("Hunting lure delivered to your mission pad. Stake it in open ground on the hunt planet's surface.")
+	notify_crew("Hunting lure delivered.")
 	return TRUE
 
 /// The lure was staked: record the spot for the kill step and advance
@@ -284,6 +271,7 @@
  * entourage of lesser fauna. Death drops the mission-bound trophy.
  */
 /datum/mission_objective/field/kill_named/big_game
+	proof_type = /obj/item/mission_recovery/trophy
 	/// Where the lure was staked; the beast breaks cover next to it
 	var/turf/lure_turf
 	/// The trophy the beast drops ("tendril-crowned skull"), set by the mission
@@ -298,49 +286,35 @@
 
 /// The beast answers the lure, not a random spawn point
 /datum/mission_objective/field/kill_named/big_game/do_field_spawn()
+	if(spawned)
+		return
 	if(!lure_turf)
 		return ..()
 	spawned = TRUE
 	spawn_field_objects(get_nearby_open_turf(lure_turf, 4))
 
 /datum/mission_objective/field/kill_named/big_game/spawn_field_objects(turf/spawn_turf)
-	var/mob/living/beast = new target_mob_type(spawn_turf)
+	if(mission.named_kill_completed)
+		return ..()
+	var/mob/living/beast = spawn_field_npc(target_mob_type, spawn_turf, finalize = FALSE)
 	beast.name = mission.objective_name
 	beast.desc += " This one is old, scarred, and much too big. The guild wants it as a wall piece."
 	if(health_override > beast.maxHealth)
 		beast.maxHealth = health_override
 		beast.health = health_override
-	target_mob = beast
-	protect_field_mob(beast)
-	RegisterSignal(beast, COMSIG_LIVING_DEATH, PROC_REF(on_target_death))
-	mission.register_quest_atom(beast)
+	beast.npc_spawn_context.finalize()
+	track_target(beast)
 	// The entourage: lesser fauna drawn in by the blood on the wind. Killing
 	// them pays nothing - the contract is the name on the trophy.
 	for(var/guard_type in guard_types)
-		var/mob/living/guard = new guard_type(get_nearby_open_turf(spawn_turf))
+		var/mob/living/guard = spawn_field_npc(guard_type, get_nearby_open_turf(spawn_turf), finalize = FALSE)
 		guard.desc += " It followed something much bigger here."
+		guard.npc_spawn_context.finalize()
 	beast.visible_message(span_boldwarning("[beast] comes crashing in and goes straight for the lure!"))
 	notify_crew("The lure's been taken. [mission.objective_name] is out in the open - good hunting.", type = SHIP_NOTIFY_WARNING, sound = 'voidcrew/sound/notify2.ogg')
 
-/**
- * The beast died: drop the bound trophy, track it instead, and advance.
- * Full override of kill_named's proof drop - same signal, hunt flavor.
- */
-/datum/mission_objective/field/kill_named/big_game/on_target_death(mob/living/source, gibbed)
-	SIGNAL_HANDLER
-	if(target_killed || !mission || mission.failed || mission.completed)
-		return
-	target_killed = TRUE
-	UnregisterSignal(source, COMSIG_LIVING_DEATH)
-	target_mob = null
-
-	var/obj/item/mission_recovery/trophy/trophy = new(source.drop_location())
-	trophy.name = "[mission.objective_name]'s [trophy_part]"
-	mission.bind_item(trophy)
-	mission.register_quest_atom(trophy)
-
-	notify_crew("[mission.objective_name] is down. Recover the [trophy_part] and return it to the mission pad.")
-	complete()
+/datum/mission_objective/field/kill_named/big_game/get_proof_name()
+	return "[mission.objective_name]'s [trophy_part]"
 
 /datum/mission_objective/field/kill_named/big_game/get_progress_string()
 	if(!spawned)
@@ -366,8 +340,7 @@
  */
 /obj/item/hunting_lure
 	name = "apex hunting lure"
-	desc = "A folding guild lure rig: chum reservoir, pheromone wicks and a seismic thumper. \
-		Use it in hand to stake it in open ground on the contracted planet, then get somewhere defensible."
+	desc = "A folding guild lure rig with a chum reservoir, pheromone wicks and a seismic thumper."
 	icon = 'voidcrew/modules/missions/icons/recovery.dmi'
 	icon_state = "recovery_anchored"
 	w_class = WEIGHT_CLASS_NORMAL
@@ -411,7 +384,7 @@
  */
 /obj/item/mission_recovery/trophy
 	name = "hunting trophy"
-	desc = "A field-dressed piece of something enormous, tagged and sealed for the guild's assayer. The mission pad will accept it."
+	desc = "A field-dressed piece of something enormous, tagged for the guild's assayer."
 	icon_state = "recovery"
 	w_class = WEIGHT_CLASS_BULKY
 
diff --git a/voidcrew/modules/missions/missions/delivery.dm b/voidcrew/modules/missions/missions/delivery.dm
index a951bd45fc7..08357971d3f 100644
--- a/voidcrew/modules/missions/missions/delivery.dm
+++ b/voidcrew/modules/missions/missions/delivery.dm
@@ -9,40 +9,32 @@
 	weight = 10
 
 	/// The rolled ask (kept for UI keys)
-	var/required_type = /obj/item/stack/ore/iron
-	var/required_name = "iron ore"
+	var/required_type = /obj/item/stack/spice_pods
+	var/required_name = "spice pods"
 	var/required_amount = 1
-
-/datum/mission/delivery/generate_details()
-	// Each target defines its own difficulty, amount, and value range
-	var/static/list/delivery_targets = list(
-		// Easy - common ores, low amounts
-		list("type" = /obj/item/stack/ore/iron, "name" = "iron ore", "amount" = 10, "value_min" = 400, "value_max" = 600, "difficulty" = MISSION_DIFFICULTY_EASY),
-		list("type" = /obj/item/stack/ore/glass, "name" = "sand", "amount" = 15, "value_min" = 300, "value_max" = 500, "difficulty" = MISSION_DIFFICULTY_EASY),
-		list("type" = /obj/item/stack/sheet/iron, "name" = "iron sheets", "amount" = 10, "value_min" = 500, "value_max" = 700, "difficulty" = MISSION_DIFFICULTY_EASY),
-		list("type" = /obj/item/stack/sheet/glass, "name" = "glass sheets", "amount" = 10, "value_min" = 400, "value_max" = 600, "difficulty" = MISSION_DIFFICULTY_EASY),
-		// Medium - uncommon ores, moderate amounts
-		list("type" = /obj/item/stack/ore/plasma, "name" = "plasma ore", "amount" = 10, "value_min" = 800, "value_max" = 1200, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
-		list("type" = /obj/item/stack/ore/silver, "name" = "silver ore", "amount" = 8, "value_min" = 700, "value_max" = 1000, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
-		list("type" = /obj/item/stack/ore/titanium, "name" = "titanium ore", "amount" = 8, "value_min" = 800, "value_max" = 1100, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
-		list("type" = /obj/item/stack/sheet/plasteel, "name" = "plasteel sheets", "amount" = 5, "value_min" = 1000, "value_max" = 1400, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
-		// Hard - rare ores, higher amounts
-		list("type" = /obj/item/stack/ore/gold, "name" = "gold ore", "amount" = 8, "value_min" = 1200, "value_max" = 1800, "difficulty" = MISSION_DIFFICULTY_HARD),
-		list("type" = /obj/item/stack/ore/uranium, "name" = "uranium ore", "amount" = 6, "value_min" = 1400, "value_max" = 2000, "difficulty" = MISSION_DIFFICULTY_HARD),
-		list("type" = /obj/item/stack/ore/diamond, "name" = "diamond ore", "amount" = 4, "value_min" = 2000, "value_max" = 3000, "difficulty" = MISSION_DIFFICULTY_HARD),
-		list("type" = /obj/item/stack/ore/bluespace_crystal, "name" = "bluespace crystals", "amount" = 2, "value_min" = 2500, "value_max" = 3500, "difficulty" = MISSION_DIFFICULTY_HARD),
+	/// Equal row weights; these asks accept stored goods and pay flat credits.
+	var/static/list/delivery_asks = list(
+		list("type" = /obj/item/stack/spice_pods, "amount" = 3, "difficulty" = MISSION_DIFFICULTY_EASY, "value_min" = 320, "value_max" = 400),
+		list("type" = /obj/item/stack/sheet/sinew, "amount" = 2, "difficulty" = MISSION_DIFFICULTY_EASY, "value_min" = 260, "value_max" = 340),
+		list("type" = /obj/item/stack/sheet/animalhide/goliath_hide, "amount" = 2, "difficulty" = MISSION_DIFFICULTY_MEDIUM, "value_min" = 400, "value_max" = 550),
+		list("type" = /obj/item/stack/glacial_core, "amount" = 3, "difficulty" = MISSION_DIFFICULTY_MEDIUM, "value_min" = 550, "value_max" = 700),
+		list("type" = /obj/item/stack/telecrystal_raw, "amount" = 5, "difficulty" = MISSION_DIFFICULTY_HARD, "value_min" = 1500, "value_max" = 1700),
+		list("type" = /obj/item/sea_crystal, "amount" = 1, "difficulty" = MISSION_DIFFICULTY_HARD, "value_min" = 1000, "value_max" = 1200),
+		list("type" = /obj/item/documents/syndicate, "amount" = 1, "difficulty" = MISSION_DIFFICULTY_HARD, "value_min" = 3000, "value_max" = 3300),
 	)
 
-	var/list/ask = pick(delivery_targets)
+/datum/mission/delivery/generate_details()
+	var/list/ask = pick(delivery_asks)
 	required_type = ask["type"]
-	required_name = ask["name"]
+	var/obj/item/goods = required_type
+	required_name = initial(goods.name)
 	required_amount = ask["amount"]
+	difficulty = ask["difficulty"]
 	value_min = ask["value_min"]
 	value_max = ask["value_max"]
-	difficulty = ask["difficulty"]
 
 /datum/mission/delivery/build_objectives()
-	var/datum/mission_objective/deliver/ask = new
+	var/datum/mission_objective/deliver/console/ask = new
 	ask.required_type = required_type
 	ask.required_name = required_name
 	ask.required_amount = required_amount
@@ -50,9 +42,8 @@
 
 /datum/mission/delivery/update_text()
 	var/item_text = required_amount > 1 ? "[required_amount] [required_name]" : required_name
-	var/datum/mission_objective/deliver/ask = objectives[1]
 	name = "Delivery Contract: [item_text]"
-	desc = "Deliver [item_text] to the mission pad to complete this contract.[ask.get_delivery_instructions()]"
+	desc = "[author] wants [item_text]."
 
 /datum/mission/delivery/get_ui_data()
 	var/list/data = ..()
diff --git a/voidcrew/modules/missions/missions/exploration.dm b/voidcrew/modules/missions/missions/exploration.dm
index c4771fbddf2..0286df3c74c 100644
--- a/voidcrew/modules/missions/missions/exploration.dm
+++ b/voidcrew/modules/missions/missions/exploration.dm
@@ -9,8 +9,8 @@
 	name = "Exploration Contract"
 	weight = 10
 	// Green-band pay; apply_zone_scaling() raises it for deeper zones
-	value_min = 400
-	value_max = 700
+	value_min = 150
+	value_max = 250
 
 /datum/mission/exploration/setup_target()
 	var/datum/mission_target/coords/coords = new(src)
@@ -31,7 +31,7 @@
 
 /datum/mission/exploration/update_text()
 	name = "Exploration Contract: ([target.target_x], [target.target_y])"
-	desc = "Chart the sector at coordinates ([target.target_x], [target.target_y]) in the [target_zone_name]. Fly to this location, then return to the mission board to collect the fee."
+	desc = "Chart the sector at ([target.target_x], [target.target_y]) in the [target_zone_name]."
 
 /datum/mission/exploration/waypoint_label()
 	return "Survey site"
diff --git a/voidcrew/modules/missions/missions/field_expedition.dm b/voidcrew/modules/missions/missions/field_expedition.dm
index 0f13e73df2d..81fd90250d9 100644
--- a/voidcrew/modules/missions/missions/field_expedition.dm
+++ b/voidcrew/modules/missions/missions/field_expedition.dm
@@ -14,13 +14,13 @@
 	name = "Field Expedition"
 	weight = 9
 	mission_limit = 2
-	voucher_count = 1
+	voucher_count = 0
 	quest_lost_policy = MISSION_QUEST_LOST_RETARGET
 	gps_tag_prefix = "XPDN"
 	// Green-band pay, a notch over plain recovery: planets mean weather,
 	// wildlife and a walk from the dock
-	value_min = 800
-	value_max = 1100
+	value_min = 500
+	value_max = 700
 
 	/// zone_mobs theme that may answer the pickup
 	var/wave_theme
@@ -69,10 +69,7 @@
 
 /datum/mission/field_expedition/update_text()
 	name = "Field Expedition: [objective_name]"
-	desc = "Our [objective_name] is down on the planet at ([target.target_x], [target.target_y]) in the [target_zone_name]. \
-		Land, locate the beacon-marked salvage and bring it to the mission pad. Picking it up may draw an ambush. \
-		Payment includes [voucher_count] trade voucher[voucher_count > 1 ? "s" : ""]. \
-		Tap a GPS unit on the mission board to receive the salvage's beacon ([gps_tag])."
+	desc = "Recover our [objective_name] from the planet at ([target.target_x], [target.target_y]) in the [target_zone_name]."
 
 /datum/mission/field_expedition/waypoint_label()
 	return "Expedition: [objective_name]"
diff --git a/voidcrew/modules/missions/missions/gas_harvest.dm b/voidcrew/modules/missions/missions/gas_harvest.dm
index 1778415c4b6..15ca2f5a508 100644
--- a/voidcrew/modules/missions/missions/gas_harvest.dm
+++ b/voidcrew/modules/missions/missions/gas_harvest.dm
@@ -20,21 +20,22 @@
 	/// Moles asked for in one tank
 	var/required_moles = 600
 
+	var/static/list/gas_asks = list(
+		/datum/gas/plasma = list("moles" = list(600, 900), "value" = list(250, 350), "difficulty" = MISSION_DIFFICULTY_EASY, "vouchers" = 0),
+		/datum/gas/nitrogen = list("moles" = list(600, 900), "value" = list(220, 320), "difficulty" = MISSION_DIFFICULTY_EASY, "vouchers" = 0),
+		/datum/gas/water_vapor = list("moles" = list(600, 900), "value" = list(220, 320), "difficulty" = MISSION_DIFFICULTY_EASY, "vouchers" = 0),
+		/datum/gas/miasma = list("moles" = list(400, 700), "value" = list(300, 450), "difficulty" = MISSION_DIFFICULTY_MEDIUM, "vouchers" = 0),
+		/datum/gas/tritium = list("moles" = list(250, 450), "value" = list(450, 650), "difficulty" = MISSION_DIFFICULTY_MEDIUM, "vouchers" = 1),
+		/datum/gas/pluoxium = list("moles" = list(200, 350), "value" = list(650, 850), "difficulty" = MISSION_DIFFICULTY_HARD, "vouchers" = 1),
+		/datum/gas/nitrium = list("moles" = list(200, 350), "value" = list(650, 850), "difficulty" = MISSION_DIFFICULTY_HARD, "vouchers" = 1),
+		/datum/gas/hypernoblium = list("moles" = list(150, 300), "value" = list(750, 950), "difficulty" = MISSION_DIFFICULTY_HARD, "vouchers" = 1),
+	)
+
 /datum/mission/gas_harvest/get_archetype()
 	return "procurement"
 
 /datum/mission/gas_harvest/generate_details()
 	// Ask parameters per gas: moles band, pay band, difficulty, voucher
-	var/static/list/gas_asks = list(
-		/datum/gas/plasma = list("moles" = list(600, 900), "value" = list(800, 1200), "difficulty" = MISSION_DIFFICULTY_EASY, "vouchers" = 0),
-		/datum/gas/nitrogen = list("moles" = list(600, 900), "value" = list(700, 1100), "difficulty" = MISSION_DIFFICULTY_EASY, "vouchers" = 0),
-		/datum/gas/water_vapor = list("moles" = list(600, 900), "value" = list(700, 1100), "difficulty" = MISSION_DIFFICULTY_EASY, "vouchers" = 0),
-		/datum/gas/miasma = list("moles" = list(400, 700), "value" = list(900, 1400), "difficulty" = MISSION_DIFFICULTY_MEDIUM, "vouchers" = 0),
-		/datum/gas/tritium = list("moles" = list(250, 450), "value" = list(1500, 2200), "difficulty" = MISSION_DIFFICULTY_MEDIUM, "vouchers" = 1),
-		/datum/gas/pluoxium = list("moles" = list(200, 350), "value" = list(2000, 2800), "difficulty" = MISSION_DIFFICULTY_HARD, "vouchers" = 1),
-		/datum/gas/nitrium = list("moles" = list(200, 350), "value" = list(2000, 2800), "difficulty" = MISSION_DIFFICULTY_HARD, "vouchers" = 1),
-		/datum/gas/hypernoblium = list("moles" = list(150, 300), "value" = list(2400, 3200), "difficulty" = MISSION_DIFFICULTY_HARD, "vouchers" = 1),
-	)
 
 	// Only ask for gas somebody can actually go scoop: poll the live nebulas.
 	// No nebula scan hit -> fall back to the common green-band gases.
@@ -67,7 +68,4 @@
 
 /datum/mission/gas_harvest/update_text()
 	name = "Gas Harvest: [gas_name]"
-	var/voucher_line = voucher_count > 0 ? " Payment includes [voucher_count] trade voucher[voucher_count > 1 ? "s" : ""]." : ""
-	desc = "Deliver one handheld gas tank holding at least [required_moles] mol of [LOWER_TEXT(gas_name)] to the mission pad. \
-		A ram scoop can harvest it while your ship holds still inside a matching nebula; transfer the gas from the pipe network into the tank. \
-		Gas from any source counts, and mixtures are accepted if the requested gas meets the full quota in that one tank. We keep the tank and its contents.[voucher_line]"
+	desc = "Nebula sample requested: [required_moles] mol [LOWER_TEXT(gas_name)]."
diff --git a/voidcrew/modules/missions/missions/live_capture.dm b/voidcrew/modules/missions/missions/live_capture.dm
index 141767fa3cb..17090950e32 100644
--- a/voidcrew/modules/missions/missions/live_capture.dm
+++ b/voidcrew/modules/missions/missions/live_capture.dm
@@ -42,17 +42,18 @@
 
 /datum/mission/live_capture
 	name = "Live Capture"
+	guarded_prize_family = "capture"
 	weight = 8
 	mission_limit = 1
 	duration = 35 MINUTES
-	voucher_count = 1
+	voucher_count = 0
 	quest_lost_policy = MISSION_QUEST_LOST_FAIL
 	gps_tag_prefix = "FAUNA"
 	// Green-band pay between field_expedition and big_game_hunt: harder than
 	// pulling a probe core, gentler than killing an apex - the specimen is
 	// smaller fauna, but you have to win WITHOUT the killing blow.
-	value_min = 900
-	value_max = 1250
+	value_min = 600
+	value_max = 800
 
 	/// Per-planet capture tables, keyed by /datum/overmap/planet typepath:
 	/// the specimen, the board-title form, the ask phrase, and the habitat
@@ -108,16 +109,7 @@
 	return "procurement"
 
 /datum/mission/live_capture/setup_target()
-	// Only offer contracts for planet types actually on the overmap this round
-	var/list/present_types = list()
-	for(var/obj/structure/overmap/planet/candidate as anything in GLOB.overmap_planets)
-		if(QDELETED(candidate))
-			continue
-		if(!istype(get_turf(candidate), /turf/open/overmap))
-			continue
-		if(!candidate.planet || !capture_tables[candidate.planet])
-			continue
-		present_types |= candidate.planet
+	var/list/present_types = get_work_biomes(capture_tables)
 	if(!length(present_types))
 		return FALSE
 	capture_planet_type = pick(present_types)
@@ -150,7 +142,7 @@
 
 /datum/mission/live_capture/build_objectives()
 	var/datum/mission_objective/goto_coords/approach = new
-	approach.arrival_message = "On station over the habitat. Take the capture crate down to the surface and find the marked specimen."
+	approach.arrival_message = "On station over the habitat."
 	add_objective(approach)
 
 	capture = new
@@ -168,12 +160,7 @@
 	var/datum/mission_target/planet/planet_target = target
 	var/planet_name = istype(planet_target) ? (planet_target.planet?.name || "the planet") : "the planet"
 	name = "Live Capture: [capture_row["title"]]"
-	desc = "[flavor_line] \
-		The guild survey has tagged [objective_name] in the [capture_row["ground"]] of [planet_name] at ([target.target_x], [target.target_y]) in the [target_zone_name]. \
-		A capture crate lands on your mission pad when you accept. Find the marked specimen and reduce it to [CAPTURE_HEALTH_FRACTION * 100]% health or less, or incapacitate it, while keeping it alive. \
-		With combat mode off, use the crate on the tagged animal while it is on the ground. Bring the sealed crate to the mission pad with the specimen alive; its death voids the contract. \
-		Payment includes [voucher_count] trade voucher[voucher_count > 1 ? "s" : ""]. \
-		Tap a GPS unit on the mission board to follow the specimen's survey tag ([gps_tag])."
+	desc = "Bring back [objective_name] alive from [planet_name] at ([target.target_x], [target.target_y]) in the [target_zone_name]."
 
 /datum/mission/live_capture/waypoint_label()
 	return "Capture: [objective_name]"
@@ -249,18 +236,19 @@
 	mission.bind_item(kit)
 	// One crate per contract: losing it voids the capture
 	RegisterSignal(kit, COMSIG_QDELETING, PROC_REF(on_crate_destroyed))
-	notify_crew("Capture crate delivered to your mission pad. It only seals the survey-marked specimen, and only subdued.")
+	notify_crew("Capture crate delivered.")
 	return TRUE
 
 /datum/mission_objective/field/capture_beast/spawn_field_objects(turf/spawn_turf)
-	var/mob/living/beast = new target_mob_type(spawn_turf)
+	var/mob/living/beast = spawn_field_npc(target_mob_type, spawn_turf, finalize = FALSE)
 	beast.name = "marked [beast.name]"
-	beast.desc += " It's wearing a guild survey tag. This is the contracted specimen, and it's worth nothing dead."
+	beast.desc += " It's wearing a guild survey tag."
 	target_mob = beast
 	protect_field_mob(beast)
+	beast.npc_spawn_context.finalize()
 	RegisterSignal(beast, COMSIG_LIVING_DEATH, PROC_REF(on_target_death))
 	mission.register_quest_atom(beast)
-	notify_crew("Survey tag live - the marked specimen is on the surface ([mission.gps_tag]). Wear it down and crate it breathing.", type = SHIP_NOTIFY_WARNING, sound = 'voidcrew/sound/notify2.ogg')
+	notify_crew("Specimen sighted ([mission.gps_tag]).", type = SHIP_NOTIFY_WARNING, sound = 'voidcrew/sound/notify2.ogg')
 
 /**
  * The specimen died before delivery: the client pays for live capture only.
@@ -295,7 +283,7 @@
 	if(deliver_objective)
 		deliver_objective.crate = crate
 		deliver_objective.beast = beast
-	notify_crew("Specimen sealed and stable in suspension. Bring the crate back to the mission pad alive.", sound = 'voidcrew/sound/notify2.ogg')
+	notify_crew("Specimen secured.", sound = 'voidcrew/sound/notify2.ogg')
 	complete()
 
 /datum/mission_objective/field/capture_beast/get_progress_string()
@@ -445,8 +433,7 @@
  */
 /obj/item/mission_recovery/capture_crate
 	name = "capture crate"
-	desc = "A guild-issue xenofauna transport pod: reinforced shell, intake maw, suspension-field emitter. \
-		It only takes the survey-marked specimen, and only once it's been worn down. After it seals, nobody opens it but the client's assayer."
+	desc = "A guild-issue xenofauna transport pod with a reinforced shell and suspension-field emitter."
 	icon_state = "capture_crate"
 	base_icon_state = "capture_crate"
 	w_class = WEIGHT_CLASS_BULKY
diff --git a/voidcrew/modules/missions/missions/poacher_bust.dm b/voidcrew/modules/missions/missions/poacher_bust.dm
index d54cd04d0db..07cf53dc8f8 100644
--- a/voidcrew/modules/missions/missions/poacher_bust.dm
+++ b/voidcrew/modules/missions/missions/poacher_bust.dm
@@ -33,17 +33,18 @@
  */
 /datum/mission/poacher_bust
 	name = "Poacher Bust"
+	guarded_prize_family = "poacher"
 	weight = 7
 	mission_limit = 1
 	duration = 40 MINUTES
-	voucher_count = 2
+	voucher_count = 0
 	quest_lost_policy = MISSION_QUEST_LOST_FAIL
 	gps_tag_prefix = "WARDN"
 	// Green-band pay between field_expedition and big_game_hunt: a squad
 	// fight plus a counted evidence haul, but no elite at the end of it.
 	// The zone table makes a Lawless-zone bust a serious payday.
-	value_min = 900
-	value_max = 1200
+	value_min = 600
+	value_max = 800
 
 	/// Per-planet bust tables, keyed by /datum/overmap/planet typepath: the
 	/// protected species (named for the planet's actual fauna), the hunting
@@ -122,16 +123,7 @@
 	return "bounty"
 
 /datum/mission/poacher_bust/setup_target()
-	// Only offer busts for planet types actually on the overmap this round
-	var/list/present_types = list()
-	for(var/obj/structure/overmap/planet/candidate as anything in GLOB.overmap_planets)
-		if(QDELETED(candidate))
-			continue
-		if(!istype(get_turf(candidate), /turf/open/overmap))
-			continue
-		if(!candidate.planet || !bust_tables[candidate.planet])
-			continue
-		present_types |= candidate.planet
+	var/list/present_types = get_work_biomes(bust_tables)
 	if(!length(present_types))
 		return FALSE
 	bust_planet_type = pick(present_types)
@@ -197,7 +189,7 @@
 
 /datum/mission/poacher_bust/build_objectives()
 	var/datum/mission_objective/goto_coords/approach = new
-	approach.arrival_message = "On station over the poaching grounds. Take a ground team down and sweep for [objective_name]'s camp."
+	approach.arrival_message = "On station over the poaching grounds."
 	add_objective(approach)
 
 	wipe = new
@@ -238,11 +230,7 @@
 	var/datum/mission_target/planet/planet_target = target
 	var/planet_name = istype(planet_target) ? (planet_target.planet?.name || "the planet") : "the planet"
 	name = "Poacher Bust: [objective_name]"
-	desc = "[flavor_line] \
-		Warden's warrant: [objective_name] are running an illegal [protected_species] harvest from a camp in the [bust_row["ground"]] of [planet_name] at ([target.target_x], [target.target_y]) in the [target_zone_name]. \
-		Kill the whole squad to unlock their trophy cache, then return all [evidence_count] pieces of tagged evidence to the mission pad, one at a time. Destroying any evidence voids the contract. \
-		Payment includes [voucher_count] trade voucher[voucher_count > 1 ? "s" : ""]. \
-		Tap a GPS unit on the mission board to follow the case beacon ([gps_tag])."
+	desc = "Wanted dead: [objective_name], poaching [protected_species] on [planet_name] at ([target.target_x], [target.target_y]) in the [target_zone_name]. Recover [evidence_count] pieces of evidence."
 
 /datum/mission/poacher_bust/waypoint_label()
 	return "Bust: [objective_name]"
@@ -323,13 +311,14 @@
 	// The squad, scattered around the campsite
 	for(var/i in 1 to length(squad_types))
 		var/poacher_type = squad_types[i]
-		var/mob/living/simple_animal/poacher = new poacher_type(get_nearby_open_turf(camp_turf, 3))
+		var/mob/living/simple_animal/poacher = spawn_field_npc(poacher_type, get_nearby_open_turf(camp_turf, 3), finalize = FALSE)
 		if(i <= length(squad_names))
 			poacher.name = squad_names[i]
 		poacher.desc += " The kit is professional: snare wire, skinning knives, and the brand of [mission.objective_name] burned into the stock."
 		// Outfitted expedition: cold-weather gear keeps an ice-planet camp
 		// from freezing to death before the crew arrives
 		poacher.minbodytemp = 0
+		poacher.npc_spawn_context.finalize()
 		protect_field_mob(poacher)
 		RegisterSignal(poacher, COMSIG_LIVING_DEATH, PROC_REF(on_poacher_death))
 		RegisterSignal(poacher, COMSIG_QDELETING, PROC_REF(on_poacher_removed))
@@ -353,7 +342,8 @@
 			var/obj/item/pet_carrier/cage = new(get_nearby_open_turf(camp_turf, 2))
 			cage.name = "live-catch cage"
 			cage.desc = "A warden-banned live trap, still occupied. The lock is a simple latch."
-			var/mob/living/critter = new critter_type(cage)
+			var/datum/npc_spawn_context/context = new(mission?.target || src, mission?.target?.get_zone_type(), "exempt", source_turf = camp_turf)
+			var/mob/living/critter = spawn_npc_in_zone(critter_type, cage, context)
 			cage.add_occupant(critter)
 			cage.open = FALSE
 			cage.locked = TRUE
@@ -454,7 +444,7 @@
 		cache.locked = FALSE
 		cache.update_appearance()
 		cache.visible_message(span_notice("[cache]'s mag-seal releases with a hiss."))
-	notify_crew("Camp cleared - all [squad_size] poachers accounted for. Warden override sent: the trophy cache is unlocked. Recover the evidence and return it to the mission pad.")
+	notify_crew("Camp cleared. Trophy cache unlocked.")
 
 /datum/mission_objective/field/wipe_camp/get_progress_string()
 	if(!spawned)
@@ -536,7 +526,7 @@
  */
 /obj/item/mission_recovery/poacher_evidence
 	name = "tagged evidence"
-	desc = "A confiscated poaching trophy under a warden-service evidence tag. Destroying it kills the case - the mission pad will accept it."
+	desc = "A confiscated poaching trophy under a warden-service evidence tag."
 	icon_state = "recovery"
 	w_class = WEIGHT_CLASS_NORMAL
 
@@ -550,7 +540,7 @@
  */
 /obj/structure/closet/crate/secure/poacher_cache
 	name = "sealed trophy cache"
-	desc = "A battered cargo crate under a poacher outfit's mag-seal. The warden service can override the lock once the camp is confirmed clear."
+	desc = "A battered cargo crate under a poacher outfit's mag-seal."
 
 /obj/structure/closet/crate/secure/poacher_cache/togglelock(mob/living/user, silent)
 	if(locked)
diff --git a/voidcrew/modules/missions/missions/prospect_stake.dm b/voidcrew/modules/missions/missions/prospect_stake.dm
index 45b984c5269..adcc1ff938b 100644
--- a/voidcrew/modules/missions/missions/prospect_stake.dm
+++ b/voidcrew/modules/missions/missions/prospect_stake.dm
@@ -14,23 +14,21 @@
  */
 /datum/mission/prospect_stake
 	name = "Prospect Stake"
+	guarded_prize_family = "stake"
 	weight = 6
 	mission_limit = 1
 	duration = 40 MINUTES
 	quest_lost_policy = MISSION_QUEST_LOST_FAIL // the beacon IS the contract
 	gps_tag_prefix = "CLAIM"
 	// Top of the mission pay curve - it's an announced fight
-	value_min = 2200
-	value_max = 3000
-	voucher_count = 3
+	value_min = 1400
+	value_max = 1800
+	voucher_count = 1
 
 	/// zone_mobs theme answering the claim
 	var/wave_theme
 	/// The defense objective (kit dispensing at start)
 	var/datum/mission_objective/claim_defense/defense
-	/// Whether this stake pays a ship-part prize crate instead of vouchers
-	var/pays_ship_parts = FALSE
-
 /datum/mission/prospect_stake/Destroy()
 	defense = null
 	return ..()
@@ -54,16 +52,9 @@
 /datum/mission/prospect_stake/generate_details()
 	objective_name = "notarized claim deed"
 	wave_theme = pick_weight(MISSION_WAVE_THEMES)
-	// Red-zone stakes can trade the voucher stack for a ship-part crate
-	if(difficulty == MISSION_DIFFICULTY_HARD)
-		voucher_count = 4
-		if(prob(35))
-			pays_ship_parts = TRUE
-			voucher_count = 0
-
 /datum/mission/prospect_stake/build_objectives()
 	var/datum/mission_objective/goto_coords/approach = new
-	approach.arrival_message = "On station. Deploy the claim beacon while holding these coordinates."
+	approach.arrival_message = "On station over the claim."
 	add_objective(approach)
 	defense = new
 	defense.wave_theme = wave_theme
@@ -75,23 +66,11 @@
 
 /datum/mission/prospect_stake/update_text()
 	name = "Prospect Stake: ([target.target_x], [target.target_y])"
-	desc = "File our mineral-rights claim at ([target.target_x], [target.target_y]) in the [target_zone_name]. \
-		A claim beacon kit lands on your mission pad when you sign. Fly out, deploy it aboard your ship while holding at those coordinates, and keep it in one piece for [defense ? round(defense.defend_duration / (1 MINUTES)) : 8] minutes. The clock only runs while the ship holds station. \
-		The filing goes out on Wideband, so [target_zone_name == ZONE_NAME_RED ? "every pirate in red space will know exactly where you are" : "the whole lane will hear it"]. Expect boarders. \
-		The deed prints at the beacon once the claim matures; bring it to the mission pad. \
-		Pays [pays_ship_parts ? "a bonded crate of ship-grade components" : "[voucher_count] trade vouchers"] on top of the fee."
+	desc = "File our mineral-rights claim at ([target.target_x], [target.target_y]) in the [target_zone_name]."
 
 /datum/mission/prospect_stake/waypoint_label()
 	return "Prospect stake"
 
-/datum/mission/prospect_stake/distribute_rewards(atom/reward_anchor)
-	..()
-	if(pays_ship_parts)
-		var/turf/reward_turf = get_turf(reward_anchor)
-		if(reward_turf)
-			note_metric_ship_parts(spawn_ship_part_prize(reward_turf)) // round metrics, voidcrew/modules/metrics/mission_metrics.dm
-			flash_reward_anchor(reward_anchor)
-
 /**
  * # Claim Beacon Kit
  *
@@ -101,7 +80,7 @@
  */
 /obj/item/claim_beacon_kit
 	name = "claim beacon kit"
-	desc = "A folded prospecting claim beacon, bonded and pre-registered. Use it in hand while your ship holds at the contracted coordinates. Filings are public, so expect company."
+	desc = "A folded prospecting claim beacon, bonded and pre-registered."
 	icon = 'voidcrew/modules/missions/icons/recovery.dmi'
 	icon_state = "recovery_anchored"
 	w_class = WEIGHT_CLASS_BULKY
@@ -140,7 +119,7 @@
  */
 /obj/structure/mission_claim_beacon
 	name = "prospecting claim beacon"
-	desc = "A registered mineral-rights beacon, broadcasting its claim on every open channel. Keeping it in one piece is the whole job."
+	desc = "A registered mineral-rights beacon, broadcasting its claim on every open channel."
 	icon = 'voidcrew/modules/missions/icons/recovery.dmi'
 	icon_state = "survey_pylon"
 	anchored = TRUE
@@ -189,9 +168,9 @@
 	if(!COOLDOWN_FINISHED(src, offstation_warn_cooldown))
 		return
 	COOLDOWN_START(src, offstation_warn_cooldown, 15 SECONDS)
-	balloon_alert_to_viewers("claim clock paused - off station!")
+	balloon_alert_to_viewers("off station!")
 	var/datum/mission_objective/claim_defense/objective = objective_ref?.resolve()
-	objective?.notify_crew("Claim beacon reports the ship off station - the clock is paused.", type = SHIP_NOTIFY_WARNING, sound = 'voidcrew/sound/notify2.ogg')
+	objective?.notify_crew("Claim beacon reports the ship off station.", type = SHIP_NOTIFY_WARNING, sound = 'voidcrew/sound/notify2.ogg')
 
 /// The claim matured: stop being a mission object, stay as scenery
 /obj/structure/mission_claim_beacon/proc/retire()
diff --git a/voidcrew/modules/missions/missions/recovery.dm b/voidcrew/modules/missions/missions/recovery.dm
index f7e081bd1d2..a018e34a098 100644
--- a/voidcrew/modules/missions/missions/recovery.dm
+++ b/voidcrew/modules/missions/missions/recovery.dm
@@ -12,12 +12,12 @@
 	name = "Recovery Contract"
 	weight = 10
 	mission_limit = 3
-	voucher_count = 1
+	voucher_count = 0
 	quest_lost_policy = MISSION_QUEST_LOST_RETARGET
 	gps_tag_prefix = "RCVRY"
 	// Green-band pay; the zone table scales it up
-	value_min = 700
-	value_max = 1000
+	value_min = 450
+	value_max = 650
 
 /datum/mission/recovery/setup_target()
 	var/datum/mission_target/space_ruin/ruin_target = new(src)
@@ -43,9 +43,7 @@
 
 /datum/mission/recovery/update_text()
 	name = "Recovery Contract: [objective_name]"
-	desc = "Recover the [objective_name] from the signal at ([target.target_x], [target.target_y]) in the [target_zone_name], and return it to the mission pad. \
-		Payment includes [voucher_count] trade voucher[voucher_count > 1 ? "s" : ""]. \
-		Tap a GPS unit on the mission board to receive the objective's beacon ([gps_tag])."
+	desc = "Recover the [objective_name] from ([target.target_x], [target.target_y]) in the [target_zone_name]."
 
 /datum/mission/recovery/waypoint_label()
 	return "Recovery: [objective_name]"
@@ -65,6 +63,9 @@
  */
 /datum/mission/recovery/kill
 	name = "Kill Contract"
+	value_min = 500
+	value_max = 700
+	guarded_prize_family = "kill"
 	weight = 8
 	mission_limit = 2
 	gps_tag_prefix = "HUNT"
@@ -125,10 +126,7 @@
 
 /datum/mission/recovery/kill/update_text()
 	name = "Kill Contract: [objective_name]"
-	desc = "Hunt down [objective_name], holed up at the signal at ([target.target_x], [target.target_y]) in the [target_zone_name]. \
-		Return their identification tag to the mission pad. \
-		Payment includes [voucher_count] trade voucher[voucher_count > 1 ? "s" : ""]. \
-		Tap a GPS unit on the mission board to receive the target's transponder beacon ([gps_tag])."
+	desc = "Wanted dead: [objective_name]. Last seen at ([target.target_x], [target.target_y]) in the [target_zone_name]."
 
 /datum/mission/recovery/kill/waypoint_label()
 	return "Hunt: [objective_name]"
@@ -142,7 +140,7 @@
  */
 /obj/item/mission_recovery
 	name = "recovery objective"
-	desc = "Salvage flagged for recovery under a standing contract. The mission pad will accept it."
+	desc = "Salvage flagged for recovery under a standing contract."
 	icon = 'voidcrew/modules/missions/icons/recovery.dmi'
 	icon_state = "recovery"
 	inhand_icon_state = "recovery"
@@ -163,13 +161,13 @@
 		// Sites get shared, so somebody else's objective can end up in your hands.
 		// Say whose it is rather than letting the pad refuse it with no explanation.
 		if(mission.servant)
-			. += span_notice("Filed to the [mission.servant.name]. Only that vessel's pad will take it.")
+			. += span_notice("Filed to the [mission.servant.name].")
 	else
 		. += span_warning("The contract this was tagged for has expired.")
 
 /obj/item/mission_recovery/proof
 	name = "identification tag"
-	desc = "Proof that somebody's career ended violently. The mission pad will accept it."
+	desc = "Proof that somebody's career ended violently."
 	icon_state = "recovery_proof"
 	inhand_icon_state = null
 	w_class = WEIGHT_CLASS_TINY
diff --git a/voidcrew/modules/missions/missions/recovery_variants.dm b/voidcrew/modules/missions/missions/recovery_variants.dm
index 09300188225..7a38e0c38bc 100644
--- a/voidcrew/modules/missions/missions/recovery_variants.dm
+++ b/voidcrew/modules/missions/missions/recovery_variants.dm
@@ -29,6 +29,9 @@
 
 /datum/mission/recovery/survey
 	name = "Survey Contract"
+	value_min = 550
+	value_max = 750
+	guarded_prize_family = "waves"
 	weight = 8
 	mission_limit = 2
 	gps_tag_prefix = "SRVY"
@@ -61,11 +64,7 @@
 
 /datum/mission/recovery/survey/update_text()
 	name = "Survey Contract: [objective_name]"
-	desc = "Our probes seeded [chain ? chain.points_total : 3] survey pylons through the signal at ([target.target_x], [target.target_y]) in the [target_zone_name]. \
-		Calibrate each with an empty hand, in any order. Each completed calibration draws a wave of hostiles, so go armed. \
-		The last pylon you finish prints the survey core; bring that back to the mission pad. \
-		Payment includes [voucher_count] trade voucher[voucher_count > 1 ? "s" : ""]. \
-		Tap a GPS unit on the mission board to receive a beacon for every pylon still standing ([gps_tag])."
+	desc = "Survey requested at ([target.target_x], [target.target_y]) in the [target_zone_name]: [objective_name]."
 
 /datum/mission/recovery/survey/waypoint_label()
 	return "Survey: [objective_name]"
@@ -78,7 +77,7 @@
  */
 /obj/structure/mission_survey_pylon
 	name = "survey pylon"
-	desc = "A tripod-mounted survey unit, dropped from orbit and waiting on someone to calibrate it. The routine is very loud."
+	desc = "A tripod-mounted survey unit, dropped from orbit."
 	icon = 'voidcrew/modules/missions/icons/recovery.dmi'
 	icon_state = "survey_pylon"
 	anchored = TRUE
@@ -94,7 +93,7 @@
 	if(calibrated)
 		. += span_notice("Its display reads: SURVEY SEGMENT COMPLETE.")
 	else
-		. += span_notice("Its display blinks: AWAITING FIELD CALIBRATION. Use an empty hand to start it. The routine takes a while, and it is <b>loud</b>.")
+		. += span_notice("Its display blinks: AWAITING FIELD CALIBRATION.")
 
 /obj/structure/mission_survey_pylon/attack_hand(mob/living/user, list/modifiers)
 	. = ..()
@@ -133,6 +132,9 @@
 
 /datum/mission/recovery/extraction
 	name = "Extraction Contract"
+	value_min = 500
+	value_max = 700
+	guarded_prize_family = "waves"
 	weight = 8
 	mission_limit = 2
 	gps_tag_prefix = "XTRC"
@@ -174,10 +176,7 @@
 
 /datum/mission/recovery/extraction/update_text()
 	name = "Extraction Contract: [objective_name]"
-	desc = "A [objective_name] is bolted down inside the signal at ([target.target_x], [target.target_y]) in the [target_zone_name]. \
-		Use an empty hand to start wrenching it loose. It takes a while and it will trip the site's alarm, so plan for company, then haul it to the mission pad. \
-		Payment includes [voucher_count] trade voucher[voucher_count > 1 ? "s" : ""]. \
-		Tap a GPS unit on the mission board to receive the cargo's beacon ([gps_tag])."
+	desc = "Recover the [objective_name] from ([target.target_x], [target.target_y]) in the [target_zone_name]."
 
 /datum/mission/recovery/extraction/waypoint_label()
 	return "Extraction: [objective_name]"
@@ -192,7 +191,7 @@
 	var/turf/site = get_turf(cargo)
 	new wave_theme(site, list(1, 2))
 	second_wave_timer = addtimer(CALLBACK(src, PROC_REF(second_wave), site), EXTRACTION_SECOND_WAVE_DELAY, TIMER_STOPPABLE)
-	servant?.ship_notify("[name]: site security tripped. Expect resistance in waves.", "MISSION UPDATE", SHIP_NOTIFY_WARNING, 'voidcrew/sound/notify2.ogg', 50)
+	servant?.ship_notify("[name]: site security alarm triggered.", "MISSION UPDATE", SHIP_NOTIFY_WARNING, 'voidcrew/sound/notify2.ogg', 50)
 
 /datum/mission/recovery/extraction/proc/second_wave(turf/site)
 	second_wave_timer = null
@@ -207,7 +206,7 @@
  * the deck. Unbolting is a channel that trips the mission's alarm.
  */
 /obj/item/mission_recovery/anchored
-	desc = "Flagged for recovery under a standing contract, and bolted to the deck. Getting it loose takes a while, and it won't be quiet."
+	desc = "Contracted salvage, bolted to the deck."
 	icon_state = "recovery_anchored"
 	anchored = TRUE
 	w_class = WEIGHT_CLASS_BULKY
@@ -215,7 +214,7 @@
 /obj/item/mission_recovery/anchored/examine(mob/user)
 	. = ..()
 	if(anchored)
-		. += span_warning("It is bolted down. Use an empty hand to start wrenching it free.")
+		. += span_warning("It is bolted down.")
 
 /obj/item/mission_recovery/anchored/attack_hand(mob/living/user, list/modifiers)
 	if(!anchored)
diff --git a/voidcrew/modules/missions/missions/rescue.dm b/voidcrew/modules/missions/missions/rescue.dm
index 3d711f9e9dd..0a3e7b6527a 100644
--- a/voidcrew/modules/missions/missions/rescue.dm
+++ b/voidcrew/modules/missions/missions/rescue.dm
@@ -1,8 +1,7 @@
 /**
  * # Rescue & Repatriation
  *
- * "A survivor's beacon is still pinging inside that wreck. Bring them back
- * breathing - the fee doubles if they can still walk."
+ * "A survivor's beacon is still pinging inside that wreck. Bring them home alive."
  *
  * Recovery variant where the objective breathes: a survivor NPC spawns in
  * the target ruin, follows whoever asks (or rides a fireman carry), and the
@@ -14,15 +13,15 @@
 	name = "Rescue Contract"
 	weight = 8
 	mission_limit = 2
-	voucher_count = 1
+	voucher_count = 0
 	quest_lost_policy = MISSION_QUEST_LOST_RETARGET
 	gps_tag_prefix = "RESQ"
 	// The survivor cannot defend themselves, so this contract does not share a
 	// wreck with a bounty's entourage or anybody else's spawns
 	exclusive_site = TRUE
-	// Green-band pay; the unharmed bonus doubles credits at turn-in
-	value_min = 800
-	value_max = 1100
+	// Green-band base pay
+	value_min = 650
+	value_max = 850
 
 /datum/mission/rescue/setup_target()
 	var/datum/mission_target/space_ruin/ruin_target = new(src)
@@ -46,15 +45,8 @@
 	add_objective(new /datum/mission_objective/field/escort)
 
 /datum/mission/rescue/update_text()
-	var/datum/mission_objective/field/escort/escort = objectives[1]
 	name = "Rescue Contract: [objective_name]"
-	desc = "A [objective_name]'s survival beacon is still pinging inside the signal at ([target.target_x], [target.target_y]) in the [target_zone_name]. \
-		Bring them back alive, on or beside your ship's mission pad, then turn in at the mission board. \
-		The credit fee doubles if they arrive with at least [escort.unharmed_threshold * 100]% health and have not needed revival. \
-		They'll follow whoever offers a hand, or ride a fireman carry. \
-		If their vitals stop, revive them within [DisplayTimeText(escort.revival_grace)] to save the contract, minus the bonus. \
-		Payment includes [voucher_count] trade voucher[voucher_count > 1 ? "s" : ""]. \
-		Tap a GPS unit on the mission board to receive the survivor's beacon ([gps_tag])."
+	desc = "Bring [objective_name] home. Last signal at ([target.target_x], [target.target_y]) in the [target_zone_name]."
 
 /datum/mission/rescue/waypoint_label()
 	return "Rescue: [objective_name]"
@@ -105,9 +97,9 @@
 	. = ..()
 	var/mob/following = following_ref?.resolve()
 	if(following)
-		. += span_notice("They're sticking close to [following]. An empty hand tells them to stay put.")
+		. += span_notice("They're sticking close to [following].")
 	else
-		. += span_notice("Offer them an empty hand and they'll follow you.")
+		. += span_notice("They look lost.")
 
 /mob/living/basic/mission_survivor/attack_hand(mob/living/user, list/modifiers)
 	. = ..()
diff --git a/voidcrew/modules/missions/missions/research.dm b/voidcrew/modules/missions/missions/research.dm
index d366d7248a0..6d0eb139800 100644
--- a/voidcrew/modules/missions/missions/research.dm
+++ b/voidcrew/modules/missions/missions/research.dm
@@ -85,6 +85,17 @@
 	/// The scan objective, for UI progress keys
 	var/datum/mission_objective/scan_celestial/scan
 
+	var/static/list/telemetry_asks = list(
+		list("type" = "nebulas", "name" = "nebulas", "name_singular" = "nebula", "amount" = 2, "research" = MISSION_RESEARCH_PAY_LOW, "value_min" = 60, "value_max" = 100, "difficulty" = MISSION_DIFFICULTY_EASY),
+		list("type" = "asteroids", "name" = "asteroid fields", "name_singular" = "asteroid field", "amount" = 2, "research" = MISSION_RESEARCH_PAY_LOW, "value_min" = 60, "value_max" = 100, "difficulty" = MISSION_DIFFICULTY_EASY),
+		list("type" = "any", "name" = "celestial objects", "name_singular" = "celestial object", "amount" = 3, "research" = MISSION_RESEARCH_PAY_LOW, "value_min" = 80, "value_max" = 120, "difficulty" = MISSION_DIFFICULTY_EASY),
+		list("type" = "planets", "name" = "planets", "name_singular" = "planet", "amount" = 2, "research" = MISSION_RESEARCH_PAY_MEDIUM, "value_min" = 100, "value_max" = 160, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
+		list("type" = "space_ruins", "name" = "space ruins", "name_singular" = "space ruin", "amount" = 2, "research" = MISSION_RESEARCH_PAY_MEDIUM, "value_min" = 100, "value_max" = 160, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
+		list("type" = "electric_storms", "name" = "electrical storms", "name_singular" = "electrical storm", "amount" = 2, "research" = MISSION_RESEARCH_PAY_MEDIUM, "value_min" = 100, "value_max" = 160, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
+		list("type" = "emp_storms", "name" = "EMP storms", "name_singular" = "EMP storm", "amount" = 2, "research" = MISSION_RESEARCH_PAY_HIGH, "value_min" = 160, "value_max" = 240, "difficulty" = MISSION_DIFFICULTY_HARD),
+		list("type" = "stars", "name" = "stars", "name_singular" = "star", "amount" = 1, "research" = MISSION_RESEARCH_PAY_HIGH, "value_min" = 100, "value_max" = 160, "difficulty" = MISSION_DIFFICULTY_HARD),
+	)
+
 /datum/mission/research/telemetry/Destroy()
 	scan = null
 	return ..()
@@ -96,16 +107,6 @@
 	// design: the crew is paid twice for one action, because the survey console has
 	// already banked its own points for each of these scans (250 for a nebula, 1000
 	// for a star), and this contract is the bonus on top of that.
-	var/static/list/telemetry_asks = list(
-		list("type" = "nebulas", "name" = "nebulas", "name_singular" = "nebula", "amount" = 2, "research" = MISSION_RESEARCH_PAY_LOW, "value_min" = 150, "value_max" = 250, "difficulty" = MISSION_DIFFICULTY_EASY),
-		list("type" = "asteroids", "name" = "asteroid fields", "name_singular" = "asteroid field", "amount" = 2, "research" = MISSION_RESEARCH_PAY_LOW, "value_min" = 150, "value_max" = 250, "difficulty" = MISSION_DIFFICULTY_EASY),
-		list("type" = "any", "name" = "celestial objects", "name_singular" = "celestial object", "amount" = 3, "research" = MISSION_RESEARCH_PAY_LOW, "value_min" = 200, "value_max" = 300, "difficulty" = MISSION_DIFFICULTY_EASY),
-		list("type" = "planets", "name" = "planets", "name_singular" = "planet", "amount" = 2, "research" = MISSION_RESEARCH_PAY_MEDIUM, "value_min" = 300, "value_max" = 450, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
-		list("type" = "space_ruins", "name" = "space ruins", "name_singular" = "space ruin", "amount" = 2, "research" = MISSION_RESEARCH_PAY_MEDIUM, "value_min" = 300, "value_max" = 450, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
-		list("type" = "electric_storms", "name" = "electrical storms", "name_singular" = "electrical storm", "amount" = 2, "research" = MISSION_RESEARCH_PAY_MEDIUM, "value_min" = 300, "value_max" = 450, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
-		list("type" = "emp_storms", "name" = "EMP storms", "name_singular" = "EMP storm", "amount" = 2, "research" = MISSION_RESEARCH_PAY_HIGH, "value_min" = 450, "value_max" = 700, "difficulty" = MISSION_DIFFICULTY_HARD),
-		list("type" = "stars", "name" = "stars", "name_singular" = "star", "amount" = 1, "research" = MISSION_RESEARCH_PAY_HIGH, "value_min" = 450, "value_max" = 700, "difficulty" = MISSION_DIFFICULTY_HARD),
-	)
 
 	var/list/ask = pick(telemetry_asks)
 	target_type = ask["type"]
@@ -128,10 +129,7 @@
 /datum/mission/research/telemetry/update_text()
 	var/display_name = required_amount == 1 ? target_name_singular : target_name
 	name = "Telemetry Contract: [display_name]"
-	desc = "Use your ship's orbital survey console to scan [required_amount] [display_name] after accepting this contract. \
-		Nothing to bring back - the contract settles at the mission board. \
-		Pays [research_reward] research points as a data dossier, plus [value] credits in expenses. \
-		Slot the dossier into an R&D console to bank the points."
+	desc = "Survey requested: [required_amount] [display_name]."
 
 /datum/mission/research/telemetry/get_ui_data()
 	var/list/data = ..()
@@ -157,8 +155,8 @@
 	research_origin = "anomalous physics"
 	// Green band; the zone table scales both, then the anomaly's own hazard
 	// multiplier is applied to the credits on top in generate_details().
-	value_min = 500
-	value_max = 800
+	value_min = 350
+	value_max = 550
 	// The most science on the board: the only contract that puts a live anomaly in
 	// front of the crew, and the only one that gives up its core.
 	research_reward = MISSION_RESEARCH_PAY_HIGH
@@ -269,11 +267,7 @@
 
 /datum/mission/research/containment/update_text()
 	name = "Containment Contract: [anomaly_name]"
-	desc = "A [anomaly_name] has settled inside the derelict at ([target.target_x], [target.target_y]) in the [target_zone_name], and it is stable - it will still be there whenever you arrive. \
-		[hazard_brief] \
-		Neutralize it the standard way: read its field with a handheld analyzer for the frequency and code, dial those into a signaler, and trigger the signaler beside it. \
-		It sheds its core when it goes. Bring that core to the mission pad. \
-		Pays [research_reward] research points as a data dossier - slot it into an R&D console to bank them."
+	desc = "Recover a [anomaly_name] core from ([target.target_x], [target.target_y]) in the [target_zone_name]."
 
 /datum/mission/research/containment/waypoint_label()
 	return "Containment: [anomaly_name]"
@@ -292,12 +286,13 @@
 	name = "Core Sample Contract"
 	weight = 7
 	mission_limit = 1
-	voucher_count = 1
+	voucher_count = 0
+	guarded_prize_family = "waves"
 	quest_lost_policy = MISSION_QUEST_LOST_RETARGET
 	gps_tag_prefix = "STRAT"
 	research_origin = "planetary geology"
-	value_min = 450
-	value_max = 700
+	value_min = 300
+	value_max = 450
 	// Green band; the zone table scales it. Middle of the ladder: a real trip and a
 	// fight for it, but the crew brings back rock rather than live physics.
 	research_reward = MISSION_RESEARCH_PAY_MEDIUM
@@ -342,11 +337,7 @@
 
 /datum/mission/research/core_sample/update_text()
 	name = "Core Sample Contract: [objective_name]"
-	desc = "We need a [objective_name] off the planet at ([target.target_x], [target.target_y]) in the [target_zone_name]. \
-		Our drop seeded [chain ? chain.points_total : 3] survey pylons across one stretch of the surface. Calibrate each with an empty hand, in any order. \
-		Each calibration draws a wave of hostiles, so go armed. The last pylon prints the [objective_name] core; bring that core to the mission pad. \
-		Pays [research_reward] research points as a data dossier plus [voucher_count] trade voucher[voucher_count > 1 ? "s" : ""]. Slot the dossier into an R&D console to bank the points. \
-		Tap a GPS unit on the mission board to receive a beacon for every pylon still standing ([gps_tag])."
+	desc = "Sample requested from ([target.target_x], [target.target_y]) in the [target_zone_name]: [objective_name]."
 
 /datum/mission/research/core_sample/waypoint_label()
 	return "Core Sample: [objective_name]"
diff --git a/voidcrew/modules/missions/missions/suppression.dm b/voidcrew/modules/missions/missions/suppression.dm
index af7723ddb51..8d7f9bebc0d 100644
--- a/voidcrew/modules/missions/missions/suppression.dm
+++ b/voidcrew/modules/missions/missions/suppression.dm
@@ -13,7 +13,7 @@
 	name = "Suppression Sweep"
 	weight = 8
 	mission_limit = 2
-	voucher_count = 1
+	voucher_count = 0
 
 	/// Kills asked for
 	var/required_kills = 8
@@ -34,18 +34,20 @@
 	if(prob(30))
 		minimum_zone = ZONE_RED
 		required_kills = rand(5, 7)
-		value_min = 1800
-		value_max = 2600
+		value_min = 1100
+		value_max = 1500
 		difficulty = MISSION_DIFFICULTY_HARD
 		target_zone_name = ZONE_NAME_RED
 	else
 		minimum_zone = ZONE_YELLOW
 		required_kills = rand(7, 10)
-		value_min = 1100
-		value_max = 1600
+		value_min = 700
+		value_max = 1000
 		difficulty = MISSION_DIFFICULTY_MEDIUM
 		target_zone_name = ZONE_NAME_YELLOW
 
+	quote_zone = minimum_zone
+
 /datum/mission/suppression/build_objectives()
 	counter = new
 	counter.required_kills = required_kills
@@ -54,6 +56,4 @@
 
 /datum/mission/suppression/update_text()
 	name = "Suppression Sweep: [target_zone_name]"
-	desc = "Confirm [required_kills] pirate faction NPC kills in the [target_zone_name][minimum_zone == ZONE_YELLOW ? " or deeper" : ""] after accepting this contract. \
-		Your crew must make the kill or have a living member nearby to confirm it. Player pirates and destroyed ships do not count. \
-		Complete the full quota, then collect the contract payment at the mission board. Includes [voucher_count] trade voucher[voucher_count > 1 ? "s" : ""]."
+	desc = "Wanted dead: [required_kills] pirates in the [target_zone_name][minimum_zone == ZONE_YELLOW ? " or deeper" : ""]."
diff --git a/voidcrew/modules/missions/missions/survey.dm b/voidcrew/modules/missions/missions/survey.dm
index 8283b516d33..12f4a6bca63 100644
--- a/voidcrew/modules/missions/missions/survey.dm
+++ b/voidcrew/modules/missions/missions/survey.dm
@@ -16,39 +16,27 @@
 	/// The scan objective, for UI progress keys
 	var/datum/mission_objective/scan_celestial/scan
 
-/datum/mission/survey/Destroy()
-	scan = null
-	return ..()
-
-/datum/mission/survey/generate_details()
-	// Types match the keys from survey_research.survey_objects_by_type
 	var/static/list/survey_targets = list(
 		// Easy - common, easy to find objects
-		list("type" = "any", "name" = "celestial objects", "name_singular" = "celestial object", "amount" = 3, "value_min" = 400, "value_max" = 600, "difficulty" = MISSION_DIFFICULTY_EASY),
-		list("type" = "nebulas", "name" = "nebulas", "name_singular" = "nebula", "amount" = 2, "value_min" = 300, "value_max" = 500, "difficulty" = MISSION_DIFFICULTY_EASY),
-		list("type" = "asteroids", "name" = "asteroid fields", "name_singular" = "asteroid field", "amount" = 2, "value_min" = 400, "value_max" = 600, "difficulty" = MISSION_DIFFICULTY_EASY),
+		list("type" = "any", "name" = "celestial objects", "name_singular" = "celestial object", "amount" = 3, "value_min" = 100, "value_max" = 160, "difficulty" = MISSION_DIFFICULTY_EASY),
+		list("type" = "nebulas", "name" = "nebulas", "name_singular" = "nebula", "amount" = 2, "value_min" = 80, "value_max" = 120, "difficulty" = MISSION_DIFFICULTY_EASY),
+		list("type" = "asteroids", "name" = "asteroid fields", "name_singular" = "asteroid field", "amount" = 2, "value_min" = 100, "value_max" = 160, "difficulty" = MISSION_DIFFICULTY_EASY),
 		// Medium - require more exploration or specific types
-		list("type" = "planets", "name" = "planets", "name_singular" = "planet", "amount" = 2, "value_min" = 700, "value_max" = 1000, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
-		list("type" = "electric_storms", "name" = "electrical storms", "name_singular" = "electrical storm", "amount" = 2, "value_min" = 600, "value_max" = 900, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
-		list("type" = "space_ruins", "name" = "space ruins", "name_singular" = "space ruin", "amount" = 2, "value_min" = 700, "value_max" = 1000, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
+		list("type" = "planets", "name" = "planets", "name_singular" = "planet", "amount" = 2, "value_min" = 180, "value_max" = 260, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
+		list("type" = "electric_storms", "name" = "electrical storms", "name_singular" = "electrical storm", "amount" = 2, "value_min" = 160, "value_max" = 240, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
+		list("type" = "space_ruins", "name" = "space ruins", "name_singular" = "space ruin", "amount" = 2, "value_min" = 180, "value_max" = 260, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
 		// Hard - rare or dangerous objects
-		list("type" = "stars", "name" = "stars", "name_singular" = "star", "amount" = 1, "value_min" = 1200, "value_max" = 1800, "difficulty" = MISSION_DIFFICULTY_HARD),
-		list("type" = "emp_storms", "name" = "EMP storms", "name_singular" = "EMP storm", "amount" = 2, "value_min" = 1000, "value_max" = 1500, "difficulty" = MISSION_DIFFICULTY_HARD),
-		list("type" = "planets", "name" = "planets", "name_singular" = "planet", "amount" = 4, "value_min" = 1400, "value_max" = 2000, "difficulty" = MISSION_DIFFICULTY_HARD),
+		list("type" = "stars", "name" = "stars", "name_singular" = "star", "amount" = 1, "value_min" = 160, "value_max" = 240, "difficulty" = MISSION_DIFFICULTY_HARD),
+		list("type" = "emp_storms", "name" = "EMP storms", "name_singular" = "EMP storm", "amount" = 2, "value_min" = 240, "value_max" = 360, "difficulty" = MISSION_DIFFICULTY_HARD),
+		list("type" = "planets", "name" = "planets", "name_singular" = "planet", "amount" = 4, "value_min" = 320, "value_max" = 440, "difficulty" = MISSION_DIFFICULTY_HARD),
 	)
 
-	// Possible item rewards by difficulty
-	var/static/list/medium_rewards = list(
-		/obj/item/gun/ballistic/automatic/pistol,
-		/obj/item/gun/energy/laser/retro,
-		/obj/item/gun/ballistic/revolver,
-	)
-	var/static/list/hard_rewards = list(
-		/obj/item/gun/energy/laser,
-		/obj/item/gun/energy/laser/carbine,
-		/obj/item/gun/ballistic/shotgun/riot,
-		/obj/item/gun/ballistic/automatic/wt550,
-	)
+/datum/mission/survey/Destroy()
+	scan = null
+	return ..()
+
+/datum/mission/survey/generate_details()
+	// Types match the keys from survey_research.survey_objects_by_type
 
 	var/list/ask = pick(survey_targets)
 	target_type = ask["type"]
@@ -59,13 +47,26 @@
 	value_max = ask["value_max"]
 	difficulty = ask["difficulty"]
 
-	// Assign random item reward based on difficulty
-	switch(difficulty)
-		if(MISSION_DIFFICULTY_MEDIUM)
-			if(prob(50)) // 50% chance for item reward
-				mission_reward = pick(medium_rewards)
-		if(MISSION_DIFFICULTY_HARD)
-			mission_reward = pick(hard_rewards) // Always get a reward for hard
+/// Utility is rolled once, after the posting zone and ask difficulty are fixed.
+/datum/mission/survey/roll_posted_rewards()
+	..()
+	if(difficulty == MISSION_DIFFICULTY_EASY || (difficulty == MISSION_DIFFICULTY_MEDIUM && !prob(50)))
+		return
+	mission_reward = pick(get_utility_pool())
+
+/datum/mission/survey/proc/get_utility_pool()
+	var/static/list/medium = list(
+		list(/obj/item/gps, /obj/item/extraction_pack),
+		list(/obj/item/t_scanner/adv_mining_scanner, /obj/item/analyzer/ranged),
+		list(/obj/item/clothing/glasses/meson/night, /obj/item/inducer/orderable),
+	)
+	var/static/list/hard = list(
+		list(/obj/item/t_scanner/adv_mining_scanner, /obj/item/survivalcapsule),
+		list(/obj/item/healthanalyzer/advanced, /obj/item/tank/jetpack/oxygen),
+		list(/obj/item/construction/rcd, /obj/item/survivalcapsule),
+	)
+	var/zone = quote_zone || ZONE_GREEN
+	return difficulty == MISSION_DIFFICULTY_HARD ? hard[zone] : medium[zone]
 
 /datum/mission/survey/build_objectives()
 	scan = new
@@ -78,8 +79,7 @@
 /datum/mission/survey/update_text()
 	var/display_name = required_amount == 1 ? target_name_singular : target_name
 	name = "Survey Contract: [display_name]"
-	desc = "Use your ship's orbital survey console to scan [required_amount] [display_name] after accepting this contract. \
-		Nothing to bring back - payment is settled at the mission board once the scans are logged."
+	desc = "Survey requested: [required_amount] [display_name]."
 
 /datum/mission/survey/get_ui_data()
 	var/list/data = ..()
diff --git a/voidcrew/modules/missions/objectives/combat.dm b/voidcrew/modules/missions/objectives/combat.dm
index dc9bded3307..a9f08365fff 100644
--- a/voidcrew/modules/missions/objectives/combat.dm
+++ b/voidcrew/modules/missions/objectives/combat.dm
@@ -100,6 +100,11 @@
 /datum/mission_objective/field/proc/spawn_field_objects(turf/spawn_turf)
 	return
 
+/// Construct against the mission site before replacement rolls or caller setup.
+/datum/mission_objective/field/proc/spawn_field_npc(mob_type, turf/spawn_turf, role = "auto", finalize = TRUE)
+	var/datum/npc_spawn_context/context = new(mission?.target || src, mission?.target?.get_zone_type(), role, source_turf = spawn_turf)
+	return spawn_npc_in_zone(mob_type, spawn_turf, context, finalize)
+
 /**
  * Marks a mob the contract can't finish without, so the planet's fauna sweep
  * leaves it alone (SSplanet_mobs clears every unclaimed living mob off an empty
@@ -149,8 +154,8 @@
 	var/target_mob_type
 	/// Guard typepaths spawned around the target (may repeat; may be empty)
 	var/list/guard_types
-	/// Whether the named target is dead (the proof tag exists)
-	var/target_killed = FALSE
+	/// Proof subtype, shared by the initial kill and subsequent interior rewinds.
+	var/proof_type = /obj/item/mission_recovery/proof
 	/// The live target, while they're alive
 	var/mob/living/target_mob
 
@@ -161,41 +166,61 @@
 	return ..()
 
 /datum/mission_objective/field/kill_named/reset()
+	deactivate() // also unhook a surviving target before forgetting it
 	. = ..()
-	target_killed = FALSE
-	target_mob = null
 
 /datum/mission_objective/field/kill_named/spawn_field_objects(turf/spawn_turf)
-	var/mob/living/target = new target_mob_type(spawn_turf)
+	if(mission.named_kill_completed)
+		create_proof(spawn_turf)
+		complete()
+		return
+	var/mob/living/target = spawn_field_npc(target_mob_type, spawn_turf, finalize = FALSE)
 	target.name = mission.objective_name
 	target.desc += " They look like they're worth something dead."
-	target_mob = target
-	protect_field_mob(target)
-	RegisterSignal(target, COMSIG_LIVING_DEATH, PROC_REF(on_target_death))
-	mission.register_quest_atom(target)
+	target.npc_spawn_context.finalize()
+	track_target(target)
 	// The entourage: untracked muscle around the target. Killing them pays
 	// nothing - the contract is the name on the tag.
 	for(var/guard_type in guard_types)
-		var/mob/living/guard = new guard_type(get_nearby_open_turf(spawn_turf))
+		var/mob/living/guard = spawn_field_npc(guard_type, get_nearby_open_turf(spawn_turf), finalize = FALSE)
 		guard.desc += " They're on somebody's payroll."
+		guard.npc_spawn_context.finalize()
+
+/// Keep death tracking and the cash entitlement attached to the same mission.
+/datum/mission_objective/field/kill_named/proc/track_target(mob/living/target)
+	target_mob = target
+	protect_field_mob(target)
+	if(istype(target, /mob/living/basic/trooper/pirate/faction))
+		var/mob/living/basic/trooper/pirate/faction/pirate = target
+		pirate.mission_payout_ref = WEAKREF(mission)
+	RegisterSignal(target, COMSIG_LIVING_DEATH, PROC_REF(on_target_death))
+	mission.register_quest_atom(target)
+
+/datum/mission_objective/field/kill_named/proc/get_proof_name()
+	return "[mission.objective_name]'s identification tag"
+
+/// The one proof factory for both a first kill and recovery after a rewind.
+/datum/mission_objective/field/kill_named/proc/create_proof(atom/proof_location)
+	var/obj/item/mission_recovery/proof = new proof_type(proof_location)
+	proof.name = get_proof_name()
+	mission.bind_item(proof)
+	mission.register_quest_atom(proof)
+	return proof
 
 /**
  * The target died: drop the proof item, track it instead, and advance.
  */
 /datum/mission_objective/field/kill_named/proc/on_target_death(mob/living/source, gibbed)
 	SIGNAL_HANDLER
-	if(target_killed || !mission || mission.failed || mission.completed)
+	if(!active || source != target_mob || !mission || mission.failed || mission.completed || mission.named_kill_completed)
 		return
-	target_killed = TRUE
+	mission.named_kill_completed = TRUE
 	UnregisterSignal(source, COMSIG_LIVING_DEATH)
 	target_mob = null
 
-	var/obj/item/mission_recovery/proof/proof = new(source.drop_location())
-	proof.name = "[mission.objective_name]'s identification tag"
-	mission.bind_item(proof)
-	mission.register_quest_atom(proof)
+	create_proof(source.drop_location())
 
-	notify_crew("[mission.objective_name] eliminated. Recover the identification tag and return it to the mission pad.")
+	notify_crew("[mission.objective_name] is dead.")
 	complete()
 
 /datum/mission_objective/field/kill_named/get_progress_string()
@@ -250,7 +275,7 @@
 		return
 	kill_count++
 	if(kill_count >= required_kills)
-		notify_crew("Suppression quota met ([kill_count]/[required_kills]). Return to the mission board to collect payment.")
+		notify_crew("Suppression sweep complete.")
 		complete()
 		return
 	notify_crew("Kill confirmed: [kill_count]/[required_kills].", sound = 'voidcrew/sound/notify2.ogg')
diff --git a/voidcrew/modules/missions/objectives/deliver.dm b/voidcrew/modules/missions/objectives/deliver.dm
index d5cffbdc03f..98223b2f100 100644
--- a/voidcrew/modules/missions/objectives/deliver.dm
+++ b/voidcrew/modules/missions/objectives/deliver.dm
@@ -26,15 +26,9 @@
 /datum/mission_objective/deliver/proc/describe_ask()
 	return required_amount > 1 ? "[required_amount] [required_name]" : required_name
 
-/// Shared contract text for the item forms and stack sizes accepted at turn-in.
+/// Kept for callers that used to append delivery instructions.
 /datum/mission_objective/deliver/proc/get_delivery_instructions()
-	. = ""
-	if(ispath(required_type, /obj/item/stack) && required_amount > 1)
-		. += " Bring the full quantity in one stack; only the requested amount will be taken."
-	if(ispath(required_type, /obj/item/stack/ore/bluespace_crystal))
-		. += " Natural, refined, or artificial individual bluespace crystals are accepted. Split bluespace polycrystals into individual crystals before delivery."
-	else if(ispath(required_type, /obj/item/stack/ore))
-		. += " Keep the material unrefined; smelted sheets do not count."
+	return ""
 
 /datum/mission_objective/deliver/get_progress_string()
 	if(required_amount > 1 && delivered_count > 0)
@@ -65,6 +59,8 @@
 	return ..()
 
 /datum/mission_objective/deliver/accept_item(obj/item/item, atom/reward_anchor)
+	if(completed || QDELETED(item) || !can_turn_in(item))
+		return MISSION_ITEM_REFUSED
 	// The delivered item is often the mission's tracked quest atom; stop the
 	// destruction watch before consuming it, or qdel fires it synchronously and
 	// handle_quest_loss() voids the contract mid-turn-in (outpost_quests.dm
@@ -83,6 +79,17 @@
 	notify_crew("[mission.name]: [delivered_count]/[required_amount] [required_name] received.")
 	return MISSION_ITEM_PROGRESS
 
+/// Salvage stays exact; original Syndicate intelligence comes in several variants.
+/datum/mission_objective/deliver/console/matches_ask(obj/item/item)
+	if(QDELETED(item))
+		return FALSE
+	if(required_type == /obj/item/documents/syndicate)
+		return istype(item, /obj/item/documents/syndicate)
+	return item.type == required_type
+
+/datum/mission_objective/deliver/console/can_turn_in(obj/item/item)
+	return !completed && matches_ask(item) && ..()
+
 // =========================================================================
 // BOUND ITEM: a specific quest item this mission spawned
 // =========================================================================
diff --git a/voidcrew/modules/missions/objectives/site_ops.dm b/voidcrew/modules/missions/objectives/site_ops.dm
index ccc592049ee..0689c21430e 100644
--- a/voidcrew/modules/missions/objectives/site_ops.dm
+++ b/voidcrew/modules/missions/objectives/site_ops.dm
@@ -178,7 +178,7 @@
 	// Survey complete: the last pylon prints the core
 	var/obj/item/mission_recovery/core = new(pylon.drop_location())
 	core.name = "[mission.objective_name] core"
-	core.desc = "A completed survey core, warm from compiling. The mission pad will accept it."
+	core.desc = "A completed survey core, warm from compiling."
 	mission.bind_item(core)
 	mission.register_quest_atom(core)
 	notify_crew("Survey complete. Recover the [mission.objective_name] core and return it to the mission pad.")
@@ -253,7 +253,7 @@
 	anomaly.stabilize(anchor = TRUE)
 	anomaly.countdown?.stop()
 	RegisterSignal(anomaly, COMSIG_QDELETING, PROC_REF(on_anomaly_gone))
-	notify_crew("Containment target is live and holding at the site. Read its field with an analyzer, then match that frequency and code on a signaler to neutralize it.")
+	notify_crew("Containment target confirmed at the site.")
 
 /**
  * The anomaly is gone. A proper neutralization has already dropped its core on
@@ -305,7 +305,7 @@
 	/// Health fraction at turn-in for the "still walking" pay bonus
 	var/unharmed_threshold = 0.8
 	/// Multiplier applied to mission credits when unharmed
-	var/unharmed_bonus = 2
+	var/unharmed_bonus = 1.25
 	/// How long a flatlined survivor stays recoverable before the contract writes them off
 	var/revival_grace = 3 MINUTES
 	/// Timer id for the grace window; non-null exactly while the survivor is down
@@ -391,7 +391,7 @@
 	if(grace_timer) // already counting down; a re-death mid-revival doesn't restart it
 		return
 	grace_timer = addtimer(CALLBACK(src, PROC_REF(on_grace_expired)), revival_grace, TIMER_STOPPABLE)
-	notify_crew("Survivor's vitals flatlined - the beacon is still holding their tag. Get them breathing again within [DisplayTimeText(revival_grace)] and the contract stands.", type = SHIP_NOTIFY_WARNING)
+	notify_crew("Survivor's vitals flatlined.", type = SHIP_NOTIFY_WARNING)
 
 /// Somebody got them back up inside the window
 /datum/mission_objective/field/escort/proc/on_survivor_revived(mob/living/source, full_heal_flags)
@@ -402,7 +402,7 @@
 		return
 	clear_grace()
 	was_revived = TRUE
-	notify_crew("Survivor is breathing again. Bring them to the pad - the fee holds, the unharmed bonus does not.")
+	notify_crew("Survivor is breathing again.")
 
 /// Nobody brought them back in time
 /datum/mission_objective/field/escort/proc/on_grace_expired()
@@ -439,11 +439,11 @@
 	if(QDELETED(survivor))
 		return
 	clear_grace()
-	// Still walking pays double - somebody who had to be brought back doesn't count,
+	// Somebody who had to be brought back doesn't count toward the unharmed bonus,
 	// however healthy the revival left them
 	if(!was_revived && survivor.health >= survivor.maxHealth * unharmed_threshold)
 		mission.value *= unharmed_bonus
-		notify_crew("Survivor recovered unharmed - fee doubled.")
+		notify_crew("Survivor recovered unharmed.")
 	// Repatriation: they step onto the pad and ship out
 	var/mob/living/leaving = survivor
 	UnregisterSignal(leaving, list(COMSIG_LIVING_DEATH, COMSIG_LIVING_REVIVE))
@@ -517,7 +517,7 @@
 		return FALSE
 	kit = new(kit_turf)
 	kit.objective_ref = WEAKREF(src)
-	notify_crew("Claim beacon kit delivered to your mission pad. Deploy it while holding at the marked coordinates.")
+	notify_crew("Claim beacon kit delivered.")
 	return TRUE
 
 /// Whether the ship is close enough to the stake coordinates to count
@@ -539,7 +539,7 @@
 	QDEL_NULL(kit)
 	var/datum/mission_target/target = mission.target
 	beacon.file_claim("Prospect filing: mineral-rights claim staked at grid [target.target_x], [target.target_y]. Claim matures in [round(defend_duration / (1 MINUTES))] minutes. All counterclaims settled on-site.")
-	notify_crew("Claim filed on Wideband. The whole sector heard it - hold the site for [round(defend_duration / (1 MINUTES))] minutes.", type = SHIP_NOTIFY_WARNING)
+	notify_crew("Claim filed on Wideband.", type = SHIP_NOTIFY_WARNING)
 
 /// One second of defending, ticked by the beacon's process
 /datum/mission_objective/claim_defense/proc/tick_defense(seconds)
@@ -565,7 +565,7 @@
 	deed_printed = TRUE
 	var/obj/item/mission_recovery/deed = new(beacon.drop_location())
 	deed.name = "notarized claim deed"
-	deed.desc = "A matured mineral-rights filing, printed and bonded. The mission pad will accept it."
+	deed.desc = "A matured mineral-rights filing, printed and bonded."
 	mission.bind_item(deed)
 	mission.register_quest_atom(deed)
 	beacon.retire()
diff --git a/voidcrew/modules/mob/living/simple_animal/friendly/sea_crystal.dm b/voidcrew/modules/mob/living/simple_animal/friendly/sea_crystal.dm
index 3e14c208c7d..7d39700d394 100644
--- a/voidcrew/modules/mob/living/simple_animal/friendly/sea_crystal.dm
+++ b/voidcrew/modules/mob/living/simple_animal/friendly/sea_crystal.dm
@@ -61,6 +61,7 @@
 
 /obj/structure/spawner/sea_crystal/Initialize(mapload)
 	. = ..()
+	get_npc_spawn_context()
 	for(var/turf/adjacent in RANGE_TURFS(1, src))
 		if(ismineralturf(adjacent))
 			var/turf/closed/mineral/mineral = adjacent
@@ -135,28 +136,25 @@
 		return FALSE
 
 	COOLDOWN_START(src, summon_cooldown, cooldown_time)
+	// Retain a separate construction context per landing before the source can die.
+	var/datum/npc_spawn_context/source_context = get_npc_spawn_context()
+	var/list/summon_contexts = list()
+	for(var/turf/summon_turf as anything in summon_turfs)
+		summon_contexts[summon_turf] = new /datum/npc_spawn_context(src, source_context.zone_type)
 	crystal_power()
-	// Both legs are scheduled HERE, while the crystal is certainly alive, rather
-	// than the telegraph chaining the landing. addtimer() stack_traces when the
-	// callback's object is already qdeleting, and the whole point of the change
-	// below is that the landing has to survive the crystal dying mid-windup.
-	addtimer(CALLBACK(src, PROC_REF(summon_telegraph), summon_turfs, center), 2.5 SECONDS)
-	addtimer(CALLBACK(src, PROC_REF(summon_hivelords), summon_turfs), 3.5 SECONDS)
+	// Datum destruction cancels its own timers. Independent callbacks retain the
+	// committed landing contexts, with only a weak reference back to the crystal.
+	addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(sea_crystal_summon_telegraph), summon_turfs, center), 2.5 SECONDS)
+	addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(sea_crystal_summon_hivelords), summon_turfs, summon_contexts, WEAKREF(src)), 3.5 SECONDS)
 	return TRUE
 
 /**
  * Sparks and camera shake, one second before the hivelords actually land.
  *
- * Deliberately NOT guarded on QDELETED(src), and neither is summon_hivelords():
- * a committed wave lands even if the crystal is broken during its own three and
- * a half second windup. Both used to bail there, which meant the harder a crew
- * hit the crystal the less it answered with, and a fast kill produced no
- * hivelords whatsoever - the one case the answer exists for. The landing spots
- * were picked when the wave was committed, so nothing here needs the crystal to
- * still be standing; `origin` is carried through because a broken spawner has
- * been moved to nullspace and its own loc is no longer a turf.
+ * The independent timer survives the crystal's destruction. Landing spots,
+ * origin and spawn contexts were all pinned when the wave was committed.
  */
-/obj/structure/spawner/sea_crystal/proc/summon_telegraph(list/summon_turfs, turf/origin)
+/proc/sea_crystal_summon_telegraph(list/summon_turfs, turf/origin)
 	if(!length(summon_turfs) || isnull(origin))
 		return
 	for(var/mob/mob in range(10, origin))
@@ -167,19 +165,24 @@
 		new /obj/effect/temp_visual/seacrystal/sparks(summon_turf)
 		new /obj/effect/temp_visual/seacrystal/arrival(summon_turf)
 
-/obj/structure/spawner/sea_crystal/proc/summon_hivelords(list/summon_turfs)
-	var/still_standing = !QDELETED(src)
+/proc/sea_crystal_summon_hivelords(list/summon_turfs, list/summon_contexts, datum/weakref/crystal_ref)
+	var/obj/structure/spawner/sea_crystal/crystal = crystal_ref.resolve()
 	for(var/turf/summon_turf as anything in summon_turfs)
-		var/mob/living/basic/mining/hivelord/beach/hivelord = new(summon_turf)
+		var/datum/npc_spawn_context/context = summon_contexts[summon_turf]
+		var/mob/living/basic/mining/hivelord/beach/hivelord = spawn_npc_in_zone(/mob/living/basic/mining/hivelord/beach, summon_turf, context)
 		// A broken crystal keeps no ledger: it will never summon again, and
 		// registering on the hivelord would hold the dead spawner alive through
 		// the signal until the mob died.
-		if(!still_standing)
+		if(QDELETED(crystal))
 			continue
-		live_hivelords += hivelord
-		RegisterSignals(hivelord, list(COMSIG_LIVING_DEATH, COMSIG_QDELETING), PROC_REF(on_hivelord_gone))
-	if(still_standing)
-		crystal_depower()
+		crystal.track_hivelord(hivelord)
+	if(!QDELETED(crystal))
+		crystal.crystal_depower()
+
+/// A surviving crystal tracks its own wave until the hivelords die or disappear.
+/obj/structure/spawner/sea_crystal/proc/track_hivelord(mob/living/hivelord)
+	live_hivelords += hivelord
+	RegisterSignals(hivelord, list(COMSIG_LIVING_DEATH, COMSIG_QDELETING), PROC_REF(on_hivelord_gone))
 
 /// Free the slot on death rather than on deletion - a corpse is not a threat.
 /obj/structure/spawner/sea_crystal/proc/on_hivelord_gone(datum/source)
diff --git a/voidcrew/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm b/voidcrew/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm
index 9f6813270b1..d220a368806 100644
--- a/voidcrew/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm
+++ b/voidcrew/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm
@@ -1,6 +1,7 @@
 /mob/living/basic/mining/ice_demon/random/Initialize()
 	. = ..()
-	if(prob(15))
+	var/datum/npc_spawn_context/context = GLOB.npc_zone_construction_context
+	if(context?.zone_type == ZONE_RED && prob(15))
 		new /mob/living/simple_animal/hostile/asteroid/old_demon(loc)
 		return INITIALIZE_HINT_QDEL
 
@@ -62,6 +63,5 @@
 	move_resist = MOVE_RESIST_DEFAULT
 	pull_force = PULL_FORCE_DEFAULT
 	new /obj/item/stack/ore/bluespace_crystal(loc, 10)
-	if(prob(20))
-		new /obj/item/assembly/signaler/anomaly/bluespace(loc)
+	// Core rolls use the shared spawn-bound allowance in anomalies/core_rewards.dm.
 	return ..()
diff --git a/voidcrew/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm b/voidcrew/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm
index 63f4b66c4d3..8963ec41abd 100644
--- a/voidcrew/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm
+++ b/voidcrew/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm
@@ -39,5 +39,5 @@
 /mob/living/simple_animal/hostile/asteroid/polarbear/random/Initialize()
 	. = ..()
 	if(prob(15))
-		new /mob/living/simple_animal/hostile/asteroid/polarbear/warrior(loc)
+		spawn_npc_in_zone(/mob/living/simple_animal/hostile/asteroid/polarbear/warrior, loc, get_npc_spawn_context(), FALSE)
 		return INITIALIZE_HINT_QDEL
diff --git a/voidcrew/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm b/voidcrew/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm
index da80bd6cb72..3244e474397 100644
--- a/voidcrew/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm
+++ b/voidcrew/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm
@@ -69,7 +69,7 @@
 /mob/living/basic/mining/wolf/random/Initialize()
 	. = ..()
 	if(prob(15))
-		new /mob/living/basic/mining/wolf/alpha(loc)
+		spawn_npc_in_zone(/mob/living/basic/mining/wolf/alpha, loc, get_npc_spawn_context(), FALSE)
 		return INITIALIZE_HINT_QDEL
 
 /mob/living/basic/mining/wolf/wasteland
@@ -81,5 +81,5 @@
 /mob/living/basic/mining/wolf/wasteland/random/Initialize()
 	. = ..()
 	if(prob(15))
-		new /mob/living/basic/mining/wolf/alpha/wasteland(loc)
+		spawn_npc_in_zone(/mob/living/basic/mining/wolf/alpha/wasteland, loc, get_npc_spawn_context(), FALSE)
 		return INITIALIZE_HINT_QDEL
diff --git a/voidcrew/modules/mob/living/simple_animal/hostile/wasteland/hermits.dm b/voidcrew/modules/mob/living/simple_animal/hostile/wasteland/hermits.dm
index ddbadbbbbe0..e59848796f3 100644
--- a/voidcrew/modules/mob/living/simple_animal/hostile/wasteland/hermits.dm
+++ b/voidcrew/modules/mob/living/simple_animal/hostile/wasteland/hermits.dm
@@ -54,10 +54,10 @@
 /mob/living/simple_animal/hostile/asteroid/hermit/survivor/random/Initialize()
 	. = ..()
 	if(prob(10))
-		new /mob/living/simple_animal/hostile/asteroid/hermit/ranged/gunslinger(loc)
+		spawn_npc_in_zone(/mob/living/simple_animal/hostile/asteroid/hermit/ranged/gunslinger, loc, get_npc_spawn_context(), FALSE)
 		return INITIALIZE_HINT_QDEL
 	if(prob(35))
-		new /mob/living/simple_animal/hostile/asteroid/hermit/ranged/hunter(loc)
+		spawn_npc_in_zone(/mob/living/simple_animal/hostile/asteroid/hermit/ranged/hunter, loc, get_npc_spawn_context(), FALSE)
 		return INITIALIZE_HINT_QDEL
 
 /mob/living/simple_animal/hostile/asteroid/hermit/ranged
diff --git a/voidcrew/modules/nanites/code/machines/nanite_cloud_control.dm b/voidcrew/modules/nanites/code/machines/nanite_cloud_control.dm
index 54a4ace922d..9471f2b343a 100644
--- a/voidcrew/modules/nanites/code/machines/nanite_cloud_control.dm
+++ b/voidcrew/modules/nanites/code/machines/nanite_cloud_control.dm
@@ -1,6 +1,6 @@
 /obj/machinery/computer/nanite_cloud_controller
 	name = "nanite programmer"
-	desc = "Downloads nanite programs from the techweb servers, edits them, and stores and controls nanite cloud backups. Cloud networks are local to the ship this console is aboard: nanites can only join one by having their cloud ID set in a nanite chamber on the same ship, and cloud IDs on other ships are separate networks even if the numbers match."
+	desc = "A console for programming nanites and storing cloud backups."
 	icon = 'voidcrew/modules/nanites/icons/research.dmi'
 	icon_state = "nanite_cloud_controller"
 	circuit = /obj/item/circuitboard/computer/nanite_cloud_controller
@@ -223,6 +223,25 @@
 		data["cloud_backups"] = backup_list
 	return data
 
+/// Check the whole backup against the receiver's live research before replacing any programs.
+/obj/machinery/computer/nanite_cloud_controller/proc/can_import_backup(list/programs)
+	if(QDELETED(linked_techweb))
+		unsync_research_servers()
+		return FALSE
+	if(!validate_research_site(linked_techweb) || !islist(programs))
+		return FALSE
+	var/list/researched_program_types = list()
+	for(var/design_id in linked_techweb.researched_designs)
+		var/datum/design/nanites/design = linked_techweb.isDesignResearchedID(design_id)
+		if(!istype(design) || QDELETED(design) || !(design.build_type & NANITE_PROGRAM) || !ispath(design.program_type, /datum/nanite_program))
+			continue
+		researched_program_types[design.program_type] = TRUE
+	// Do not filter this loop: an invalid entry must reject the entire backup.
+	for(var/datum/nanite_program/program as anything in programs)
+		if(!istype(program) || QDELETED(program) || !researched_program_types[program.type])
+			return FALSE
+	return TRUE
+
 /obj/machinery/computer/nanite_cloud_controller/ui_static_data(mob/user)
 	var/list/data = list()
 	if(!validate_research_site(linked_techweb))
@@ -352,9 +371,12 @@
 						disk.backup += program.copy()
 			. = TRUE
 		if("load_backup")
-			if(disk)
+			if(!QDELETED(disk) && disk.loc == src)
 				var/datum/nanite_cloud_backup/backup = get_backup(current_view)
 				if(backup)
+					if(!can_import_backup(disk.backup))
+						to_chat(usr, span_warning("Backup refused."))
+						return TRUE
 					playsound(src, 'sound/machines/terminal/terminal_prompt.ogg', 25, FALSE)
 					var/datum/component/nanites/nanites = backup.nanites
 					QDEL_LIST(nanites.programs)
diff --git a/voidcrew/modules/nanites/code/nanite_component.dm b/voidcrew/modules/nanites/code/nanite_component.dm
index 5b0d9a2c0d4..e2cc6707728 100644
--- a/voidcrew/modules/nanites/code/nanite_component.dm
+++ b/voidcrew/modules/nanites/code/nanite_component.dm
@@ -1,3 +1,4 @@
+#define NANITE_SYNC_REFUSED (1<<2)
 #define NANITE_DEFAULT_MAX_VOLUME 500
 
 /datum/component/nanites
@@ -32,10 +33,14 @@
 	var/next_sync = 0
 	///World time before which the "can't reach the cloud" warning stays quiet, so an unreachable cloud tells the host at most once every NANITE_CLOUD_WARNING_DELAY
 	var/next_cloud_warning = 0
+	/// Capacity refusals have a separate throttle from unreachable clouds.
+	var/next_update_warning = 0
 	///TRUE while the host still has to be told that the cloud took their programming over. Set whenever a cloud ID is assigned, cleared by the first sync that changes anything.
 	var/announce_cloud_takeover = FALSE
 	///All nanite programs in the user
 	var/list/datum/nanite_program/programs = list()
+	/// Suppress intermediate checks and brownouts while committing an already checked complete set.
+	var/programming_transaction = FALSE
 	///How many programs this user can have at once
 	var/max_programs = NANITE_PROGRAM_LIMIT
 
@@ -137,6 +142,7 @@
 /datum/component/nanites/Destroy()
 	STOP_PROCESSING(SSnanites, src)
 	QDEL_LIST(programs)
+	cyberware_reevaluate_brownout(host_mob)
 	if(host_mob)
 		set_nanite_bar(TRUE)
 		host_mob.hud_set_nanite_indicator()
@@ -151,6 +157,7 @@
 		adjust_nanites(null, amount) //just add to the nanite volume
 
 /datum/component/nanites/process()
+	capacity_changed()
 	if(!HAS_TRAIT(host_mob, TRAIT_STASIS))
 		adjust_nanites(null, regen_rate)
 		for(var/datum/nanite_program/NP as anything in programs)
@@ -179,6 +186,7 @@
  *
  * Returns a bitfield describing what actually changed, so callers can tell a sync that rewrote the
  * host's programming from the 30-second one that found everything already identical:
+ * * NANITE_SYNC_REFUSED - the complete package exceeded the host's capacity
  * * NANITE_SYNC_ADDED - programs were installed
  * * NANITE_SYNC_REPLACED - programming the host already had was deleted or overwritten with different settings
  */
@@ -186,11 +194,24 @@
 	. = NONE
 	var/list/programs_to_remove = programs.Copy()
 	var/list/programs_to_add = source.programs.Copy()
+	// Build the complete result before copying settings or deleting incumbents.
 	for(var/datum/nanite_program/NP as anything in programs)
 		for(var/datum/nanite_program/SNP as anything in programs_to_add)
 			if(NP.type == SNP.type)
 				programs_to_remove -= NP
 				programs_to_add -= SNP
+				break
+	var/list/result = programs.Copy()
+	if(full_overwrite)
+		result -= programs_to_remove
+	result += programs_to_add
+	if(length(result) > max_programs || !programs_fit_capacity(result))
+		capacity_changed()
+		return NANITE_SYNC_REFUSED
+	programming_transaction = TRUE
+	for(var/datum/nanite_program/NP as anything in programs)
+		for(var/datum/nanite_program/SNP as anything in source.programs)
+			if(NP.type == SNP.type)
 				if(SNP.programming_differs(NP, copy_activation))
 					. |= NANITE_SYNC_REPLACED
 				SNP.copy_programming(NP, copy_activation)
@@ -202,6 +223,31 @@
 	for(var/datum/nanite_program/SNP as anything in programs_to_add)
 		. |= NANITE_SYNC_ADDED
 		add_program(null, SNP.copy())
+	programming_transaction = FALSE
+	capacity_changed()
+
+/// Cloud backups have no body. Only a hosted complete result has a capacity ceiling.
+/datum/component/nanites/proc/programs_fit_capacity(list/result)
+	if(!iscarbon(host_mob))
+		return TRUE
+	var/load = get_chrome_load(host_mob)
+	for(var/datum/nanite_program/program in programs)
+		load -= program.capacity_cost()
+	for(var/datum/nanite_program/program in result)
+		load += program.capacity_cost()
+	return load <= get_chrome_capacity(host_mob)
+
+/datum/component/nanites/proc/capacity_changed()
+	if(!programming_transaction)
+		cyberware_reevaluate_brownout(host_mob)
+
+/// Only withdraw effects here; resuming uses normal processing and its fuel/condition checks.
+/datum/component/nanites/proc/settle_capacity(over)
+	if(programming_transaction)
+		return
+	for(var/datum/nanite_program/program in programs)
+		if(over && program.capacity_beneficial() && program.passive_enabled)
+			program.disable_passive_effect()
 
 /**
  * Tells the host one line about what their nanites are doing. Dropped entirely when there is no
@@ -224,6 +270,12 @@
 				if(cloud_copy)
 					var/sync_changes = sync_programming(cloud_copy)
 					next_cloud_warning = 0 //the cloud is back, so a future outage warns immediately
+					if(sync_changes & NANITE_SYNC_REFUSED)
+						if(world.time >= next_update_warning)
+							next_update_warning = world.time + NANITE_CLOUD_WARNING_DELAY
+							notify_host("Nanite update refused.", warning = TRUE)
+						return
+					next_update_warning = 0
 					//The cloud copy is authoritative, so the first sync after joining a cloud wipes
 					//whatever the host programmed locally. Say so once instead of letting it look
 					//like the programming vanished on its own.
@@ -246,16 +298,29 @@
 /datum/component/nanites/proc/add_program(datum/source, datum/nanite_program/new_program, datum/nanite_program/source_program)
 	SIGNAL_HANDLER
 
-	for(var/X in programs)
-		var/datum/nanite_program/NP = X
+	if(new_program in programs)
+		capacity_changed()
+		return COMPONENT_PROGRAM_INSTALLED
+	var/list/replaced = list()
+	for(var/datum/nanite_program/NP in programs)
 		if(NP.unique && NP.type == new_program.type)
-			qdel(NP)
-	if(programs.len >= max_programs)
+			replaced += NP
+	var/list/result = programs - replaced
+	result += new_program
+	if(length(result) > max_programs)
 		return COMPONENT_PROGRAM_NOT_INSTALLED
+	if(!programming_transaction && !installed_capacity_check(host_mob, list(new_program), replaced, silent = TRUE))
+		return COMPONENT_PROGRAM_NOT_INSTALLED
+	var/was_transaction = programming_transaction
+	programming_transaction = TRUE
+	for(var/datum/nanite_program/NP in replaced)
+		qdel(NP)
 	if(source_program)
 		source_program.copy_programming(new_program)
 	programs += new_program
 	new_program.on_add(src)
+	programming_transaction = was_transaction
+	capacity_changed()
 	return COMPONENT_PROGRAM_INSTALLED
 
 /datum/component/nanites/proc/consume_nanites(amount, force = FALSE)
@@ -391,6 +456,7 @@
 		//A new cloud owes the host one takeover notice, and starts with a clean warning cooldown
 		announce_cloud_takeover = !!cloud_id
 		next_cloud_warning = 0
+		next_update_warning = 0
 	//Re-pair to the ship the host is standing on when the ID is assigned. Chambers can only
 	//set this on their occupant, so joining a ship's cloud requires being physically aboard it.
 	cloud_ship_ref = (cloud_id && host_mob) ? WEAKREF(get_service_site(host_mob)) : null
@@ -522,3 +588,5 @@
 	data["mob_programs"] = mob_programs
 
 #undef NANITE_DEFAULT_MAX_VOLUME
+
+#undef NANITE_SYNC_REFUSED
diff --git a/voidcrew/modules/nanites/code/programs/_programs.dm b/voidcrew/modules/nanites/code/programs/_programs.dm
index ecc6b2f1774..8766160f419 100644
--- a/voidcrew/modules/nanites/code/programs/_programs.dm
+++ b/voidcrew/modules/nanites/code/programs/_programs.dm
@@ -1,3 +1,36 @@
+// Exact types are resolved before category defaults, independently of table order.
+GLOBAL_LIST_INIT(nanite_program_capacity_costs, list(
+	/datum/nanite_program/regenerative_advanced = 6,
+	/datum/nanite_program/defib = 6,
+	/datum/nanite_program/regenerative = 3,
+	/datum/nanite_program/repairing = 3,
+	/datum/nanite_program/hardening = 3,
+	/datum/nanite_program/refractive = 3,
+	/datum/nanite_program/nervous = 3,
+	/datum/nanite_program/adrenaline = 3,
+	/datum/nanite_program/purging = 2,
+	/datum/nanite_program/purging_advanced = 2,
+	/datum/nanite_program/brain_heal_advanced = 2,
+	/datum/nanite_program/coagulating = 2,
+	/datum/nanite_program/access = 2,
+	/datum/nanite_program/viral = 2,
+	/datum/nanite_program/emp = 2,
+	/datum/nanite_program/spreading = 2,
+	/datum/nanite_program/brain_heal = 1,
+	/datum/nanite_program/blood_restoring = 1,
+	/datum/nanite_program/temperature = 1,
+	/datum/nanite_program/conductive = 1,
+	/datum/nanite_program/mindshield = 1,
+	/datum/nanite_program/self_scan = 1,
+	/datum/nanite_program/stealth = 1,
+	/datum/nanite_program/metabolic_synthesis = 1,
+	/datum/nanite_program/mitosis = 1,
+	/datum/nanite_program/nanite_sting = 1,
+	/datum/nanite_program/protocol = 1,
+	/datum/nanite_program/sensor = 0,
+	/datum/nanite_program = 0,
+))
+
 /datum/nanite_program
 	var/name = "Generic Nanite Program"
 	var/desc = "Warn a coder if you can read this."
@@ -82,8 +115,27 @@
 		on_mob_remove()
 	if(nanites)
 		nanites.programs -= src
+		nanites.capacity_changed()
+	nanites = null
+	host_mob = null
 	return ..()
 
+/datum/nanite_program/proc/capacity_cost()
+	// Walk the type tree, so a specific zero also overrides a costed category.
+	var/program_type = type
+	while(ispath(program_type, /datum/nanite_program))
+		if(program_type in GLOB.nanite_program_capacity_costs)
+			return GLOB.nanite_program_capacity_costs[program_type]
+		program_type = type2parent(program_type)
+	return 0
+
+/// Paid support programs pause on overload. Hostile payloads retain their effects.
+/datum/nanite_program/proc/capacity_beneficial()
+	return capacity_cost() > 0 && !istype(src, /datum/nanite_program/viral) && !istype(src, /datum/nanite_program/emp) && !istype(src, /datum/nanite_program/spreading) && !istype(src, /datum/nanite_program/nanite_sting)
+
+/datum/nanite_program/proc/capacity_blocked()
+	return capacity_beneficial() && iscarbon(host_mob) && get_chrome_load(host_mob) > get_chrome_capacity(host_mob)
+
 /datum/nanite_program/proc/copy()
 	var/datum/nanite_program/new_program = new type()
 	copy_programming(new_program, TRUE)
@@ -213,6 +265,10 @@
 		timer_restart_next = world.time + timer_restart
 
 /datum/nanite_program/proc/on_process()
+	if(capacity_blocked())
+		if(passive_enabled)
+			disable_passive_effect()
+		return
 	if(!activated)
 		if(timer_restart_next && world.time > timer_restart_next)
 			activate()
@@ -269,6 +325,8 @@
 
 //Checks conditions then fires the nanite trigger effect
 /datum/nanite_program/proc/trigger(delayed = FALSE, comm_message)
+	if(capacity_blocked())
+		return
 	if(!can_trigger)
 		return
 	if(!activated || force_disabled)
diff --git a/voidcrew/modules/nanites/code/programs/buffing.dm b/voidcrew/modules/nanites/code/programs/buffing.dm
index f1afcb13bab..ad5aab4a6d8 100644
--- a/voidcrew/modules/nanites/code/programs/buffing.dm
+++ b/voidcrew/modules/nanites/code/programs/buffing.dm
@@ -38,20 +38,30 @@
 
 /datum/nanite_program/hardening
 	name = "Dermal Hardening"
-	desc = "The nanites form a mesh under the host's skin, protecting them from melee and bullet impacts."
+	desc = "The nanites form a mesh under the host's skin."
 	use_rate = 1.0
 	rogue_types = list(/datum/nanite_program/skin_decay)
 
 #define NANITE_ARMOR_BOOST_ADDED 30
+#define NANITE_ARMOR_COST_PER_DAMAGE 1
 
 //TODO on_hit effect that turns skin grey for a moment
 /datum/nanite_program/hardening/enable_passive_effect()
+	if(passive_enabled || !ishuman(host_mob) || nanite_armor_exhausted())
+		return
 	. = ..()
 	if(ishuman(host_mob))
 		var/mob/living/carbon/human/user = host_mob
 		user.physiology.armor = user.physiology.armor.generate_new_with_modifiers(list(MELEE = NANITE_ARMOR_BOOST_ADDED, BULLET = NANITE_ARMOR_BOOST_ADDED))
+		RegisterSignal(user, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(nanite_resolve_hit_armor))
+
+/datum/nanite_program/hardening/active_effect()
+	nanite_armor_exhausted()
 
 /datum/nanite_program/hardening/disable_passive_effect()
+	if(!passive_enabled)
+		return
+	UnregisterSignal(host_mob, COMSIG_MOB_APPLY_DAMAGE)
 	. = ..()
 	if(ishuman(host_mob))
 		var/mob/living/carbon/human/user = host_mob
@@ -61,17 +71,26 @@
 
 /datum/nanite_program/refractive
 	name = "Dermal Refractive Surface"
-	desc = "The nanites form a membrane above the host's skin, reducing the effect of laser and energy impacts."
+	desc = "The nanites form a reflective membrane above the host's skin."
 	use_rate = 1.0
 	rogue_types = list(/datum/nanite_program/skin_decay)
 
 /datum/nanite_program/refractive/enable_passive_effect()
+	if(passive_enabled || !ishuman(host_mob) || nanite_armor_exhausted())
+		return
 	. = ..()
 	if(ishuman(host_mob))
 		var/mob/living/carbon/human/user = host_mob
 		user.physiology.armor = user.physiology.armor.generate_new_with_modifiers(list(LASER = NANITE_ARMOR_BOOST_ADDED, ENERGY = NANITE_ARMOR_BOOST_ADDED))
+		RegisterSignal(user, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(nanite_resolve_hit_armor))
+
+/datum/nanite_program/refractive/active_effect()
+	nanite_armor_exhausted()
 
 /datum/nanite_program/refractive/disable_passive_effect()
+	if(!passive_enabled)
+		return
+	UnregisterSignal(host_mob, COMSIG_MOB_APPLY_DAMAGE)
 	. = ..()
 	if(ishuman(host_mob))
 		var/mob/living/carbon/human/user = host_mob
@@ -79,6 +98,83 @@
 		if(user.physiology)
 			user.physiology.armor = user.physiology.armor.generate_new_with_modifiers(list(LASER = -NANITE_ARMOR_BOOST_ADDED, ENERGY = -NANITE_ARMOR_BOOST_ADDED))
 
+/// Both armor programs draw on the same reserve. Recovery still goes through normal upkeep.
+/datum/nanite_program/proc/nanite_armor_exhausted()
+	if(nanites && nanites.nanite_volume > nanites.safety_threshold)
+		return FALSE
+	if(nanites)
+		for(var/datum/nanite_program/program in nanites.programs)
+			if(program.passive_enabled && (istype(program, /datum/nanite_program/hardening) || istype(program, /datum/nanite_program/refractive)))
+				program.disable_passive_effect()
+	return TRUE
+
+/**
+ * Bill only the incremental armor supplied by this program, once apply_damage accepts a hit.
+ * The signal has no armor category: projectiles supply theirs, items use melee, and source-less
+ * brute/burn hits fall back to melee/laser. Unknown caller modifiers are approximated by treating
+ * the reported blocked value as the cap. Forced hits with blocked = 0 and direct limb damage
+ * are intentionally unbilled. An underfunded hit keeps its already calculated protection.
+ */
+/datum/nanite_program/proc/nanite_resolve_hit_armor(mob/living/carbon/human/source, damage, damagetype, def_zone, blocked, wound_bonus, exposed_wound_bonus, sharpness, attack_direction, attacking_item)
+	SIGNAL_HANDLER
+	if(!passive_enabled || damage <= 0 || blocked <= 0 || blocked >= 100 || (damagetype != BRUTE && damagetype != BURN))
+		return
+	if(nanite_armor_exhausted())
+		return
+
+	var/armor_flag = damagetype == BRUTE ? MELEE : LASER
+	var/penetration = 0
+	var/weak_against_armor = FALSE
+	if(istype(attacking_item, /obj/projectile))
+		var/obj/projectile/projectile = attacking_item
+		armor_flag = projectile.armor_flag
+		penetration = projectile.armour_penetration
+		weak_against_armor = projectile.weak_against_armour
+	else if(isitem(attacking_item))
+		var/obj/item/weapon = attacking_item
+		armor_flag = MELEE
+		penetration = weapon.armour_penetration
+		weak_against_armor = weapon.weak_against_armour
+	if(istype(src, /datum/nanite_program/hardening))
+		if(armor_flag != MELEE && armor_flag != BULLET)
+			return
+	else if(armor_flag != LASER && armor_flag != ENERGY)
+		return
+
+	// Rebuild clothing's multiplicative remainder without temporarily changing the host's armor.
+	var/list/parts = isbodypart(def_zone) ? list(def_zone) : source.bodyparts
+	var/clothing_remainder = 0
+	for(var/obj/item/bodypart/part in parts)
+		var/part_remainder = 1
+		for(var/obj/item/clothing/clothing in source.get_clothing_on_part(part))
+			part_remainder *= (100 - min(clothing.get_armor_rating(armor_flag), 100)) / 100
+		clothing_remainder += part_remainder
+	clothing_remainder /= max(length(parts), 1)
+	var/armor_with = source.getarmor(def_zone, armor_flag)
+	var/physiology_without = source.physiology.armor.get_rating(armor_flag) - NANITE_ARMOR_BOOST_ADDED
+	var/armor_without = 100 - clothing_remainder * (100 - min(physiology_without, 100))
+	if(weak_against_armor)
+		armor_with *= ARMOR_WEAKENED_MULTIPLIER
+		armor_without *= ARMOR_WEAKENED_MULTIPLIER
+	if(armor_with > 0)
+		armor_with = max(0, PENETRATE_ARMOUR(armor_with, penetration))
+	if(armor_without > 0)
+		armor_without = max(0, PENETRATE_ARMOUR(armor_without, penetration))
+	var/armor_delta = max(0, min(blocked, armor_with) - min(blocked, armor_without))
+	var/cost = damage * armor_delta / (100 - blocked) * NANITE_ARMOR_COST_PER_DAMAGE
+	if(cost <= 0)
+		return
+
+	var/datum/component/nanites/swarm = nanites
+	var/available = max(0, swarm.nanite_volume - swarm.safety_threshold)
+	if(cost >= available)
+		// Disable before withdrawing: a zero-safety swarm deletes itself at zero volume.
+		for(var/datum/nanite_program/program in swarm.programs)
+			if(program.passive_enabled && (istype(program, /datum/nanite_program/hardening) || istype(program, /datum/nanite_program/refractive)))
+				program.disable_passive_effect()
+	swarm.adjust_nanites(null, -min(cost, available))
+
+#undef NANITE_ARMOR_COST_PER_DAMAGE
 #undef NANITE_ARMOR_BOOST_ADDED
 
 /datum/nanite_program/coagulating
diff --git a/voidcrew/modules/nanites/code/programs/healing.dm b/voidcrew/modules/nanites/code/programs/healing.dm
index 2a7c65ea73a..f3ac5be1a7f 100644
--- a/voidcrew/modules/nanites/code/programs/healing.dm
+++ b/voidcrew/modules/nanites/code/programs/healing.dm
@@ -209,37 +209,82 @@
 
 /datum/nanite_program/defib
 	name = "Defibrillation"
-	desc = "The nanites shock the host's heart when triggered, bringing them back to life if the body can sustain it."
+	desc = "The nanites deliver a pulse to the host's heart."
 	can_trigger = TRUE
 	trigger_cost = 25
 	trigger_cooldown = 120
 	rogue_types = list(/datum/nanite_program/shocking)
 
 /datum/nanite_program/defib/on_trigger(comm_message)
-	host_mob.notify_revival("Your heart is being defibrillated by nanites. Re-enter your corpse if you want to be revived!")
-	host_mob.grab_ghost()
-	addtimer(CALLBACK(src, PROC_REF(zap)), 50)
+	if(!check_revivable())
+		return
+	var/mob/living/carbon/patient = host_mob
+	patient.notify_revival("Your heart is being defibrillated by nanites.")
+	if(patient.can_defib() == DEFIB_POSSIBLE)
+		patient.grab_ghost()
+	addtimer(CALLBACK(src, PROC_REF(zap), WEAKREF(patient)), 5 SECONDS)
 
 /datum/nanite_program/defib/proc/check_revivable()
-	if(!iscarbon(host_mob)) //nonstandard biology
+	if(QDELETED(src) || QDELETED(host_mob) || !iscarbon(host_mob) || host_mob.stat != DEAD)
 		return FALSE
 	var/mob/living/carbon/C = host_mob
-	if(C.get_ghost())
-		return FALSE
-	return C.can_defib()
+	var/defib_result = C.can_defib()
+	return defib_result == DEFIB_POSSIBLE || defib_result == DEFIB_NOGRAB_AGHOST
+
+/datum/nanite_program/defib/proc/zap(datum/weakref/intended_host)
+	var/mob/living/carbon/patient = intended_host?.resolve()
+	if(QDELETED(patient) || host_mob != patient || !check_revivable() || capacity_blocked())
+		return
+	playsound(patient, 'sound/machines/defib/defib_charge.ogg', 50, FALSE)
+	sleep(3 SECONDS)
+	if(QDELETED(src) || QDELETED(patient) || host_mob != patient || capacity_blocked())
+		return
+	playsound(patient, 'sound/machines/defib/defib_zap.ogg', 50, FALSE)
+	if(!defibrillate() && !capacity_blocked())
+		playsound(patient, 'sound/machines/defib/defib_failed.ogg', 50, FALSE)
 
-/datum/nanite_program/defib/proc/zap()
+/// Rechecked after the windup, immediately before healing and revival.
+/datum/nanite_program/defib/proc/defibrillate()
+	if(!check_revivable() || capacity_blocked())
+		return FALSE
 	var/mob/living/carbon/C = host_mob
-	playsound(C, 'sound/machines/defib/defib_charge.ogg', 50, FALSE)
-	sleep(30)
-	playsound(C, 'sound/machines/defib/defib_zap.ogg', 50, FALSE)
-	if(check_revivable())
-		playsound(C, 'sound/machines/defib/defib_success.ogg', 50, FALSE)
-		C.set_heartattack(FALSE)
-		C.revive(full_heal_flags = HEAL_ADMIN)
-		C.emote("gasp")
-		C.set_timed_status_effect(10 SECONDS, /datum/status_effect/jitter, only_if_higher = TRUE)
-		SEND_SIGNAL(C, COMSIG_LIVING_MINOR_SHOCK)
-		log_game("[C] has been successfully defibrillated by nanites.")
+	C.heal_for_defib()
+	C.set_heartattack(FALSE)
+	if(capacity_blocked() || !C.revive_from("nanites"))
+		return FALSE
+	playsound(C, 'sound/machines/defib/defib_success.ogg', 50, FALSE)
+	C.emote("gasp")
+	C.set_timed_status_effect(10 SECONDS, /datum/status_effect/jitter, only_if_higher = TRUE)
+	SEND_SIGNAL(C, COMSIG_LIVING_MINOR_SHOCK)
+	log_game("[C] has been successfully defibrillated by nanites.")
+	return TRUE
+
+/// The paddles' damage redistribution, shared with nanites. Leaves unrelated injuries alone.
+/mob/living/carbon/proc/heal_for_defib()
+	var/target_health = -50
+	var/need_mob_update = FALSE
+	if(health > target_health)
+		need_mob_update += adjustOxyLoss(health - target_health, updating_health = FALSE)
 	else
-		playsound(C, 'sound/machines/defib/defib_failed.ogg', 50, FALSE)
+		// Limb damage has different health weights. Heal the same fraction of each
+		// limb's injuries, rather than selecting random limbs for an aggregate heal.
+		var/overall_damage = maxHealth - health
+		if(overall_damage <= 0)
+			return
+		var/healing_fraction = (target_health - health) / overall_damage
+		need_mob_update += adjustOxyLoss(-getOxyLoss() * healing_fraction, updating_health = FALSE)
+		need_mob_update += adjustToxLoss(-getToxLoss() * healing_fraction, updating_health = FALSE, forced = TRUE)
+		var/brute_fraction = can_adjust_brute_loss(-getBruteLoss() * healing_fraction, FALSE, null) ? healing_fraction : 0
+		var/burn_fraction = can_adjust_fire_loss(-getFireLoss() * healing_fraction, FALSE, null) ? healing_fraction : 0
+		var/update_overlays = FALSE
+		for(var/obj/item/bodypart/part as anything in bodyparts)
+			var/brute_heal = part.brute_dam * brute_fraction
+			var/burn_heal = part.burn_dam * burn_fraction
+			if(!brute_heal && !burn_heal)
+				continue
+			update_overlays |= part.heal_damage(brute_heal, burn_heal, updating_health = FALSE)
+			need_mob_update = TRUE
+		if(update_overlays)
+			update_damage_overlays()
+	if(need_mob_update)
+		updatehealth()
diff --git a/voidcrew/modules/nanites/code/programs/utility.dm b/voidcrew/modules/nanites/code/programs/utility.dm
index 6f8a6f8ec17..73a45190360 100644
--- a/voidcrew/modules/nanites/code/programs/utility.dm
+++ b/voidcrew/modules/nanites/code/programs/utility.dm
@@ -28,19 +28,28 @@
 
 /datum/nanite_program/monitoring
 	name = "Monitoring"
-	desc = "The nanites monitor the host's vitals and location, sending them to the suit sensor network."
+	desc = "A quiet pulse follows the host's heartbeat."
 	rogue_types = list(/datum/nanite_program/toxic)
 
 /datum/nanite_program/monitoring/enable_passive_effect()
 	. = ..()
 	SSnanites.nanite_monitored_mobs |= host_mob
+	GLOB.crewmonitor.data_by_scope.Cut()
+	GLOB.crewmonitor.last_update.Cut()
 	host_mob.hud_set_nanite_indicator()
 
 /datum/nanite_program/monitoring/disable_passive_effect()
 	. = ..()
 	SSnanites.nanite_monitored_mobs -= host_mob
+	GLOB.crewmonitor.data_by_scope.Cut()
+	GLOB.crewmonitor.last_update.Cut()
 	host_mob.hud_set_nanite_indicator()
 
+/datum/nanite_program/monitoring/on_mob_remove()
+	. = ..()
+	if(host_mob in SSnanites.nanite_monitored_mobs)
+		disable_passive_effect()
+
 /datum/nanite_program/self_scan
 	name = "Host Scan"
 	desc = "The nanites display a detailed readout of a body scan to the host."
@@ -181,19 +190,18 @@
 
 /datum/nanite_program/spreading
 	name = "Infective Exo-Locomotion"
-	desc = "The nanites gain the ability to survive for brief periods outside of the human body, as well as the ability to start new colonies without an integration process; \
-			resulting in an extremely infective strain of nanites."
+	desc = "A restless swarm that drifts between nearby bodies."
 	use_rate = 1.50
 	rogue_types = list(/datum/nanite_program/aggressive_replication, /datum/nanite_program/necrotic)
 	var/spread_cooldown = 0
 
 /datum/nanite_program/spreading/active_effect()
-	if(spread_cooldown < world.time)
+	if(world.time < spread_cooldown)
 		return
-	spread_cooldown = world.time + 50
+	spread_cooldown = world.time + 5 SECONDS
 	var/list/mob/living/carbon/human/target_hosts = list()
 	for(var/mob/living/carbon/human/L in oview(5, host_mob))
-		if(!prob(25))
+		if(!roll_infection_chance(25))
 			continue
 		if(!(L.mob_biotypes & (MOB_ORGANIC|MOB_UNDEAD)))
 			continue
@@ -201,7 +209,8 @@
 	if(!target_hosts.len)
 		return
 	var/mob/living/carbon/human/infectee = pick(target_hosts)
-	if(prob(100 - infectee.wear_suit.get_armor_rating(BIO)))
+	var/bio_protection = infectee.wear_suit ? infectee.wear_suit.get_armor_rating(BIO) : 0
+	if(roll_infection_chance(100 - bio_protection))
 		//this will potentially take over existing nanites!
 		infectee.AddComponent(/datum/component/nanites, null, 10)
 		SEND_SIGNAL(infectee, COMSIG_NANITE_SYNC, nanites)
@@ -209,10 +218,10 @@
 
 /datum/nanite_program/nanite_sting
 	name = "Nanite Sting"
-	desc = "When triggered, projects a nearly invisible spike of nanites that attempts to infect a nearby non-host with a copy of the host's nanites cluster."
+	desc = "The swarm forms a fine needle beneath the skin."
 	can_trigger = TRUE
 	trigger_cost = 5
-	trigger_cooldown = 100
+	trigger_cooldown = 10 SECONDS
 	rogue_types = list(/datum/nanite_program/glitch, /datum/nanite_program/toxic)
 
 /datum/nanite_program/nanite_sting/on_trigger(comm_message)
@@ -225,13 +234,18 @@
 		consume_nanites(-5)
 		return
 	var/mob/living/carbon/human/infectee = pick(target_hosts)
-	if(prob(100 - infectee.wear_suit.get_armor_rating(BIO)))
+	var/bio_protection = infectee.wear_suit ? infectee.wear_suit.get_armor_rating(BIO) : 0
+	if(roll_infection_chance(100 - bio_protection))
 		//unlike with Infective Exo-Locomotion, this can't take over existing nanites, because Nanite Sting only targets non-hosts.
 		infectee.AddComponent(/datum/component/nanites, null, 5)
 		SEND_SIGNAL(infectee, COMSIG_NANITE_SYNC, nanites)
 		log_game("[infectee] was infected by a nanite cluster by [key_name(host_mob)] at [AREACOORD(infectee)].")
 		to_chat(infectee, span_warning("You feel a tiny prick."))
 
+/// Chance gate for infection candidates and their suit protection.
+/datum/nanite_program/proc/roll_infection_chance(chance)
+	return prob(chance)
+
 /datum/nanite_program/mitosis
 	name = "Mitosis"
 	desc = "The nanites gain the ability to self-replicate, using bluespace to power the process. Becomes more effective the more nanites are already in the host.\
diff --git a/voidcrew/modules/npc_scaling/damage.dm b/voidcrew/modules/npc_scaling/damage.dm
new file mode 100644
index 00000000000..56c4a5aa973
--- /dev/null
+++ b/voidcrew/modules/npc_scaling/damage.dm
@@ -0,0 +1,39 @@
+/// Capture this NUMBER on delayed effects, so creator deletion cannot change damage.
+/mob/living/proc/get_npc_zone_damage_factor()
+	if(npc_zone_applied && is_npc_zone_exempt())
+		exempt_npc_zone()
+	return npc_zone_damage_factor
+
+/// Raw ability input by default. Set already_scaled for a roll of scaled melee bounds.
+/// Delayed effects pass their captured numeric factor instead of retaining a mob.
+/proc/npc_zone_damage(raw_damage, source_or_factor, already_scaled = FALSE)
+	if(already_scaled)
+		return raw_damage
+	var/factor = 1
+	if(isliving(source_or_factor))
+		var/mob/living/source = source_or_factor
+		factor = source.get_npc_zone_damage_factor()
+	else if(isnum(source_or_factor))
+		factor = source_or_factor
+	return raw_damage * factor
+
+/// Always pass RAW weapon force/bounds, including when re-equipping the same weapon.
+/mob/living/proc/set_npc_zone_melee(raw_lower, raw_upper)
+	npc_zone_original_melee_lower = raw_lower
+	npc_zone_original_melee_upper = raw_upper
+	var/factor = get_npc_zone_damage_factor()
+	melee_damage_lower = raw_lower * factor
+	melee_damage_upper = raw_upper * factor
+
+/obj/projectile
+	/// A reused/reflected projectile retains its first factor, never multiplying twice.
+	var/npc_zone_damage_scaled = FALSE
+	var/npc_zone_damage_factor = 1
+
+/mob/living/proc/npc_zone_projectile(datum/source, obj/projectile/projectile)
+	SIGNAL_HANDLER
+	if(projectile.npc_zone_damage_scaled)
+		return
+	projectile.npc_zone_damage_scaled = TRUE
+	projectile.npc_zone_damage_factor = get_npc_zone_damage_factor()
+	projectile.damage *= projectile.npc_zone_damage_factor
diff --git a/voidcrew/modules/npc_scaling/spawn_hooks.dm b/voidcrew/modules/npc_scaling/spawn_hooks.dm
new file mode 100644
index 00000000000..94014ca6222
--- /dev/null
+++ b/voidcrew/modules/npc_scaling/spawn_hooks.dm
@@ -0,0 +1,94 @@
+/// Construction scope only; InitAtom does not sleep. Nested spawn calls restore it.
+GLOBAL_VAR(npc_zone_construction_context)
+
+/**
+ * The single constructor for profiled producers. A context is per construction,
+ * including its replacement chain. Pass finalize = FALSE when the caller still
+ * has body/weapon/faction setup to do; call context.finalize() afterwards.
+ * Returns the surviving replacement when Initialize deletes the requested body.
+ * Non-mob outputs (nests, portals) keep the context for their later spawns.
+ * constructor_args, when supplied, are the Initialize arguments after location.
+ */
+/proc/spawn_npc_in_zone(spawn_type, atom/location, datum/npc_spawn_context/context, finalize = TRUE, list/constructor_args)
+	var/datum/npc_spawn_context/previous = GLOB.npc_zone_construction_context
+	GLOB.npc_zone_construction_context = context
+	var/list/spawn_args = list(location)
+	if(constructor_args)
+		spawn_args += constructor_args
+	var/atom/created = new spawn_type(arglist(spawn_args))
+	GLOB.npc_zone_construction_context = previous
+	if(QDELETED(created))
+		for(var/datum/weakref/body_ref as anything in context.bodies)
+			var/mob/living/body = body_ref.resolve()
+			if(!QDELETED(body))
+				created = body
+				break
+	else
+		created.npc_spawn_context = context
+		if(isliving(created))
+			context.bodies |= WEAKREF(created)
+	if(finalize)
+		context.finalize()
+	return created
+
+/// Pin an environmental parent's source before its first emission, not at child death.
+/atom/proc/get_npc_spawn_context()
+	if(!npc_spawn_context)
+		npc_spawn_context = GLOB.npc_zone_construction_context || new /datum/npc_spawn_context(src)
+	return npc_spawn_context
+
+// The initialization-complete signal is emitted even for INITIALIZE_HINT_QDEL.
+// Wrapping InitAtom keeps context active through the ENTIRE subtype Initialize,
+// including replacement rolls after ..(), without modifying those mob types.
+/datum/controller/subsystem/atoms/InitAtom(atom/target, from_template = FALSE, list/arguments)
+	if(!isliving(target) || QDELETED(target))
+		return ..()
+	var/datum/npc_spawn_context/previous = GLOB.npc_zone_construction_context
+	var/datum/npc_spawn_context/context = previous
+	var/owns_context = FALSE
+	if(isliving(target))
+		context ||= target.npc_spawn_context
+		if(!context && arguments && arguments[1])
+			context = new /datum/npc_spawn_context(target)
+			owns_context = TRUE
+		if(context)
+			GLOB.npc_zone_construction_context = context
+			target.npc_spawn_context = context
+			context.bodies |= WEAKREF(target)
+		RegisterSignal(target, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZE, PROC_REF(npc_zone_initialized))
+	. = ..()
+	GLOB.npc_zone_construction_context = previous
+	if(owns_context || (context?.ready_to_finalize && previous != context))
+		context.finalize()
+
+/datum/controller/subsystem/atoms/proc/npc_zone_initialized(mob/living/source)
+	SIGNAL_HANDLER
+	UnregisterSignal(source, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZE)
+	if(QDELETED(source))
+		return
+	source.npc_zone_initialization_complete = TRUE
+	source.apply_npc_weapon_ladder()
+	// Ownership can change long after spawn. Signals are installed once per body.
+	RegisterSignals(source, list(COMSIG_MOB_LOGIN, COMSIG_MOB_MIND_INITIALIZED, COMSIG_MOB_MIND_TRANSFERRED_INTO), PROC_REF(npc_zone_owned))
+	RegisterSignal(source, COMSIG_LIVING_BEFRIENDED, PROC_REF(npc_zone_befriended))
+	if(source.npc_zone_ready)
+		source.finalize_npc_zone()
+
+/datum/controller/subsystem/atoms/proc/npc_zone_owned(mob/living/source)
+	SIGNAL_HANDLER
+	source.exempt_npc_zone()
+
+/datum/controller/subsystem/atoms/proc/npc_zone_befriended(mob/living/source, mob/living/friend)
+	SIGNAL_HANDLER
+	if(friend && (friend.client || friend.mind || friend.npc_zone_exempt))
+		source.exempt_npc_zone()
+
+// Replace upstream's bare constructor so the regular megafauna attack inherits its source.
+// No parent call: it would create an additional, unprofiled skull.
+/datum/action/cooldown/mob_cooldown/create_legion_skull/create(atom/target)
+	owner.get_npc_spawn_context()
+	var/datum/npc_spawn_context/context = new(owner, role = "ordinary")
+	var/mob/living/basic/legion_brood/minion = spawn_npc_in_zone(/mob/living/basic/legion_brood, owner.loc, context, FALSE)
+	minion.assign_creator(owner)
+	minion.ai_controller.set_blackboard_key(BB_BASIC_MOB_CURRENT_TARGET, target)
+	context.finalize()
diff --git a/voidcrew/modules/npc_scaling/zone_profiles.dm b/voidcrew/modules/npc_scaling/zone_profiles.dm
new file mode 100644
index 00000000000..59385ef4d83
--- /dev/null
+++ b/voidcrew/modules/npc_scaling/zone_profiles.dm
@@ -0,0 +1,219 @@
+/**
+ * Spawn contract: create a context BEFORE construction, use spawn_npc_in_zone(),
+ * finish source-specific body/weapon/faction setup, then context.finalize().
+ * Roles are "auto" (hostile gate + named boss types), "ordinary", "boss", or
+ * "exempt". Explicit combat roles also cover setpieces with otherwise passive AI.
+ * Never edit a context's source, zone or role after construction. Unresolved zones
+ * resolve once against source_turf, never against a moving mob's current location.
+ */
+/datum/npc_spawn_context
+	var/source_id
+	var/source_type
+	var/turf/source_turf
+	var/zone_type
+	var/role
+	var/exempt = FALSE
+	/// Carries a caller's finalization request across deferred map initialization.
+	var/ready_to_finalize = FALSE
+	/// Weak references include replacements; discarded precursors are skipped.
+	var/list/bodies = list()
+	var/datum/zone_resolver/resolver
+	var/suppress_gun_loot = FALSE
+
+/datum/npc_spawn_context/New(datum/source, zone_type, role = "auto", exempt = FALSE, turf/source_turf)
+	var/atom/source_atom = isatom(source) ? source : null
+	var/datum/npc_spawn_context/inherited = source_atom?.npc_spawn_context
+	src.source_id = inherited ? inherited.source_id : REF(source)
+	src.source_type = inherited ? inherited.source_type : source?.type
+	src.source_turf = inherited ? inherited.source_turf : (source_turf || get_turf(source_atom))
+	src.zone_type = isnull(zone_type) ? inherited?.zone_type : zone_type
+	src.role = role
+	suppress_gun_loot = inherited?.suppress_gun_loot || (source_atom && (source_atom.flags_1 & ADMIN_SPAWNED_1))
+	src.exempt = exempt || role == "exempt" || source_atom?.npc_zone_exempt || inherited?.exempt
+	if(isliving(source))
+		var/mob/living/owner = source
+		src.exempt ||= owner.is_npc_zone_exempt()
+	if(isnull(src.zone_type))
+		// Start after New returns: zone_resolver may invoke its callback synchronously.
+		addtimer(CALLBACK(src, PROC_REF(resolve_zone)), 0)
+
+/datum/npc_spawn_context/Destroy()
+	QDEL_NULL(resolver)
+	bodies = null
+	source_turf = null
+	return ..()
+
+/datum/npc_spawn_context/proc/resolve_zone()
+	if(!isnull(zone_type))
+		return
+	resolver = new /datum/zone_resolver(source_turf, CALLBACK(src, PROC_REF(on_zone_resolved)))
+	// A synchronous callback runs before the constructor's result is assigned.
+	if(!isnull(zone_type))
+		resolver = null
+
+/datum/npc_spawn_context/proc/on_zone_resolved(resolved_zone)
+	resolver = null
+	if(!isnull(zone_type))
+		return
+	zone_type = isnull(resolved_zone) ? ZONE_GREEN : resolved_zone
+	for(var/datum/weakref/body_ref as anything in bodies)
+		var/mob/living/body = body_ref.resolve()
+		body?.apply_npc_weapon_ladder()
+		if(body?.npc_zone_ready)
+			body.finalize_npc_zone()
+
+/// Call after ALL source-specific setup, including on replacement bodies.
+/datum/npc_spawn_context/proc/finalize()
+	ready_to_finalize = TRUE
+	for(var/datum/weakref/body_ref as anything in bodies)
+		var/mob/living/body = body_ref.resolve()
+		if(!QDELETED(body))
+			// Conjure marks every surviving summon before its finalization request.
+			if(body.flags_1 & ADMIN_SPAWNED_1)
+				suppress_gun_loot = TRUE
+			body.finalize_npc_zone(src)
+
+/atom
+	/// Also carried by environmental parents so later children use the pinned source.
+	var/datum/npc_spawn_context/npc_spawn_context
+	/// Permanent ownership opt-out. Child contexts copy it even after a profile is removed.
+	var/npc_zone_exempt = FALSE
+
+/mob/living
+	var/npc_zone_initialization_complete = FALSE
+	var/npc_zone_ready = FALSE
+	var/npc_zone_applied = FALSE
+	var/npc_zone_role
+	var/npc_zone_health_factor = 1
+	var/npc_zone_damage_factor = 1
+	var/npc_zone_original_max_health
+	var/npc_zone_original_melee_lower
+	var/npc_zone_original_melee_upper
+
+/// Approved boss classification, including marker types that grant a boss role
+/// to otherwise ordinary bodies. Other setpiece producers pass "boss" explicitly.
+/proc/npc_zone_boss_type(candidate_type)
+	// A lich's disposable images are registered minions, not additional bosses.
+	if(ispath(candidate_type, /mob/living/basic/lich/mirror_image))
+		return FALSE
+	var/static/list/boss_types = list(
+		/mob/living/simple_animal/hostile/megafauna,
+		/mob/living/simple_animal/hostile/asteroid/elite,
+		/mob/living/basic/boss,
+		/mob/living/basic/trooper/pirate/faction/boss,
+		/mob/living/basic/bounty_criminal/boss,
+		/mob/living/basic/bounty_criminal/kingpin,
+		/mob/living/basic/bounty_lair_boss,
+		/mob/living/basic/lich,
+		/mob/living/basic/hoarfrost_matriarch,
+		/mob/living/basic/trooper/pirate/faction/silverscale/captain,
+		/mob/living/basic/trooper/pirate/faction/skeleton/captain,
+		/mob/living/basic/trooper/pirate/faction/grey/captain,
+		/mob/living/basic/trooper/pirate/faction/lustrous/captain,
+		/mob/living/basic/trooper/pirate/faction/interdyne/captain,
+		/mob/living/basic/trooper/pirate/faction/irs/captain,
+		/mob/living/basic/trooper/pirate/faction/medieval/captain,
+		/mob/living/simple_animal/hostile/asteroid/old_demon,
+		/mob/living/basic/mining/wolf/alpha,
+		/mob/living/simple_animal/hostile/asteroid/polarbear/warrior,
+		/obj/effect/zone_mobs/bug/boss,
+		/obj/effect/zone_mobs/cult/boss,
+		/obj/effect/zone_mobs/pirate/boss,
+		/obj/effect/zone_mobs/robot/boss,
+		/obj/effect/zone_mobs/syndicate/boss,
+		/obj/effect/zone_mobs/undead/boss,
+		/obj/effect/zone_mobs/wildlife/boss,
+	)
+	for(var/boss_type in boss_types)
+		if(ispath(candidate_type, boss_type))
+			return TRUE
+	return FALSE
+
+/// Environmental auto gate: passive fauna and mobs without autonomous AI stay baseline.
+/mob/living/proc/is_npc_zone_hostile()
+	if(ishostile(src))
+		return TRUE
+	if(!isbasicmob(src) || !ai_controller)
+		return FALSE
+	if(combat_mode)
+		return TRUE
+	// Autonomous target acquisition does not depend on the pawn's combat stance.
+	for(var/datum/ai_planning_subtree/simple_find_target/targeting in ai_controller.planning_subtrees)
+		if(targeting.target_key == BB_BASIC_MOB_CURRENT_TARGET)
+			return TRUE
+	return FALSE
+
+/mob/living/proc/is_npc_zone_exempt()
+	return npc_zone_exempt || npc_spawn_context?.exempt || client || mind || (FACTION_NEUTRAL in faction)
+
+/mob/living/proc/finalize_npc_zone(datum/npc_spawn_context/context)
+	if(QDELETED(src))
+		return
+	if(!npc_spawn_context)
+		npc_spawn_context = context
+	context = npc_spawn_context
+	if(!context)
+		return
+	context.bodies |= WEAKREF(src)
+	npc_zone_ready = TRUE
+	if(!npc_zone_initialization_complete)
+		return
+	apply_npc_weapon_ladder()
+	if(is_npc_zone_exempt())
+		exempt_npc_zone()
+		return
+	if(npc_zone_applied || isnull(context.zone_type))
+		return
+	if(!isbasicmob(src) && !isanimal(src))
+		return
+	// Named bosses (including the lich) need not start with combat mode enabled.
+	if(context.role == "auto" && !is_npc_zone_hostile() && !npc_zone_boss_type(type))
+		return
+	npc_zone_role = (context.role == "boss" || npc_zone_boss_type(type)) ? "boss" : "ordinary"
+	npc_zone_original_max_health = maxHealth
+	npc_zone_original_melee_lower = melee_damage_lower
+	npc_zone_original_melee_upper = melee_damage_upper
+	switch(context.zone_type)
+		if(ZONE_YELLOW)
+			npc_zone_health_factor = npc_zone_role == "boss" ? 1.15 : 1.35
+			npc_zone_damage_factor = npc_zone_role == "boss" ? 1.1 : 1.15
+		if(ZONE_RED)
+			npc_zone_health_factor = npc_zone_role == "boss" ? 1.3 : 1.8
+			npc_zone_damage_factor = npc_zone_role == "boss" ? 1.2 : 1.35
+	npc_zone_applied = TRUE
+	set_npc_zone_health(npc_zone_original_max_health)
+	set_npc_zone_melee(npc_zone_original_melee_lower, npc_zone_original_melee_upper)
+	RegisterSignal(src, COMSIG_PROJECTILE_FIRER_BEFORE_FIRE, PROC_REF(npc_zone_projectile))
+
+/// Use for raw max-health changes (posse size, phases). Retains the selected factor.
+/mob/living/proc/set_npc_zone_health(raw_max_health)
+	npc_zone_original_max_health = raw_max_health
+	resize_npc_zone_health(raw_max_health * npc_zone_health_factor)
+
+/// Basic and legacy simple animals both store ALL physical damage in bruteloss.
+/// Scale the damage store too, so updatehealth/healing/revival cannot undo the resize.
+/mob/living/proc/resize_npc_zone_health(new_max_health)
+	if(maxHealth <= 0 || new_max_health <= 0)
+		return
+	var/ratio = new_max_health / maxHealth
+	bruteloss *= ratio
+	// Preserve any nonstandard extra loss stores too; do not change stamina.
+	oxyloss *= ratio
+	toxloss *= ratio
+	fireloss *= ratio
+	setMaxHealth(new_max_health)
+	updatehealth()
+
+/// Source producers call this for recruits, guards, pets, arena mobs and summons.
+/// Removal is permanent and preserves health fraction, including on wounded bodies.
+/mob/living/proc/exempt_npc_zone()
+	npc_zone_exempt = TRUE
+	if(!npc_zone_applied)
+		return
+	UnregisterSignal(src, COMSIG_PROJECTILE_FIRER_BEFORE_FIRE)
+	npc_zone_applied = FALSE
+	npc_zone_health_factor = 1
+	npc_zone_damage_factor = 1
+	resize_npc_zone_health(npc_zone_original_max_health)
+	melee_damage_lower = npc_zone_original_melee_lower
+	melee_damage_upper = npc_zone_original_melee_upper
diff --git a/voidcrew/modules/npc_ships/code/_defines.dm b/voidcrew/modules/npc_ships/code/_defines.dm
index 335fd1b08bb..d1c533268ea 100644
--- a/voidcrew/modules/npc_ships/code/_defines.dm
+++ b/voidcrew/modules/npc_ships/code/_defines.dm
@@ -121,10 +121,7 @@ GLOBAL_LIST_EMPTY(patrol_stagger_counter)
 #define COMSIG_BOARDING_ESCALATED "boarding_escalated"              // Fired when player aggression escalates to full combat
 
 // Boarding timing constants
-#define NPC_BOARDING_WAVE_COUNT 3                  // Number of waves before boss
-/// Yellow zone raids are a single crew-scaled wave with no boss - the pirate
-/// leaves once it's repelled. Red keeps the full gauntlet above.
-#define NPC_BOARDING_WAVE_COUNT_YELLOW 1
+#define NPC_BOARDING_WAVE_COUNT 1                  // One crew-sized wave, then a boss in red
 #define NPC_BOARDING_WAVE_COOLDOWN (30 SECONDS)    // Time between waves
 #define NPC_BOARDING_DISENGAGE_DELAY (10 SECONDS)  // Time before pirates leave after victory
 #define NPC_BOARDING_WAVE_TIME_LIMIT (3 MINUTES)   // Max time per wave before escalation
@@ -139,16 +136,6 @@ GLOBAL_LIST_EMPTY(patrol_stagger_counter)
 #define NPC_SHIP_COMBAT_MAX_BOARDERS 10            // Max hostile mobs during ship combat phase
 #define NPC_SHIP_COMBAT_POD_COOLDOWN (15 SECONDS)  // Cooldown between boarding pod volleys
 
-// Boarding difficulty
-/// Health multiplier for crew aboard an NPC ship and for anything it drops on you
-/// in a boarding pod. Applied at the spawn site by scale_npc_ship_pirate_health()
-/// rather than on the mob definitions, because ruin zone spawners, planet spawns
-/// and bounty missions reuse the same faction pirate types and are tuned for their
-/// own zone bands.
-#define NPC_PIRATE_CREW_HEALTH_MULT 1.8
-/// Same, for the faction boss that drops in after the last wave is repelled.
-#define NPC_PIRATE_BOSS_HEALTH_MULT 1.6
-
 // ========== NPC HULL WEALTH ==========
 // What a pirate is carrying in its own accounts, and therefore what a crew can
 // take back off it with a data siphon. Rolled per hull from the faction's
diff --git a/voidcrew/modules/npc_ships/code/admin_verbs.dm b/voidcrew/modules/npc_ships/code/admin_verbs.dm
index fb320e40619..e0c9bbb8c9c 100644
--- a/voidcrew/modules/npc_ships/code/admin_verbs.dm
+++ b/voidcrew/modules/npc_ships/code/admin_verbs.dm
@@ -91,7 +91,8 @@ ADMIN_VERB(spawn_npc_pirate, R_SPAWN|R_DEBUG, "Spawn NPC Pirate", "Spawn an NPC
 	var/setup_patrol = tgui_alert(user, "Set up door-to-door patrol AI? (Requires being on a ship)", "Patrol AI", list("Yes", "No"))
 
 	// Spawn the pirate
-	var/mob/living/basic/trooper/pirate/spawned_pirate = new mob_path(spawn_turf)
+	var/datum/npc_spawn_context/context = new(spawn_turf, null, "ordinary")
+	var/mob/living/basic/trooper/pirate/spawned_pirate = spawn_npc_in_zone(mob_path, spawn_turf, context, FALSE)
 	if(!spawned_pirate)
 		to_chat(user, span_warning("Failed to spawn pirate."))
 		return
@@ -142,6 +143,7 @@ ADMIN_VERB(spawn_npc_pirate, R_SPAWN|R_DEBUG, "Spawn NPC Pirate", "Spawn an NPC
 	else
 		to_chat(user, span_notice("Spawned [spawned_pirate.name] ([selected_faction] - [selected_type]) without patrol AI."))
 
+	context.finalize()
 	message_admins("[key_name_admin(user)] spawned NPC pirate: [spawned_pirate.name] ([selected_faction] - [selected_type]) at [AREACOORD(spawn_turf)]")
 	log_admin("[key_name(user)] spawned NPC pirate: [spawned_pirate.name] ([selected_faction] - [selected_type]) at [AREACOORD(spawn_turf)]")
 	BLACKBOX_LOG_ADMIN_VERB("Spawn NPC Pirate")
diff --git a/voidcrew/modules/npc_ships/code/behaviors/ship_combat_behaviors.dm b/voidcrew/modules/npc_ships/code/behaviors/ship_combat_behaviors.dm
index 8d5383e6817..0b5c1916e1c 100644
--- a/voidcrew/modules/npc_ships/code/behaviors/ship_combat_behaviors.dm
+++ b/voidcrew/modules/npc_ships/code/behaviors/ship_combat_behaviors.dm
@@ -359,11 +359,11 @@
  * Hailing behavior - pirate is demanding tribute, waiting for player response.
  * During this phase:
  * - Pirate follows target but doesn't attack
- * - Player can answer via holopad → NEGOTIATING
+ * - Player can answer via holopad → NEGOTIATING
  * - Player can escape (moving is OK during hailing)
- * - Player locks weapons → immediate COMBAT
- * - Player fires on pirate → immediate COMBAT
- * - 20 seconds pass without answer → escalation
+ * - Player locks weapons → immediate COMBAT
+ * - Player fires on pirate → immediate COMBAT
+ * - 20 seconds pass without answer → escalation
  *
  * What "escalation" means depends on the hail: red opens fire, a broke target
  * gets boarded, and a yellow-band shakedown gets its accounts drained by the
@@ -692,16 +692,7 @@
 	if(target_has_shields)
 		return AI_BEHAVIOR_DELAY
 
-	// Check if we've hit the max boarder cap (10 mobs max during ship combat)
-	var/current_boarders = count_hostile_mobs_on_ship(target)
-	if(current_boarders >= NPC_SHIP_COMBAT_MAX_BOARDERS)
-		return AI_BEHAVIOR_DELAY
-
-	// Calculate number of pods to launch (don't exceed the cap)
 	var/pod_count = rand(ship.boarding_pods_min, ship.boarding_pods_max)
-	pod_count = min(pod_count, NPC_SHIP_COMBAT_MAX_BOARDERS - current_boarders)
-	if(pod_count <= 0)
-		return AI_BEHAVIOR_DELAY
 
 	// Fire the boarding pods!
 	if(combat.fire_boarding_pods(target, pod_count))
@@ -1089,7 +1080,7 @@
 	// Check 3: Target has moved within same zone (trying to escape but still in range)
 	var/list/initial_pos = controller.blackboard[BB_NPC_BOARDING_TARGET_POS]
 	if(initial_pos && length(initial_pos) >= 2)
-		if(target.x != initial_pos[1] || target.y != initial_pos[2])
+		if(target.x != initial_pos["x"] || target.y != initial_pos["y"])
 			ship.ship_notify("Target is trying to escape! Weapons free!", "COMBAT", SHIP_NOTIFY_WARNING, 'voidcrew/sound/alert2.ogg', 25)
 			target.ship_notify("[ship.name]: \"Running won't save you! All guns, fire!\"", "COMMS", SHIP_NOTIFY_DANGER, 'voidcrew/sound/alert3.ogg', 25)
 			controller.escalate_boarding_to_combat("movement")
diff --git a/voidcrew/modules/npc_ships/code/boarding_pod.dm b/voidcrew/modules/npc_ships/code/boarding_pod.dm
index acce9b0ccca..c3e6d07b6d0 100644
--- a/voidcrew/modules/npc_ships/code/boarding_pod.dm
+++ b/voidcrew/modules/npc_ships/code/boarding_pod.dm
@@ -11,25 +11,32 @@ GLOBAL_VAR_INIT(boarding_spawn_total, 1)
 
 /// Global proc to create a boarding pod drop at a target location
 /// Returns the boarder mob so the caller can register signals (e.g. death tracking)
-/proc/create_boarding_pod(turf/target_turf, obj/structure/overmap/ship/target_ship, obj/structure/overmap/ship/npc/source_ship, mob_type)
+/proc/create_boarding_pod(turf/target_turf, obj/structure/overmap/ship/target_ship, obj/structure/overmap/ship/npc/source_ship, mob_type, datum/npc_spawn_context/encounter, budget_reserved = FALSE)
 	if(!target_turf || !mob_type)
 		return null
 	// Combat volleys call this on a timer; the target may have docked since firing.
 	if(QDELETED(target_ship) || QDELETED(source_ship) || target_ship.state != OVERMAP_SHIP_FLYING || source_ship.state != OVERMAP_SHIP_FLYING)
 		return null
 
+	var/datum/ai_controller/npc_ship/controller = source_ship.ai_controller
+	if(!istype(controller) || controller.get_target() != target_ship)
+		return null
+	controller.capture_boarding_encounter(target_ship)
+	if(encounter && encounter != controller.boarding_context)
+		return null
+	if(!budget_reserved && !controller.reserve_boarders(target_ship, 1))
+		return null
+	var/datum/npc_spawn_context/context = new(target_ship, controller.boarding_context.zone_type, "ordinary", source_turf = controller.boarding_context.source_turf)
+
 	// Create the boarding pod with the mob inside
 	var/obj/structure/closet/supplypod/boarding/pod = new()
 
 	// Create the boarder mob and put it in the pod
-	var/mob/living/boarder = new mob_type(pod)
+	var/mob/living/boarder = spawn_npc_in_zone(mob_type, pod, context)
 	if(!boarder)
 		qdel(pod)
 		return null
 
-	// Boarders are tougher than the same mob type is out in a ruin
-	scale_npc_ship_pirate_health(boarder)
-
 	// Store references for the pod
 	pod.target_ship = target_ship
 	pod.source_ship = source_ship
@@ -210,21 +217,27 @@ GLOBAL_VAR_INIT(boarding_spawn_total, 1)
 	if(QDELETED(target_ship) || QDELETED(source_ship) || target_ship.state != OVERMAP_SHIP_FLYING || source_ship.state != OVERMAP_SHIP_FLYING)
 		return null
 
+	var/datum/ai_controller/npc_ship/controller = source_ship.ai_controller
+	if(!istype(controller) || controller.get_target() != target_ship)
+		return null
+	controller.capture_boarding_encounter(target_ship)
+	if(!controller.is_red_zone_raid() || controller.boarding_boss_sent)
+		return null
+	controller.boarding_boss_sent = TRUE
+	var/datum/npc_spawn_context/context = new(target_ship, controller.boarding_context.zone_type, "boss", source_turf = controller.boarding_context.source_turf)
+
 	// Create the boss boarding pod
 	var/obj/structure/closet/supplypod/boarding/boss/pod = new()
 
 	// Create the boss mob and put it in the pod
-	var/mob/living/basic/trooper/pirate/faction/boss/boss = new mob_type(pod)
+	var/mob/living/basic/trooper/pirate/faction/boss/boss = spawn_npc_in_zone(mob_type, pod, context, FALSE)
 	if(!boss)
 		qdel(pod)
 		return null
 
-	// Scaled after Initialize() so bosses that set their health there (silverscale)
-	// are multiplied off their real pool, not the var default
-	scale_npc_ship_pirate_health(boss, NPC_PIRATE_BOSS_HEALTH_MULT)
-
 	// Set up boss-specific properties
 	boss.parent_ship = source_ship
+	context.finalize()
 
 	// Store references for the pod
 	pod.target_ship = target_ship
diff --git a/voidcrew/modules/npc_ships/code/bounty/bounty.dm b/voidcrew/modules/npc_ships/code/bounty/bounty.dm
index 45fb8b86cf4..d85ce308e14 100644
--- a/voidcrew/modules/npc_ships/code/bounty/bounty.dm
+++ b/voidcrew/modules/npc_ships/code/bounty/bounty.dm
@@ -114,7 +114,7 @@
  * Note: Ships are confined to their spawn zone (BB_NPC_SPAWN_ZONE),
  * so the zone at spawn time is the zone for the ship's lifetime.
  */
-/datum/pirate_bounty/proc/calculate_reward(obj/structure/overmap/ship/npc/ship)
+/datum/pirate_bounty/proc/calculate_reward(obj/structure/overmap/ship/npc/ship, reward_roll = rand(80, 120))
 	// Base reward - yellow zone pirates
 	var/base_reward = 5000
 
@@ -125,8 +125,8 @@
 		base_reward = 15000
 		is_heavy_bounty = TRUE
 
-	// Add some variance (80-120%)
-	return round(base_reward * rand(80, 120) / 100)
+	// Reduce pirate bounty cash to 80%, retaining the usual 80-120% variance.
+	return round(base_reward * 0.8 * reward_roll / 100)
 
 /**
  * Checks if the bounty is still valid (target exists and not resolved).
diff --git a/voidcrew/modules/npc_ships/code/bounty/bounty_loot.dm b/voidcrew/modules/npc_ships/code/bounty/bounty_loot.dm
index 6f507984780..5fa67ccaf49 100644
--- a/voidcrew/modules/npc_ships/code/bounty/bounty_loot.dm
+++ b/voidcrew/modules/npc_ships/code/bounty/bounty_loot.dm
@@ -22,8 +22,6 @@
 /obj/structure/closet/crate/secure/weapon/pirate_loot/lasers/populate_contents_immediate()
 	. = ..()
 	new /obj/item/gun/energy/laser(src)
-	new /obj/item/gun/energy/laser(src)
-	new /obj/item/gun/energy/laser(src)
 
 /obj/structure/closet/crate/secure/weapon/pirate_loot/disablers
 	name = "pirate disabler cache"
@@ -33,8 +31,6 @@
 /obj/structure/closet/crate/secure/weapon/pirate_loot/disablers/populate_contents_immediate()
 	. = ..()
 	new /obj/item/gun/energy/disabler(src)
-	new /obj/item/gun/energy/disabler(src)
-	new /obj/item/gun/energy/disabler(src)
 
 /obj/structure/closet/crate/secure/weapon/pirate_loot/armor
 	name = "pirate armor cache"
@@ -85,30 +81,22 @@
 /obj/structure/closet/crate/secure/weapon/pirate_loot/heavy/energy_guns/populate_contents_immediate()
 	. = ..()
 	new /obj/item/gun/energy/e_gun(src)
-	new /obj/item/gun/energy/e_gun(src)
 
 /obj/structure/closet/crate/secure/weapon/pirate_loot/heavy/combat_shotguns
-	name = "pirate combat shotgun cache"
-	desc = "A crate of combat shotguns recovered from a pirate vessel."
+	name = "pirate laser cache"
+	desc = "A crate of laser weapons recovered from a pirate vessel."
 
-/obj/structure/closet/crate/secure/weapon/pirate_loot/heavy/combat_shotguns/PopulateContents()
+/obj/structure/closet/crate/secure/weapon/pirate_loot/heavy/combat_shotguns/populate_contents_immediate()
 	. = ..()
-	new /obj/item/gun/ballistic/shotgun/automatic/combat(src)
-	new /obj/item/gun/ballistic/shotgun/automatic/combat(src)
-	new /obj/item/gun/ballistic/shotgun/automatic/combat(src)
-	new /obj/item/storage/belt/bandolier(src)
-	new /obj/item/storage/belt/bandolier(src)
-	new /obj/item/storage/belt/bandolier(src)
+	new /obj/item/gun/energy/laser(src)
 
 /obj/structure/closet/crate/secure/weapon/pirate_loot/heavy/laser_carbines
-	name = "pirate laser carbine cache"
-	desc = "A crate of laser carbines recovered from a pirate vessel."
+	name = "pirate energy gun cache"
+	desc = "A crate of energy guns recovered from a pirate vessel."
 
-/obj/structure/closet/crate/secure/weapon/pirate_loot/heavy/laser_carbines/PopulateContents()
+/obj/structure/closet/crate/secure/weapon/pirate_loot/heavy/laser_carbines/populate_contents_immediate()
 	. = ..()
-	new /obj/item/gun/energy/laser/carbine(src)
-	new /obj/item/gun/energy/laser/carbine(src)
-	new /obj/item/gun/energy/laser/carbine(src)
+	new /obj/item/gun/energy/e_gun(src)
 
 /obj/structure/closet/crate/secure/weapon/pirate_loot/heavy/swat
 	name = "pirate tactical gear cache"
diff --git a/voidcrew/modules/npc_ships/code/faction_pirates/faction_pirate_bosses.dm b/voidcrew/modules/npc_ships/code/faction_pirates/faction_pirate_bosses.dm
index d408032eba2..b2bc13a4dd1 100644
--- a/voidcrew/modules/npc_ships/code/faction_pirates/faction_pirate_bosses.dm
+++ b/voidcrew/modules/npc_ships/code/faction_pirates/faction_pirate_bosses.dm
@@ -58,7 +58,7 @@
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/pirate/faction/silverscale/highlord
 	corpse = /obj/effect/mob_spawn/corpse/human/pirate/faction/silverscale/highlord
 	r_hand = /obj/item/melee/energy/sword/pirate
-	loot_pool = list(/obj/item/claymore/cutlass, /obj/item/clothing/suit/hooded/cloak/drake, /obj/item/clothing/head/hooded/cloakhood/drake)
+	loot_pool = list(/obj/item/clothing/suit/hooded/cloak/drake, /obj/item/clothing/head/hooded/cloakhood/drake)
 	plunder_credits = 3000
 
 /mob/living/basic/trooper/pirate/faction/boss/silverscale/Initialize(mapload)
@@ -87,7 +87,7 @@
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/pirate/faction/skeleton/davyjones
 	corpse = /obj/effect/mob_spawn/corpse/human/pirate/faction/skeleton/davyjones
 	r_hand = /obj/item/claymore/cutlass
-	loot_pool = list(/obj/item/claymore/cutlass, /obj/item/gun/ballistic/shotgun/hook)
+	loot_pool = list(/obj/item/gun/ballistic/shotgun/hook)
 	plunder_credits = 3000
 
 /mob/living/basic/trooper/pirate/faction/boss/skeleton/Initialize(mapload)
@@ -113,7 +113,8 @@
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/pirate/faction/grey/robust
 	corpse = /obj/effect/mob_spawn/corpse/human/pirate/faction/grey/robust
 	r_hand = /obj/item/storage/toolbox/mechanical/old/clean
-	loot_pool = list(/obj/item/storage/toolbox/mechanical/old/clean, /obj/item/stack/telecrystal/five)
+	loot_pool = list(/obj/item/stack/telecrystal/five)
+	rare_loot_pool = list(/obj/item/storage/toolbox/mechanical/old/clean)
 	plunder_credits = 3000
 
 /mob/living/basic/trooper/pirate/faction/boss/grey/Initialize(mapload)
@@ -141,7 +142,8 @@
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/pirate/faction/lustrous/radiant
 	corpse = /obj/effect/mob_spawn/corpse/human/pirate/faction/lustrous/radiant
 	r_hand = /obj/item/melee/energy/sword/pirate
-	loot_pool = list(/obj/item/grenade/gas_crystal/nitrous_oxide_crystal, /obj/item/cain_and_abel)
+	loot_pool = list(/obj/item/grenade/gas_crystal/nitrous_oxide_crystal)
+	rare_loot_pool = list(/obj/item/cain_and_abel)
 	plunder_credits = 3000
 
 /mob/living/basic/trooper/pirate/faction/boss/lustrous/Initialize(mapload)
@@ -202,7 +204,7 @@
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/pirate/faction/irs/chief
 	corpse = /obj/effect/mob_spawn/corpse/human/pirate/faction/irs/chief
 	r_hand = /obj/item/gun/energy/e_gun/lethal
-	loot_pool = list(/obj/item/gun/energy/e_gun/nuclear, /obj/item/storage/bag/money/dutchmen)
+	loot_pool = list(/obj/item/gun/energy/laser, /obj/item/storage/bag/money/dutchmen)
 	plunder_credits = 3000
 	ai_controller = /datum/ai_controller/basic_controller/trooper/ranged
 	var/projectiletype = /obj/projectile/beam/laser
@@ -237,7 +239,7 @@
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/pirate/faction/medieval/blackknight
 	corpse = /obj/effect/mob_spawn/corpse/human/pirate/faction/medieval/blackknight
 	r_hand = /obj/item/claymore
-	loot_pool = list(/obj/item/claymore/weak, /obj/item/shield/kite)
+	loot_pool = list(/obj/item/claymore/shortsword, /obj/item/shield/kite)
 	plunder_credits = 3000
 
 /mob/living/basic/trooper/pirate/faction/boss/medieval/Initialize(mapload)
@@ -248,4 +250,3 @@
 	// Visual gigantism
 	transform = transform.Scale(1.3, 1.3)
 
-
diff --git a/voidcrew/modules/npc_ships/code/faction_pirates/faction_pirate_corpses.dm b/voidcrew/modules/npc_ships/code/faction_pirates/faction_pirate_corpses.dm
index 37525716556..441ce006666 100644
--- a/voidcrew/modules/npc_ships/code/faction_pirates/faction_pirate_corpses.dm
+++ b/voidcrew/modules/npc_ships/code/faction_pirates/faction_pirate_corpses.dm
@@ -104,7 +104,7 @@
 	name = "Skeleton Captain Corpse"
 	head = /obj/item/clothing/head/costume/crown
 	suit = /obj/item/clothing/suit/costume/pirate/armored
-	belt = /obj/item/gun/magic/midas_hand
+	belt = null
 	glasses = /obj/item/clothing/glasses/eyepatch
 	l_pocket = /obj/item/coin/gold/doubloon
 
@@ -112,7 +112,7 @@
 	name = "Davy Jones Corpse"
 	head = /obj/item/clothing/head/costume/pirate/armored
 	suit = /obj/item/clothing/suit/costume/pirate/captain/armored
-	belt = /obj/item/gun/magic/midas_hand
+	belt = null
 	glasses = /obj/item/clothing/glasses/eyepatch
 	l_pocket = /obj/item/coin/gold/doubloon
 
@@ -302,7 +302,7 @@
 	neck = /obj/item/clothing/neck/tie/red/tied
 	suit = null
 	head = null
-	belt = /obj/item/storage/belt/holster/detective/full/ert
+	belt = null
 
 /datum/outfit/piratecorpse/faction/irs/chief
 	name = "IRS Head Auditor Corpse"
@@ -310,7 +310,7 @@
 	neck = /obj/item/clothing/neck/tie/red/tied
 	suit = null
 	head = /obj/item/clothing/head/costume/constable
-	belt = /obj/item/storage/belt/holster/detective/full/ert
+	belt = null
 
 // ==================== MEDIEVAL (Space Warmongers) ====================
 
@@ -346,7 +346,7 @@
 
 /datum/outfit/piratecorpse/faction/medieval/melee
 	name = "Medieval Footsoldier Corpse"
-	belt = /obj/item/claymore/shortsword
+	belt = null
 
 /datum/outfit/piratecorpse/faction/medieval/ranged
 	name = "Medieval Crossbowman Corpse"
@@ -359,7 +359,7 @@
 	head = /obj/item/clothing/head/helmet/knight/warlord
 	mask = /obj/item/clothing/mask/breath
 	shoes = /obj/item/clothing/shoes/bronze
-	back = /obj/item/fireaxe/boardingaxe
+	back = null
 
 /datum/outfit/piratecorpse/faction/medieval/blackknight
 	name = "The Black Knight Corpse"
@@ -369,4 +369,4 @@
 	head = /obj/item/clothing/head/hooded/cloakhood/godslayer
 	mask = /obj/item/clothing/mask/breath
 	shoes = /obj/item/clothing/shoes/bronze
-	back = /obj/item/fireaxe/boardingaxe
+	back = null
diff --git a/voidcrew/modules/npc_ships/code/faction_pirates/faction_pirate_mobs.dm b/voidcrew/modules/npc_ships/code/faction_pirates/faction_pirate_mobs.dm
index 9f158b5d8d5..bd3d16177ee 100644
--- a/voidcrew/modules/npc_ships/code/faction_pirates/faction_pirate_mobs.dm
+++ b/voidcrew/modules/npc_ships/code/faction_pirates/faction_pirate_mobs.dm
@@ -14,13 +14,18 @@
 	obj_damage = 60  // Can break doors/objects like blobbernauts
 	/// Guaranteed loot items dropped on death. All items in this list are spawned.
 	var/list/loot_pool
+	/// Independently rolled once at construction, never on a later death.
+	var/list/rare_loot_pool
+	var/list/rolled_rare_loot
+	var/weapon_loot_initialized = FALSE
+	var/credits_dropped = FALSE
+	/// A named mission target keeps this even after replacement or mission expiry.
+	var/datum/weakref/mission_payout_ref
 	/// Random combat loot - one item is picked at random and added to death drops.
 	var/list/random_loot = list(\
-		/obj/item/pen/edagger,\
-		/obj/item/switchblade,\
 		/obj/item/knife/combat/survival,\
-		/obj/item/melee/baton/telescopic,\
-		/obj/item/gun/energy/e_gun/mini\
+		/obj/item/spear,\
+		/obj/item/melee/baseball_bat\
 	)
 	/// Random auxiliary loot - one item is picked at random and added to death drops.
 	var/list/random_loot_2 = list(\
@@ -39,12 +44,28 @@
 	// Drop credits as holochip on death
 	if(plunder_credits > 0)
 		RegisterSignal(src, COMSIG_LIVING_DEATH, PROC_REF(on_death_drop_credits))
-	// Build death drops from loot pool
+	get_npc_spawn_context().bodies |= WEAKREF(src)
+	rolled_rare_loot = list()
+	for(var/item_type in rare_loot_pool)
+		if(npc_ladder_red_drop())
+			rolled_rare_loot += item_type
+
+/// The source context can resolve after map initialization. Roll against it once.
+/mob/living/basic/trooper/pirate/faction/proc/initialize_weapon_loot(zone)
+	if(weapon_loot_initialized)
+		return
+	weapon_loot_initialized = TRUE
 	var/list/death_loot = list()
 	if(length(loot_pool))
 		death_loot += loot_pool
+	death_loot += rolled_rare_loot
 	if(length(random_loot))
-		death_loot += pick(random_loot)
+		death_loot += roll_ladder_weapon(zone)
+	if(istype(src, /mob/living/basic/trooper/pirate/faction/silverscale/captain) || istype(src, /mob/living/basic/trooper/pirate/faction/lustrous/captain) || istype(src, /mob/living/basic/trooper/pirate/faction/interdyne/captain))
+		if(zone == ZONE_YELLOW)
+			death_loot += /obj/item/claymore/shortsword
+		else if(zone == ZONE_RED)
+			death_loot += pick(npc_ladder_yellow_melee())
 	if(length(random_loot_2))
 		death_loot += pick(random_loot_2)
 	if(length(death_loot))
@@ -53,9 +74,33 @@
 		// that rolls the same two items.
 		AddElement(/datum/element/death_drops, string_list(death_loot))
 
+/mob/living/basic/trooper/pirate/faction/proc/roll_ladder_weapon(zone, roll = rand(1, 100))
+	switch(zone)
+		if(ZONE_YELLOW)
+			return roll <= 5 ? /obj/item/gun/energy/laser : pick(npc_ladder_yellow_melee())
+		if(ZONE_RED)
+			return roll <= 10 ? /obj/item/gun/ballistic/automatic/c20r/unrestricted : pick(npc_ladder_yellow_melee())
+	if(roll <= 50)
+		return /obj/item/knife/combat/survival
+	return roll <= 75 ? /obj/item/spear : /obj/item/melee/baseball_bat
+
+/mob/living/basic/trooper/pirate/faction/death(gibbed)
+	// An early death still resolves from the original source turf, never this body.
+	if(!weapon_loot_initialized)
+		var/datum/npc_spawn_context/context = get_npc_spawn_context()
+		initialize_weapon_loot(context.zone_type || SSovermap_zones.get_zone_type_anywhere(context.source_turf) || ZONE_GREEN)
+	return ..()
+
 /// Drops plunder_credits as a holochip on death
 /mob/living/basic/trooper/pirate/faction/proc/on_death_drop_credits(mob/living/source)
 	SIGNAL_HANDLER
+	if(credits_dropped)
+		return
+	credits_dropped = TRUE
+	if(mission_payout_ref)
+		var/datum/mission/mission = mission_payout_ref.resolve()
+		if(!mission?.claim_boss_cash())
+			return
 	new /obj/item/holochip(drop_location(), plunder_credits)
 
 // ==================== SILVERSCALE (Aristocratic Lizards) ====================
@@ -126,7 +171,6 @@
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/pirate/faction/silverscale/captain
 	corpse = /obj/effect/mob_spawn/corpse/human/pirate/faction/silverscale/captain
 	r_hand = /obj/item/gun/energy/e_gun/lethal
-	loot_pool = list(/obj/item/claymore/cutlass)
 	random_loot = null
 	plunder_credits = 1000
 
@@ -193,7 +237,7 @@
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/pirate/faction/skeleton/captain
 	corpse = /obj/effect/mob_spawn/corpse/human/pirate/faction/skeleton/captain
 	r_hand = /obj/item/gun/energy/e_gun/lethal
-	loot_pool = list(/obj/item/gun/energy/e_gun/lethal)
+	loot_pool = list(/obj/item/gun/energy/laser)
 	random_loot = null
 	plunder_credits = 1000
 
@@ -325,7 +369,6 @@
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/pirate/faction/lustrous/captain
 	corpse = /obj/effect/mob_spawn/corpse/human/pirate/faction/lustrous/captain
 	r_hand = /obj/item/melee/energy/sword/pirate
-	loot_pool = list(/obj/item/claymore/cutlass)
 	random_loot = null
 	plunder_credits = 1000
 
@@ -389,7 +432,6 @@
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/pirate/faction/interdyne/captain
 	corpse = /obj/effect/mob_spawn/corpse/human/pirate/faction/interdyne/captain
 	r_hand = /obj/item/melee/energy/sword/pirate
-	loot_pool = list(/obj/item/claymore/cutlass)
 	random_loot = null
 	plunder_credits = 1000
 
@@ -447,7 +489,7 @@
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/pirate/faction/irs/captain
 	corpse = /obj/effect/mob_spawn/corpse/human/pirate/faction/irs/captain
 	r_hand = /obj/item/gun/energy/e_gun/lethal
-	loot_pool = list(/obj/item/gun/energy/e_gun/lethal)
+	loot_pool = list(/obj/item/gun/energy/laser)
 	random_loot = null
 	ai_controller = /datum/ai_controller/basic_controller/trooper/ranged
 	var/projectiletype = /obj/projectile/beam/laser
@@ -535,9 +577,9 @@
 	mob_spawner = /obj/effect/mob_spawn/corpse/human/pirate/faction/medieval/captain
 	corpse = /obj/effect/mob_spawn/corpse/human/pirate/faction/medieval/captain
 	r_hand = /obj/item/fireaxe/boardingaxe
-	loot_pool = list(/obj/item/fireaxe/boardingaxe)
+	loot_pool = list(/obj/item/fireaxe)
 	random_loot = null
-	plunder_credits = 300
+	plunder_credits = 1000
 
 /mob/living/basic/trooper/pirate/faction/medieval/captain/Initialize(mapload)
 	. = ..()
diff --git a/voidcrew/modules/npc_ships/code/npc_combat_interface.dm b/voidcrew/modules/npc_ships/code/npc_combat_interface.dm
index a4a958c8b9a..ba4b83f7c7f 100644
--- a/voidcrew/modules/npc_ships/code/npc_combat_interface.dm
+++ b/voidcrew/modules/npc_ships/code/npc_combat_interface.dm
@@ -482,16 +482,26 @@
 	if(!spawn_types || !length(spawn_types))
 		return FALSE
 
+	var/datum/ai_controller/npc_ship/controller = owner_ship.ai_controller
+	if(!istype(controller) || controller.get_target() != target_ship)
+		return FALSE
+	pod_count = controller.reserve_boarders(target_ship, pod_count)
+	if(!pod_count)
+		return controller.deploy_combat_boss(target_ship)
+
 	// Set up patrol distribution for this wave
 	GLOB.boarding_spawn_index = 0
 	GLOB.boarding_spawn_total = pod_count
 
 	var/pods_launched = 0
+	controller.boarding_pending += pod_count
 
 	// Launch pods at different locations on the target ship
 	for(var/i in 1 to pod_count)
 		var/turf/target_turf = get_random_target_turf(target_ship)
 		if(!target_turf)
+			controller.boarding_pending--
+			controller.boarding_committed--
 			continue
 
 		// Pick a random mob type for this pod
@@ -500,7 +510,7 @@
 		// Create the boarding pod with a slight delay between launches
 		// Uses supplypod system - pod falls from above, lands, opens to reveal mob
 		var/launch_delay = (i - 1) * 0.5 SECONDS
-		addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(create_boarding_pod), target_turf, target_ship, owner_ship, mob_type), launch_delay)
+		controller.boarding_timers += addtimer(CALLBACK(controller, TYPE_PROC_REF(/datum/ai_controller/npc_ship, deploy_combat_boarder), target_turf, target_ship, mob_type, controller.boarding_context), launch_delay, TIMER_STOPPABLE)
 		pods_launched++
 
 	if(pods_launched > 0)
diff --git a/voidcrew/modules/npc_ships/code/npc_ship.dm b/voidcrew/modules/npc_ships/code/npc_ship.dm
index 6e1adcc12a3..f2a57bad866 100644
--- a/voidcrew/modules/npc_ships/code/npc_ship.dm
+++ b/voidcrew/modules/npc_ships/code/npc_ship.dm
@@ -329,23 +329,6 @@
 /obj/structure/overmap/ship/npc/proc/set_patrol_mode()
 	set_movement_mode(NPC_MOVEMENT_PATROL)
 
-/**
- * Scales up a freshly spawned NPC ship pirate's health pool.
- *
- * NPC ship crew and boarding pod mobs are the same types the ruin zone spawners,
- * planet spawns and bounty missions use, and those are balanced per zone band -
- * so the "fighting a ship" difficulty lives here at the spawn site instead of on
- * the mob definitions. It also picks up bosses that set their health in
- * Initialize() rather than as a var default.
- *
- * Only valid on an undamaged mob: health is rebuilt from the new maxHealth.
- */
-/proc/scale_npc_ship_pirate_health(mob/living/pirate, multiplier = NPC_PIRATE_CREW_HEALTH_MULT)
-	if(QDELETED(pirate) || multiplier <= 1)
-		return
-	pirate.maxHealth = round(pirate.maxHealth * multiplier)
-	pirate.updatehealth()
-
 /**
  * Spawns crew aboard the ship using per-ship crew configuration.
  * Override crew_min, crew_max, and crew_types in subtypes for different crews.
@@ -391,11 +374,12 @@
 	// Spawn captain first with ship key
 	if(captain_type && length(valid_turfs))
 		var/turf/captain_loc = pick_n_take(valid_turfs)
-		var/mob/living/basic/captain = new captain_type(captain_loc)
-		scale_npc_ship_pirate_health(captain)
+		var/datum/npc_spawn_context/context = new(src, pool_zone_type, "boss")
+		var/mob/living/basic/captain = spawn_npc_in_zone(captain_type, captain_loc, context, FALSE)
 		// Give captain the ship key - stored in contents, drops on death
 		var/obj/item/ship_key/key = new(null, src)
 		key.forceMove(captain)
+		context.finalize()
 		// Track captain and register death signal
 		tracked_crew += captain
 		RegisterSignal(captain, COMSIG_LIVING_DEATH, PROC_REF(on_crew_death))
@@ -405,8 +389,8 @@
 	for(var/i in 1 to min(crew_count, length(valid_turfs)))
 		var/turf/spawn_loc = pick_n_take(valid_turfs)
 		var/mob_type = pick(crew_types)
-		var/mob/living/crewmember = new mob_type(spawn_loc)
-		scale_npc_ship_pirate_health(crewmember)
+		var/datum/npc_spawn_context/context = new(src, pool_zone_type, "ordinary")
+		var/mob/living/crewmember = spawn_npc_in_zone(mob_type, spawn_loc, context)
 		// Track crew and register death signal
 		tracked_crew += crewmember
 		RegisterSignal(crewmember, COMSIG_LIVING_DEATH, PROC_REF(on_crew_death))
diff --git a/voidcrew/modules/npc_ships/code/npc_ship_controller.dm b/voidcrew/modules/npc_ships/code/npc_ship_controller.dm
index f38d53ec3ed..bb5a1744aab 100644
--- a/voidcrew/modules/npc_ships/code/npc_ship_controller.dm
+++ b/voidcrew/modules/npc_ships/code/npc_ship_controller.dm
@@ -26,6 +26,12 @@
 
 	/// Delayed boarding actions belonging to the current encounter.
 	var/list/boarding_timers = list()
+	/// Captured once per target engagement, retained through combat escalation.
+	var/datum/npc_spawn_context/boarding_context
+	var/boarding_budget = 0
+	var/boarding_committed = 0
+	var/boarding_pending = 0
+	var/boarding_boss_sent = FALSE
 
 /datum/ai_controller/npc_ship/New(atom/new_pawn)
 	// Initialize combat blackboard
@@ -432,6 +438,12 @@
 	// Crew-wipe findings are about one hull. Don't carry "I've seen them alive" or a
 	// half-elapsed wipe timer over onto whoever we point at next.
 	if(old_target != target)
+		cleanup_boarding_signals()
+		boarding_context = null
+		boarding_budget = 0
+		boarding_committed = 0
+		boarding_pending = 0
+		boarding_boss_sent = FALSE
 		clear_blackboard_key(BB_NPC_TARGET_CREW_SEEN)
 		clear_blackboard_key(BB_NPC_CREW_WIPE_SINCE)
 
@@ -443,6 +455,7 @@
 
 	if(target)
 		set_blackboard_key(BB_NPC_TARGET, target)
+		capture_boarding_encounter(target)
 		// Mark this target as engaged by us (only one pirate can engage at a time)
 		// Don't overwrite if another active pirate already has this target claimed
 		if(our_ship)
@@ -619,11 +632,10 @@
 
 /**
  * TRUE if the target we are raiding is in the lawless (red) band.
- * Red runs the full wave gauntlet plus a boss; everywhere else gets the
- * lighter single-wave raid.
+ * Red adds one boss to the single ordinary boarding budget.
  */
 /datum/ai_controller/npc_ship/proc/is_red_zone_raid()
-	return get_raid_zone()?.zone_type == ZONE_RED
+	return (boarding_context ? boarding_context.zone_type : get_raid_zone()?.zone_type) == ZONE_RED
 
 /**
  * TRUE if the thing waiting at the end of this hail is the data siphon rather
@@ -661,7 +673,7 @@
  * fighting in.
  */
 /datum/ai_controller/npc_ship/proc/get_boarding_wave_count()
-	return is_red_zone_raid() ? NPC_BOARDING_WAVE_COUNT : NPC_BOARDING_WAVE_COUNT_YELLOW
+	return NPC_BOARDING_WAVE_COUNT
 
 /**
  * End a yellow-zone raid. The single wave has been repelled, so the pirate
@@ -677,7 +689,7 @@
 	var/obj/structure/overmap/ship/target = get_target()
 
 	if(target && !QDELETED(target))
-		target.ship_notify("Boarding party eliminated! [ship?.name || "The attacker"] is breaking off.", "COMBAT", SHIP_NOTIFY_NOTICE, 'voidcrew/sound/notify.ogg', 50)
+		target.ship_notify("[ship?.name || "The attacker"] is breaking off.", "COMBAT", SHIP_NOTIFY_NOTICE, 'voidcrew/sound/notify.ogg', 50)
 	ship?.ship_notify("Boarding party lost. Disengaging.", "COMMS", SHIP_NOTIFY_WARNING, 'voidcrew/sound/notify2.ogg', 50)
 
 	clear_target()
@@ -697,8 +709,8 @@
 		return FALSE
 
 	// Count and store player crew count for wave scaling
-	var/crew_count = count_player_crew(target)
-	set_blackboard_key(BB_NPC_BOARDING_INITIAL_CREW_COUNT, crew_count)
+	capture_boarding_encounter(target)
+	set_blackboard_key(BB_NPC_BOARDING_INITIAL_CREW_COUNT, boarding_budget)
 
 	// Start tracking player crew deaths
 	start_tracking_player_crew(target)
@@ -774,24 +786,15 @@
 		return
 
 	// Announce boarding phase start
-	ship.ship_notify("Boarding operation initiated. Wave 1 deploying.", "COMBAT", SHIP_NOTIFY_WARNING, 'voidcrew/sound/alert2.ogg', 25)
+	ship.ship_notify("Boarding operation initiated.", "COMBAT", SHIP_NOTIFY_WARNING, 'voidcrew/sound/alert2.ogg', 25)
 	target.ship_notify("[ship.name] is deploying boarding parties! Prepare to repel boarders!", "COMBAT", SHIP_NOTIFY_DANGER)
-	target.ship_notify("First wave incoming in 30 seconds!", "COMBAT", SHIP_NOTIFY_WARNING, 'voidcrew/sound/notify.ogg', 50)
+	target.ship_notify("Boarding pods inbound!", "COMBAT", SHIP_NOTIFY_WARNING, 'voidcrew/sound/notify.ogg', 50)
 
 /**
- * Count living humanoid crew on the target ship.
- * Used for wave scaling.
+ * Count living connected carbon and silicon crew on the target ship.
  */
 /datum/ai_controller/npc_ship/proc/count_player_crew(obj/structure/overmap/ship/target)
-	if(!target?.shuttle?.shuttle_areas)
-		return 0
-
-	var/count = 0
-	for(var/area/shuttle_area as anything in target.shuttle.shuttle_areas)
-		for(var/mob/living/carbon/human/H in shuttle_area)
-			if(H.stat != DEAD)
-				count++
-	return count
+	return max(0, count_living_crew(target))
 
 /**
  * Launch a boarding wave of the specified number.
@@ -811,27 +814,9 @@
 	if(!ship || !target || QDELETED(target))
 		return FALSE
 
-	// Get wave size range from ship config
-	var/list/wave_sizes = ship.boarding_wave_sizes
-	if(!wave_sizes || wave_number > length(wave_sizes))
+	if(wave_number != 1)
 		return FALSE
-
-	var/list/wave_range = wave_sizes[wave_number]
-	var/base_min = wave_range[1]
-	var/base_max = wave_range[2]
-
-	// Scale wave size based on initial crew count
-	var/initial_crew = blackboard[BB_NPC_BOARDING_INITIAL_CREW_COUNT] || 1
-	var/scale_factor = get_crew_scale_factor(initial_crew)
-
-	var/scaled_min = round(base_min * scale_factor)
-	var/scaled_max = round(base_max * scale_factor)
-
-	// Ensure at least 1 boarder
-	scaled_min = max(1, scaled_min)
-	scaled_max = max(scaled_min, scaled_max)
-
-	var/boarder_count = rand(scaled_min, scaled_max)
+	var/boarder_count = max(0, boarding_budget - boarding_committed)
 
 	// Get mob types to spawn (use boarding pod types or crew types)
 	var/list/mob_types = ship.boarding_pod_mob_types
@@ -874,29 +859,16 @@
 
 	// Track wave start time and target position (for time limit and movement detection)
 	set_blackboard_key(BB_NPC_BOARDING_WAVE_START_TIME, world.time)
-	blackboard[BB_NPC_BOARDING_TARGET_POS] = list(target.x, target.y)
+	// Blackboard deletion walks nested lists as associations; numeric coordinates
+	// cannot be keys into a two-element positional list.
+	blackboard[BB_NPC_BOARDING_TARGET_POS] = list("x" = target.x, "y" = target.y)
 
 	// Notify target ship
-	target.ship_notify("Wave [wave_number]: [length(wave_boarders)] hostiles have boarded!", "SECURITY", SHIP_NOTIFY_DANGER, 'voidcrew/sound/warn3.ogg', 25)
+	target.ship_notify("Hostiles have boarded!", "SECURITY", SHIP_NOTIFY_DANGER, 'voidcrew/sound/warn3.ogg', 25)
 	npc_metric_boarding_wave(src, wave_number, length(wave_boarders))
 
 	return TRUE
 
-/**
- * Get crew scaling factor based on player crew count.
- * Returns multiplier for wave sizes.
- */
-/datum/ai_controller/npc_ship/proc/get_crew_scale_factor(crew_count)
-	switch(crew_count)
-		if(0 to 2)
-			return 0.75  // Solo/duo - smaller waves
-		if(3 to 4)
-			return 1.0   // Standard crew - normal waves
-		if(5 to 6)
-			return 1.25  // Larger crew - bigger waves
-		else
-			return 1.5   // Full crew - maximum waves
-
 /**
  * Find valid turfs on the target ship for spawning boarders.
  */
@@ -947,7 +919,7 @@
 /datum/ai_controller/npc_ship/proc/check_wave_complete()
 	// Guard against multiple calls - only process if we're in BOARDING state
 	var/combat_state = get_combat_state()
-	if(combat_state != NPC_COMBAT_BOARDING && combat_state != NPC_COMBAT_BOSS_PHASE)
+	if(combat_state != NPC_COMBAT_BOARDING || !validate_boarding_target())
 		return
 
 	var/list/wave_boarders = blackboard[BB_NPC_BOARDING_WAVE_BOARDERS]
@@ -1043,7 +1015,7 @@
 	var/obj/structure/overmap/ship/npc/pirate/ship = get_ship()
 	var/obj/structure/overmap/ship/target = get_target()
 
-	if(!ship || !target)
+	if(!ship || !target || boarding_boss_sent || !is_red_zone_raid())
 		return
 
 	// Enter cooldown state (reuse boarding cooldown state)
@@ -1062,7 +1034,7 @@
 			target.ship_notify("[ship.name]: \"[taunt]\"", "COMMS", SHIP_NOTIFY_DANGER, 'voidcrew/sound/alert3.ogg', 25)
 
 	// Announce boss incoming
-	target.ship_notify("All waves repelled! Enemy commander boarding in 30 seconds...", "COMBAT", SHIP_NOTIFY_WARNING, 'voidcrew/sound/notify.ogg', 50)
+	target.ship_notify("Enemy commander inbound!", "COMBAT", SHIP_NOTIFY_WARNING, 'voidcrew/sound/notify.ogg', 50)
 
 	// Schedule boss spawn
 	boarding_timers += addtimer(CALLBACK(src, PROC_REF(spawn_boarding_boss)), NPC_BOARDING_WAVE_COOLDOWN, TIMER_STOPPABLE)
@@ -1224,7 +1196,7 @@
 	// walking every turf of every shuttle area - this runs on a 5 second poll per pirate.
 	var/count = 0
 	for(var/mob/living/crew in GLOB.player_list)
-		if(crew.stat == DEAD)
+		if(crew.stat == DEAD || !crew.client)
 			continue
 		if(!iscarbon(crew) && !issilicon(crew))
 			continue
@@ -1359,6 +1331,8 @@
 	for(var/timer_id in boarding_timers)
 		deltimer(timer_id)
 	boarding_timers.Cut()
+	boarding_committed -= boarding_pending
+	boarding_pending = 0
 
 	// Unregister from player crew deaths
 	var/list/tracked_crew = blackboard[BB_NPC_BOARDING_PLAYER_CREW]
@@ -1410,10 +1384,11 @@
 	set_combat_state(NPC_COMBAT_ENGAGING)
 
 /**
- * Handle wave timeout - advance to next wave instead of escalating to combat.
- * Only escalate to ship combat if ALL waves time out (none defeated).
+ * Finish the ordinary wave on timeout, with the same band transition as clearance.
  */
 /datum/ai_controller/npc_ship/proc/handle_wave_timeout()
+	if(get_combat_state() != NPC_COMBAT_BOARDING || !validate_boarding_target())
+		return
 	var/obj/structure/overmap/ship/npc/pirate/ship = get_ship()
 	var/obj/structure/overmap/ship/target = get_target()
 	var/current_wave = blackboard[BB_NPC_BOARDING_WAVE] || 1
@@ -1430,27 +1405,10 @@
 				UnregisterSignal(boarder, COMSIG_LIVING_DEATH)
 	clear_blackboard_key(BB_NPC_BOARDING_WAVE_BOARDERS)
 
-	// Check if this was the final wave
-	if(current_wave >= NPC_BOARDING_WAVE_COUNT)
-		// All waves timed out - escalate to boss phase
-		ship.ship_notify("Time's up! Sending in the heavy hitter!", "COMBAT", SHIP_NOTIFY_WARNING, 'voidcrew/sound/alert2.ogg', 25)
-		target.ship_notify("[ship.name]: \"You've stalled long enough. Meet our enforcer.\"", "COMMS", SHIP_NOTIFY_DANGER, 'voidcrew/sound/alert3.ogg', 25)
+	if(is_red_zone_raid())
 		start_boss_cooldown()
-		return
-
-	// Advance to next wave
-	var/next_wave = current_wave + 1
-	ship.ship_notify("Wave [current_wave] timed out. Sending wave [next_wave]!", "COMBAT", SHIP_NOTIFY_WARNING)
-	target.ship_notify("[ship.name]: \"Your stalling won't save you. More incoming!\"", "COMMS", SHIP_NOTIFY_WARNING)
-
-	// Start cooldown for next wave
-	set_combat_state(NPC_COMBAT_BOARDING_COOLDOWN)
-	var/cooldown_end = world.time + NPC_BOARDING_WAVE_COOLDOWN
-	set_blackboard_key(BB_NPC_BOARDING_COOLDOWN_END, cooldown_end)
-	set_blackboard_key(BB_NPC_BOARDING_WAVE_START_TIME, null)
-
-	// Schedule next wave
-	boarding_timers += addtimer(CALLBACK(src, PROC_REF(end_wave_cooldown), next_wave), NPC_BOARDING_WAVE_COOLDOWN, TIMER_STOPPABLE)
+	else
+		end_yellow_raid()
 
 /**
  * Check if any boarders have fallen into space and clean them up.
@@ -1478,3 +1436,38 @@
 			spaced.death()
 			wave_boarders -= spaced
 			UnregisterSignal(spaced, COMSIG_LIVING_DEATH)
+
+/// Snapshot the target band and connected crew exactly once, including combat-only raids.
+/datum/ai_controller/npc_ship/proc/capture_boarding_encounter(obj/structure/overmap/ship/target)
+	if(boarding_context || QDELETED(target))
+		return
+	boarding_context = new(target, get_raid_zone(target)?.zone_type || ZONE_GREEN, "ordinary")
+	boarding_budget = max(1, count_player_crew(target))
+
+/datum/ai_controller/npc_ship/proc/reserve_boarders(obj/structure/overmap/ship/target, requested)
+	capture_boarding_encounter(target)
+	var/reserved = min(max(0, requested), max(0, boarding_budget - boarding_committed))
+	boarding_committed += reserved
+	return reserved
+
+/// Timer callbacks must still belong to this encounter after docking or target changes.
+/datum/ai_controller/npc_ship/proc/deploy_combat_boarder(turf/spot, obj/structure/overmap/ship/target, mob_type, datum/npc_spawn_context/encounter)
+	if(get_target() != target || boarding_context != encounter)
+		return
+	boarding_pending--
+	return create_boarding_pod(spot, target, get_ship(), mob_type, encounter, TRUE)
+
+/datum/ai_controller/npc_ship/proc/deploy_combat_boss(obj/structure/overmap/ship/target)
+	if(!is_red_zone_raid() || boarding_boss_sent || boarding_pending || boarding_committed < boarding_budget)
+		return FALSE
+	var/obj/structure/overmap/ship/npc/pirate/ship = get_ship()
+	var/list/spots = get_target_spawn_turfs(target)
+	if(!istype(ship) || !ship.boss_type || !length(spots))
+		return FALSE
+	var/mob/living/boss = create_boss_boarding_pod(pick(spots), target, ship, ship.boss_type)
+	if(!boss)
+		return FALSE
+	set_blackboard_key(BB_NPC_BOARDING_BOSS, boss)
+	RegisterSignal(boss, COMSIG_LIVING_DEATH, PROC_REF(on_boss_death))
+	npc_metric_boss_deployed(src, boss)
+	return TRUE
diff --git a/voidcrew/modules/outfits/syndicate.dm b/voidcrew/modules/outfits/syndicate.dm
index e5c52b13405..9a9a3081c70 100644
--- a/voidcrew/modules/outfits/syndicate.dm
+++ b/voidcrew/modules/outfits/syndicate.dm
@@ -10,7 +10,7 @@
 	head = /obj/item/clothing/head/hats/hos/beret/syndicate
 	glasses = /obj/item/clothing/glasses/thermal/eyepatch
 
-	l_pocket = /obj/item/melee/energy/sword/saber/red
+	l_pocket = /obj/item/knife/combat/survival
 	r_pocket = /obj/item/melee/baton/telescopic
 
 	id = /obj/item/card/id/advanced/black/syndicate_command/captain_id
diff --git a/voidcrew/modules/overmap/code/controllers/subsystem/overmap.dm b/voidcrew/modules/overmap/code/controllers/subsystem/overmap.dm
index bb676cff72b..093ac4b78e8 100644
--- a/voidcrew/modules/overmap/code/controllers/subsystem/overmap.dm
+++ b/voidcrew/modules/overmap/code/controllers/subsystem/overmap.dm
@@ -58,6 +58,20 @@ SUBSYSTEM_DEF(overmap)
 	var/jump_request_time = 6000
 	/// Time taken for a bluespace jump to complete after it initiates (in deciseconds)
 	var/jump_completion_time = 1200
+	/// Absolute REALTIMEOFDAY deadline, armed only once the round actually starts.
+	/// Every jump timer runs on real time (TIMER_CLIENT_TIME): world.time slows under lag and
+	/// crawls while an empty server sleeps, which once stretched six-hour rounds to eight.
+	var/round_end_time
+	/// Timer requesting the existing fleet jump early enough to meet round_end_time.
+	var/round_end_request_timer
+	/// Independent completion timer so ship launches cannot push back the deadline.
+	var/round_end_timer
+	/// REALTIMEOFDAY when a called fleet jump launches. Drives the status panel countdown.
+	var/jump_launch_time
+	/// Timers for the late departure alerts of a called jump.
+	var/list/jump_alert_timers = list()
+	/// How long before launch each late departure alert plays, longest first.
+	var/static/list/jump_alert_leads = list(5 MINUTES, 1 MINUTES)
 
 	/// Ready players each roundstart hull is expected to carry. The fleet scales off
 	/// this once turnout is known - see SSticker.create_characters().
@@ -80,8 +94,15 @@ SUBSYSTEM_DEF(overmap)
 	/// contact with no interior until a ship actually goes there, so raising this adds
 	/// places to go without adding anything to the round-start wait.
 	var/dynamic_planets_per_type = 6
+	/// Ordinary combat ruins approved for repeat mission contacts, independently of natural seeding's duplicate limit.
+	var/static/list/mission_ruin_templates = list(
+		/datum/map_template/ruin/space/derelict_sulaco,
+		/datum/map_template/ruin/space/listeningstation,
+		/datum/map_template/ruin/space/turreted_outpost,
+	)
 
 /datum/controller/subsystem/overmap/Initialize(start_timeofday)
+	RegisterSignal(SSticker, COMSIG_TICKER_ROUND_STARTING, PROC_REF(arm_round_end))
 	create_map()
 	setup_sun()
 	setup_planets()
@@ -424,31 +445,114 @@ SUBSYSTEM_DEF(overmap)
  * Bluespace jump procs
  */
 
+/// Use the ticker's actual start timestamp, excluding initialization and the lobby.
+/// started_at is the world.time of roundstart; the deadline itself is kept in real time.
+/datum/controller/subsystem/overmap/proc/arm_round_end(datum/source, started_at)
+	SIGNAL_HANDLER
+	var/duration = CONFIG_GET(number/round_time_limit) MINUTES
+	if(!duration || round_end_time || jump_mode != BS_JUMP_IDLE)
+		return
+	var/now = REALTIMEOFDAY
+	var/real_start = now - (world.time - started_at)
+	round_end_time = real_start + duration
+	var/request_at = max(real_start, round_end_time - jump_request_time - jump_completion_time)
+	round_end_request_timer = addtimer(CALLBACK(src, PROC_REF(request_scheduled_jump)), max(0, request_at - now), TIMER_STOPPABLE | TIMER_CLIENT_TIME)
+	round_end_timer = addtimer(CALLBACK(src, PROC_REF(complete_jump)), max(0, round_end_time - now), TIMER_STOPPABLE | TIMER_CLIENT_TIME)
+	log_game("Fleet jump scheduled: the round ends in [DisplayTimeText(round_end_time - now)] of real time.")
+
+/datum/controller/subsystem/overmap/proc/request_scheduled_jump()
+	round_end_request_timer = null
+	if(round_end_time)
+		request_jump(scheduled = TRUE)
+
 /**
  * ## request_jump
  *
  * Requests a bluespace jump, which, after jump_request_time deciseconds, will initiate a bluespace jump.
+ * Scheduled jumps launch jump_completion_time before round_end_time instead.
  *
  * Arguments:
  * * modifiers - (Optional) Modifies the length of the jump request time (defaults to 1)
  */
-/datum/controller/subsystem/overmap/proc/request_jump(modifier = 1)
+/datum/controller/subsystem/overmap/proc/request_jump(modifier = 1, scheduled = FALSE)
+	// A vote cannot bring forward or restart the scheduled fleet departure.
+	if(jump_mode != BS_JUMP_IDLE || (round_end_time && !scheduled))
+		return FALSE
 	jump_mode = BS_JUMP_CALLED
-	jump_timer = addtimer(CALLBACK(src, PROC_REF(initiate_jump)), jump_request_time * modifier, TIMER_STOPPABLE)
-	priority_announce("Preparing for jump. ETD: [jump_request_time * modifier / 600] minutes.", null, null, "Priority")
+	var/now = REALTIMEOFDAY
+	jump_launch_time = scheduled ? max(now, round_end_time - jump_completion_time) : now + jump_request_time * modifier
+	var/time_left = jump_launch_time - now
+	jump_timer = addtimer(CALLBACK(src, PROC_REF(initiate_jump)), time_left, TIMER_STOPPABLE | TIMER_CLIENT_TIME)
+	for(var/alert_lead in jump_alert_leads)
+		if(time_left > alert_lead)
+			jump_alert_timers += addtimer(CALLBACK(src, PROC_REF(jump_alert), alert_lead), time_left - alert_lead, TIMER_STOPPABLE | TIMER_CLIENT_TIME)
+	log_game("Fleet jump called[scheduled ? " by the round timer" : ""]: launch in [DisplayTimeText(time_left)].")
+	// Under a minute left (a very short round, or a server that slept through the warning) there is nothing useful to say.
+	var/minutes = round(time_left / (1 MINUTES), 1)
+	if(minutes >= 1)
+		announce_jump(minutes)
+	return TRUE
+
+/// Late departure alert. Skipped when a later alert or the launch is already due, as after an empty server wakes.
+/datum/controller/subsystem/overmap/proc/jump_alert(alert_lead)
+	if(jump_mode != BS_JUMP_CALLED)
+		return
+	var/time_left = jump_launch_time - REALTIMEOFDAY
+	if(time_left <= 0)
+		return
+	for(var/later_lead in jump_alert_leads)
+		if(later_lead < alert_lead && time_left <= later_lead)
+			return
+	announce_jump(alert_lead / (1 MINUTES), alarm = TRUE)
+
+/// Fleet jump countdown announcement. The late alerts are red, with the red alert alarm.
+/datum/controller/subsystem/overmap/proc/announce_jump(minutes, alarm = FALSE)
+	var/text = minutes > 1 ? "All ships, fleet jump in [minutes] minutes. Get your crews aboard." : "All ships, fleet jump in 1 minute. Anyone not aboard will be left behind."
+	priority_announce(text, "Fleet Jump", alarm ? /datum/security_level/red::sound : null, ANNOUNCEMENT_TYPE_PRIORITY, has_important_message = TRUE, color_override = alarm ? "red" : null)
+
+/// Status panel line, like the shuttle ETA: shown from the first warning until launch.
+/datum/controller/subsystem/overmap/proc/jump_countdown_text()
+	if(jump_mode != BS_JUMP_CALLED || !jump_launch_time)
+		return null
+	return "Fleet Jump: [gameTimestamp("mm:ss", max(1, jump_launch_time - REALTIMEOFDAY))]"
+
+/mob/get_status_tab_items()
+	. = ..()
+	var/countdown = SSovermap?.jump_countdown_text()
+	if(countdown)
+		. += countdown
+
+/datum/controller/subsystem/overmap/proc/clear_jump_alerts()
+	for(var/alert_timer in jump_alert_timers)
+		deltimer(alert_timer)
+	jump_alert_timers.Cut()
+	jump_launch_time = null
 
 /**
  * ##cancel_jump
  *
  * Cancels a currently requested bluespace jump.
- * Can only be done after the jump has been requested, but before the jump has actually begun.
+ * Also cancels an automatic departure before its first announcement, but never after launch.
  */
-/datum/controller/subsystem/overmap/proc/cancel_jump()
-	if(jump_mode != BS_JUMP_CALLED)
-		return
-	deltimer(jump_timer)
+/datum/controller/subsystem/overmap/proc/cancel_jump(announce = TRUE)
+	if(jump_mode >= BS_JUMP_INITIATED || (!round_end_time && jump_mode != BS_JUMP_CALLED))
+		return FALSE
+	if(jump_timer)
+		deltimer(jump_timer)
+		jump_timer = null
+	if(round_end_request_timer)
+		deltimer(round_end_request_timer)
+		round_end_request_timer = null
+	if(round_end_timer)
+		deltimer(round_end_timer)
+		round_end_timer = null
+	clear_jump_alerts()
+	round_end_time = null
 	jump_mode = BS_JUMP_IDLE
-	priority_announce("Bluespace jump cancelled.", null, null, "Priority")
+	log_game("Fleet jump cancelled.")
+	if(announce)
+		priority_announce("Fleet jump cancelled.", "Fleet Jump", null, ANNOUNCEMENT_TYPE_PRIORITY, has_important_message = TRUE)
+	return TRUE
 
 /**
  * ##initiate_jump
@@ -457,13 +561,36 @@ SUBSYSTEM_DEF(overmap)
  * This cannot be interrupted by conventional means.
  */
 /datum/controller/subsystem/overmap/proc/initiate_jump()
+	if(jump_mode != BS_JUMP_CALLED)
+		return
+	jump_timer = null
 	jump_mode = BS_JUMP_INITIATED
+	clear_jump_alerts()
+	// Arm completion before moving ships: enterTransit() can yield during a launch.
+	// Scheduled rounds already have an absolute completion timer from roundstart.
+	if(!round_end_time)
+		jump_timer = addtimer(CALLBACK(src, PROC_REF(complete_jump)), jump_completion_time, TIMER_STOPPABLE | TIMER_CLIENT_TIME)
+	log_game("Fleet jump launched.")
+	priority_announce("Fleet jump underway.", "Fleet Jump", null, ANNOUNCEMENT_TYPE_PRIORITY, has_important_message = TRUE)
 	for(var/obj/docking_port/mobile/voidcrew/mobile_port as anything in SSshuttle.mobile_docking_ports)
 		mobile_port.hyperspace_sound(HYPERSPACE_WARMUP, mobile_port.shuttle_areas)
 		mobile_port.on_emergency_launch()
 
-	priority_announce("Jump initiated. ETA: [jump_completion_time / 600] minutes.", null, null, "Priority")
-	jump_timer = addtimer(VARSET_CALLBACK(src, jump_mode, BS_JUMP_COMPLETED), jump_completion_time)
+/// Finish through the normal ticker immediately, rather than waiting for its next poll.
+/datum/controller/subsystem/overmap/proc/complete_jump()
+	// A server that slept past the launch reaches the deadline with the launch still pending.
+	if(jump_mode == BS_JUMP_CALLED && jump_timer)
+		deltimer(jump_timer)
+	jump_timer = null
+	round_end_timer = null
+	clear_jump_alerts()
+	jump_mode = BS_JUMP_COMPLETED
+	log_game("Fleet jump completed.")
+	if(SSticker.IsRoundInProgress())
+		// Cinematics must not hold a scheduled round open past its deadline.
+		if(round_end_time)
+			SSticker.roundend_check_paused = FALSE
+		SSticker.fire()
 
 /datum/controller/subsystem/overmap/proc/create_map()
 	// creates the overmap area and sets it up
@@ -783,11 +910,11 @@ SUBSYSTEM_DEF(overmap)
  * * pass - which round of one-per-type this is. Pass 1 is generated during the lobby;
  *   later passes are numbered in the contact's name and build on first visit.
  */
-/datum/controller/subsystem/overmap/proc/spawn_dynamic_planet(obj/structure/overmap/planet/marker_type, pass = 1, wanted_band = null, datum/overmap_layout/layout)
+/datum/controller/subsystem/overmap/proc/spawn_dynamic_planet(obj/structure/overmap/planet/marker_type, pass = 1, wanted_band = null, datum/overmap_layout/layout, strict_band = FALSE)
 	if(isnull(wanted_band))
 		wanted_band = SSmapping.next_planet_zone_band()
 	var/turf/turf_for_planet = layout ? layout.pick_destination(wanted_band) : get_unused_overmap_square_in_zone_band(wanted_band, tries = 80)
-	if(!turf_for_planet && layout)
+	if(!turf_for_planet && (layout || strict_band))
 		return null // The caller can try another band without mismatching planet difficulty.
 	if(!turf_for_planet)
 		log_mapping("SSovermap: Failed to place dynamic planet [marker_type] in zone band [wanted_band], falling back to any free square")
@@ -818,6 +945,60 @@ SUBSYSTEM_DEF(overmap)
 	log_mapping("SSovermap: Spawned dynamic planet '[planet_to_spawn.name]' (unloaded) in zone band [wanted_band] at ([turf_for_planet.x], [turf_for_planet.y])")
 	return planet_to_spawn
 
+/// Contact creation stays unloaded; actual docking still claims ground through the capacity gate.
+/datum/controller/subsystem/overmap/proc/mission_contact_capacity(tenant_class)
+	return length(find_free_slot(tenant_class)) || !SSmapping.at_z_level_ceiling()
+
+/// Only ordinary terrain biomes can supply scheduled field work.
+/datum/controller/subsystem/overmap/proc/spawn_mission_planet(band, wanted_planet)
+	if(!(band in list(ZONE_GREEN, ZONE_YELLOW, ZONE_RED)) || !mission_contact_capacity(MAP_TENANT_CLASS_PLANET))
+		log_mapping("SSmissions: planet contact unavailable for band [band]: invalid band or world capacity")
+		return null
+	var/list/markers = list(
+		/obj/structure/overmap/planet/lava,
+		/obj/structure/overmap/planet/ice,
+		/obj/structure/overmap/planet/jungle,
+		/obj/structure/overmap/planet/beach,
+		/obj/structure/overmap/planet/wasteland,
+	)
+	for(var/obj/structure/overmap/planet/marker as anything in markers.Copy())
+		if(wanted_planet && initial(marker.planet) != wanted_planet)
+			markers -= marker
+	if(!length(markers))
+		log_mapping("SSmissions: no repeatable planet biome for [wanted_planet]")
+		return null
+	var/obj/structure/overmap/planet/contact = spawn_dynamic_planet(pick(markers), 1, band, null, TRUE)
+	if(!contact)
+		log_mapping("SSmissions: no free overmap square for planet contact in band [band]")
+	return contact
+
+/// Scheduled shortages may add an ordinary repeatable signal, never a chart or unique ruin.
+/datum/controller/subsystem/overmap/proc/spawn_mission_ruin(band)
+	if(!(band in list(ZONE_GREEN, ZONE_YELLOW, ZONE_RED)))
+		return null
+	var/list/templates = list()
+	for(var/key in SSmapping.space_ruins_templates)
+		var/datum/map_template/ruin/space/template = SSmapping.space_ruins_templates[key]
+		if(!istype(template) || !(template.type in mission_ruin_templates) || template.unpickable || !ruin_fits_in_level(template))
+			continue
+		var/tenant_class = ruin_fits_in_slot(template) ? MAP_TENANT_CLASS_FLAT : MAP_TENANT_CLASS_SOLO
+		if(mission_contact_capacity(tenant_class))
+			templates[template] = template.placement_weight || 1
+	if(!length(templates))
+		log_mapping("SSmissions: no repeatable ruin contact available in band [band]: templates or world capacity")
+		return null
+	var/turf/destination = get_unused_overmap_square_in_zone_band(band, tries = 80)
+	if(!destination)
+		log_mapping("SSmissions: no free overmap square for ruin contact in band [band]")
+		return null
+	return place_space_ruin_contact(pick_weight(templates), destination)
+
+/// Shared with natural seeding; no interior is loaded during offer generation.
+/datum/controller/subsystem/overmap/proc/place_space_ruin_contact(datum/map_template/ruin/space/template, turf/destination)
+	var/obj/structure/overmap/space_ruin/contact = new(destination)
+	contact.set_ruin_template(template)
+	return contact
+
 /// Roman numeral for a planet's place in its type, so the chart reads "Lava Planet II"
 /// rather than a second "Lava Planet".
 /datum/controller/subsystem/overmap/proc/planet_designation(index)
@@ -891,8 +1072,7 @@ SUBSYSTEM_DEF(overmap)
 	for(var/i in 1 to length(positions))
 		var/turf/turf_for_ruin = positions[i]
 		var/datum/map_template/ruin/space/selected_ruin = used_ruins[i]
-		var/obj/structure/overmap/space_ruin/new_ruin = new(turf_for_ruin)
-		new_ruin.set_ruin_template(selected_ruin)
+		place_space_ruin_contact(selected_ruin, turf_for_ruin)
 		log_mapping("SSovermap: Spawned space ruin '[selected_ruin.name]' at ([turf_for_ruin.x], [turf_for_ruin.y])")
 
 	// Asteroid mining no longer has a guarantee here - space ruin signals retired the
diff --git a/voidcrew/modules/overmap/code/controllers/subsystem/shuttle.dm b/voidcrew/modules/overmap/code/controllers/subsystem/shuttle.dm
index 6fdfbf489b1..56244d14d69 100644
--- a/voidcrew/modules/overmap/code/controllers/subsystem/shuttle.dm
+++ b/voidcrew/modules/overmap/code/controllers/subsystem/shuttle.dm
@@ -309,6 +309,9 @@ GLOBAL_LIST_INIT(ship_brought_landmarks, typecacheof(list(
 	if(SSovermap.jump_mode > BS_JUMP_IDLE)
 		return
 
+	// An explicit admin departure replaces the automatic schedule.
+	if(SSovermap.round_end_time)
+		SSovermap.cancel_jump(FALSE)
 	SSovermap.request_jump()
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Call Shuttle") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	log_admin("[key_name(usr)] admin-initiated a bluespace jump.")
@@ -324,10 +327,8 @@ GLOBAL_LIST_INIT(ship_brought_landmarks, typecacheof(list(
 	if(confirm != "Yes")
 		return
 
-	if(SSovermap.jump_mode != BS_JUMP_CALLED)
+	if(!SSovermap.cancel_jump())
 		return
-
-	SSovermap.cancel_jump()
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Cancel Shuttle") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	log_admin("[key_name(usr)] admin-cancelled a bluespace jump.")
 	message_admins("<span class='adminnotice'>[key_name_admin(usr)] admin-cancelled a bluespace jump.</span>")
diff --git a/voidcrew/modules/overmap/code/modules/overmap/_overmap.dm b/voidcrew/modules/overmap/code/modules/overmap/_overmap.dm
index 81adfc4bcfb..1ad6965e29c 100644
--- a/voidcrew/modules/overmap/code/modules/overmap/_overmap.dm
+++ b/voidcrew/modules/overmap/code/modules/overmap/_overmap.dm
@@ -18,8 +18,8 @@ GLOBAL_LIST_EMPTY(overmap_objects)
 	///List of other overmap objects in the same tile
 	var/list/close_overmap_objects
 	var/surveyed = FALSE
-	/// Research points (and credits) an orbital survey of this object banks, before the
-	/// first-survey bonus and console tier multipliers (see survey_computer.dm
+	/// Research points an orbital survey of this object banks, before console tier,
+	/// target zone and remote-storm multipliers (see survey_computer.dm
 	/// get_survey_value). Set it on the family's base type and every subtype inherits it,
 	/// so storm severities, planet terrains and star classes are all worth what their
 	/// family is worth. 0 is "nothing to learn here" - the default for everything that
diff --git a/voidcrew/modules/overmap/code/modules/overmap/events.dm b/voidcrew/modules/overmap/code/modules/overmap/events.dm
index 0b71ccf4fca..5d939abaa2e 100644
--- a/voidcrew/modules/overmap/code/modules/overmap/events.dm
+++ b/voidcrew/modules/overmap/code/modules/overmap/events.dm
@@ -36,26 +36,12 @@ GLOBAL_LIST_EMPTY(meteor_fields)
 	max_cluster_size = 5
 	chart_variant = "rock"
 	parallax_theme = PARALLAX_THEME_ASTEROIDS // crews over/inside the field see drifting asteroids
-	survey_value = 100
-	/// Notable minerals shown on the survey report. Keep in sync with ore_weights
-	var/mineral_types = list(/datum/material/iron, /datum/material/plasma, /datum/material/silver, /datum/material/titanium, /datum/material/gold)
+	survey_value = 50
+	/// Minerals available in every field; zone weights determine their relative abundance.
+	var/mineral_types = list(/datum/material/iron, /datum/material/plasma, /datum/material/silver, /datum/material/titanium, /datum/material/gold, /datum/material/uranium, /datum/material/diamond, /datum/material/bluespace, /datum/material/bananium)
 
 	/// Map generator used to carve this severity's landable rock field (see AsteroidCaves.dm)
 	var/datum/map_generator/cave_generator/asteroid_field/mapgen_type = /datum/map_generator/cave_generator/asteroid_field
-	/// Weighted ore table seeded into this severity's rock (seed_asteroid_ore_block);
-	/// higher severities carry rarer minerals. Braving the worse storm pays better
-	var/list/ore_weights = list(
-		/obj/item/stack/ore/iron = 40,
-		/obj/item/stack/ore/plasma = 20,
-		/obj/item/stack/ore/silver = 12,
-		/obj/item/stack/ore/titanium = 12,
-		/obj/item/stack/ore/gold = 10,
-		/obj/item/stack/ore/uranium = 5,
-		/obj/item/stack/ore/diamond = 2,
-		/obj/item/stack/ore/bluespace_crystal = 1,
-	)
-	/// Fraction of the field's rock turfs seeded ore-bearing
-	var/ore_target_ratio = EVENT_FIELD_ORE_TARGET_RATIO
 	/// Chance (0-100) the field hides a zone-scaled expedition cache (zone_loot.dm)
 	var/crate_chance = 40
 	/// How many roaming zone-scaled mob packs guard the field: list(min, max)
@@ -85,10 +71,8 @@ GLOBAL_LIST_EMPTY(meteor_fields)
 	var/dock_index
 	/// Bottom-left turf of the field's padded generation footprint (set by load_level, cleared on unload)
 	var/turf/field_bottom_left
-	/// Whether this field's ore and caches have already been rolled once. The rock
-	/// regenerates on every dock (it is the hazard), but the payout does not - without
-	/// this, undocking for 20 seconds and re-docking re-rolled a fresh ore-seeded field.
-	var/field_mined = FALSE
+	/// Terminal once teardown starts; no caller may regenerate this field.
+	var/retiring = FALSE
 
 /obj/structure/overmap/event/meteor/Initialize(mapload)
 	. = ..()
@@ -97,6 +81,15 @@ GLOBAL_LIST_EMPTY(meteor_fields)
 
 /obj/structure/overmap/event/meteor/Destroy()
 	GLOB.meteor_fields -= src
+	// The chart was previously static. Retiring a field must also open its cached route.
+	var/turf/chart = get_turf(src)
+	var/still_blocked = FALSE
+	for(var/obj/structure/overmap/event/other in chart)
+		if(other != src && !QDELETED(other) && !istype(other, /obj/structure/overmap/event/nebula))
+			still_blocked = TRUE
+			break
+	if(!still_blocked)
+		GLOB.overmap_blocked_turfs -= chart
 	field_bottom_left = null
 	field_area = null
 	// The orderly teardown (unload_level -> remove_mapzone) leaves both of these null. What
@@ -121,16 +114,6 @@ GLOBAL_LIST_EMPTY(meteor_fields)
 	max_cluster_size = 4
 	chart_severity = 1
 	mapgen_type = /datum/map_generator/cave_generator/asteroid_field/minor
-	mineral_types = list(/datum/material/iron, /datum/material/plasma, /datum/material/silver, /datum/material/titanium)
-	// Common rock only: no uranium, diamond or bluespace this shallow
-	ore_weights = list(
-		/obj/item/stack/ore/iron = 50,
-		/obj/item/stack/ore/plasma = 22,
-		/obj/item/stack/ore/silver = 12,
-		/obj/item/stack/ore/titanium = 12,
-		/obj/item/stack/ore/gold = 4,
-	)
-	ore_target_ratio = 0.25
 	crate_chance = 20
 	mob_pack_count = list(1, 2)
 
@@ -139,21 +122,7 @@ GLOBAL_LIST_EMPTY(meteor_fields)
 	spread_chance = 25
 	max_cluster_size = 7
 	chart_severity = 3
-	mineral_types = list(/datum/material/gold, /datum/material/uranium, /datum/material/diamond, /datum/material/bluespace)
 	mapgen_type = /datum/map_generator/cave_generator/asteroid_field/majour
-	// The deep-storm payout: still mostly working rock, but the precious tail
-	// is fat enough that a full strip run banks real diamond/bluespace
-	ore_weights = list(
-		/obj/item/stack/ore/iron = 18,
-		/obj/item/stack/ore/plasma = 14,
-		/obj/item/stack/ore/silver = 12,
-		/obj/item/stack/ore/titanium = 12,
-		/obj/item/stack/ore/gold = 16,
-		/obj/item/stack/ore/uranium = 14,
-		/obj/item/stack/ore/diamond = 9,
-		/obj/item/stack/ore/bluespace_crystal = 5,
-	)
-	ore_target_ratio = 0.4
 	crate_chance = 65
 	mob_pack_count = list(3, 4)
 
@@ -187,6 +156,9 @@ GLOBAL_LIST_EMPTY(meteor_fields)
  * contract: null takes the default, UI callers pass WORLDGEN_QUEUE_NO_WAIT.
  */
 /obj/structure/overmap/event/meteor/proc/load_level(mob/user, obj/structure/overmap/ship/waiting_ship, queue_timeout)
+	if(retiring)
+		SEND_SIGNAL(src, COMSIG_VOIDCREW_SITE_LOAD_FINISHED, FALSE)
+		return
 	if(mapzone)
 		SEND_SIGNAL(src, COMSIG_VOIDCREW_SITE_LOAD_FINISHED, is_loaded())
 		return
@@ -203,7 +175,13 @@ GLOBAL_LIST_EMPTY(meteor_fields)
 		SEND_SIGNAL(src, COMSIG_VOIDCREW_SITE_LOAD_FINISHED, FALSE)
 		return
 
-	// The world moved while we queued: another caller may have loaded us already.
+	// The world moved while we queued: recheck terminal teardown as well.
+	if(retiring)
+		SSovermap.worldgen_release(src)
+		loading = FALSE
+		worldgen_end(probe, "retiring")
+		SEND_SIGNAL(src, COMSIG_VOIDCREW_SITE_LOAD_FINISHED, FALSE)
+		return
 	if(mapzone)
 		SSovermap.worldgen_release(src)
 		loading = FALSE
@@ -255,8 +233,7 @@ GLOBAL_LIST_EMPTY(meteor_fields)
 	var/list/field_candidates = block(field_bottom_left, field_top_right)
 
 	// Carve the rock field via the map generator framework (same architecture as
-	// planets - see AsteroidCaves.dm) then top up ore the same way asteroid space
-	// ruin signals used to, before that category was retired in favor of this field.
+	// planets - see AsteroidCaves.dm). Mineral turfs perform the only ore roll.
 	//
 	// The area is OURS, minted per load. /area/centcom/asteroid/voidcrew used to be
 	// UNIQUE_AREA, so every field alive at once shared one instance spanning all of them -
@@ -266,12 +243,7 @@ GLOBAL_LIST_EMPTY(meteor_fields)
 	var/list/field_turfs = mapgen.generate_terrain(field_candidates, field_area)
 	if(length(field_turfs))
 		mapgen.populate_terrain(field_turfs, field_area)
-		// One payout per field per round: the rock (and the meteor hazard) come back on
-		// every dock, but the ore roll and the cache extras only happen the first time.
-		if(!field_mined)
-			field_mined = TRUE
-			seed_asteroid_ore_block(field_bottom_left, field_top_right, ore_target_ratio, "hazard field '[name]'", ore_weights)
-			populate_field_extras(field_turfs)
+		populate_field_extras(field_turfs)
 	else
 		// Nothing was carved, so nothing ever entered our area instance - and
 		// reap_emptied_areas() only collects areas a teardown takes turfs AWAY from, so an
@@ -302,7 +274,7 @@ GLOBAL_LIST_EMPTY(meteor_fields)
 	// exist, and request_site_load()'s fast path re-invokes ship_act off this answer -
 	// answering "loaded" while the slot is gone would bounce the two procs off each other
 	// in an unbroken INVOKE_ASYNC loop.
-	return loaded && mapzone && reserve_dock
+	return !retiring && loaded && mapzone && reserve_dock
 
 /// A wedged load or teardown leaves these flags latched (the watchdog force-released
 /// the queue, but nothing else ever resets them), and ships may be registered for a
@@ -334,6 +306,8 @@ GLOBAL_LIST_EMPTY(meteor_fields)
 	return "[name] (mining anchorage)"
 
 /obj/structure/overmap/event/meteor/ship_act(mob/user, obj/structure/overmap/ship/acting, obj/structure/overmap/ship/optional_partner)
+	if(retiring)
+		return
 	// dock() refuses interdicted ships only after the dock slot below is claimed -
 	// refuse up front instead
 	if(acting.is_interdicted)
@@ -467,8 +441,8 @@ GLOBAL_LIST_EMPTY(meteor_fields)
 	SSambient_npcs.populate_field(src, open_turfs)
 
 /**
- * Releases the field's map slot and docks when nobody's using it. Unlike space ruins,
- * the event itself is never deleted or moved - only its (lazily-loaded) interior is freed.
+ * Releases the field's map slot and docks when nobody's using it.
+ * Successful teardown also retires the event permanently.
  */
 /obj/structure/overmap/event/meteor/proc/can_release_interior()
 	return isnull(get_interior_release_blocker(log_failure = TRUE))
@@ -513,7 +487,7 @@ GLOBAL_LIST_EMPTY(meteor_fields)
 	return null
 
 /obj/structure/overmap/event/meteor/proc/unload_level()
-	if(concerned)
+	if(retiring || concerned)
 		return
 
 	if(!can_release_interior())
@@ -561,11 +535,12 @@ GLOBAL_LIST_EMPTY(meteor_fields)
 	// is_loaded() must read FALSE the moment the ground stops being safe to dock into,
 	// or an arriving ship's fast path resumes an approach into turfs that are
 	// mid-recycle.
+	retiring = TRUE
 	loaded = FALSE
 	remove_docks()
 	remove_mapzone()
 	SSovermap.worldgen_release(src)
-	concerned = FALSE
+	qdel(src)
 
 /obj/structure/overmap/event/meteor/proc/remove_docks()
 	if(reserve_dock)
@@ -597,73 +572,13 @@ GLOBAL_LIST_EMPTY(meteor_fields)
 	field_area = null
 	field_bottom_left = null
 
-/**
- * Seeds ore deposits into a rectangular block of rock turfs, converting barren
- * /turf/closed/mineral rock into ore deposits until target_ratio of the mineral
- * turfs in the block are ore-bearing. Originally shared with space ruin asteroid
- * signals; those were retired in favor of landable fields, so this is now solely
- * the field ore-seeding step, called from load_level() above.
- *
- * source_desc is a human-readable label for the mapping log line only.
- * ore_weights optionally overrides the default weighted ore table, the meteor
- * severity tiers pass their own so worse storms seed richer rock.
- *
- * Mining itself needs no z-level traits: off mining levels, prox_to_vent() returns 0 and
- * the mineral turf machinery falls back to flat random yields, so this works fine inside
- * a map slot on a shared encounter z-level.
- */
-/proc/seed_asteroid_ore_block(turf/bottom_left, turf/top_right, target_ratio, source_desc, list/ore_weights)
-	if(!bottom_left || !top_right)
-		return
-
-	// Default weighted ore table - iron/plasma-heavy like planet rock, no bananium, and
-	// no gibtonite (its detonation admin-alerts are tuned for mining levels, and surprise
-	// bombs shouldn't be procedurally injected into rock the mapper made inert)
-	var/static/list/asteroid_ore_weights = list(
-		/obj/item/stack/ore/iron = 40,
-		/obj/item/stack/ore/plasma = 20,
-		/obj/item/stack/ore/silver = 12,
-		/obj/item/stack/ore/titanium = 12,
-		/obj/item/stack/ore/gold = 10,
-		/obj/item/stack/ore/uranium = 5,
-		/obj/item/stack/ore/diamond = 2,
-		/obj/item/stack/ore/bluespace_crystal = 1,
-	)
-	var/list/table = (length(ore_weights)) ? ore_weights : asteroid_ore_weights
-
-	var/mineral_turf_count = 0
-	var/ore_bearing_count = 0
-	var/list/barren_rock = list()
-	for(var/turf/closed/mineral/rock in block(bottom_left, top_right))
-		mineral_turf_count++
-		// Already has ore, a boulder, or is gibtonite (mineralType-less but very much not barren)
-		if(rock.mineralType || rock.spawned_boulder || istype(rock, /turf/closed/mineral/gibtonite))
-			ore_bearing_count++
-			continue
-		barren_rock += rock
-		// Scans a whole site block mid-round - yield (see worldgen_yield())
-		SSovermap.worldgen_yield()
-
-	var/target = CEILING(mineral_turf_count * target_ratio, 1)
-	var/to_seed = target - ore_bearing_count
-	var/seeded = 0
-	while(to_seed > 0 && length(barren_rock))
-		var/turf/closed/mineral/rock = pick_n_take(barren_rock)
-		rock.Change_Ore(pick_weight(table))
-		rock.mineralAmt = rand(ASTEROID_ORE_AMOUNT_MIN, ASTEROID_ORE_AMOUNT_MAX)
-		to_seed--
-		seeded++
-
-	if(seeded)
-		log_mapping("SPACE RUIN: Seeded [seeded] ore deposits into [source_desc] ([ore_bearing_count]/[mineral_turf_count] rock was already ore-bearing)")
-
 /obj/structure/overmap/event/emp
 	name = "ion storm (moderate)"
 	icon_state = "ion1"
 	spread_chance = 20
 	max_cluster_size = 4
 	chart_variant = "ion"
-	survey_value = 400
+	survey_value = 100
 	var/intensity = 1
 
 /obj/structure/overmap/event/emp/Initialize(mapload)
@@ -688,7 +603,7 @@ GLOBAL_LIST_EMPTY(meteor_fields)
 	spread_chance = 30
 	max_cluster_size = 4
 	chart_variant = "electrical"
-	survey_value = 250
+	survey_value = 75
 	var/intensity = 1
 
 /obj/structure/overmap/event/electric/Initialize(mapload)
@@ -727,6 +642,11 @@ GLOBAL_LIST_INIT(nebula_gas_tables_by_band, list(
 		/datum/gas/plasma = 55,
 		/datum/gas/nitrogen = 30,
 		/datum/gas/water_vapor = 15,
+		/datum/gas/miasma = 1,
+		/datum/gas/tritium = 1,
+		/datum/gas/pluoxium = 1,
+		/datum/gas/nitrium = 1,
+		/datum/gas/hypernoblium = 1,
 	),
 	"[ZONE_YELLOW]" = list(
 		/datum/gas/plasma = 40,
@@ -746,7 +666,7 @@ GLOBAL_LIST_INIT(nebula_gas_tables_by_band, list(
 ))
 
 /// Moles per second a rating-1 ram scoop pulls from a nebula of each gas.
-/// The precious stuff comes slower on top of already being red-band-only
+/// The precious stuff comes slower as well as being rarer in the safer bands.
 GLOBAL_LIST_INIT(nebula_gas_scoop_rates, list(
 	/datum/gas/plasma = 8,
 	/datum/gas/nitrogen = 8,
@@ -786,7 +706,7 @@ GLOBAL_LIST_EMPTY(nebula_events)
 	spread_chance = 75
 	opacity = TRUE
 	parallax_theme = PARALLAX_THEME_SPACE_GAS // crews inside see space gas, tinted below
-	survey_value = 50
+	survey_value = 25
 	/// The /datum/gas typepath this nebula carries. Null rolls one from the
 	/// zone band's table on Init; the fixed subtypes below force a specific gas.
 	var/datum/gas/gas_type
@@ -824,7 +744,7 @@ GLOBAL_LIST_EMPTY(nebula_events)
 
 /obj/structure/overmap/event/nebula/get_hazard_note()
 	if((GLOB.nebula_gas_radioactivity[gas_type] || 0) > 0)
-		return "Radioactive nebula: irradiates the crew unless protected by an active nebula shielder."
+		return "Radioactive gas."
 	return null
 
 /// Display name of the carried gas, for survey readouts and examine
diff --git a/voidcrew/modules/overmap/code/modules/overmap/generation.dm b/voidcrew/modules/overmap/code/modules/overmap/generation.dm
index c1da3e1e342..362be922cfa 100644
--- a/voidcrew/modules/overmap/code/modules/overmap/generation.dm
+++ b/voidcrew/modules/overmap/code/modules/overmap/generation.dm
@@ -215,6 +215,7 @@
 			for(var/path in weights)
 				if(!tally[path])
 					weights[path] *= 2
+			weights = meteor_event_weights(weights, band)
 			event_type = pick_weight(weights)
 		grow_cluster(seed, event_type)
 		CHECK_TICK
@@ -240,6 +241,25 @@
 		return FALSE
 	return ensure_event_supply()
 
+/// Severity changes within the existing meteor budget, leaving hazard coverage intact.
+/proc/meteor_severity_weights(zone_type)
+	switch(ordinary_ore_zone(zone_type))
+		if(ZONE_YELLOW)
+			return list(/obj/structure/overmap/event/meteor/minor = 25, /obj/structure/overmap/event/meteor = 50, /obj/structure/overmap/event/meteor/majour = 25)
+		if(ZONE_RED)
+			return list(/obj/structure/overmap/event/meteor/minor = 10, /obj/structure/overmap/event/meteor = 30, /obj/structure/overmap/event/meteor/majour = 60)
+	return list(/obj/structure/overmap/event/meteor/minor = 60, /obj/structure/overmap/event/meteor = 30, /obj/structure/overmap/event/meteor/majour = 10)
+
+/proc/meteor_event_weights(list/weights, zone_type)
+	var/list/result = weights.Copy()
+	var/list/severities = meteor_severity_weights(zone_type)
+	var/total = 0
+	for(var/path in severities)
+		total += weights[path]
+	for(var/path in severities)
+		result[path] = total * severities[path] / 100
+	return result
+
 /// Repairs only remove hazards, so this converges. A cross-zone opening can expose
 /// another pocket inside one band; recheck until both guarantees hold together.
 /datum/overmap_layout/proc/connect_clear_space()
diff --git a/voidcrew/modules/overmap/code/modules/overmap/planet.dm b/voidcrew/modules/overmap/code/modules/overmap/planet.dm
index eade5003ca9..f12f5269573 100644
--- a/voidcrew/modules/overmap/code/modules/overmap/planet.dm
+++ b/voidcrew/modules/overmap/code/modules/overmap/planet.dm
@@ -4,7 +4,7 @@
 	icon_state = "strange_event"
 	sensor_detectable = TRUE
 	sensor_category = "Planets"
-	survey_value = 500
+	survey_value = 150
 
 	/// Datum containing all of the information about this planet
 	var/datum/overmap/planet/planet
diff --git a/voidcrew/modules/overmap/code/modules/overmap/ship.dm b/voidcrew/modules/overmap/code/modules/overmap/ship.dm
index d15ad4ed61c..cdeac741996 100644
--- a/voidcrew/modules/overmap/code/modules/overmap/ship.dm
+++ b/voidcrew/modules/overmap/code/modules/overmap/ship.dm
@@ -209,9 +209,12 @@
 	var/list/datum/mission/active_missions = list()
 	/// Maximum number of active missions (captain can adjust)
 	var/max_missions = DEFAULT_MAX_ACTIVE_MISSIONS
-	/// World time of the last manual mission refresh (rate-limited). Starts a whole cooldown back, so a
-	/// ship that never refreshed can, rather than waiting out the first minutes after the server boots.
+	/// Last scheduled refresh, retained for callers of the original board API.
 	var/last_mission_refresh = -MISSION_REFRESH_COOLDOWN
+	/// Fixed offer-set schedule, shared by every console on this hull.
+	var/next_mission_refresh = 0
+	/// Round time of this hull's first suit award, for mission metrics.
+	var/mission_first_suit_seconds
 
 	var/pending_dock = FALSE
 	var/pending_dock_timer
@@ -692,6 +695,7 @@
 	ship_team = new()
 	ship_team.name = template.name
 	ship_team.ship = src
+	ship_team.ensure_crew_record()
 
 	// Pick a random bright color for ship runechat
 	var/static/list/ship_chat_colors = list(
@@ -1006,7 +1010,8 @@
 	register_crewmember(H)
 
 /obj/structure/overmap/ship/proc/register_crewmember(mob/living/carbon/human/crewmate)
-	ship_team.add_member(crewmate.mind)
+	if(!ship_team?.join_member(crewmate?.mind))
+		return FALSE
 	// Remember crew across respawns until the password changes or join access is reset.
 	if(crewmate.ckey)
 		password_cleared_ckeys[crewmate.ckey] = TRUE
@@ -1032,22 +1037,49 @@
  *
  * NOT register_crewmember(): that is for fresh spawns only - it wipes the mind's
  * memory and folds their bank account into ours, which would trash the character of
- * anyone who already has a life on another ship. This also deliberately leaves their
- * other crew memberships alone: founding or being handed a second hull should not
- * strip a player off their first one.
+ * anyone who already has a life on another ship. Same-crew hull rosters survive;
+ * joining a different crew removes all former-crew memberships.
  *
  * Returns TRUE if they ended up on the roster.
  */
 /obj/structure/overmap/ship/proc/enlist_crewmember(mob/living/crewmate)
 	if(!crewmate?.mind || !ship_team)
 		return FALSE
-	ship_team.add_member(crewmate.mind) // no-op if they are already aboard
+	if(!ship_team.join_member(crewmate.mind))
+		return FALSE
 	if(!(crewmate.real_name in manifest))
 		manifest += crewmate.real_name
 	if(crewmate.ckey)
 		password_cleared_ckeys[crewmate.ckey] = TRUE
 	return TRUE
 
+/// Stable service/research interface. Unclaimed hulls without teams have no standing.
+/obj/structure/overmap/ship/proc/get_crew_record()
+	return ship_team?.ensure_crew_record()
+
+/// Bind a successfully loaded empty hull before enrollment or commissioning signals yield.
+/// Only the leader can extend an existing crew; confirmed departures found a new one.
+/obj/structure/overmap/ship/proc/bind_reputation_crew(datum/mind/commissioner, form_new = FALSE)
+	if(!ship_team || length(ship_team.members))
+		return FALSE
+	var/datum/voidcrew_crew_record/record = commissioner?.recover_reputation_crew()
+	if(record && !form_new && record.leader != commissioner)
+		return FALSE
+	if(form_new)
+		record = null
+	if(!record)
+		record = new
+	if(!ship_team.set_crew_record(record))
+		return FALSE
+	// The hull has loaded successfully. Reserve founding affiliation now, before
+	// any commissioning signal yields, so two builds by one newcomer share it.
+	commissioner?.join_reputation_crew(record)
+	return TRUE
+
+/// Shared prompt for empty-hull registration. Null is cancellation, not consent.
+/proc/choose_new_reputation_crew(mob/user)
+	return user?.mind ? user.mind.choose_new_ship_crew() : FALSE
+
 /**
  * ##destroy_ship
  *
@@ -1327,25 +1359,13 @@
 /**
  * Whether a mob counts as this ship's crew.
  *
- * Two things make you crew and either one is enough: your mind is on the ship's team
- * (you serve aboard right now), or your ckey is cleared past the join password - you
- * bought the hull, you were invited, you typed the password, or you served aboard
- * earlier this round, since the last password change or join access reset. The ckey
- * clause is what keeps a crewman who died and came back
- * through the lobby from being locked out of their own airlocks while the new body's
- * mind is still being put on the roster.
- *
+ * Current shared crew affiliation grants services aboard all of its hulls.
+ * Password clearance only permits a future job join, never current service access.
  * Deliberately takes a plain /mob: ghosts and non-human crew ask this too.
  */
 /obj/structure/overmap/ship/proc/is_ship_crew(mob/checking)
-	if(!checking)
-		return FALSE
-	if(checking.mind && (checking.mind in ship_team?.members))
-		return TRUE
-	var/checking_ckey = checking.ckey
-	if(!checking_ckey)
-		return FALSE
-	return (checking_ckey in password_cleared_ckeys)
+	var/datum/voidcrew_crew_record/record = checking?.mind?.get_reputation_crew()
+	return record && record == ship_team?.crew_record
 
 /**
  * Turns the crew-only airlock lock on or off. Returns TRUE if the state changed.
@@ -1381,14 +1401,26 @@
  * Claims an abandoned ship for a new owner.
  * * claimer - The mob claiming the ship
  */
-/obj/structure/overmap/ship/proc/claim_abandoned_ship(mob/living/claimer)
+/obj/structure/overmap/ship/proc/claim_abandoned_ship(mob/living/claimer, form_new = null)
 	if(retired_by_checkpoint || checkpoint_rebuilding)
-		to_chat(claimer, span_warning("This ship is retired or being rebuilt from a checkpoint."))
+		to_chat(claimer, span_warning("This vessel is unavailable."))
 		return FALSE
 	if(!abandoned)
 		return FALSE
 	if(!claimer?.mind)
 		return FALSE
+	if(length(ship_team?.members))
+		return FALSE
+	if(isnull(form_new))
+		form_new = choose_new_reputation_crew(claimer)
+		if(isnull(form_new) || QDELETED(src) || retired_by_checkpoint || checkpoint_rebuilding || !abandoned || length(ship_team?.members))
+			return FALSE
+	if(!ship_team)
+		ship_team = new /datum/team/voidcrew()
+		ship_team.name = name
+		ship_team.ship = src
+	if(!bind_reputation_crew(claimer.mind, form_new))
+		return FALSE
 	ship_metric_claimed_abandoned(src, claimer)
 
 	// Reset abandoned state, stopping the derelict-despawn clock
@@ -1397,16 +1429,10 @@
 	crewless_since = 0
 	joining_allowed = TRUE // Re-enable cryopod spawning
 
-	// Create new ship team or use existing (cleared) one
-	if(!ship_team)
-		ship_team = new /datum/team/voidcrew()
-		ship_team.name = name
-		ship_team.ship = src
-
 	// Add claimer to ship team. Every crew-adding path also clears the ckey through
 	// the join password gate - the claimer must never be locked out of the hull they
 	// now command if they die and respawn through the lobby.
-	ship_team.add_member(claimer.mind)
+	ship_team.join_member(claimer.mind)
 	if(claimer.ckey)
 		password_cleared_ckeys[claimer.ckey] = TRUE
 
@@ -4646,6 +4672,72 @@
 
 // ===== MISSION PROCS =====
 
+/// Disjoint ranges on a single roll, in tenths of a percent.
+/proc/mission_prize_outcome(zone, roll)
+	var/suit_chance = zone == ZONE_RED ? 200 : (zone == ZONE_YELLOW ? 40 : 30)
+	var/gadget_chance = zone == ZONE_RED ? 100 : (zone == ZONE_YELLOW ? 20 : 15)
+	if(roll <= suit_chance)
+		return "suit"
+	if(roll <= suit_chance + gadget_chance)
+		return "gadget"
+	return null
+
+/// Every eligible family uses the same caps, regardless of its completion surface.
+/proc/mission_prize_pool(family, category)
+	var/static/list/suits = list(
+		"kill" = list(/obj/item/mod/control/pre_equipped/traitor_elite),
+		"hunt" = list(/obj/item/mod/control/pre_equipped/safeguard),
+		"poacher" = list(/obj/item/mod/control/pre_equipped/empty/ninja),
+		"capture" = list(/obj/item/mod/control/pre_equipped/empty/ninja),
+		"waves" = list(/obj/item/mod/control/pre_equipped/magnate, /obj/item/mod/control/pre_equipped/safeguard),
+		"stake" = list(/obj/item/mod/control/pre_equipped/safeguard),
+		"lair" = list(/obj/item/mod/control/pre_equipped/traitor_elite, /obj/item/mod/control/pre_equipped/safeguard),
+	)
+	var/static/list/gadgets = list(
+		"kill" = list(/obj/item/gun/energy/laser/captain),
+		"hunt" = list(/obj/item/organ/cyberimp/cyberware/piledriver),
+		"poacher" = list(/obj/item/circuitboard/machine/ship_combat/cloak_device),
+		"capture" = list(/obj/item/gun/energy/laser/captain),
+		"waves" = list(/obj/item/gun/energy/laser/captain, /obj/item/organ/cyberimp/cyberware/piledriver, /obj/item/circuitboard/machine/ship_combat/cloak_device),
+		"stake" = list(/obj/item/gun/energy/laser/captain, /obj/item/organ/cyberimp/cyberware/piledriver, /obj/item/circuitboard/machine/ship_combat/cloak_device),
+		"lair" = list(/obj/item/gun/energy/laser/captain, /obj/item/organ/cyberimp/cyberware/piledriver, /obj/item/circuitboard/machine/ship_combat/cloak_device),
+	)
+	return category == "suit" ? suits[family] : (category == "gadget" ? gadgets[family] : null)
+
+/obj/structure/overmap/ship/proc/roll_mission_prize(zone)
+	return mission_prize_outcome(zone, rand(1, 1000))
+
+/// A capped result is spent without rerolling; claim before the constructor can yield.
+/obj/structure/overmap/ship/proc/award_guarded_prize(family, zone, atom/reward_anchor, source_type)
+	if(QDELETED(src) || !(zone in list(ZONE_GREEN, ZONE_YELLOW, ZONE_RED)))
+		return null
+	if(zone == ZONE_GREEN && (family == "stake" || family == "lair"))
+		return null
+	var/turf/spot = get_turf(reward_anchor)
+	if(!spot || !length(mission_prize_pool(family, "suit")))
+		return null
+	var/datum/voidcrew_crew_record/crew = get_crew_record()
+	if(!crew)
+		return null
+	var/category = roll_mission_prize(zone)
+	var/list/pool = mission_prize_pool(family, category)
+	if(!length(pool))
+		return null
+	if(category == "suit")
+		if(crew.mission_suit_paid)
+			return null
+		crew.mission_suit_paid = TRUE
+		mission_first_suit_seconds = metric_round_seconds()
+	else
+		if(crew.mission_gadget_paid)
+			return null
+		crew.mission_gadget_paid = TRUE
+	var/prize_type = pick(pool)
+	new prize_type(spot)
+	record_guarded_prize(src, family, category, zone, prize_type, source_type)
+	ship_notify("Requisition cleared.", "MISSION CONTROL", SHIP_NOTIFY_NOTICE, 'voidcrew/sound/notify.ogg', 50)
+	return prize_type
+
 /**
  * Accepts a mission, moving it from available to active.
  * * mission - The mission to accept
@@ -4660,6 +4752,12 @@
 		return "Your ship's active mission limit reached ([max_missions])."
 	if(mission.active)
 		return "Mission already accepted."
+	// Authoritative admission: callers cannot bypass this through a cached board.
+	// Z2 pins/retargets receipts; this validates the resolved work band, never the shop.
+	if(mission.target)
+		var/band = mission.target.get_zone_type()
+		if(!mission.target.is_valid() || band != mission.quote_zone || !get_crew_record()?.can_work_in_zone(band))
+			return "Authorization declined."
 	// Boards can hold more copies of a capped contract than the cap allows (the
 	// roll only counts live missions), so the cap has to hold here too or N ships
 	// run the same "limit 1" job at once.
diff --git a/voidcrew/modules/overmap/code/modules/overmap/space_ruin.dm b/voidcrew/modules/overmap/code/modules/overmap/space_ruin.dm
index 1875cd6f973..2a88700fb42 100644
--- a/voidcrew/modules/overmap/code/modules/overmap/space_ruin.dm
+++ b/voidcrew/modules/overmap/code/modules/overmap/space_ruin.dm
@@ -16,7 +16,7 @@ GLOBAL_LIST_EMPTY(space_ruin_signals)
 	icon_state = "strange_event"
 	sensor_detectable = TRUE
 	sensor_category = "Ruins"
-	survey_value = 300
+	survey_value = 75
 
 	/// The ruin template this object will spawn
 	var/datum/map_template/ruin/space/ruin_template
@@ -56,6 +56,9 @@ GLOBAL_LIST_EMPTY(space_ruin_signals)
 	/// Rare ruins come from rumor charts, not natural seeding: tinted gold on
 	/// the map, and cleaning one out never spawns a replacement.
 	var/rare = FALSE
+	/// Spawned for one purpose (an anomaly chart's site): cleaning it out does not seed
+	/// a replacement, so the sector's ruin count stays where natural seeding left it.
+	var/no_replacement = FALSE
 	/// Live missions currently pointed at this ruin; target picks prefer unclaimed ruins
 	var/mission_claims = 0
 	/// A mission owns this ruin's lifecycle: the empty-ruin cleanup in
@@ -761,7 +764,7 @@ GLOBAL_LIST_EMPTY(space_ruin_signals)
 
 	// Spawn a new ruin somewhere else on the overmap BEFORE we delete ourselves.
 	// Rare rumor ruins are one-shots: clearing one doesn't seed anything new.
-	if(!rare)
+	if(!rare && !no_replacement)
 		spawn_replacement_ruin(old_template)
 
 	// Delete this overmap object
diff --git a/voidcrew/modules/overmap/code/modules/overmap/stars.dm b/voidcrew/modules/overmap/code/modules/overmap/stars.dm
index 70590fe2a98..6ae48bc03d6 100644
--- a/voidcrew/modules/overmap/code/modules/overmap/stars.dm
+++ b/voidcrew/modules/overmap/code/modules/overmap/stars.dm
@@ -3,7 +3,7 @@
 	// the map centre (see HelmComputer.tsx); charting it as a generic contact too
 	// would put two marks on the same spot.
 	sensor_visible = FALSE
-	survey_value = 1000
+	survey_value = 250
 	/// Datum containing all of the information for the star
 	var/datum/overmap/star/star_datum = /datum/overmap/star
 	var/star_type = "basic"
diff --git a/voidcrew/modules/player_outposts/outpost_checkpoint_construction.dm b/voidcrew/modules/player_outposts/outpost_checkpoint_construction.dm
index 77b236cf2f4..ecc5398095a 100644
--- a/voidcrew/modules/player_outposts/outpost_checkpoint_construction.dm
+++ b/voidcrew/modules/player_outposts/outpost_checkpoint_construction.dm
@@ -38,6 +38,12 @@
 	var/obj/structure/overmap/dynamic/player_outpost/home
 	var/datum/outpost_berth/ship_bay/bay
 	var/datum/ship_checkpoint/snapshot
+	/// Live round identity retains prize and research claims after checkpoint consumption.
+	var/datum/weakref/crew_record_ref
+	/// Confirmed departure when registration would found a different crew.
+	var/form_new_crew = FALSE
+	/// The affiliation whose departure was confirmed, not a later crew joined mid-build.
+	var/datum/weakref/registration_crew_ref
 	var/datum/weakref/panel_ref
 	/// Only used to reapply console upgrade disks while the hidden copy is prepared.
 	var/datum/weakref/operator_ref
@@ -113,6 +119,7 @@
 	panel_ref = terminal ? WEAKREF(terminal) : null
 	operator_ref = WEAKREF(user)
 	snapshot = blueprint
+	crew_record_ref = blueprint.crew_record_ref
 	home = blueprint.outpost
 	captain_ckey = blueprint.captain_ckey
 	ship_name = blueprint.ship_name
@@ -158,6 +165,8 @@
 	home = null
 	bay = null
 	snapshot = null
+	crew_record_ref = null
+	registration_crew_ref = null
 	port = null
 	vessel = null
 	// A load still writing into the shipyard lets it go itself when it returns (load_source()).
@@ -188,6 +197,10 @@
 	if(!bay)
 		error = "The ship bay is occupied or reserved."
 		return FALSE
+	if(!confirm_crew_registration())
+		if(!QDELETED(src))
+			abort("Registration cancelled. [unspent_note()]")
+		return FALSE
 	// The shared loader is held only for the load itself, never for the build. A rebuild waits
 	// its turn behind purchases and earlier rebuilds, keeping its bay, rather than giving up.
 	queued = TRUE
@@ -351,6 +364,9 @@
  * Returns FALSE, with error set, when it cannot be spent; nothing is spent then.
  */
 /datum/checkpoint_construction/proc/consume_source()
+	if(!crew_registration_valid())
+		error = "Registration cancelled. [unspent_note()]"
+		return FALSE
 	committed = TRUE
 	UnregisterSignal(snapshot, COMSIG_QDELETING)
 	var/datum/ship_checkpoint/consumed = snapshot
@@ -370,6 +386,39 @@
 	log_game("Checkpoint for [ship_name] ([captain_ckey]) at [home.name] was consumed by its reconstruction.")
 	return TRUE
 
+/// A saved captain restoring the same crew's own hull needs no new-ship permission.
+/datum/checkpoint_construction/proc/restores_crew_ship(datum/mind/command)
+	var/datum/voidcrew_crew_record/saved_crew = crew_record_ref?.resolve()
+	var/datum/voidcrew_crew_record/current_crew = command?.recover_reputation_crew() || GLOB.voidcrew_crew_roster[captain_ckey]
+	return saved_crew && (!command || ckey(command.key) == captain_ckey) && current_crew == saved_crew
+
+/// No prompt from drone processing: changed registration cancels before the first piece.
+/datum/checkpoint_construction/proc/crew_registration_valid()
+	var/datum/mind/command = captain_mind()
+	if(restores_crew_ship(command))
+		return TRUE
+	var/datum/voidcrew_crew_record/current_crew = command?.recover_reputation_crew()
+	if(!current_crew)
+		return TRUE
+	if(form_new_crew)
+		return IS_WEAKREF_OF(current_crew, registration_crew_ref)
+	return current_crew.leader == command
+
+/// Recheck before consuming a checkpoint or charging a shipyard order.
+/datum/checkpoint_construction/proc/confirm_crew_registration()
+	var/datum/mind/command = captain_mind()
+	if(restores_crew_ship(command))
+		return TRUE
+	var/datum/voidcrew_crew_record/current_crew = command?.recover_reputation_crew()
+	if(crew_registration_valid())
+		return TRUE
+	var/form_new = command.choose_new_ship_crew()
+	if(isnull(form_new) || QDELETED(src))
+		return FALSE
+	form_new_crew = form_new
+	registration_crew_ref = current_crew ? WEAKREF(current_crew) : null
+	return TRUE
+
 /// Lets go of the source when the job stops. Before the first piece it stays spendable.
 /datum/checkpoint_construction/proc/release_source()
 	var/obj/structure/overmap/ship/original = original_ref?.resolve()
@@ -396,6 +445,14 @@
 	if(!record.setup_from_template(template))
 		qdel(record)
 		return null
+	var/datum/mind/command = captain_mind()
+	if(restores_crew_ship(command))
+		record.ship_team.set_crew_record(crew_record_ref.resolve())
+		command?.join_reputation_crew(record.get_crew_record())
+	else if(crew_registration_valid())
+		// A departed captain registers a new hull under the ordinary leader rule.
+		// If command changed during building, the normal handover leaves it claimable.
+		record.bind_reputation_crew(command, form_new_crew)
 	return record
 
 /// Names the record and its hull. A rebuild keeps the saved ship's name.
@@ -1112,12 +1169,16 @@
 /datum/checkpoint_construction/proc/enlist_captain(datum/mind/command)
 	if(!command || !vessel?.ship_team)
 		return FALSE
+	// Recheck after construction signals: never pull a departed captain back into a crew.
+	var/datum/voidcrew_crew_record/current_crew = command.recover_reputation_crew()
+	if(current_crew != vessel.get_crew_record())
+		return FALSE
 	var/mob/living/body = command.current
 	if(isliving(body) && body.mind == command)
 		vessel.enlist_crewmember(body)
 		grant_captain_management(body, vessel)
 	else
-		vessel.ship_team.add_member(command)
+		vessel.ship_team.join_member(command)
 		if(!(command.name in vessel.manifest))
 			vessel.manifest += command.name
 		if(captain_ckey)
diff --git a/voidcrew/modules/player_outposts/outpost_checkpoint_rebuild.dm b/voidcrew/modules/player_outposts/outpost_checkpoint_rebuild.dm
index 8fc65d60759..a62e15dfdde 100644
--- a/voidcrew/modules/player_outposts/outpost_checkpoint_rebuild.dm
+++ b/voidcrew/modules/player_outposts/outpost_checkpoint_rebuild.dm
@@ -94,6 +94,24 @@ GLOBAL_LIST_INIT(outpost_checkpoint_restocked, typecacheof(list(
 					for(var/datum/gas_mixture/mix as anything in stored)
 						mix?.gases.Cut()
 			// Stock kept outside contents or in counters rather than as items.
+			if(istype(object, /obj/structure/closet))
+				var/obj/structure/closet/closet = object
+				closet.contents_initialized = TRUE
+			if(istype(object, /obj/structure/closet/crate/secure/loot))
+				var/obj/structure/closet/crate/secure/loot/freight = object
+				freight.consume_freight_loot()
+			if(istype(object, /obj/machinery/suit_storage_unit))
+				var/obj/machinery/suit_storage_unit/unit = object
+				unit.suit = null
+				unit.helmet = null
+				unit.mask = null
+				unit.mod = null
+				unit.storage = null
+				if(istype(unit, /obj/machinery/suit_storage_unit/ruin_zone))
+					var/obj/machinery/suit_storage_unit/ruin_zone/ruin_unit = unit
+					ruin_unit.stock_consumed = TRUE
+					ruin_unit.stock_spawn_turf = null
+				unit.update_appearance()
 			if(istype(object, /obj/structure/closet/crate/critter))
 				var/obj/structure/closet/crate/critter/crate = object
 				QDEL_NULL(crate.tank)
@@ -122,3 +140,9 @@ GLOBAL_LIST_INIT(outpost_checkpoint_restocked, typecacheof(list(
 			if(istype(object, /obj/machinery/atmospherics/components/unary/shuttle/heater))
 				var/obj/machinery/atmospherics/components/unary/shuttle/heater/heater = object
 				heater.fuel_tank = null
+
+/// Mapped suit rewards are fittings only when rebuilt, even if unbolted at save time.
+/obj/machinery/suit_storage_unit/checkpoint_type()
+	if(!..())
+		return null
+	return /obj/machinery/suit_storage_unit
diff --git a/voidcrew/modules/player_outposts/outpost_checkpoint_snapshot.dm b/voidcrew/modules/player_outposts/outpost_checkpoint_snapshot.dm
index aad06503529..71dc3b0dffb 100644
--- a/voidcrew/modules/player_outposts/outpost_checkpoint_snapshot.dm
+++ b/voidcrew/modules/player_outposts/outpost_checkpoint_snapshot.dm
@@ -27,6 +27,8 @@ GLOBAL_LIST_INIT(outpost_checkpoint_infrastructure, typecacheof(list(
 GLOBAL_LIST_INIT(outpost_checkpoint_excluded, typecacheof(list(
 	/obj/machinery/portable_atmospherics,
 	/obj/machinery/computer/ship_checkpoint,
+	// Internal vending stock is not scrubbed by clear_stock().
+	/obj/machinery/vending/security/marine/solgov,
 	// Made by its turret.
 	/obj/machinery/porta_turret_cover,
 	// Never rebuilt: user decision, 2026-09-24.
@@ -83,6 +85,8 @@ GLOBAL_LIST_INIT(outpost_checkpoint_refused_terrain, typecacheof(list(
 /datum/ship_checkpoint
 	var/obj/structure/overmap/dynamic/player_outpost/outpost
 	var/datum/weakref/source_ship
+	/// Live round identity and entitlements; only the round registry owns record lifetime.
+	var/datum/weakref/crew_record_ref
 	var/captain_ckey
 	var/ship_name
 	var/saved_at
@@ -105,6 +109,7 @@ GLOBAL_LIST_INIT(outpost_checkpoint_refused_terrain, typecacheof(list(
 		original.checkpoint_ref = null
 	outpost = null
 	source_ship = null
+	crew_record_ref = null
 	tgm = null
 	rooms = null
 	machines = null
@@ -139,6 +144,9 @@ GLOBAL_LIST_INIT(outpost_checkpoint_refused_terrain, typecacheof(list(
 		keys += list("icon", "icon_door", "base_icon_state", "enable_door_overlay", "has_opened_overlay", "has_closed_overlay", "wall_mounted", "horizontal", "locked", "req_one_access")
 		// Closet stock is otherwise generated lazily on first opening.
 		properties += "contents_initialized = 1"
+		if(istype(object, /obj/structure/closet/crate/secure/loot))
+			// A saved freight shell never receives a fresh code-lock payout.
+			properties += "spawned_loot = 1"
 	if(istype(object, /obj/machinery/light))
 		// Lights otherwise materialize a charged mock battery after map loading.
 		properties += "start_with_cell = 0"
@@ -248,6 +256,8 @@ GLOBAL_LIST_INIT(outpost_checkpoint_refused_terrain, typecacheof(list(
 	if(!valid)
 		return "The hull design could not be read back. No payment was taken."
 	source_ship = WEAKREF(ship)
+	var/datum/voidcrew_crew_record/crew = ship.get_crew_record()
+	crew_record_ref = crew ? WEAKREF(crew) : null
 	captain_ckey = owner_ckey
 	ship_name = ship.name
 	saved_at = world.time
diff --git a/voidcrew/modules/player_outposts/outpost_network.dm b/voidcrew/modules/player_outposts/outpost_network.dm
index bb34609e14b..4125675f3a4 100644
--- a/voidcrew/modules/player_outposts/outpost_network.dm
+++ b/voidcrew/modules/player_outposts/outpost_network.dm
@@ -632,8 +632,9 @@ GLOBAL_LIST_EMPTY(outpost_network_ready_at)
  * Puts this trading outpost's network pad in its concourse. Called once the interior has loaded,
  * outside the load's try block: a runtime inside it would unwind the whole load. The trader maps
  * are regenerated from plans, so the pad is placed here rather than mapped: a breadth-first walk
- * from the elevator alcove to the first clear tile 2 to 4 steps out, against a wall where one is
- * available, with a clear arrival spot beside it.
+ * from the elevator alcove through the connected concourse, beyond any checkpoint or railed
+ * walkway, to a clear tile at least 2 steps out with a clear arrival spot beside it. Prefer
+ * a wall within the original 4-step search; beyond that, use the nearest suitable distance.
  */
 /obj/structure/overmap/trader_outpost/proc/spawn_network_pad()
 	var/obj/machinery/outpost_network_pad/existing = network_pad_ref?.resolve()
@@ -667,8 +668,30 @@ GLOBAL_LIST_EMPTY(outpost_network_ready_at)
 			return FALSE
 	return TRUE
 
+/// Doors can open; border fixtures only obstruct the edges they actually cover.
+/// The checkpoint's doors and exit gate are walls here, so the pad stays in the checkpoint lobby.
+/obj/structure/overmap/trader_outpost/proc/network_pad_step_blocked(turf/source, turf/target)
+	var/direction = get_dir(source, target)
+	if((locate(/obj/machinery/door/airlock/outpost/checkpoint) in target) || (locate(/obj/structure/outpost_exit_gate) in target))
+		return TRUE
+	for(var/atom/movable/border as anything in source)
+		if(border.density && !istype(border, /obj/machinery/door) && (border.flags_1 & ON_BORDER_1) && (border.dir & direction))
+			return TRUE
+	for(var/atom/movable/thing as anything in target)
+		if(!thing.density || istype(thing, /obj/machinery/door) || isliving(thing))
+			continue
+		if(!(thing.flags_1 & ON_BORDER_1) || (thing.dir & REVERSE_DIR(direction)))
+			return TRUE
+	return FALSE
+
 /// list(pad turf, arrival turf) for the network pad, or null
 /obj/structure/overmap/trader_outpost/proc/find_network_pad_spot()
+	// The map's own spot first (/obj/effect/landmark/outpost_network_pad_spot)
+	if(network_pad_spot && network_pad_tile_clear(network_pad_spot))
+		for(var/direction in GLOB.cardinals)
+			var/turf/beside = get_step(network_pad_spot, direction)
+			if(beside && network_pad_tile_clear(beside) && !network_pad_step_blocked(network_pad_spot, beside))
+				return list(network_pad_spot, beside)
 	if(!length(lobby_alcove_turfs))
 		return null
 	var/list/distance = list()
@@ -681,18 +704,11 @@ GLOBAL_LIST_EMPTY(outpost_network_ready_at)
 	while(index <= length(queue))
 		var/turf/current = queue[index++]
 		var/steps = distance[current]
-		if(steps >= 4)
-			continue
 		for(var/direction in GLOB.cardinals)
 			var/turf/next = get_step(current, direction)
 			if(!next || !isnull(distance[next]) || !isopenturf(next) || !istype(next.loc, /area/voidcrew/trader_outpost))
 				continue
-			var/walkable = TRUE
-			for(var/atom/movable/thing as anything in next)
-				if(thing.density && !istype(thing, /obj/machinery/door) && !isliving(thing))
-					walkable = FALSE
-					break
-			if(!walkable)
+			if(network_pad_step_blocked(current, next))
 				continue
 			distance[next] = steps + 1
 			queue += next
@@ -700,6 +716,8 @@ GLOBAL_LIST_EMPTY(outpost_network_ready_at)
 				candidates += next
 	var/list/fallback
 	for(var/turf/candidate as anything in candidates)
+		if(fallback && distance[candidate] > max(4, distance[fallback[1]]))
+			break
 		var/turf/arrival
 		for(var/direction in GLOB.cardinals)
 			var/turf/beside = get_step(candidate, direction)
diff --git a/voidcrew/modules/player_outposts/outpost_prison_guards.dm b/voidcrew/modules/player_outposts/outpost_prison_guards.dm
index ce1e9977f88..17a559bba63 100644
--- a/voidcrew/modules/player_outposts/outpost_prison_guards.dm
+++ b/voidcrew/modules/player_outposts/outpost_prison_guards.dm
@@ -910,8 +910,10 @@ GLOBAL_LIST_INIT(outpost_guard_placeholders, list("{boss}", "{count}", "{cause}"
 	var/turf/spot = guard_office_spot()
 	if(!spot)
 		return null
-	var/mob/living/basic/outpost_prison_guard/guard = new record.guard_type(spot)
+	var/datum/npc_spawn_context/context = new(outpost, role = "exempt")
+	var/mob/living/basic/outpost_prison_guard/guard = spawn_npc_in_zone(record.guard_type, spot, context, FALSE)
 	guard.join(src, record)
+	context.finalize()
 	record.away_left = 0
 	guard.beam_in()
 	if(isnull(guard_rounds_left))
diff --git a/voidcrew/modules/player_outposts/outpost_residents.dm b/voidcrew/modules/player_outposts/outpost_residents.dm
index c3152b983da..045855736a1 100644
--- a/voidcrew/modules/player_outposts/outpost_residents.dm
+++ b/voidcrew/modules/player_outposts/outpost_residents.dm
@@ -24,6 +24,14 @@
 /obj/structure/overmap/dynamic/player_outpost/proc/is_resident(mob/user)
 	return is_owner(user) || (user?.mind && user.mind in residents)
 
+/// Commit a validated pod arrival through the same crew transaction as ship arrivals.
+/obj/structure/overmap/dynamic/player_outpost/proc/register_resident_arrival(mob/living/character, player_key)
+	var/datum/voidcrew_crew_record/crew = character.mind.recover_reputation_crew()
+	if(crew)
+		character.mind.join_reputation_crew(crew)
+	residents |= character.mind
+	resident_clearance[player_key] = resident_access_revision
+
 /obj/structure/overmap/dynamic/player_outpost/proc/has_resident_clearance(player_key)
 	return player_key && !(player_key in blocked_residents) && (player_key == founder_ckey || invited_residents[player_key] || resident_clearance[player_key] == resident_access_revision)
 
@@ -149,8 +157,7 @@
 		return FALSE
 	home.arrival_reservations -= player_key
 	pod.arrival_reserved = FALSE
-	home.residents |= character.mind
-	home.resident_clearance[player_key] = home.resident_access_revision
+	home.register_resident_arrival(character, player_key)
 	SSticker.queued_players -= src
 	SSticker.queue_delay = 4
 	transfer_character()
@@ -171,7 +178,7 @@
 	log_manifest(character.mind.key, character.mind, character, latejoin = TRUE)
 	SEND_GLOBAL_SIGNAL(COMSIG_GLOB_CREWMEMBER_JOINED, character, job.title)
 	log_shuttle("[character.ckey] arrived as a resident of [home.name]")
-	to_chat(character, span_boldnotice("You are a resident of [home.name]. Your ID keeps its own account. Management can delegate treasury and construction authority separately."))
+	to_chat(character, span_boldnotice("You are a resident of [home.name]."))
 	try_show_orientation_briefing(character)
 	return TRUE
 
diff --git a/voidcrew/modules/player_outposts/outpost_ship_orders.dm b/voidcrew/modules/player_outposts/outpost_ship_orders.dm
index 2459458c5dd..a3316a03b52 100644
--- a/voidcrew/modules/player_outposts/outpost_ship_orders.dm
+++ b/voidcrew/modules/player_outposts/outpost_ship_orders.dm
@@ -231,6 +231,10 @@ GLOBAL_LIST_INIT(ship_order_refused_hulls, typecacheof(list(
 /datum/checkpoint_construction/order/create_template()
 	return order.make_template()
 
+/datum/checkpoint_construction/order/captain_mind()
+	// Keyed respawns use the live character; keyless commissioning still has its buyer.
+	return ..() || (!captain_ckey ? buyer_mind_ref?.resolve() : null)
+
 /// Upgrade slots find their module and theme on the order while the copy loads.
 /datum/checkpoint_construction/order/load_copy(datum/shuttle_template_load/load_owner)
 	SSshuttle.loading_ship = null
@@ -244,6 +248,9 @@ GLOBAL_LIST_INIT(ship_order_refused_hulls, typecacheof(list(
 
 /// Charged once, here, immediately before the first piece. Short funds stop the job unpaid.
 /datum/checkpoint_construction/order/consume_source()
+	if(!crew_registration_valid())
+		error = "Registration cancelled. [unspent_note()]"
+		return FALSE
 	var/denial = payer_denial()
 	if(denial)
 		error = "[denial] [unspent_note()]"
@@ -333,8 +340,16 @@ GLOBAL_LIST_INIT(ship_order_refused_hulls, typecacheof(list(
 	if(!record.setup_from_template(template, order.theme))
 		qdel(record)
 		return null
+	// Bind before commissioning signals can yield; a new crew keeps the fresh record.
+	var/datum/mind/command = captain_mind()
+	if(crew_registration_valid())
+		record.bind_reputation_crew(command, form_new_crew)
 	return record
 
+/// Orders always add a hull; only an actual checkpoint can restore one.
+/datum/checkpoint_construction/order/restores_crew_ship(datum/mind/command)
+	return FALSE
+
 /// A new ship takes its hull's name, as a spawned one does.
 /datum/checkpoint_construction/order/name_vessel()
 	vessel.name = port.name
@@ -424,12 +439,20 @@ GLOBAL_LIST_INIT(ship_order_refused_hulls, typecacheof(list(
 	var/obj/structure/overmap/ship/paying_ship = payer[2]
 	working = TRUE
 	notice = null
-	var/accepted = confirm_order(user, "Order a [order.hull.name][order.theme ? " ([order.theme.name])" : ""] for [price] credits from [paying_ship ? "the [paying_ship.name] account" : "your personal account"]? The credits are spent when construction begins.")
+	var/accepted = confirm_order(user, "Order a [order.hull.name][order.theme ? " ([order.theme.name])" : ""] for [price] credits from [paying_ship ? "the [paying_ship.name] account" : "your personal account"]?")
 	if(QDELETED(src))
 		qdel(order)
 		return FALSE
-	working = FALSE
 	if(!accepted)
+		working = FALSE
+		qdel(order)
+		return FALSE
+	var/form_new = choose_new_reputation_crew(user)
+	if(QDELETED(src))
+		qdel(order)
+		return FALSE
+	working = FALSE
+	if(isnull(form_new))
 		qdel(order)
 		return FALSE
 	// Anything may have changed while the prompt was open.
@@ -442,6 +465,9 @@ GLOBAL_LIST_INIT(ship_order_refused_hulls, typecacheof(list(
 		return FALSE
 	working = TRUE
 	var/datum/checkpoint_construction/order/job = create_order_job(user, order, payer[1], paying_ship)
+	job.form_new_crew = form_new
+	var/datum/voidcrew_crew_record/registration_crew = user.mind?.recover_reputation_crew()
+	job.registration_crew_ref = registration_crew ? WEAKREF(registration_crew) : null
 	var/started = FALSE
 	if(job.bay)
 		started = job.prepare()
@@ -453,7 +479,7 @@ GLOBAL_LIST_INIT(ship_order_refused_hulls, typecacheof(list(
 	working = FALSE
 	if(started)
 		error = null
-		notice = "Construction started. [price] cr is charged when the first piece is placed."
+		notice = "Construction started."
 		log_game("[key_name(user)] ordered a [order.hull.name] at [outpost.name] for [price] credits.")
 	else
 		error = job.error || "Construction failed. Nothing was charged."
diff --git a/voidcrew/modules/research/designs/ammo_designs.dm b/voidcrew/modules/research/designs/ammo_designs.dm
index a837ee1e348..abeddf2d423 100644
--- a/voidcrew/modules/research/designs/ammo_designs.dm
+++ b/voidcrew/modules/research/designs/ammo_designs.dm
@@ -1,7 +1,7 @@
 /**
  * Generic ballistic ammunition designs.
  *
- * voidcrew/modules/weapons_bench/ already gives every blueprint gun (C-20r, Bulldog,
+ * voidcrew/modules/weapons_bench/ already gives each of these guns (C-20r, Bulldog,
  * WT-550, L6 SAW, anti-materiel rifle) its own ammo node and design. ammo_catalogue.dm
  * adds the remaining firearm calibers and specialty loads. What had no
  * manufacturing path at all was the plain stuff every crew is actually carrying:
diff --git a/voidcrew/modules/research/edits/_experiments.dm b/voidcrew/modules/research/edits/_experiments.dm
index 934bda9f289..eff98126b4d 100644
--- a/voidcrew/modules/research/edits/_experiments.dm
+++ b/voidcrew/modules/research/edits/_experiments.dm
@@ -2,6 +2,27 @@
 /// code/__DEFINES/research.dm: one experiment funds exactly one tier-5 node.
 #define RESEARCH_POINTS_PER_EXPERIMENT 200
 
+/// Both scanner callbacks and ordnance publications complete through this path.
+/datum/techweb/complete_experiment(datum/experiment/completed_experiment)
+	if(QDELETED(completed_experiment) || completed_experiments[completed_experiment.type] || !(completed_experiment in available_experiments))
+		return null
+	var/list/ledger = experiment_reward_ledger()
+	var/grant_claimed = ledger?[completed_experiment.type]
+	. = ..()
+	if(. && grant_claimed)
+		. += "\nResearch grant already claimed."
+
+/// Claim before granting either reward. Completion state and paid-node refunds remain web-local.
+/datum/techweb/proc/award_experiment_completion(datum/experiment/experiment)
+	var/list/ledger = experiment_reward_ledger()
+	if(isnull(ledger) || ledger[experiment.type])
+		return list()
+	ledger[experiment.type] = TRUE
+	var/list/reward = experiment.points_reward?.Copy() || list()
+	reward[TECHWEB_POINT_TYPE_GENERIC] += RESEARCH_POINTS_PER_EXPERIMENT
+	add_point_list(reward)
+	return reward
+
 /datum/experiment/finish_experiment(datum/component/experiment_handler/experiment_handler)
 	if(QDELETED(experiment_handler) || !experiment_handler.validate_research_site())
 		return FALSE
@@ -11,9 +32,6 @@
 		return FALSE
 	var/metric_points_before = metric_web_points(web) // round metrics, voidcrew/modules/metrics/research_metrics.dm
 	. = ..()
-	web.add_point_list(list(
-		TECHWEB_POINT_TYPE_GENERIC = RESEARCH_POINTS_PER_EXPERIMENT),
-	)
 	record_experiment_completed(web, type, metric_web_points(web) - metric_points_before, experiment_handler.parent)
 	return TRUE
 
@@ -49,12 +67,8 @@
 
 /**
  * Ordnance experiments never pass through finish_experiment() - they are finished off from
- * /datum/techweb/add_scientific_paper(), which flips the experiment's completed flag and calls
- * complete_experiment() on us directly, so publishing a paper paid none of the flat experiment bonus above.
- *
- * Pay it here when (and only when) the publication is what actually completed the experiment. Papers that
- * complete nothing pay nothing: publishing a further tier of an already-completed experiment finds it in
- * completed_experiments, so add_experiment() refuses to re-add it and complete_experiment() is never reached.
+ * /datum/techweb/add_scientific_paper(), which calls complete_experiment() directly.
+ * Keep publication metrics here; both routes award points through the same completion hook.
  */
 /datum/techweb/add_scientific_paper(datum/scientific_paper/paper_to_add)
 	var/experiment_path = paper_to_add?.experiment_path
@@ -66,7 +80,6 @@
 		return
 	if(isnull(completed_experiments[experiment_path])) // paper published, but it didn't complete the experiment
 		return
-	add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = RESEARCH_POINTS_PER_EXPERIMENT))
 	record_experiment_completed(src, experiment_path, metric_web_points(src) - metric_points_before)
 
 #undef RESEARCH_POINTS_PER_EXPERIMENT
@@ -152,8 +165,7 @@
 	if(linked_web)
 		examine_text += span_notice("It is linked to the R&D server network of [linked_web.organization].")
 		return
-	examine_text += span_warning("It has no R&D server link, so it cannot run experiments or bank any points.")
-	examine_text += span_notice("Copy a techweb from an R&D server with a [EXAMINE_HINT("multitool")], then use the multitool on this.")
+	examine_text += span_warning("It has no R&D server link.")
 
 /**
  * Handlers with no server link have no network to announce on. Without this they'd all match each
@@ -198,7 +210,7 @@
 	if(isnull(linked_web) && !(config_flags & EXPERIMENT_CONFIG_SILENT_FAIL))
 		playsound(user, 'sound/machines/buzz/buzz-sigh.ogg', 25)
 		var/atom/scanner = parent
-		to_chat(user, span_warning("[scanner] has no R&D server link. Copy a techweb from an R&D server with a multitool, then use the multitool on [scanner]."))
+		to_chat(user, span_warning("[scanner] has no R&D server link."))
 		return
 	return ..()
 
diff --git a/voidcrew/modules/research/edits/_rd_consoles.dm b/voidcrew/modules/research/edits/_rd_consoles.dm
index 9a5425b4313..8d63b62a3c6 100644
--- a/voidcrew/modules/research/edits/_rd_consoles.dm
+++ b/voidcrew/modules/research/edits/_rd_consoles.dm
@@ -122,6 +122,7 @@
 		data["nodes"] += list(list(
 			"id" = n.id,
 			"can_unlock" = stored_research.can_unlock_node(n),
+			"zone_permission_blocked" = stored_research.is_only_zone_permission_blocked(n),
 			"tier" = stored_research.tiers[n.id],
 		))
 
diff --git a/voidcrew/modules/research/edits/_techweb.dm b/voidcrew/modules/research/edits/_techweb.dm
index ab95ee1e529..ceba7e5440c 100644
--- a/voidcrew/modules/research/edits/_techweb.dm
+++ b/voidcrew/modules/research/edits/_techweb.dm
@@ -3,6 +3,11 @@
 	var/list/connected_machines = list()
 	/// Research data collected from a survey console. Used to restrict tech behind surveys
 	var/datum/survey_research/survey_data
+	/// Node id -> remaining actual payment by currency and the discounts still owed to that purchase.
+	/// These receipts belong only to this web; research transfers never copy them.
+	var/list/experiment_payment_receipts = list()
+	/// Completion grants for webs without a crew or player outpost to hold their claims.
+	var/list/local_experiment_reward_ledger = list()
 
 /datum/techweb/Destroy()
 	survey_data = null
@@ -41,20 +46,75 @@
 			update_node_status(SSresearch.techweb_node_by_id(node_id))
 
 /datum/techweb/can_unlock_node(datum/techweb_node/node)
+	return have_zone_permission_for_node(node) && can_afford(node.get_price(src)) && have_experiments_for_node(node) && have_surveys_for_node(node)
+
+/// A relay exposes this same web, but only its installed physical source grants standing.
+/datum/techweb/proc/get_research_zone_permission()
+	for(var/obj/machinery/rnd/server/ship/server in techweb_servers)
+		if(QDELETED(server) || server.stored_research != src || !server.source_code_hdd || server.source_code_hdd.loc != server || server.source_code_hdd.stored_research != src)
+			continue
+		var/datum/voidcrew_crew_record/record = server.get_research_crew_record()
+		return QDELETED(record) ? ZONE_PERMISSION_PUBLIC : record.get_zone_permission()
+	return ZONE_PERMISSION_PUBLIC
+
+/datum/techweb/proc/have_zone_permission_for_node(datum/techweb_node/node)
+	if(!istype(node))
+		return FALSE
+	return node.zone_permission == ZONE_PERMISSION_PUBLIC || node.zone_permission <= get_research_zone_permission()
+
+/// Authorization is the sole blocker only after prerequisites and every research requirement pass.
+/datum/techweb/proc/is_only_zone_permission_blocked(datum/techweb_node/node)
+	if(!istype(node) || have_zone_permission_for_node(node) || !available_nodes[node.id])
+		return FALSE
 	return can_afford(node.get_price(src)) && have_experiments_for_node(node) && have_surveys_for_node(node)
 
-/**
- * The survey requirement has to be enforced here as well as in can_unlock_node. That proc only
- * drives the console UI's button states, whereas research_node is what every path that actually
- * unlocks a node funnels through: the R&D console, the Science Hub app, and SSresearch's
- * automatic processing of the research queue. Without this a survey-gated node can simply be
- * enqueued and researched on the next SSresearch fire with none of the surveys done.
- *
- * force is honoured so roundstart/starting-node and admin research still bypass it, matching
- * the point and experiment gates in the parent proc.
- */
+/datum/techweb/enqueue_node(id, mob/user)
+	if(!have_zone_permission_for_node(SSresearch.techweb_node_by_id(id)))
+		if(user)
+			to_chat(user, span_warning("Authorization declined."))
+		return FALSE
+	return ..()
+
+/// Called immediately after a successful purchase's debit, before the node is marked researched.
+/datum/techweb/proc/record_node_payment(datum/techweb_node/node, list/points_before)
+	if(node.starting_node || researched_nodes[node.id])
+		return
+	var/list/pending_discounts = list()
+	for(var/experiment_type in node.discount_experiments)
+		if(!completed_experiments[experiment_type] && node.discount_experiments[experiment_type] > 0)
+			pending_discounts[experiment_type] = node.discount_experiments[experiment_type]
+	if(!length(pending_discounts))
+		return
+	var/list/paid_points = list()
+	for(var/point_type in points_before)
+		var/paid = points_before[point_type] - research_points[point_type]
+		if(paid > 0)
+			paid_points[point_type] = paid
+	if(length(paid_points))
+		experiment_payment_receipts[node.id] = list("remaining" = paid_points, "discounts" = pending_discounts)
+
+/// Each missing experiment may refund its discount once per paid node, capped in each currency.
+/datum/techweb/proc/refund_experiment_discounts(datum/experiment/experiment)
+	var/list/refund = list()
+	for(var/node_id in experiment_payment_receipts)
+		var/list/receipt = experiment_payment_receipts[node_id]
+		var/list/discounts = receipt["discounts"]
+		var/discount = discounts[experiment.type]
+		if(!discount)
+			continue
+		discounts -= experiment.type
+		var/list/remaining = receipt["remaining"]
+		for(var/point_type in remaining)
+			var/amount = min(discount, remaining[point_type])
+			remaining[point_type] -= amount
+			refund[point_type] += amount
+	add_point_list(refund)
+	return refund
+
+/// Direct calls and queued work recheck surveys and live source standing before the debit.
+/// Forced imports, starting nodes and admin grants retain the parent's bypass.
 /datum/techweb/research_node(datum/techweb_node/node, force = FALSE, auto_adjust_cost = TRUE, get_that_dosh = TRUE, atom/research_source)
-	if(!force && istype(node) && !have_surveys_for_node(node))
+	if(!force && istype(node) && (!have_surveys_for_node(node) || !have_zone_permission_for_node(node)))
 		return FALSE
 	var/mob/metric_queued_by = force ? null : metric_node_queued_by(node) // round metrics, voidcrew/modules/metrics/research_metrics.dm
 	. = ..()
diff --git a/voidcrew/modules/research/edits/_techweb_node.dm b/voidcrew/modules/research/edits/_techweb_node.dm
index a4aa68ad6f5..08e55af6140 100644
--- a/voidcrew/modules/research/edits/_techweb_node.dm
+++ b/voidcrew/modules/research/edits/_techweb_node.dm
@@ -1,4 +1,6 @@
 /datum/techweb_node
+	/// Standing required for direct research only; imported knowledge remains usable.
+	var/zone_permission = ZONE_PERMISSION_PUBLIC
 	// list(
 	// 	nebulas = 0,
 	// 	asteroids = 0,
@@ -8,3 +10,23 @@
 	// 	stars = 0,
 	// )
 	var/list/required_surveyed_objects
+
+/// Prices are per-web copies: discounts must never make a debit negative or alter global nodes.
+/datum/techweb_node/get_price(datum/techweb/host)
+	var/list/prices = ..()
+	prices = prices.Copy()
+	for(var/point_type in prices)
+		prices[point_type] = max(0, prices[point_type])
+	return prices
+
+/datum/techweb_node/electric_weapons
+	zone_permission = ZONE_PERMISSION_YELLOW
+
+/datum/techweb_node/beam_weapons
+	zone_permission = ZONE_PERMISSION_ADVANCED
+
+/datum/techweb_node/syndicate_basic
+	zone_permission = ZONE_PERMISSION_ELITE
+
+/datum/techweb_node/unregulated_bluespace
+	zone_permission = ZONE_PERMISSION_ELITE
diff --git a/voidcrew/modules/research/edits/destructive_analyzer.dm b/voidcrew/modules/research/edits/destructive_analyzer.dm
new file mode 100644
index 00000000000..fb071269ab4
--- /dev/null
+++ b/voidcrew/modules/research/edits/destructive_analyzer.dm
@@ -0,0 +1,49 @@
+/**
+ * Destructive analyzer on ship techwebs.
+ *
+ * no_default_techweb_link is TRUE fork-wide (voidcrew/edits/config.dm), so an analyzer has no
+ * techweb until someone uses a multitool carrying a server's web on it, like every other R&D
+ * machine. Two upstream assumptions broke that:
+ * - Upstream loads any held item before the tool acts run, so a left-click with the multitool
+ *   loaded the multitool into the analyzer instead of linking it. Only a right-click linked.
+ * - ui_data() reads stored_research for any loaded item, so an unlinked analyzer holding an item
+ *   runtimed while its window opened, and the window never appeared.
+ */
+
+/// A multitool carrying a new research web links on a left-click instead of being loaded as a sample.
+/obj/machinery/rnd/destructive_analyzer/base_item_interaction(mob/living/user, obj/item/weapon, list/modifiers)
+	if(!LAZYACCESS(modifiers, RIGHT_CLICK) && !user.combat_mode && is_techweb_link_tool(weapon))
+		return tool_act(user, weapon, modifiers) || ITEM_INTERACT_BLOCKING
+	return ..()
+
+/obj/machinery/rnd/destructive_analyzer/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
+	. = ..()
+	if(!panel_open && is_techweb_link_tool(held_item?.get_proxy_attacker_for(src, user)))
+		context[SCREENTIP_CONTEXT_LMB] = "Upload Techweb"
+		return CONTEXTUAL_SCREENTIP_SET
+
+/**
+ * Whether this item is a multitool holding a research web we are not linked to yet.
+ * Once linked to that web, the same multitool loads as a sample again, so alien multitools can
+ * still be analyzed.
+ */
+/obj/machinery/rnd/destructive_analyzer/proc/is_techweb_link_tool(obj/item/tool)
+	var/obj/item/multitool/linker = tool
+	if(!istype(linker) || QDELETED(linker.buffer) || !istype(linker.buffer, /datum/techweb))
+		return FALSE
+	return linker.buffer != stored_research
+
+/obj/machinery/rnd/destructive_analyzer/ui_data(mob/user)
+	if(!QDELETED(stored_research))
+		return ..()
+	return list(
+		"server_connected" = FALSE,
+		"loaded_item" = null,
+		"node_data" = list(),
+	)
+
+/// Nothing is broken down without a web to record it.
+/obj/machinery/rnd/destructive_analyzer/destroy_item(gain_research_points = FALSE)
+	if(QDELETED(stored_research))
+		return FALSE
+	return ..()
diff --git a/voidcrew/modules/research/research_notes.dm b/voidcrew/modules/research/research_notes.dm
index 1a5813c7015..ab5f4859b89 100644
--- a/voidcrew/modules/research/research_notes.dm
+++ b/voidcrew/modules/research/research_notes.dm
@@ -1,5 +1,20 @@
 /obj/item/research_notes
-	desc = "Valuable scientific data. Use it in an RD console to generate research points."
+	desc = "Valuable scientific data."
+
+/obj/item/research_notes/attackby(obj/item/attacking_item, mob/living/user, list/modifiers, list/attack_modifiers)
+	if(istype(attacking_item, /obj/item/research_notes))
+		merge(attacking_item)
+		return
+	return ..()
+
+/// Combining papers conserves their value, regardless of their origin or merge order.
+/obj/item/research_notes/merge(obj/item/research_notes/new_paper)
+	if(QDELETED(new_paper) || new_paper == src)
+		return FALSE
+	value += new_paper.value
+	change_vol()
+	qdel(new_paper)
+	return TRUE
 
 // Research notes for ruins. Priced against the node ladder in code/__DEFINES/research.dm,
 // where a node runs 40 (tier 1) to 200 (tier 5): a tiny note is worth about two cheap nodes
diff --git a/voidcrew/modules/research/server.dm b/voidcrew/modules/research/server.dm
index 3b23530ba12..8baa14d041f 100644
--- a/voidcrew/modules/research/server.dm
+++ b/voidcrew/modules/research/server.dm
@@ -17,16 +17,49 @@
  */
 GLOBAL_LIST_EMPTY(ship_research_servers)
 
+/obj/structure/overmap/dynamic/player_outpost
+	/// Site research retains its entitlement across server replacements and ownership changes.
+	var/list/research_reward_ledger = list()
+
 /datum/techweb
 	/// Physical disk webs must not become unscoped fallback webs when uninstalled.
 	var/requires_physical_server = FALSE
 
+/// Relays expose the physical source web, so only its installed server determines who earns rewards.
+/datum/techweb/proc/experiment_reward_ledger()
+	for(var/obj/machinery/rnd/server/ship/server in techweb_servers)
+		if(QDELETED(server) || server.stored_research != src || !server.source_code_hdd || server.source_code_hdd.loc != server || server.source_code_hdd.stored_research != src)
+			continue
+		var/obj/structure/overmap/site = get_research_service_site(server)
+		if(istype(site, /obj/structure/overmap/ship))
+			var/obj/structure/overmap/ship/ship = site
+			var/datum/voidcrew_crew_record/crew = ship.get_crew_record()
+			if(!QDELETED(crew))
+				return crew.research_reward_ledger
+		if(istype(site, /obj/structure/overmap/dynamic/player_outpost))
+			var/obj/structure/overmap/dynamic/player_outpost/home = site
+			return home.research_reward_ledger
+	return local_experiment_reward_ledger
+
 /obj/machinery/rnd/server/ship
-	desc = "A computer system that hosts a physical R&D source disk and shares its research with linked machinery on the same ship or outpost. Use a multitool to connect local research equipment."
+	desc = "A computer system with a removable research drive."
 	circuit = /obj/item/circuitboard/machine/rdserver/ship
 	///Installed source code files that hosts our research.
 	var/obj/item/computer_disk/ship_disk/source_code_hdd
 
+/// Resolve the source server's current site, never a consumer's crew or a disk snapshot.
+/obj/machinery/rnd/server/ship/proc/get_research_crew_record()
+	var/obj/structure/overmap/site = get_research_service_site(src)
+	if(istype(site, /obj/structure/overmap/ship))
+		var/obj/structure/overmap/ship/ship = site
+		return ship.get_crew_record()
+	if(istype(site, /obj/structure/overmap/dynamic/player_outpost))
+		var/obj/structure/overmap/dynamic/player_outpost/home = site
+		// The round roster survives cryo/mind replacement and changes on explicit departure.
+		if(home.founder_ckey)
+			return GLOB.voidcrew_crew_roster[ckey(home.founder_ckey)]
+	return null
+
 /obj/machinery/rnd/server/ship/Initialize(mapload)
 	. = ..()
 	QDEL_NULL(stored_research)
@@ -233,7 +266,7 @@ GLOBAL_LIST_EMPTY(ship_research_servers)
 	victim_web.remove_point_list(list(TECHWEB_POINT_TYPE_GENERIC = stolen))
 	new /obj/item/research_notes(loc, stolen, "thievery")
 	record_research_stolen(thief, stolen) // round metrics, voidcrew/modules/metrics/research_metrics.dm
-	balloon_alert(thief, "siphoned [stolen] points!")
+	balloon_alert(thief, "research siphoned!")
 
 #undef RESEARCH_STOLEN_PER_THEFT
 
@@ -243,7 +276,7 @@ GLOBAL_LIST_EMPTY(ship_research_servers)
  */
 /obj/item/computer_disk/ship_disk
 	name = "R&D server source code"
-	desc = "This drive stores research for a ship or outpost. Insert it into an R&D server, then use a multitool to link local research equipment."
+	desc = "A hard drive containing research records."
 
 	///The techweb we create on initialize and store everything to.
 	var/datum/techweb/stored_research
diff --git a/voidcrew/modules/research/survey_scanner.dm b/voidcrew/modules/research/survey_scanner.dm
index 4ad5cb9d534..4dd643891cc 100644
--- a/voidcrew/modules/research/survey_scanner.dm
+++ b/voidcrew/modules/research/survey_scanner.dm
@@ -6,8 +6,10 @@
 #define SURVEY_SCAN_DECAY 0.04
 /// Once a site is worth less than this fraction, it is tapped out for the rest of the round.
 #define SURVEY_MIN_PENALTY 0.20
-/// Points per scan per servo rating, before the decay multiplier. 9/18/27/36.
-#define SURVEY_GAIN_PER_SERVO 9
+
+/obj/structure/overmap
+	/// Successful ground scans at this site, retained when its interior is unloaded.
+	var/survey_scans_completed = 0
 
 /**
  * Survey scanner
@@ -24,7 +26,7 @@
  */
 /obj/machinery/survey_scanner
 	name = "survey scanner"
-	desc = "A machine that scans whatever it is bolted to and refines the readings into research data. It runs off an internal power cell, so it works anywhere you can carry it."
+	desc = "A rugged, battery-powered survey instrument."
 	icon = 'voidcrew/modules/research/icons/objects.dmi'
 	icon_state = "hivebot_fab"
 	density = TRUE
@@ -53,15 +55,6 @@
 	var/next_scan = 0
 	///Amount of research points we've generated from processing.
 	var/stored_points
-	///How many times each SITE has been scanned, keyed by get_scan_history_key().
-	///
-	///Was keyed by z-level, which meant "this site" only while a site owned a z-level of its
-	///own. Sites share levels now: crew B scanning at the encounter next door burned down
-	///crew A's payout, and could push the shared counter past SURVEY_MIN_PENALTY so that A's
-	///scanner reported "unable to locate valuable information" at ground nobody had touched.
-	///`static` also meant the count outlived the z-level itself, so a recycled level handed
-	///its next occupant a used-up site.
-	var/static/list/site_scan_history = list()
 
 /obj/machinery/survey_scanner/Initialize(mapload)
 	. = ..()
@@ -79,16 +72,16 @@
 /obj/machinery/survey_scanner/examine(mob/user)
 	. = ..()
 	if(cell)
-		. += span_notice("It has \a [cell] installed, at [round(cell.percent())]% charge.")
+		. += span_notice("It has \a [cell] installed.")
 	else
-		. += span_warning("It has no power cell. Open the maintenance panel with a screwdriver to fit one.")
+		. += span_warning("Its cell compartment is empty.")
 	if(stored_points)
-		. += "It currently has [round(stored_points, 1)] points. You can Right-Click to print it."
+		. += "Its data spool is ready."
 
 /obj/machinery/survey_scanner/add_context(atom/source, list/context, obj/item/held_item, mob/user)
 	. = ..()
 	if(istype(held_item, /obj/item/stock_parts/power_store))
-		context[SCREENTIP_CONTEXT_LMB] = panel_open ? "Install cell" : "Open panel first"
+		context[SCREENTIP_CONTEXT_LMB] = panel_open ? "Install cell" : "Panel closed"
 		return CONTEXTUAL_SCREENTIP_SET
 
 	if(!isnull(held_item))
@@ -125,7 +118,7 @@
 /obj/machinery/survey_scanner/RefreshParts()
 	. = ..()
 	research_power = max(total_part_rating(/datum/stock_part/matter_bin), 1)
-	research_gain = max(total_part_rating(/datum/stock_part/servo), 1) * SURVEY_GAIN_PER_SERVO //9, 18, 27, 36
+	research_gain = 6 + 3 * clamp(total_part_rating(/datum/stock_part/servo), 1, 4)
 
 	//cell drain is cut, not increased - better lasers mean one cell lasts longer.
 	active_power_usage = initial(active_power_usage) / (1 + total_part_rating(/datum/stock_part/micro_laser))
@@ -167,7 +160,7 @@
 		return ..()
 
 	if(!panel_open)
-		balloon_alert(user, "open the panel first!")
+		balloon_alert(user, "panel closed!")
 		return ITEM_INTERACT_BLOCKING
 	if(cell)
 		balloon_alert(user, "already has a cell!")
@@ -177,7 +170,7 @@
 
 	cell = tool
 	balloon_alert(user, "cell installed")
-	to_chat(user, span_notice("You slot [tool] into [src]. Close the maintenance panel to run it."))
+	to_chat(user, span_notice("You slot [tool] into [src]."))
 	playsound(src, 'sound/machines/click.ogg', 50, TRUE)
 	return ITEM_INTERACT_SUCCESS
 
@@ -206,7 +199,7 @@
 	if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
 		return
 	if(!stored_points)
-		say("No research points found, nothing to dispense.")
+		say("Data spool empty.")
 		return
 
 	//accumulator is fractional (gain * decay), so only round at the point it becomes an item
@@ -225,6 +218,12 @@
 	return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
 
 /obj/machinery/survey_scanner/process(seconds_per_tick)
+	var/obj/structure/overmap/site = get_scan_site()
+	if(!site)
+		say("No survey target. Scanning stopped.")
+		disable()
+		return
+
 	// Bill the internal cell, not the area - see the type comment.
 	if(!cell?.use(active_power_usage * seconds_per_tick, force = TRUE))
 		say("Power cell depleted, scanning stopped.")
@@ -241,33 +240,37 @@
 	// the decay, so a better matter bin keeps a site productive for longer - it does NOT
 	// scale the payout. (It used to be applied as a raw multiplier, which stacked with the
 	// longer run and made a maxed scanner worth ~9x the entire techweb from one planet.)
-	var/scan_key = get_scan_history_key()
-	var/penalty = 1 - ((site_scan_history[scan_key] - 1) * SURVEY_SCAN_DECAY / max(research_power, 1))
+	var/penalty = 1 - site.survey_scans_completed * SURVEY_SCAN_DECAY / max(research_power, 1)
 	if(penalty < SURVEY_MIN_PENALTY) // tapped out, and it stays that way for the round
-		say("Unable to locate valuable information in current sector, scanning stopped.")
+		say("Survey complete. Scanning stopped.")
 		playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 20)
 		disable()
 		return
 
 	playsound(src, 'sound/machines/ding.ogg', 20)
-	site_scan_history[scan_key]++
 	stored_points += (research_gain * penalty)
+	site.survey_scans_completed++
 	tally_metric_scan(research_gain * penalty) // round metrics, voidcrew/modules/metrics/research_metrics.dm
 
-/**
- * The history key for wherever this scanner is standing.
- *
- * A map region (see map_region_for_turf) is the site: the planet or encounter footprint on a
- * packed level, or the turf reservation for a ruin or asteroid field. Ground that belongs to
- * no region - a roundstart level, a ship in deep space - falls back to the z-level, which is
- * exactly what the whole list used to be.
- */
-/obj/machinery/survey_scanner/proc/get_scan_history_key()
+/// Resolve natural ground to its persistent contact, never to a reusable interior slot.
+/obj/machinery/survey_scanner/proc/get_scan_site()
 	var/turf/here = get_turf(src)
-	if(!here)
-		return "z_[z]"
-	var/datum/region = map_region_for_turf(here)
-	return region ? "site_[REF(region)]" : "z_[here.z]"
+	if(!here || SSshuttle.get_containing_shuttle(here) || get_voidcrew_ship_for_turf(here))
+		return null
+	var/obj/structure/overmap/site = SSovermap_zones.get_overmap_object_for_turf(here)
+	if(QDELETED(site))
+		return null
+	// The resolver also supports legacy whole-level tenants. Surveying requires owned ground.
+	var/datum/map_footprint/footprint = site.get_interior_footprint()
+	if(!footprint?.contains_turf(here))
+		return null
+	if(istype(site, /obj/structure/overmap/space_ruin) || istype(site, /obj/structure/overmap/event/meteor))
+		return site
+	if(istype(site, /obj/structure/overmap/planet) && !istype(site, /obj/structure/overmap/planet/empty))
+		var/obj/structure/overmap/planet/planet = site
+		if(planet.is_terrain_planet())
+			return planet
+	return null
 
 /obj/machinery/survey_scanner/wrench_act(mob/living/user, obj/item/tool)
 	if(enabled)
@@ -295,21 +298,20 @@
  */
 /obj/machinery/survey_scanner/proc/enable()
 	if(!anchored)
-		say("Unable to operate, not anchored properly to the floor!")
+		say("Anchor unsecured.")
 		return
 	if(panel_open)
-		say("Unable to operate, maintenance panel is open!")
+		say("Maintenance panel open.")
 		return
 	if(!cell)
-		say("Unable to operate, no power cell installed!")
+		say("Power cell missing.")
 		return
 	if(!cell.charge)
-		say("Unable to operate, power cell is depleted!")
+		say("Power cell depleted.")
+		return
+	if(!get_scan_site())
+		say("No survey target.")
 		return
-	//don't have a history here, create one.
-	var/scan_key = get_scan_history_key()
-	if(!site_scan_history[scan_key])
-		site_scan_history[scan_key] = 1
 	next_scan = world.time //first scan lands on the next tick, so it visibly does something
 	enabled = TRUE
 	note_metric_operator() // round metrics, voidcrew/modules/metrics/research_metrics.dm
@@ -348,7 +350,7 @@
  */
 /datum/design/board/survey_scanner
 	name = "Survey Scanner Machine Board"
-	desc = "The Machine Circuit board for a Survey scanner which allows research generation through power."
+	desc = "A circuit board for a survey scanner."
 	id = "surveyscanner"
 	build_path = /obj/item/circuitboard/machine/survey_scanner
 	category = list(
@@ -373,4 +375,3 @@
 #undef SURVEY_SCAN_INTERVAL
 #undef SURVEY_SCAN_DECAY
 #undef SURVEY_MIN_PENALTY
-#undef SURVEY_GAIN_PER_SERVO
diff --git a/voidcrew/modules/research/techweb_nodes.dm b/voidcrew/modules/research/techweb_nodes.dm
index 2cf477391a9..4fa4f492106 100644
--- a/voidcrew/modules/research/techweb_nodes.dm
+++ b/voidcrew/modules/research/techweb_nodes.dm
@@ -263,6 +263,7 @@
 
 /datum/techweb_node/nanite_combat
 	id = "nanite_military"
+	zone_permission = ZONE_PERMISSION_ELITE
 	display_name = "Military Nanite Programming"
 	description = "Nanite programs that perform military-grade functions."
 	prereq_ids = list("nanite_harmonic", "syndicate_basic")
@@ -408,8 +409,9 @@
 
 /datum/techweb_node/automatic_ammunition
 	id = TECHWEB_NODE_AUTOMATIC_AMMO
+	zone_permission = ZONE_PERMISSION_YELLOW
 	display_name = "Automatic Ammunition"
-	description = "High-capacity feed devices and specialist shells. Keeping an automatic fed costs a lot more metal than keeping a pistol fed."
+	description = "High-capacity feed devices and specialist shells."
 	prereq_ids = list(TECHWEB_NODE_BALLISTIC_AMMO)
 	design_ids = list(
 		"vc_mag_m9mm_aps",
@@ -423,6 +425,7 @@
 
 /datum/techweb_node/specialist_ammo
 	id = TECHWEB_NODE_SPECIALIST_AMMO
+	zone_permission = ZONE_PERMISSION_YELLOW
 	display_name = "Specialist Ammunition"
 	description = "Precision, armor-piercing, hollow-point and incendiary loads for conventional firearms."
 	prereq_ids = list(TECHWEB_NODE_AUTOMATIC_AMMO, TECHWEB_NODE_EXOTIC_AMMO)
@@ -471,6 +474,7 @@
 
 /datum/techweb_node/experimental_ammo
 	id = TECHWEB_NODE_EXPERIMENTAL_AMMO
+	zone_permission = ZONE_PERMISSION_ADVANCED
 	display_name = "Experimental Ammunition"
 	description = "Guided and phasic projectiles, advanced payloads and high-energy shells."
 	prereq_ids = list(TECHWEB_NODE_SPECIALIST_AMMO, TECHWEB_NODE_APPLIED_BLUESPACE)
@@ -491,6 +495,7 @@
 
 /datum/techweb_node/explosive_ammo
 	id = TECHWEB_NODE_EXPLOSIVE_AMMO
+	zone_permission = ZONE_PERMISSION_ADVANCED
 	display_name = "Explosive Ammunition"
 	description = "Gyrojet cartridges, launcher grenades and 84mm rockets."
 	prereq_ids = list(TECHWEB_NODE_AUTOMATIC_AMMO, TECHWEB_NODE_EXPLOSIVES)
@@ -576,7 +581,6 @@
 	prereq_ids = list(TECHWEB_NODE_SURVEY_CONSOLE)
 	design_ids = list(
 		"survey_ship_docking",
-		"survey_console_rewards_upgrade_advanced",
 		"survey_console_information_upgrade_advanced",
 	)
 	required_surveyed_objects = list(planets = 1, nebulas = 3, electric_storms = 1)
diff --git a/voidcrew/modules/ship_upgrades/previews/hiryu_class_carrier_captain_s_quarters_pink.png b/voidcrew/modules/ship_upgrades/previews/hiryu_class_carrier_captain_s_quarters_pink.png
index 498c985ccd0..ce6930cb761 100644
Binary files a/voidcrew/modules/ship_upgrades/previews/hiryu_class_carrier_captain_s_quarters_pink.png and b/voidcrew/modules/ship_upgrades/previews/hiryu_class_carrier_captain_s_quarters_pink.png differ
diff --git a/voidcrew/modules/ship_upgrades/previews/hiryu_class_carrier_captain_s_quarters_standard.png b/voidcrew/modules/ship_upgrades/previews/hiryu_class_carrier_captain_s_quarters_standard.png
index dd78e003ddb..364ddc4536d 100644
Binary files a/voidcrew/modules/ship_upgrades/previews/hiryu_class_carrier_captain_s_quarters_standard.png and b/voidcrew/modules/ship_upgrades/previews/hiryu_class_carrier_captain_s_quarters_standard.png differ
diff --git a/voidcrew/modules/ship_upgrades/previews/hiryu_class_carrier_captain_s_quarters_syndicate.png b/voidcrew/modules/ship_upgrades/previews/hiryu_class_carrier_captain_s_quarters_syndicate.png
index b6502a6f3c8..b5513d92341 100644
Binary files a/voidcrew/modules/ship_upgrades/previews/hiryu_class_carrier_captain_s_quarters_syndicate.png and b/voidcrew/modules/ship_upgrades/previews/hiryu_class_carrier_captain_s_quarters_syndicate.png differ
diff --git a/voidcrew/modules/ship_upgrades/previews/hulls/bogatyr.preview.json b/voidcrew/modules/ship_upgrades/previews/hulls/bogatyr.preview.json
index 6ff172dc94d..5bf12cd4a87 100644
--- a/voidcrew/modules/ship_upgrades/previews/hulls/bogatyr.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/hulls/bogatyr.preview.json
@@ -21,7 +21,7 @@
      8
     ]
    },
-   "src_md5": "5614cc7edb4942bfebbac44d46a2fe08",
+   "src_md5": "15f2688f8f9d6671a9c5bc3e951bccb1",
    "width": 17
   }
  },
diff --git a/voidcrew/modules/ship_upgrades/previews/hulls/bogatyr_freshen_up.preview.json b/voidcrew/modules/ship_upgrades/previews/hulls/bogatyr_freshen_up.preview.json
index 0099e89cb62..aeb1489470c 100644
--- a/voidcrew/modules/ship_upgrades/previews/hulls/bogatyr_freshen_up.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/hulls/bogatyr_freshen_up.preview.json
@@ -21,7 +21,7 @@
      8
     ]
    },
-   "src_md5": "c68adc90b32a6035d4b09f5aacada6e9",
+   "src_md5": "1e1acd1184ce3b452035a1d435ecbdd3",
    "width": 17
   }
  },
diff --git a/voidcrew/modules/ship_upgrades/previews/hulls/bogatyr_nightclub.preview.json b/voidcrew/modules/ship_upgrades/previews/hulls/bogatyr_nightclub.preview.json
index c3ac95eaf26..6d1ab846f60 100644
--- a/voidcrew/modules/ship_upgrades/previews/hulls/bogatyr_nightclub.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/hulls/bogatyr_nightclub.preview.json
@@ -21,7 +21,7 @@
      8
     ]
    },
-   "src_md5": "90a4d033246cf782c01397870ff94433",
+   "src_md5": "3d7b760806b1daea06d94b2295b47928",
    "width": 17
   }
  },
diff --git a/voidcrew/modules/ship_upgrades/previews/hulls/delta_a.preview.json b/voidcrew/modules/ship_upgrades/previews/hulls/delta_a.preview.json
index ebbacd1aa18..1ec2dba47f5 100644
--- a/voidcrew/modules/ship_upgrades/previews/hulls/delta_a.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/hulls/delta_a.preview.json
@@ -21,7 +21,7 @@
      2
     ]
    },
-   "src_md5": "a8dbf1de1c7273996c21d038215f7434",
+   "src_md5": "e000cb452f37aef6f14189b2f66bd05c",
    "width": 28
   }
  },
diff --git a/voidcrew/modules/ship_upgrades/previews/hulls/delta_b.preview.json b/voidcrew/modules/ship_upgrades/previews/hulls/delta_b.preview.json
index 53705479dac..4abe3f75ed3 100644
--- a/voidcrew/modules/ship_upgrades/previews/hulls/delta_b.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/hulls/delta_b.preview.json
@@ -21,7 +21,7 @@
      2
     ]
    },
-   "src_md5": "f424e2913f09a96f139cec37162ff7dc",
+   "src_md5": "86cef38bcdcbed153d6635604d11629c",
    "width": 28
   }
  },
diff --git a/voidcrew/modules/ship_upgrades/previews/hulls/delta_c.preview.json b/voidcrew/modules/ship_upgrades/previews/hulls/delta_c.preview.json
index fcd3d1fedcc..176169ebc02 100644
--- a/voidcrew/modules/ship_upgrades/previews/hulls/delta_c.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/hulls/delta_c.preview.json
@@ -21,7 +21,7 @@
      2
     ]
    },
-   "src_md5": "f866b76df60aa0acaf7d08c0ed911fa3",
+   "src_md5": "9412c446b0b0cc4f6af29b2f20cc6a7c",
    "width": 28
   }
  },
diff --git a/voidcrew/modules/ship_upgrades/previews/hulls/delta_d.preview.json b/voidcrew/modules/ship_upgrades/previews/hulls/delta_d.preview.json
index 3be1adc7c8c..1d0d65ab344 100644
--- a/voidcrew/modules/ship_upgrades/previews/hulls/delta_d.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/hulls/delta_d.preview.json
@@ -21,7 +21,7 @@
      2
     ]
    },
-   "src_md5": "73c0ea6954c404e73ad8c628b857800c",
+   "src_md5": "276a7f4d236a3685af7384b8363c2761",
    "width": 28
   }
  },
diff --git a/voidcrew/modules/ship_upgrades/previews/hulls/goon_c.preview.json b/voidcrew/modules/ship_upgrades/previews/hulls/goon_c.preview.json
index 5848132a733..2a8ec09b61f 100644
--- a/voidcrew/modules/ship_upgrades/previews/hulls/goon_c.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/hulls/goon_c.preview.json
@@ -25,7 +25,7 @@
      7
     ]
    },
-   "src_md5": "189679e722ae203b99e775f932e9d8ae",
+   "src_md5": "696be1a3346178f1f51b13a1e5c636ca",
    "width": 19
   }
  },
diff --git a/voidcrew/modules/ship_upgrades/previews/hulls/kilo_a.preview.json b/voidcrew/modules/ship_upgrades/previews/hulls/kilo_a.preview.json
index 95824a688d5..a7cce5751c3 100644
--- a/voidcrew/modules/ship_upgrades/previews/hulls/kilo_a.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/hulls/kilo_a.preview.json
@@ -17,7 +17,7 @@
      2
     ]
    },
-   "src_md5": "375dffd3dd43ba774a81b4ed806b4443",
+   "src_md5": "4904826142acf03467462245d8904943",
    "width": 24
   }
  },
diff --git a/voidcrew/modules/ship_upgrades/previews/hulls/kilo_b.preview.json b/voidcrew/modules/ship_upgrades/previews/hulls/kilo_b.preview.json
index cd9049535fe..aeb4ac91e82 100644
--- a/voidcrew/modules/ship_upgrades/previews/hulls/kilo_b.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/hulls/kilo_b.preview.json
@@ -17,7 +17,7 @@
      2
     ]
    },
-   "src_md5": "f85e1c9afd2b40b96d51cb108cf60a8d",
+   "src_md5": "18060cfa0f83c97b1faa012004b8aa9c",
    "width": 24
   }
  },
diff --git a/voidcrew/modules/ship_upgrades/previews/hulls/kilo_c.preview.json b/voidcrew/modules/ship_upgrades/previews/hulls/kilo_c.preview.json
index 15c24a8059b..6c14dc05419 100644
--- a/voidcrew/modules/ship_upgrades/previews/hulls/kilo_c.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/hulls/kilo_c.preview.json
@@ -17,7 +17,7 @@
      2
     ]
    },
-   "src_md5": "70f775270394806b161cdcc2328c8b09",
+   "src_md5": "dd80fdb65da8b1b5aba72d0c2f5d64c5",
    "width": 24
   }
  },
diff --git a/voidcrew/modules/ship_upgrades/previews/hulls/kilo_d.preview.json b/voidcrew/modules/ship_upgrades/previews/hulls/kilo_d.preview.json
index 5a0487f6f80..4dc0af548e9 100644
--- a/voidcrew/modules/ship_upgrades/previews/hulls/kilo_d.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/hulls/kilo_d.preview.json
@@ -17,7 +17,7 @@
      2
     ]
    },
-   "src_md5": "477c0735c5cbb2dd97c0d664c68d7d27",
+   "src_md5": "63d0d73a537ee3f0f5825b71b4c270ac",
    "width": 24
   }
  },
diff --git a/voidcrew/modules/ship_upgrades/previews/hulls/nano_phalanx_a.preview.json b/voidcrew/modules/ship_upgrades/previews/hulls/nano_phalanx_a.preview.json
index 448d1dff082..f5df286a5d7 100644
--- a/voidcrew/modules/ship_upgrades/previews/hulls/nano_phalanx_a.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/hulls/nano_phalanx_a.preview.json
@@ -25,7 +25,7 @@
      11
     ]
    },
-   "src_md5": "13958fc798c01b4bffdd5d9c1d649117",
+   "src_md5": "e106f8ee8926704c66f9764ea40ace52",
    "width": 56
   }
  },
diff --git a/voidcrew/modules/ship_upgrades/previews/hulls/nano_phalanx_b.preview.json b/voidcrew/modules/ship_upgrades/previews/hulls/nano_phalanx_b.preview.json
index 5949f1a7c87..ebb0c3c8e9f 100644
--- a/voidcrew/modules/ship_upgrades/previews/hulls/nano_phalanx_b.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/hulls/nano_phalanx_b.preview.json
@@ -25,7 +25,7 @@
      11
     ]
    },
-   "src_md5": "d58b0e7e963891855cd49411e2f94514",
+   "src_md5": "d70bf3b8f1c2d11a93c95e41e7a10c76",
    "width": 56
   }
  },
diff --git a/voidcrew/modules/ship_upgrades/previews/hulls/nano_phalanx_c.preview.json b/voidcrew/modules/ship_upgrades/previews/hulls/nano_phalanx_c.preview.json
index 30167fe6505..d69e96aad40 100644
--- a/voidcrew/modules/ship_upgrades/previews/hulls/nano_phalanx_c.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/hulls/nano_phalanx_c.preview.json
@@ -25,7 +25,7 @@
      11
     ]
    },
-   "src_md5": "4c005aa96c5f1f5b74ed23e71625f47a",
+   "src_md5": "3eb98fbeb731b8c6bd475e73bd59c0b1",
    "width": 56
   }
  },
diff --git a/voidcrew/modules/ship_upgrades/previews/hulls/nano_phalanx_d.preview.json b/voidcrew/modules/ship_upgrades/previews/hulls/nano_phalanx_d.preview.json
index ac205a4f535..05f8223e63b 100644
--- a/voidcrew/modules/ship_upgrades/previews/hulls/nano_phalanx_d.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/hulls/nano_phalanx_d.preview.json
@@ -25,7 +25,7 @@
      11
     ]
    },
-   "src_md5": "3ff8299f8dbe1c41f5e0dcaf12ce32fc",
+   "src_md5": "5b06c76908f519a4d7e7cd0415e1c4d7",
    "width": 56
   }
  },
diff --git a/voidcrew/modules/ship_upgrades/previews/hulls/scarab_c.preview.json b/voidcrew/modules/ship_upgrades/previews/hulls/scarab_c.preview.json
index dfa3bc34900..5a3d38e6fe8 100644
--- a/voidcrew/modules/ship_upgrades/previews/hulls/scarab_c.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/hulls/scarab_c.preview.json
@@ -21,7 +21,7 @@
      7
     ]
    },
-   "src_md5": "f9c0406dac6267d3f0b450e7fd30e604",
+   "src_md5": "b43b9c108ae7db5fc117ac5532bdc27b",
    "width": 33
   }
  },
diff --git a/voidcrew/modules/ship_upgrades/previews/hulls/squab_a.preview.json b/voidcrew/modules/ship_upgrades/previews/hulls/squab_a.preview.json
index cd453e55870..ce235eaa1dd 100644
--- a/voidcrew/modules/ship_upgrades/previews/hulls/squab_a.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/hulls/squab_a.preview.json
@@ -25,7 +25,7 @@
      14
     ]
    },
-   "src_md5": "a562ec39be53a0a2ff922b2ebc3eefd0",
+   "src_md5": "535311e4a5f361617393698e12f8711c",
    "width": 36
   }
  },
diff --git a/voidcrew/modules/ship_upgrades/previews/hulls/squab_b.preview.json b/voidcrew/modules/ship_upgrades/previews/hulls/squab_b.preview.json
index 4f4d00ef0b7..de3f99e473a 100644
--- a/voidcrew/modules/ship_upgrades/previews/hulls/squab_b.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/hulls/squab_b.preview.json
@@ -25,7 +25,7 @@
      14
     ]
    },
-   "src_md5": "80a0d608795baec44f94237cc18b53b7",
+   "src_md5": "b6c4c0f75c28b88dd5383326d31a12f3",
    "width": 36
   }
  },
diff --git a/voidcrew/modules/ship_upgrades/previews/hulls/squab_c.preview.json b/voidcrew/modules/ship_upgrades/previews/hulls/squab_c.preview.json
index 82130e37cad..fda3b61ba69 100644
--- a/voidcrew/modules/ship_upgrades/previews/hulls/squab_c.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/hulls/squab_c.preview.json
@@ -25,7 +25,7 @@
      14
     ]
    },
-   "src_md5": "81b54c1936a39acc8684abb74fd422ab",
+   "src_md5": "5e9bf0ae951e9e9a34bed6de346236d7",
    "width": 36
   }
  },
diff --git a/voidcrew/modules/ship_upgrades/previews/modules/bogatyr/workshop/engineering_and_classic_armory.preview.json b/voidcrew/modules/ship_upgrades/previews/modules/bogatyr/workshop/engineering_and_classic_armory.preview.json
index 532e0bfc41a..1665e0d9131 100644
--- a/voidcrew/modules/ship_upgrades/previews/modules/bogatyr/workshop/engineering_and_classic_armory.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/modules/bogatyr/workshop/engineering_and_classic_armory.preview.json
@@ -8,7 +8,7 @@
    ],
    "height": 9,
    "png": "bogatyr_workshop_engineering_and_classic_armory.png",
-   "src_md5": "75edd923c6041b33f9bc99bf4363dabe",
+   "src_md5": "32126c33a0a5ea0f2826b6881cd2b8a6",
    "themes": {
     "freshen_up": {
      "connector": [
@@ -17,7 +17,7 @@
      ],
      "height": 9,
      "png": "bogatyr_workshop_engineering_and_classic_armory_freshen_up.png",
-     "src_md5": "28f1044f06233197a82cf1b3295d5cd7",
+     "src_md5": "646d3e18fac2d50f20388bc9514985e4",
      "width": 5
     },
     "nightclub": {
@@ -27,7 +27,7 @@
      ],
      "height": 9,
      "png": "bogatyr_workshop_engineering_and_classic_armory_nightclub.png",
-     "src_md5": "0a03c99353b9632cae6f78ff87f2d44f",
+     "src_md5": "e164ecb9348facc9440e3144294a10f0",
      "width": 5
     }
    },
diff --git a/voidcrew/modules/ship_upgrades/previews/modules/bogatyr/workshop/enhanced_armory.preview.json b/voidcrew/modules/ship_upgrades/previews/modules/bogatyr/workshop/enhanced_armory.preview.json
index ee97048178d..24e55df8afb 100644
--- a/voidcrew/modules/ship_upgrades/previews/modules/bogatyr/workshop/enhanced_armory.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/modules/bogatyr/workshop/enhanced_armory.preview.json
@@ -8,7 +8,7 @@
    ],
    "height": 9,
    "png": "bogatyr_workshop_enhanced_armory.png",
-   "src_md5": "2e7fdf047fa97a763970f0edacc98d09",
+   "src_md5": "c36d9cf31b99ed6c4ef0ea7ab1f9802f",
    "themes": {
     "nightclub": {
      "connector": [
@@ -17,7 +17,7 @@
      ],
      "height": 9,
      "png": "bogatyr_workshop_enhanced_armory_nightclub.png",
-     "src_md5": "88a0cc2272707feb95b38906bc4ff35e",
+     "src_md5": "a1c14d306c96b876c5358b6e1788be17",
      "width": 5
     }
    },
diff --git a/voidcrew/modules/ship_upgrades/previews/modules/delta/delta_cargo_gundeck.preview.json b/voidcrew/modules/ship_upgrades/previews/modules/delta/delta_cargo_gundeck.preview.json
index e56c9bb7fe0..6705ee7752e 100644
--- a/voidcrew/modules/ship_upgrades/previews/modules/delta/delta_cargo_gundeck.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/modules/delta/delta_cargo_gundeck.preview.json
@@ -8,7 +8,7 @@
    ],
    "height": 5,
    "png": "delta_delta_cargo_gundeck.png",
-   "src_md5": "43dcd176bb75c2bfe51b292ec072d87f",
+   "src_md5": "38fcc11f3255e8cb2d9572f4c2c2edd8",
    "themes": {
     "cult": {
      "connector": [
@@ -17,7 +17,7 @@
      ],
      "height": 5,
      "png": "delta_delta_cargo_gundeck_cult.png",
-     "src_md5": "e10fa2b6ac3041e551fe3312baef0b32",
+     "src_md5": "12a5fb61662bce0acf98131957c1769f",
      "width": 7
     },
     "lightship": {
@@ -27,7 +27,7 @@
      ],
      "height": 5,
      "png": "delta_delta_cargo_gundeck_lightship.png",
-     "src_md5": "d40ab03d71fe932484c6d9c7c2586ec0",
+     "src_md5": "97f57b1171f5c0de06a4d13b8cafa39d",
      "width": 7
     },
     "syndicate": {
@@ -37,7 +37,7 @@
      ],
      "height": 5,
      "png": "delta_delta_cargo_gundeck_syndicate.png",
-     "src_md5": "c8696c250e69cfaf5ea433b9737d7fbc",
+     "src_md5": "8d50cd069559aaa36df69c95cc3a59bc",
      "width": 7
     }
    },
diff --git a/voidcrew/modules/ship_upgrades/previews/modules/delta/delta_cargo_salvage.preview.json b/voidcrew/modules/ship_upgrades/previews/modules/delta/delta_cargo_salvage.preview.json
index de95a72d448..b33007813e4 100644
--- a/voidcrew/modules/ship_upgrades/previews/modules/delta/delta_cargo_salvage.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/modules/delta/delta_cargo_salvage.preview.json
@@ -8,7 +8,7 @@
    ],
    "height": 5,
    "png": "delta_delta_cargo_salvage.png",
-   "src_md5": "0b14657fa61321127bfaf110a0329d87",
+   "src_md5": "53de32c3bff84d0d748e5116775130cc",
    "themes": {
     "cult": {
      "connector": [
@@ -17,7 +17,7 @@
      ],
      "height": 5,
      "png": "delta_delta_cargo_salvage_cult.png",
-     "src_md5": "bdf5d2f688ac785f4e7da0a83f43da94",
+     "src_md5": "d51e84ea50034ebac19a4387f9c8c728",
      "width": 7
     },
     "lightship": {
@@ -27,7 +27,7 @@
      ],
      "height": 5,
      "png": "delta_delta_cargo_salvage_lightship.png",
-     "src_md5": "9d735253ba3b10b2e92d1c927041bbcb",
+     "src_md5": "8738078061302130f28414fc574db76f",
      "width": 7
     },
     "syndicate": {
@@ -37,7 +37,7 @@
      ],
      "height": 5,
      "png": "delta_delta_cargo_salvage_syndicate.png",
-     "src_md5": "ffc029c18248c9d44644565e0879ef45",
+     "src_md5": "1fe2ffe862d93b7ec801eede632adb29",
      "width": 7
     }
    },
diff --git a/voidcrew/modules/ship_upgrades/previews/modules/hiryu_class_carrier/bridge.preview.json b/voidcrew/modules/ship_upgrades/previews/modules/hiryu_class_carrier/bridge.preview.json
index 968f2b4b616..8b2222e6dd4 100644
--- a/voidcrew/modules/ship_upgrades/previews/modules/hiryu_class_carrier/bridge.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/modules/hiryu_class_carrier/bridge.preview.json
@@ -15,7 +15,7 @@
      ],
      "height": 7,
      "png": "hiryu_class_carrier_bridge_pink.png",
-     "src_md5": "1aae35b54225e93979c9b5b51dde8129",
+     "src_md5": "e40128db69a8320dd4f2fe8f01e2065b",
      "width": 4
     },
     "standard": {
@@ -25,7 +25,7 @@
      ],
      "height": 7,
      "png": "hiryu_class_carrier_bridge_standard.png",
-     "src_md5": "c83011d8e0d3ea14f47dea93a4df9065",
+     "src_md5": "7001441ba4ebd94555178c02289af950",
      "width": 4
     },
     "syndicate": {
@@ -35,7 +35,7 @@
      ],
      "height": 7,
      "png": "hiryu_class_carrier_bridge_syndicate.png",
-     "src_md5": "1dbbf1361f23aba157b5d789c5c861b1",
+     "src_md5": "5447baa62a51c2d48bc841b40e659ebc",
      "width": 4
     }
    },
diff --git a/voidcrew/modules/ship_upgrades/previews/modules/hiryu_class_carrier/captain_s_quarters.preview.json b/voidcrew/modules/ship_upgrades/previews/modules/hiryu_class_carrier/captain_s_quarters.preview.json
index deabcfdebb1..d4dad550e5b 100644
--- a/voidcrew/modules/ship_upgrades/previews/modules/hiryu_class_carrier/captain_s_quarters.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/modules/hiryu_class_carrier/captain_s_quarters.preview.json
@@ -15,7 +15,7 @@
      ],
      "height": 7,
      "png": "hiryu_class_carrier_captain_s_quarters_pink.png",
-     "src_md5": "7e9964f24027790ca764f4bd65297ab3",
+     "src_md5": "af523eedc8f52073daee7bf5917339d8",
      "width": 4
     },
     "standard": {
@@ -25,7 +25,7 @@
      ],
      "height": 7,
      "png": "hiryu_class_carrier_captain_s_quarters_standard.png",
-     "src_md5": "4bcd8f569927a2ae0e0000a4870f7764",
+     "src_md5": "8c1f9a5c001e1130eaf5c94c0e9d023d",
      "width": 4
     },
     "syndicate": {
@@ -35,7 +35,7 @@
      ],
      "height": 7,
      "png": "hiryu_class_carrier_captain_s_quarters_syndicate.png",
-     "src_md5": "fcebbba0444ede432ffcac98cfc685d6",
+     "src_md5": "0ace53d7099953e8fb723782b4ff811e",
      "width": 4
     }
    },
diff --git a/voidcrew/modules/ship_upgrades/previews/modules/nanobead/security_north.preview.json b/voidcrew/modules/ship_upgrades/previews/modules/nanobead/security_north.preview.json
index 6f6f98d2f68..355159eec7d 100644
--- a/voidcrew/modules/ship_upgrades/previews/modules/nanobead/security_north.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/modules/nanobead/security_north.preview.json
@@ -15,7 +15,7 @@
      ],
      "height": 6,
      "png": "nanobead_security_north_dark.png",
-     "src_md5": "37d4dd3fd797d8a79fd5ff2780014f63",
+     "src_md5": "e033cfecbef36490ebc37f7d22eed12c",
      "width": 6
     },
     "standard": {
@@ -25,7 +25,7 @@
      ],
      "height": 6,
      "png": "nanobead_security_north_standard.png",
-     "src_md5": "530d699b9735ea5d7039499377a79e96",
+     "src_md5": "968bc503e04fc81dd3e0dc4fd235c2b0",
      "width": 6
     }
    },
diff --git a/voidcrew/modules/ship_upgrades/previews/modules/nanobead/security_south.preview.json b/voidcrew/modules/ship_upgrades/previews/modules/nanobead/security_south.preview.json
index 4afe7b02aee..3c73000dca0 100644
--- a/voidcrew/modules/ship_upgrades/previews/modules/nanobead/security_south.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/modules/nanobead/security_south.preview.json
@@ -15,7 +15,7 @@
      ],
      "height": 6,
      "png": "nanobead_security_south_dark.png",
-     "src_md5": "673791403bf7919d7fc85f50b39d3685",
+     "src_md5": "455b6422c24a4f186e910294d0d2f75f",
      "width": 6
     },
     "standard": {
@@ -25,7 +25,7 @@
      ],
      "height": 6,
      "png": "nanobead_security_south_standard.png",
-     "src_md5": "5d290e649caad60c4f8aee612a18be2b",
+     "src_md5": "4f71b91a76cf436e3caa1493897f8f18",
      "width": 6
     }
    },
diff --git a/voidcrew/modules/ship_upgrades/previews/modules/phalanx/phalanx_armory_full.preview.json b/voidcrew/modules/ship_upgrades/previews/modules/phalanx/phalanx_armory_full.preview.json
index 745b120872d..644d0b9726a 100644
--- a/voidcrew/modules/ship_upgrades/previews/modules/phalanx/phalanx_armory_full.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/modules/phalanx/phalanx_armory_full.preview.json
@@ -8,7 +8,7 @@
    ],
    "height": 4,
    "png": "phalanx_phalanx_armory_full.png",
-   "src_md5": "6ac071c6072012fdc4df1015ac5eb640",
+   "src_md5": "84d3ad7519531da5830d7c7536c329ed",
    "themes": {
     "hearth": {
      "connector": [
@@ -17,7 +17,7 @@
      ],
      "height": 4,
      "png": "phalanx_phalanx_armory_full_hearth.png",
-     "src_md5": "63bd3e243c4fa1196a71518d12b2e2ed",
+     "src_md5": "ff8988bd3c8553f51b39a6fe3cafc6b1",
      "width": 6
     },
     "springs": {
@@ -27,7 +27,7 @@
      ],
      "height": 4,
      "png": "phalanx_phalanx_armory_full_springs.png",
-     "src_md5": "6e02f245e2aa075614967d19276d252e",
+     "src_md5": "eeb9b67f26612fea7042a27cdbd2acd1",
      "width": 6
     },
     "verdant": {
@@ -37,7 +37,7 @@
      ],
      "height": 4,
      "png": "phalanx_phalanx_armory_full_verdant.png",
-     "src_md5": "b7c3fe51e5976545a1951361c97e6ac1",
+     "src_md5": "626db21a315d3622e685c85c876562ec",
      "width": 6
     }
    },
diff --git a/voidcrew/modules/ship_upgrades/previews/modules/phalanx/phalanx_armory_post.preview.json b/voidcrew/modules/ship_upgrades/previews/modules/phalanx/phalanx_armory_post.preview.json
index f49b11ac703..6f38233f2ca 100644
--- a/voidcrew/modules/ship_upgrades/previews/modules/phalanx/phalanx_armory_post.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/modules/phalanx/phalanx_armory_post.preview.json
@@ -8,7 +8,7 @@
    ],
    "height": 4,
    "png": "phalanx_phalanx_armory_post.png",
-   "src_md5": "c945841b37945e0879f9312cb8f63eb7",
+   "src_md5": "656238e9d5ebd28b2d0d73b342e8f620",
    "themes": {
     "hearth": {
      "connector": [
@@ -17,7 +17,7 @@
      ],
      "height": 4,
      "png": "phalanx_phalanx_armory_post_hearth.png",
-     "src_md5": "f77e4a6e039a4e147e0873f69f004e9d",
+     "src_md5": "a343c6e31aac504808f3bc9670b740b8",
      "width": 6
     },
     "springs": {
@@ -27,7 +27,7 @@
      ],
      "height": 4,
      "png": "phalanx_phalanx_armory_post_springs.png",
-     "src_md5": "9a9a027e0f47dc8e8a18428cdf87ab98",
+     "src_md5": "fa4d969daf4972c152b2f749eec978db",
      "width": 6
     },
     "verdant": {
@@ -37,7 +37,7 @@
      ],
      "height": 4,
      "png": "phalanx_phalanx_armory_post_verdant.png",
-     "src_md5": "7401c4bf75652a591e0c0afa4a66e2be",
+     "src_md5": "d62b63d17cb196597231ebd9038f684b",
      "width": 6
     }
    },
diff --git a/voidcrew/modules/ship_upgrades/previews/modules/pill/pill_extra_weapons.preview.json b/voidcrew/modules/ship_upgrades/previews/modules/pill/pill_extra_weapons.preview.json
index 64c07c04bca..de4f9760463 100644
--- a/voidcrew/modules/ship_upgrades/previews/modules/pill/pill_extra_weapons.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/modules/pill/pill_extra_weapons.preview.json
@@ -8,7 +8,7 @@
    ],
    "height": 1,
    "png": "pill_pill_extra_weapons.png",
-   "src_md5": "3f99ca091844c107a7dc4c24ef2d94cd",
+   "src_md5": "27659b611da5cd28d666c8a3802e1fbe",
    "width": 1
   }
  },
diff --git a/voidcrew/modules/ship_upgrades/previews/modules/squab/science_director.preview.json b/voidcrew/modules/ship_upgrades/previews/modules/squab/science_director.preview.json
index fabe86896b5..0ed78e1a091 100644
--- a/voidcrew/modules/ship_upgrades/previews/modules/squab/science_director.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/modules/squab/science_director.preview.json
@@ -8,7 +8,7 @@
    ],
    "height": 2,
    "png": "squab_science_director.png",
-   "src_md5": "2278880fcce97b042f12d1948c94e3d6",
+   "src_md5": "b64ff0408c6a84d26e40ec7462f5c2d1",
    "width": 3
   }
  },
diff --git a/voidcrew/modules/ship_upgrades/previews/modules/squab/security_director.preview.json b/voidcrew/modules/ship_upgrades/previews/modules/squab/security_director.preview.json
index d9f49ef1552..4898acd9eea 100644
--- a/voidcrew/modules/ship_upgrades/previews/modules/squab/security_director.preview.json
+++ b/voidcrew/modules/ship_upgrades/previews/modules/squab/security_director.preview.json
@@ -8,7 +8,7 @@
    ],
    "height": 2,
    "png": "squab_security_director.png",
-   "src_md5": "a54ea9e2fbe15b05b5219d33bbadd24b",
+   "src_md5": "4440328b675331a7eef10d962b0fef57",
    "width": 3
   }
  },
diff --git a/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_full.png b/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_full.png
index f2acff64b99..31c029c49ea 100644
Binary files a/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_full.png and b/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_full.png differ
diff --git a/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_full_hearth.png b/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_full_hearth.png
index aa941655d39..aac7638703c 100644
Binary files a/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_full_hearth.png and b/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_full_hearth.png differ
diff --git a/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_full_springs.png b/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_full_springs.png
index 39d8034111c..8117b42c5ca 100644
Binary files a/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_full_springs.png and b/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_full_springs.png differ
diff --git a/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_full_verdant.png b/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_full_verdant.png
index 32e37549d62..934732296db 100644
Binary files a/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_full_verdant.png and b/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_full_verdant.png differ
diff --git a/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_post.png b/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_post.png
index 687e82a2361..c4069674f1a 100644
Binary files a/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_post.png and b/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_post.png differ
diff --git a/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_post_hearth.png b/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_post_hearth.png
index 5b9e25ed50a..7be1e790e9e 100644
Binary files a/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_post_hearth.png and b/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_post_hearth.png differ
diff --git a/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_post_springs.png b/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_post_springs.png
index eddc3bb7d8a..9ce81665f15 100644
Binary files a/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_post_springs.png and b/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_post_springs.png differ
diff --git a/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_post_verdant.png b/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_post_verdant.png
index fda27fe0ec6..9d170413210 100644
Binary files a/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_post_verdant.png and b/voidcrew/modules/ship_upgrades/previews/phalanx_phalanx_armory_post_verdant.png differ
diff --git a/voidcrew/modules/ship_upgrades/previews/ship_delta_d.png b/voidcrew/modules/ship_upgrades/previews/ship_delta_d.png
index 8e4921c9a5c..3e415fc7b82 100644
Binary files a/voidcrew/modules/ship_upgrades/previews/ship_delta_d.png and b/voidcrew/modules/ship_upgrades/previews/ship_delta_d.png differ
diff --git a/voidcrew/modules/ship_upgrades/previews/ship_nano_phalanx_a.png b/voidcrew/modules/ship_upgrades/previews/ship_nano_phalanx_a.png
index 943b58f587e..3ab47423a82 100644
Binary files a/voidcrew/modules/ship_upgrades/previews/ship_nano_phalanx_a.png and b/voidcrew/modules/ship_upgrades/previews/ship_nano_phalanx_a.png differ
diff --git a/voidcrew/modules/ship_upgrades/previews/ship_nano_phalanx_b.png b/voidcrew/modules/ship_upgrades/previews/ship_nano_phalanx_b.png
index 4ba6c040676..7c68524237e 100644
Binary files a/voidcrew/modules/ship_upgrades/previews/ship_nano_phalanx_b.png and b/voidcrew/modules/ship_upgrades/previews/ship_nano_phalanx_b.png differ
diff --git a/voidcrew/modules/ship_upgrades/previews/ship_nano_phalanx_c.png b/voidcrew/modules/ship_upgrades/previews/ship_nano_phalanx_c.png
index 740c4fec8f1..e71c3b3ea21 100644
Binary files a/voidcrew/modules/ship_upgrades/previews/ship_nano_phalanx_c.png and b/voidcrew/modules/ship_upgrades/previews/ship_nano_phalanx_c.png differ
diff --git a/voidcrew/modules/ship_upgrades/previews/ship_nano_phalanx_d.png b/voidcrew/modules/ship_upgrades/previews/ship_nano_phalanx_d.png
index b4fa34b4e83..18b51b70f92 100644
Binary files a/voidcrew/modules/ship_upgrades/previews/ship_nano_phalanx_d.png and b/voidcrew/modules/ship_upgrades/previews/ship_nano_phalanx_d.png differ
diff --git a/voidcrew/modules/ship_upgrades/previews/ship_squab_a.png b/voidcrew/modules/ship_upgrades/previews/ship_squab_a.png
index d1ff0bc8f2c..17fdc322311 100644
Binary files a/voidcrew/modules/ship_upgrades/previews/ship_squab_a.png and b/voidcrew/modules/ship_upgrades/previews/ship_squab_a.png differ
diff --git a/voidcrew/modules/ship_upgrades/previews/ship_squab_b.png b/voidcrew/modules/ship_upgrades/previews/ship_squab_b.png
index 1f1aac03d2f..bb43297f538 100644
Binary files a/voidcrew/modules/ship_upgrades/previews/ship_squab_b.png and b/voidcrew/modules/ship_upgrades/previews/ship_squab_b.png differ
diff --git a/voidcrew/modules/ship_upgrades/previews/ship_squab_c.png b/voidcrew/modules/ship_upgrades/previews/ship_squab_c.png
index 9c86058de95..64a4f74ed39 100644
Binary files a/voidcrew/modules/ship_upgrades/previews/ship_squab_c.png and b/voidcrew/modules/ship_upgrades/previews/ship_squab_c.png differ
diff --git a/voidcrew/modules/ship_upgrades/previews/squab_security_director.png b/voidcrew/modules/ship_upgrades/previews/squab_security_director.png
index a6d55cc1322..b89d0139189 100644
Binary files a/voidcrew/modules/ship_upgrades/previews/squab_security_director.png and b/voidcrew/modules/ship_upgrades/previews/squab_security_director.png differ
diff --git a/voidcrew/modules/ship_upgrades/ships/delta.dm b/voidcrew/modules/ship_upgrades/ships/delta.dm
index ba69ac5c889..35be1b8ac8a 100644
--- a/voidcrew/modules/ship_upgrades/ships/delta.dm
+++ b/voidcrew/modules/ship_upgrades/ships/delta.dm
@@ -141,9 +141,7 @@
 /datum/ship_upgrade_module/delta/cargo_gundeck
 	id = "delta_cargo_gundeck"
 	name = "Gun Deck"
-	desc = "Security lockers, an energy gun rack with a recharger, and a \
-		desk for whoever minds the old hull turrets. Adds a Security \
-		Officer to the crew."
+	desc = "Security lockers, an energy gun rack, a recharger and a duty desk."
 	slot = "delta_cargo"
 	map_file = "delta/delta_cargo_gundeck.dmm"
 	part_cost = list(PART_CLASS_COMBAT = 10)
diff --git a/voidcrew/modules/ship_upgrades/ships/phalanx.dm b/voidcrew/modules/ship_upgrades/ships/phalanx.dm
index 9286d39b877..83a4e8ace47 100644
--- a/voidcrew/modules/ship_upgrades/ships/phalanx.dm
+++ b/voidcrew/modules/ship_upgrades/ships/phalanx.dm
@@ -213,8 +213,7 @@
 /datum/ship_upgrade_module/phalanx/armory_post
 	id = "phalanx_armory_post"
 	name = "Watch Post"
-	desc = "A duty desk, a rack of disablers and riot shields, and an evidence \
-		locker. Enough to keep order; not enough to start a war."
+	desc = "A duty desk, disablers, survival knives and an evidence locker."
 	slot = "phalanx_armory"
 	map_file = "phalanx/phalanx_armory_post.dmm"
 	is_default = TRUE
@@ -222,8 +221,7 @@
 /datum/ship_upgrade_module/phalanx/armory_full
 	id = "phalanx_armory_full"
 	name = "Ship Armory"
-	desc = "Energy and riot closets, an EOD locker and a marine vendor - a \
-		working slice of the arsenal this hull used to carry."
+	desc = "Armor and ballistics lockers, an EOD locker and a marine vendor."
 	slot = "phalanx_armory"
 	map_file = "phalanx/phalanx_armory_full.dmm"
 	part_cost = list(PART_CLASS_COMBAT = 14)
diff --git a/voidcrew/modules/ship_upgrades/ships/pill.dm b/voidcrew/modules/ship_upgrades/ships/pill.dm
index 74f3d1dfa58..6885260c5e4 100644
--- a/voidcrew/modules/ship_upgrades/ships/pill.dm
+++ b/voidcrew/modules/ship_upgrades/ships/pill.dm
@@ -35,8 +35,7 @@
 /datum/ship_upgrade_module/pill/weapons
 	id = "pill_extra_weapons"
 	name = "Weapons Bay"
-	desc = "Three surplus retro laser guns and a charging dock on the floor. The \
-		crew can shoot back now."
+	desc = "Three surplus retro laser guns and a charging dock."
 	slot = "pill_extra"
 	map_file = "pill/pill_extra_weapons.dmm"
 	part_cost = list(PART_CLASS_COMBAT = 4)
diff --git a/voidcrew/modules/ship_upgrades/ships/squab.dm b/voidcrew/modules/ship_upgrades/ships/squab.dm
index f98bde3dbdc..c63349d156f 100644
--- a/voidcrew/modules/ship_upgrades/ships/squab.dm
+++ b/voidcrew/modules/ship_upgrades/ships/squab.dm
@@ -126,7 +126,7 @@
 	for_ship = /datum/map_template/shuttle/voidcrew/squab
 	map_file = "squab/science_director.dmm"
 	is_default = TRUE
-	desc = "A bedroom for the science director with a research modsuit and a filled locker. An experimental prototype resides on the table."
+	desc = "The science director's bedroom, with a research MODsuit, a stocked locker and an experimental prototype."
 
 /datum/ship_upgrade_module/squab/medical_director
 	part_cost = list(PART_CLASS_SCIENCE = 1, PART_CLASS_MISC = 2)
@@ -148,7 +148,7 @@
 	for_ship = /datum/map_template/shuttle/voidcrew/squab
 	map_file = "squab/security_director.dmm"
 	is_default = FALSE
-	desc = "Sleeping quarters for the security director with all his gear intact. A displaycase proudly showcases a multiphase energy gun."
+	desc = "The security director's quarters, with a multiphase energy gun on display."
 
 /datum/ship_upgrade_module/squab/miner_gear_room
 	job_slots_add = list(list(name = "Shaft Miner", officer = FALSE, outfit = /datum/outfit/job/miner, category = "Cargo", slots = 2))
diff --git a/voidcrew/modules/ship_upgrades/workshop/bogatyr.dm b/voidcrew/modules/ship_upgrades/workshop/bogatyr.dm
index 47465b2a172..73cfef7274f 100644
--- a/voidcrew/modules/ship_upgrades/workshop/bogatyr.dm
+++ b/voidcrew/modules/ship_upgrades/workshop/bogatyr.dm
@@ -35,7 +35,7 @@
 
 /datum/ship_upgrade_module/workshop_bogatyr_engineering_basic
 	job_slots_add_by_theme = list("freshen_up" = list(list(name = "Engineer", officer = FALSE, outfit = /datum/outfit/job/workshop_bogatyr_job_11, category = "Engineering", slots = 1), list(name = "Enforcer", officer = FALSE, outfit = /datum/outfit/job/workshop_bogatyr_job_12, category = "Security", slots = 1)), "nightclub" = list(list(name = "Lights and Sounds Guy", officer = FALSE, outfit = /datum/outfit/job/workshop_bogatyr_job_13, category = "Engineering", slots = 1), list(name = "The Bouncer", officer = FALSE, outfit = /datum/outfit/job/workshop_bogatyr_job_14, category = "Security", slots = 1)), "trashed" = list(list(name = "Engineer", officer = FALSE, outfit = /datum/outfit/job/workshop_bogatyr_job_1, category = "Engineering", slots = 1), list(name = "Enforcer", officer = FALSE, outfit = /datum/outfit/job/workshop_bogatyr_job_3, category = "Security", slots = 1)))
-	desc = "\"Engineering\"... Pathetic. Comes with a single PACMAN generator, and a dated but stocked armory."
+	desc = "A PACMAN generator, engineering supplies and a dated but stocked armory."
 	job_slots_add = list(list(name = "Engines Guy", officer = FALSE, outfit = /datum/outfit/job/workshop_bogatyr_job_8, category = "Engineering", slots = 1))
 	id = "engineering_basic"
 	name = "Engineering And Classic Armory"
@@ -156,4 +156,4 @@
 	for_theme = list("trashed", "freshen_up", "nightclub")
 	map_file = "bogatyr/workshop/enhanced_armory.dmm"
 	is_default = FALSE
-	desc = "Tools? Materials? Who needs that when you have a 25% larger armory with 25% more armory things."
+	desc = "A cramped armory with surplus rifles, a survival knife and ammunition."
diff --git a/voidcrew/modules/shuttle/construction/hull_survey.dm b/voidcrew/modules/shuttle/construction/hull_survey.dm
index f04958944d2..f3ff866f5ca 100644
--- a/voidcrew/modules/shuttle/construction/hull_survey.dm
+++ b/voidcrew/modules/shuttle/construction/hull_survey.dm
@@ -1133,7 +1133,12 @@
  *
  * Returns the new overmap ship, or null on failure.
  */
-/proc/commission_vessel(mob/user, turf/origin, list/turfs, vessel_name)
+/proc/commission_vessel(mob/user, turf/origin, list/turfs, vessel_name, form_new = null)
+	if(isnull(form_new))
+		form_new = choose_new_reputation_crew(user)
+	var/datum/voidcrew_crew_record/crew = user?.mind?.recover_reputation_crew()
+	if(isnull(form_new) || (crew && !form_new && crew.leader != user.mind))
+		return null
 	prepare_claimed_turfs(turfs)
 
 	// create_shuttle() seats the mobile port on whatever turf it is handed as the origin, and
@@ -1181,6 +1186,10 @@
 	if(!vessel.setup_from_template(new /datum/map_template/shuttle/voidcrew/commissioned()))
 		qdel(vessel)
 		return null
+	if(user?.mind?.recover_reputation_crew() != crew || !vessel.bind_reputation_crew(user?.mind, form_new))
+		qdel(vessel)
+		qdel(port, force = TRUE)
+		return null
 
 	port.current_ship = vessel
 	vessel.shuttle = port
@@ -1204,26 +1213,22 @@
 	SEND_SIGNAL(port, COMSIG_VOIDCREW_SHIP_LOADED)
 	ship_metric_spawned(vessel, creator = user, source = "commissioned")
 
-	// The builders own what they built. setup_from_template() creates the crew roster
-	// but nothing used to put anyone ON it, so a commissioned hull launched with a crew
-	// of nobody: every roster-gated console refused the people who welded it together,
-	// there was no captain to invite anyone aboard, and the only way out was an admin
-	// hand-editing team membership (round 6, 2026-08-15, ticket #1). Enlist the surveyor
-	// as commanding officer and everyone standing inside the enclosure as crew.
-	// enlist_crewmember() also clears each ckey through the join password, per the
-	// crew-adding rules in ship.dm.
+	// Enlist unaffiliated builders and the surveyor's crew; visitors keep their affiliation.
 	vessel.ship_team.name = vessel_name // not the template's "Commissioned Vessel" placeholder
+	var/datum/voidcrew_crew_record/vessel_crew = vessel.get_crew_record()
 	for(var/turf/claimed as anything in turfs)
 		for(var/mob/living/builder in claimed)
-			if(builder == user || !builder.mind || !builder.client || builder.stat == DEAD)
+			if(builder == user || !builder.mind || !GET_CLIENT(builder) || builder.stat == DEAD)
+				continue
+			var/datum/voidcrew_crew_record/builder_crew = builder.mind.recover_reputation_crew()
+			if(builder_crew && builder_crew != vessel_crew)
 				continue
 			if(vessel.enlist_crewmember(builder))
 				to_chat(builder, span_notice("You are registered as crew of [vessel_name]."))
 	if(vessel.enlist_crewmember(user))
 		vessel.claimed_captain = user.mind
 		grant_captain_management(user, vessel)
-		to_chat(user, span_notice("You are registered as the commanding officer of [vessel_name]. \
-			Use the Ship Management button to invite crew, set a memo, or set a join password."))
+		to_chat(user, span_notice("You are registered as the commanding officer of [vessel_name]."))
 
 	message_admins("[key_name(user)] commissioned a scratch-built vessel, [vessel_name], at [ADMIN_VERBOSEJMP(origin)].")
 	log_shuttle("[key_name(user)] commissioned scratch-built vessel [vessel_name] at [get_area(origin)].")
@@ -1456,8 +1461,7 @@
 			break
 
 	if(!found_helm)
-		to_chat(src, span_warning("Survey complete, but this enclosure has no helm console. \
-			Without one there is nothing to fly it."))
+		to_chat(src, span_warning("This enclosure has no helm console."))
 		return
 
 	var/vessel_name = tgui_input_text(src, "Designate the vessel:", "Commission Vessel", max_length = MAX_NAME_LEN)
@@ -1467,10 +1471,16 @@
 	if(!vessel_name)
 		to_chat(src, span_warning("That name will not do."))
 		return
+	var/form_new = choose_new_reputation_crew(src)
+	if(isnull(form_new))
+		return
+	var/datum/voidcrew_crew_record/registration_crew = mind?.recover_reputation_crew()
 
-	to_chat(src, span_notice("You begin surveying the enclosure - [length(claim.turfs)] tiles."))
+	to_chat(src, span_notice("You begin surveying the enclosure."))
 	if(!do_after(src, HULL_SURVEY_DURATION, origin))
 		return
+	if(mind?.recover_reputation_crew() != registration_crew)
+		return
 
 	var/datum/hull_claim/fresh = survey_enclosure(origin)
 	var/refusal = validate_hull_claim(fresh, null)
@@ -1481,7 +1491,7 @@
 		to_chat(src, span_warning("The helm console is no longer inside the enclosure."))
 		return
 
-	var/obj/structure/overmap/ship/vessel = commission_vessel(src, origin, fresh.turfs, vessel_name)
+	var/obj/structure/overmap/ship/vessel = commission_vessel(src, origin, fresh.turfs, vessel_name, form_new)
 	if(!vessel)
 		to_chat(src, span_warning("The survey failed to resolve into a hull."))
 		return
diff --git a/voidcrew/modules/shuttle/helm/_helm.dm b/voidcrew/modules/shuttle/helm/_helm.dm
index 06df670468d..d94a1e0f89c 100644
--- a/voidcrew/modules/shuttle/helm/_helm.dm
+++ b/voidcrew/modules/shuttle/helm/_helm.dm
@@ -203,7 +203,10 @@
 		return FALSE
 
 	// Claim the ship!
-	if(claim_npc_ship(npc_ship, user))
+	var/form_new = choose_new_reputation_crew(user)
+	if(isnull(form_new) || QDELETED(key) || key.get_ship() != current_ship || !user.can_perform_action(src) || !user.is_holding(key))
+		return FALSE
+	if(claim_npc_ship(npc_ship, user, form_new))
 		to_chat(user, span_notice("Ship authorization accepted. You now have command of [npc_ship.name]."))
 		playsound(src, 'sound/machines/terminal/terminal_on.ogg', 50, TRUE)
 		// Send signal that key was used before destroying
@@ -217,11 +220,23 @@
 		return FALSE
 
 /// Converts an NPC ship to player control
-/obj/machinery/computer/helm/proc/claim_npc_ship(obj/structure/overmap/ship/npc/npc_ship, mob/living/claimer)
+/obj/machinery/computer/helm/proc/claim_npc_ship(obj/structure/overmap/ship/npc/npc_ship, mob/living/claimer, form_new = null)
 	if(npc_ship?.retired_by_checkpoint || npc_ship?.checkpoint_rebuilding)
 		return FALSE
 	if(!istype(npc_ship))
 		return FALSE
+	if(!claimer?.mind || (npc_ship.player_controlled && !npc_ship.abandoned) || length(npc_ship.ship_team?.members))
+		return FALSE
+	if(isnull(form_new))
+		form_new = choose_new_reputation_crew(claimer)
+		if(isnull(form_new) || QDELETED(npc_ship) || npc_ship.retired_by_checkpoint || npc_ship.checkpoint_rebuilding || (npc_ship.player_controlled && !npc_ship.abandoned) || length(npc_ship.ship_team?.members))
+			return FALSE
+	if(!npc_ship.ship_team)
+		npc_ship.ship_team = new /datum/team/voidcrew()
+		npc_ship.ship_team.name = npc_ship.name
+		npc_ship.ship_team.ship = npc_ship
+	if(!npc_ship.bind_reputation_crew(claimer.mind, form_new))
+		return FALSE
 	npc_metric_claimed(npc_ship, claimer, "key")
 
 	// Cancel abandonment timer if one is running
@@ -291,21 +306,10 @@
 	// Announce the change of ownership
 	npc_ship.ship_notify("NOTICE: Command authorization transferred. New commanding officer recognized.", "SHIP SYSTEMS", SHIP_NOTIFY_NOTICE, 'voidcrew/sound/notify.ogg', 50)
 
-	// Add claimer to ship team if it exists, or create one
-	// Note: Players can be members of multiple ship teams simultaneously
-	if(claimer?.mind)
-		if(!npc_ship.ship_team)
-			// Create a ship team if one doesn't exist
-			npc_ship.ship_team = new /datum/team/voidcrew()
-			npc_ship.ship_team.name = npc_ship.name
-			npc_ship.ship_team.ship = npc_ship
-		npc_ship.ship_team.add_member(claimer.mind)
-
-		// Set the claimer as captain (for NPC ships without job_slots)
-		npc_ship.claimed_captain = claimer.mind
-
-		// Grant the Captain Management action button
-		grant_captain_management(claimer, npc_ship)
+	// The hull was bound to the claimer's continuing crew before conversion.
+	npc_ship.enlist_crewmember(claimer)
+	npc_ship.claimed_captain = claimer.mind
+	grant_captain_management(claimer, npc_ship)
 
 	// Log the claim
 	log_game("[key_name(claimer)] claimed NPC ship [npc_ship.name] at [AREACOORD(npc_ship)]")
@@ -1032,13 +1036,14 @@
 			var/datum/rumor_chart/chart = locate(params["chart"]) in current_ship.pending_rumors
 			if(!chart)
 				return
-			var/obj/structure/overmap/space_ruin/ruin = current_ship.reveal_pending_rumor(chart)
-			if(!ruin)
+			var/reveal_noun = chart.reveal_noun
+			var/obj/structure/overmap/site = current_ship.reveal_pending_rumor(chart)
+			if(!site)
 				say("ERROR: Unable to pin down the rumor's coordinates. Retry shortly.")
 				playsound(src, 'sound/machines/terminal/terminal_error.ogg', 30)
 				return
-			var/list/coords = ruin.get_relative_overmap_coords()
-			say("Rumor decrypted: rare signal located at ([coords[1]], [coords[2]]). Charted under Rumors.")
+			var/list/coords = site.get_relative_overmap_coords()
+			say("Rumor decrypted: [reveal_noun] located at ([coords[1]], [coords[2]]). Charted under Rumors.")
 			playsound(src, 'sound/machines/ping.ogg', 40)
 			return
 		if("reload_ship")
@@ -1100,7 +1105,10 @@
 			var/mob/living/living_user = usr
 			if(!istype(living_user))
 				return
-			if(current_ship.claim_abandoned_ship(living_user))
+			var/form_new = choose_new_reputation_crew(living_user)
+			if(isnull(form_new) || QDELETED(current_ship) || !living_user.can_perform_action(src))
+				return
+			if(current_ship.claim_abandoned_ship(living_user, form_new))
 				playsound(src, 'sound/machines/terminal/terminal_on.ogg', 50, TRUE)
 				update_static_data(usr, ui)
 			else
diff --git a/voidcrew/modules/shuttle/survey/survey_computer.dm b/voidcrew/modules/shuttle/survey/survey_computer.dm
index fb691d57832..91ad8ef8144 100644
--- a/voidcrew/modules/shuttle/survey/survey_computer.dm
+++ b/voidcrew/modules/shuttle/survey/survey_computer.dm
@@ -5,7 +5,7 @@
 
 /obj/machinery/computer/camera_advanced/shuttle_docker/survey
 	name = "Orbital survey console"
-	desc = "Gather data, earn research points, and control how your ship docks on celestial objects around the void. Surveys only need the ship parked on the same overmap tile as the target, not docked or landed; storms can also be scanned from a few tiles away at reduced yield. On outpost ground, it imports and exports completed survey records for local research."
+	desc = "An orbital cartography and survey terminal."
 	view_range = 10
 	x_offset = 0
 	y_offset = -5
@@ -37,8 +37,6 @@
 	var/range_survey_distance = 3
 	var/survey_timer
 	var/banked_points = 0
-	var/banked_cash = 0
-	var/list/banking = list()
 	var/datum/techweb/linked_techweb
 	var/theme
 	var/attached_to_ship = FALSE
@@ -231,8 +229,7 @@
 	if(linked_techweb)
 		. += span_notice("It is feeding survey data to the R&D server network of [linked_techweb.organization].")
 		return
-	. += span_warning("It is not linked to an R&D server, so surveys will not unlock survey-gated research.")
-	. += span_notice("Build an R&D server on this ship, or copy a techweb from one with a [EXAMINE_HINT("multitool")] and use it on this.")
+	. += span_warning("It is not linked to an R&D server.")
 
 /obj/machinery/computer/camera_advanced/shuttle_docker/survey/proc/update_survey_data()
 	sync_research_surveys()
@@ -371,12 +368,9 @@
 	tgui_data["archiveMode"] = !attached_to_ship
 	tgui_data["researchLinked"] = !!linked_techweb
 	tgui_data["bankedPoints"] = banked_points
-	tgui_data["bankedCash"] = banked_cash
-	tgui_data["surveyValue"] = get_survey_value(celestial_object)
+	var/list/quote = get_survey_value(celestial_object)
+	tgui_data["surveyValue"] = list("points" = quote ? quote["points"] : 0)
 	tgui_data["surveyAtRange"] = is_survey_at_range(celestial_object)
-	// So the UI can state the range rule with the real numbers instead of folklore
-	tgui_data["rangeSurveyDistance"] = range_survey_distance
-	tgui_data["rangeSurveyPercent"] = round(range_survey_value_mult * 100)
 	tgui_data["theme"] = theme
 	tgui_data["surveyDataDisk"] = validate_survey_disk()
 	tgui_data["mappingEnabled"] = (istype(celestial_object, /obj/structure/overmap/planet) || istype(celestial_object, /obj/structure/overmap/space_ruin) || istype(celestial_object, /obj/structure/overmap/event/meteor)) ? mapping_enabled : FALSE
@@ -394,8 +388,6 @@
 			"atRange" = at_range,
 			"dist" = (at_range && ship_turf) ? get_dist(ship_turf, get_turf(candidate)) : 0,
 			"points" = values ? values["points"] : 0,
-			"cash" = values ? values["cash"] : 0,
-			"holdSeconds" = get_interior_hold_seconds(candidate),
 			"mappable" = (istype(candidate, /obj/structure/overmap/planet) || istype(candidate, /obj/structure/overmap/space_ruin) || istype(candidate, /obj/structure/overmap/event/meteor)) ? mapping_enabled : FALSE,
 		))
 	tgui_data["surveyTargets"] = targets
@@ -408,6 +400,9 @@
 	.["surveyData"] = data?.tgui_serialize()
 
 /obj/machinery/computer/camera_advanced/shuttle_docker/survey/ui_act(action, list/params, datum/tgui/ui)
+	// Old windows and forged actions cannot redeem survey currency.
+	if(action == "cashOut")
+		return FALSE
 	if(!validate_ship_binding())
 		if(!get_outpost_from_atom(src) || !(action in list("saveData", "downloadData", "eject", "setTheme", "refresh", "error")))
 			return TRUE
@@ -422,8 +417,6 @@
 			activate_survey_map(ui.user)
 		if("printResearch")
 			print_survey_notes(ui.user)
-		if("cashOut")
-			cash_out(ui.user)
 		if("setTheme")
 			theme = params["theme"]
 		if("saveData")
@@ -439,22 +432,6 @@
 
 	return TRUE
 
-/**
- * Seconds this target's charted surface stays generated, or null when nothing is
- * counting down.
- *
- * A charted planet nobody has landed on is on a cleanup countdown - it is a whole
- * z-level slot, and the round cannot afford to keep every surveyed surface resident.
- * The crew paid for the chart, so they get to see the clock rather than fly back to a
- * planet that quietly moved sectors. Docking stops it (/obj/structure/overmap/planet/Entered).
- */
-/obj/machinery/computer/camera_advanced/shuttle_docker/survey/proc/get_interior_hold_seconds(obj/structure/overmap/object)
-	var/obj/structure/overmap/planet/planet = astype(object, /obj/structure/overmap/planet)
-	if(isnull(planet))
-		return null
-	var/remaining = planet.get_interior_hold_remaining()
-	return isnull(remaining) ? null : round(remaining / 10)
-
 /// Overmap types the console refuses to treat as survey targets
 /// Callers must treat the returned list as READ-ONLY - both are shared statics.
 /// get_current_celestial_object() is now on the per-landing-turf path (see
@@ -594,7 +571,6 @@
 				has_empty_space = TRUE
 		if(has_ship_contact)
 			balloon_alert(user, "can't survey ships")
-			to_chat(user, span_warning("Vessels are not valid survey targets. The console only surveys celestial objects: planets, signals, storms, and stars."))
 		else if(has_empty_space)
 			balloon_alert(user, "empty space, nothing to survey")
 		else
@@ -644,21 +620,17 @@
 	var/list/values = get_survey_value(object)
 	if(values)
 		banked_points += values["points"]
-		banked_cash += values["cash"]
 	record_metric_survey(object, values) // round metrics, voidcrew/modules/metrics/research_metrics.dm
 	data.update_survey_data(object)
 	sync_research_surveys()
 	object.surveyed = TRUE
 	update_static_data_for_all_viewers()
 
-	// A surface charted from orbit is on a cleanup clock the crew has no other way to
-	// see: nothing docked, so no arrival and no departure ever told them the planet is
-	// only held for a while. Say it once, with the real number.
 	var/obj/structure/overmap/planet/charted = astype(object, /obj/structure/overmap/planet)
 	var/hold_remaining = charted?.get_interior_hold_remaining()
 	if(hold_remaining && ship_port?.current_ship)
 		ship_port.current_ship.ship_notify(
-			"Surface chart of [charted.display_name || charted.name] holds for [DisplayTimeText(hold_remaining)]. Land within that window or the planet drifts and has to be charted again.",
+			"Surface chart of [charted.display_name || charted.name] recorded.",
 			"SURVEY",
 			SHIP_NOTIFY_NOTICE,
 			'voidcrew/sound/notify.ogg',
@@ -674,41 +646,35 @@
 	if(!object)
 		return
 
-	var/point_list = list()
+	// Refresh the physical research link for quotes and completion alike.
+	survey_research_tiers = get_survey_research_tiers()
+	var/point_list = list("cash" = 0, "points" = 0)
 
 	// The payout lives on the overmap object (survey_value, see _overmap.dm) rather than
 	// in a table keyed by type name here - almost nothing spawns as its family's base
 	// type, so storm severities, planet terrains, fixed-gas nebulas and star classes all
 	// used to fall through to nothing. 0 is anything that isn't a celestial body.
 	var/points = object.survey_value
-	var/cash = object.survey_value
 
 	if(!points)
-		point_list["cash"] = 0
-		point_list["points"] = 0
 		return point_list
 
-	// Extra rewards for being the first to survey an object
-	if (!object.surveyed)
-		cash *= 1.2
-		points *= 1.2
-
 	if("elite" in survey_research_tiers)
-		cash *= 2
-		points *= 2
+		points *= 1.25
 	else if("superior" in survey_research_tiers)
-		cash *= 1.5
-		points *= 1.5
-	else if("advanced" in survey_research_tiers)
-		cash *= 1.2
-		points *= 1.2
+		points *= 1.1
+
+	// A remote storm can be across a zone boundary from the ship.
+	switch(SSovermap_zones.get_zone_type(get_turf(object)))
+		if(ZONE_YELLOW)
+			points *= 1.25
+		if(ZONE_RED)
+			points *= 1.5
 
 	// Scanning a storm from a neighbouring tile is safe, so it pays less
 	if(is_survey_at_range(object))
-		cash *= range_survey_value_mult
 		points *= range_survey_value_mult
 
-	point_list["cash"] = cash
 	point_list["points"] = points
 	return point_list
 
@@ -818,35 +784,6 @@
 	record_metric_notes_printed(user, banked_points) // round metrics, voidcrew/modules/metrics/research_metrics.dm
 	banked_points = 0
 
-/obj/machinery/computer/camera_advanced/shuttle_docker/survey/proc/cash_out(mob/user)
-	if(banked_cash <= 0)
-		return
-
-	var/remaining_amount = banked_cash
-	banked_cash = 0
-	record_metric_cash_out(user, remaining_amount) // round metrics, voidcrew/modules/metrics/research_metrics.dm
-
-	var/static/list/bill_denominations = list(
-		/obj/item/stack/spacecash/c10000 = 10000,
-		/obj/item/stack/spacecash/c1000 = 1000,
-		/obj/item/stack/spacecash/c500 = 500,
-		/obj/item/stack/spacecash/c200 = 200,
-		/obj/item/stack/spacecash/c100 = 100,
-		/obj/item/stack/spacecash/c50 = 50,
-		/obj/item/stack/spacecash/c20 = 20,
-		/obj/item/stack/spacecash/c10 = 10,
-		/obj/item/stack/spacecash/c1 = 1,
-	)
-
-	playsound(src, 'sound/items/taperecorder/taperecorder_print.ogg', 60)
-	playsound(src, 'sound/items/handling/paper_drop.ogg', 60)
-
-	for(var/bill_type in bill_denominations)
-		var/bill_value = bill_denominations[bill_type]
-		while(remaining_amount >= bill_value)
-			remaining_amount -= bill_value
-			new bill_type(loc)
-
 /obj/machinery/computer/camera_advanced/shuttle_docker/survey/checkLandingTurf(turf/T, list/overlappers)
 	. = ..()
 
diff --git a/voidcrew/modules/shuttle/survey/survey_designs.dm b/voidcrew/modules/shuttle/survey/survey_designs.dm
index 802dc4bc177..0d8f32e9da8 100644
--- a/voidcrew/modules/shuttle/survey/survey_designs.dm
+++ b/voidcrew/modules/shuttle/survey/survey_designs.dm
@@ -1,6 +1,6 @@
 /datum/design/survey_data_disk
 	name = "Survey data storage disk"
-	desc = "Unlocks the survey data storage disk."
+	desc = "A disk for celestial survey records."
 	id = "survey_data_disk"
 	build_type = PROTOLATHE
 	materials = list(/datum/material/iron =SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass =SMALL_MATERIAL_AMOUNT)
@@ -22,7 +22,7 @@
 // Allows shuttle docking
 /datum/design/survey_ship_docking
 	name = "Orbital survey mapping"
-	desc = "Upgrades your survey console to allow you to view a map of the planet and control where your ship docks"
+	desc = "Orbital cartography software."
 	id = "survey_ship_docking"
 	research_icon = 'voidcrew/icons/effects/overmap.dmi'
 	research_icon_state = "globe"
@@ -30,28 +30,28 @@
 // Sight capabilities - Can we view mobs, objects, turfs, etc
 /datum/design/survey_map_obj_sight
 	name = "Survey mapping upgrade - Visible objects"
-	desc = "Upgrades your survey console capabilities to show flora and objects when using the map"
+	desc = "Surface imaging software."
 	id = "survey_map_obj_sight"
 	research_icon = 'voidcrew/icons/effects/overmap.dmi'
 	research_icon_state = "globe"
 
 /datum/design/survey_map_mob_sight
 	name = "Survey mapping upgrade - Visible lifeforms"
-	desc = "Upgrades your survey mapping system to show lifeforms when using the map"
+	desc = "Biosignature imaging software."
 	id = "survey_map_mob_sight"
 	research_icon = 'voidcrew/icons/effects/overmap.dmi'
 	research_icon_state = "globe"
 
 /datum/design/survey_map_range_upg_superior
 	name = "Survey mapping upgrade - Superior view range"
-	desc = "Upgrades your survey mapping system to have a larger field of view"
+	desc = "Wide-field cartography software."
 	id = "survey_map_range_upg_superior"
 	research_icon = 'voidcrew/icons/effects/overmap.dmi'
 	research_icon_state = "globe"
 
 /datum/design/survey_map_range_upg_elite
 	name = "Survey mapping upgrade - Elite view range"
-	desc = "Upgrades your survey mapping system to have a larger field of view"
+	desc = "Panoramic cartography software."
 	id = "survey_map_range_upg_elite"
 	research_icon = 'voidcrew/icons/effects/overmap.dmi'
 	research_icon_state = "globe"
@@ -59,28 +59,28 @@
 // Rewards upgrades
 /datum/design/survey_console_rewards_upgrade_basic
 	name = "Survey basic rewards"
-	desc = "Your survey console will produce a small amount of research points and money per survey"
+	desc = "Standard survey analysis software."
 	id = "survey_console_rewards_upgrade_basic"
 	research_icon = 'icons/obj/economy.dmi'
 	research_icon_state = "spacecash1"
 
 /datum/design/survey_console_rewards_upgrade_advanced
 	name = "Survey rewards advanced upgrade"
-	desc = "Upgrades your survey console to produce more research points and money"
+	desc = "Refined survey analysis software."
 	id = "survey_console_rewards_upgrade_advanced"
 	research_icon = 'icons/obj/economy.dmi'
 	research_icon_state = "spacecash1_2"
 
 /datum/design/survey_console_rewards_upgrade_superior
 	name = "Survey rewards superior upgrade"
-	desc = "Upgrades your survey console to produce a large amount of research points and money"
+	desc = "Precision survey analysis software."
 	id = "survey_console_rewards_upgrade_superior"
 	research_icon = 'icons/obj/economy.dmi'
 	research_icon_state = "spacecash1_3"
 
 /datum/design/survey_console_rewards_upgrade_elite
 	name = "Survey rewards elite upgrade"
-	desc = "Upgrades your survey console to produce a ton of research points and money"
+	desc = "Advanced survey analysis software."
 	id = "survey_console_rewards_upgrade_elite"
 	research_icon = 'icons/obj/economy.dmi'
 	research_icon_state = "spacecash1_4"
@@ -88,28 +88,28 @@
 // Information upgrades
 /datum/design/survey_console_information_upgrade_basic
 	name = "Survey basic information upgrade"
-	desc = "Grants you basic planetary information about a planet"
+	desc = "Planetary cataloguing software."
 	id = "survey_console_information_upgrade_basic"
 	research_icon = 'icons/obj/service/bureaucracy.dmi'
 	research_icon_state = "paperslip_words"
 
 /datum/design/survey_console_information_upgrade_advanced
 	name = "Survey advanced information upgrade"
-	desc = "Grants you access to the hostility level of a planet"
+	desc = "Planetary hazard analysis software."
 	id = "survey_console_information_upgrade_advanced"
 	research_icon = 'icons/obj/service/bureaucracy.dmi'
 	research_icon_state = "paper_stack_words"
 
 /datum/design/survey_console_information_upgrade_superior
 	name = "Survey superior information upgrade"
-	desc = "Grants you information about the life forms and structures found on a planet"
+	desc = "Planetary biosignature analysis software."
 	id = "survey_console_information_upgrade_superior"
 	research_icon = 'icons/obj/service/bureaucracy.dmi'
 	research_icon_state = "docs_part"
 
 /datum/design/survey_console_information_upgrade_elite
 	name = "Survey elite information upgrade"
-	desc = "Grants you even more information about things found on a planet"
+	desc = "Comprehensive planetary analysis software."
 	id = "survey_console_information_upgrade_elite"
 	research_icon = 'icons/obj/service/bureaucracy.dmi'
 	research_icon_state = "docs_red"
diff --git a/voidcrew/modules/teams/_team.dm b/voidcrew/modules/teams/_team.dm
index 6c6a9ac5709..ef01ae8c67f 100644
--- a/voidcrew/modules/teams/_team.dm
+++ b/voidcrew/modules/teams/_team.dm
@@ -1,12 +1,152 @@
 /datum/mind
-	/// List of ship teams this mind belongs to (supports multiple crews)
+	/// Hull HUD rosters. All actual enrollment belongs to one continuing crew.
 	var/list/ship_teams
+	var/datum/voidcrew_crew_record/reputation_crew
+	/// Explicit hull context when several ships share this crew (selected by service UIs).
+	var/datum/weakref/crew_service_ship_ref
+
+/// Current affiliation only. Historical password clearance never grants services.
+/datum/mind/proc/get_reputation_crew()
+	if(QDELETED(reputation_crew))
+		return null
+	var/player_ckey = ckey(key)
+	if(player_ckey && GLOB.voidcrew_crew_roster[player_ckey] != reputation_crew)
+		return null
+	return reputation_crew
+
+/// For commissioning/respawn only: recover the round roster without enlisting or mutating it.
+/datum/mind/proc/recover_reputation_crew()
+	var/player_ckey = ckey(key)
+	return get_reputation_crew() || (player_ckey ? GLOB.voidcrew_crew_roster[player_ckey] : null)
+
+/// The only affiliation switch. A new life evicts the old keyed mind, even in the same crew.
+/// No balances move; same-crew hull memberships survive. Call before adding the hull HUD.
+/datum/mind/proc/join_reputation_crew(datum/voidcrew_crew_record/record)
+	if(QDELETED(record))
+		return FALSE
+	var/player_ckey = ckey(key)
+	var/datum/voidcrew_crew_record/previous = reputation_crew
+	var/datum/voidcrew_crew_record/rostered = player_ckey ? GLOB.voidcrew_crew_roster[player_ckey] : null
+	if(player_ckey && rostered)
+		for(var/datum/mind/old_life in rostered.minds.Copy())
+			if(old_life != src && ckey(old_life.key) == player_ckey)
+				old_life.leave_reputation_crew()
+	for(var/datum/team/voidcrew/team in ship_teams?.Copy())
+		if(team.crew_record != record)
+			team.remove_member(src)
+	if(previous != record)
+		previous?.minds.Remove(src)
+		previous?.leave_leadership_roster(src)
+	if(player_ckey)
+		previous?.ckeys.Remove(player_ckey)
+		rostered?.ckeys.Remove(player_ckey)
+		GLOB.voidcrew_crew_roster[player_ckey] = record
+		record.ckeys |= player_ckey
+	reputation_crew = record
+	record.minds |= src
+	record.join_leadership_roster(src)
+	crew_service_ship_ref = null
+	return TRUE
+
+/// Explicit departure/kick. Cryo, abandonment and hull deletion only remove HUD teams.
+/datum/mind/proc/leave_reputation_crew()
+	var/datum/voidcrew_crew_record/previous = reputation_crew
+	for(var/datum/team/voidcrew/team in ship_teams?.Copy())
+		team.remove_member(src)
+	var/player_ckey = ckey(key)
+	if(previous)
+		previous.minds -= src
+		previous.ckeys -= player_ckey
+		previous.leave_leadership_roster(src)
+	if(player_ckey && GLOB.voidcrew_crew_roster[player_ckey] == previous)
+		GLOB.voidcrew_crew_roster -= player_ckey
+	reputation_crew = null
+	crew_service_ship_ref = null
+
+/datum/mind/Destroy()
+	// Keep the ckey roster for a replacement mind, but release all world references.
+	for(var/datum/team/voidcrew/team in ship_teams?.Copy())
+		team.remove_member(src)
+	reputation_crew?.minds.Remove(src)
+	reputation_crew?.leave_leadership_roster(src)
+	ship_teams = null
+	reputation_crew = null
+	crew_service_ship_ref = null
+	return ..()
+
+/// Cryo preserves Z1 affiliation recovery, but the sleeping character yields leadership.
+/obj/machinery/cryopod/detach_from_crews(datum/mind/leaving_mind, despawn_name)
+	. = ..()
+	leaving_mind?.get_reputation_crew()?.leave_leadership_roster(leaving_mind)
+
+/// Null cancels registration; TRUE explicitly authorizes leaving to found a crew.
+/datum/mind/proc/choose_new_ship_crew()
+	var/datum/voidcrew_crew_record/record = recover_reputation_crew()
+	if(!record || record.leader == src)
+		return FALSE
+	if(!confirm_new_ship_crew(record) || QDELETED(src) || recover_reputation_crew() != record)
+		return null
+	return TRUE
+
+/// Kept separate so headless tests can answer the same registration transaction.
+/datum/mind/proc/confirm_new_ship_crew(datum/voidcrew_crew_record/record)
+	var/crew_name = "your crew"
+	for(var/datum/team/voidcrew/team in record.teams)
+		crew_name = team.name
+		break
+	return tgui_alert(current, "Start your own crew with this ship? You will leave [crew_name].", "Crew registration", list("Yes", "No")) == "Yes"
+
+/// Evict the old life before manifest insertion; normal registration adds the new hull HUD.
+/obj/structure/overmap/ship/manifest_inject(mob/living/carbon/human/H, datum/job/human_job)
+	set waitfor = FALSE
+	H.mind?.join_reputation_crew(ship_team?.ensure_crew_record())
+	return ..()
 
 /datum/team/voidcrew
 	show_roundend_report = TRUE
 	var/obj/structure/overmap/ship/ship
+	var/datum/voidcrew_crew_record/crew_record
+
+/datum/team/voidcrew/proc/ensure_crew_record()
+	if(QDELETED(crew_record))
+		if(length(members))
+			return null
+		set_crew_record(new /datum/voidcrew_crew_record())
+	return crew_record
+
+/// Only an empty hull may change identity. Occupied hulls never merge crews.
+/datum/team/voidcrew/proc/set_crew_record(datum/voidcrew_crew_record/record)
+	if(length(members) || QDELETED(record))
+		return FALSE
+	var/datum/voidcrew_crew_record/previous = crew_record
+	previous?.teams.Remove(src)
+	crew_record = record
+	record.teams |= src
+	// setup_from_template makes a provisional empty record. Rebinding must not
+	// leave thousands of unused placeholders in the round registry.
+	if(previous && previous != record && previous.is_unfounded())
+		qdel(previous)
+	return TRUE
+
+/// All job, invitation, admin and claim routes enter here.
+/datum/team/voidcrew/proc/join_member(datum/mind/new_member)
+	if(!new_member?.join_reputation_crew(ensure_crew_record()))
+		return FALSE
+	add_member(new_member)
+	return new_member in members
 
 /datum/team/voidcrew/add_member(datum/mind/new_member)
+	if(!new_member)
+		return
+	var/datum/voidcrew_crew_record/record = ensure_crew_record()
+	// Low-level HUD enrollment cannot switch an already affiliated player.
+	var/datum/voidcrew_crew_record/existing = new_member.recover_reputation_crew()
+	if(existing && existing != record)
+		return
+	if(!new_member.get_reputation_crew())
+		new_member.join_reputation_crew(record)
+	if(new_member.get_reputation_crew() != record)
+		return
 	// Check if already a member of this team (use LAZYFIND for null-safety)
 	if(LAZYFIND(new_member.ship_teams, src))
 		return
@@ -23,7 +163,11 @@
 	ship_metric_crew_changed(src, new_member, joined = TRUE)
 
 /datum/team/voidcrew/remove_member(datum/mind/member)
+	if(!member)
+		return
 	. = ..()
+	if(member.current)
+		ship?.manifest.Remove(member.current.real_name)
 
 	// Off the roster is off the bridge - retire any Ship Management button they held for us
 	if(ship && member.current)
@@ -60,8 +204,14 @@
 			break
 
 /datum/team/voidcrew/Destroy(force, ...)
-	for(var/datum/mind/team_minds as anything in members)
-		to_chat(team_minds, span_notice("Your faction has been disbanded! You are now alone!"))
+	for(var/datum/mind/team_minds in members.Copy())
+		remove_member(team_minds)
+	var/datum/voidcrew_crew_record/previous = crew_record
+	previous?.teams.Remove(src)
+	crew_record = null
+	if(previous?.is_unfounded())
+		qdel(previous)
+	ship = null
 	return ..()
 
 ///Checks the team's members to see if anyone with a client is alive. returns TRUE if active.
@@ -71,6 +221,3 @@
 // /obj/structure/overmap/ship/proc/has_active_crew(), which asks the same question
 // without dereferencing a null mind.current and reads mobs through get_turf() so a
 // crewman in a locker or a mech does not answer z 0.
-
-
-
diff --git a/voidcrew/modules/trade/anomaly_charts.dm b/voidcrew/modules/trade/anomaly_charts.dm
new file mode 100644
index 00000000000..72957ea48b2
--- /dev/null
+++ b/voidcrew/modules/trade/anomaly_charts.dm
@@ -0,0 +1,409 @@
+/**
+ * # Anomaly charts
+ *
+ * Boffin's other way to an anomaly core. A chart names one anomaly type. Buying
+ * it uploads a sealed rumor to the buyer's ship like a ruin chart; the helm's
+ * reveal button then picks the site, either a fresh ordinary derelict spawned in
+ * the chart's zone band or a terrain planet already in that band, and charts it
+ * under Rumors.
+ *
+ * Nothing spawns on reveal. The anomaly forms only when the BUYING hull docks at
+ * that site, somewhere inside the derelict or out on the planet away from the
+ * landing strip. A crew that gets there first finds an ordinary site. One chart
+ * surfaces one anomaly, then the chart is spent.
+ *
+ * If the site is cleaned up before the buyer arrives (another crew loaded and
+ * left a derelict, an admin deleted it), the chart goes back to the helm sealed
+ * and can be revealed again for a new site. It dies with the buying hull.
+ *
+ * The anomalies are the site-bound planetary subtypes from
+ * voidcrew/datums/mapgen/planet_anomalies.dm: immortal, stock behaviour, leashed
+ * to the site they formed on.
+ */
+
+/// How far from the buyer's docking port a derelict anomaly prefers to form
+#define ANOMALY_CHART_RUIN_MIN_DISTANCE 6
+/// Rows of ground kept clear between a planet's landing strip and a chart anomaly
+#define ANOMALY_CHART_PLANET_CLEARANCE 12
+/// Random ground samples tried on a planet before giving up for this arrival
+#define ANOMALY_CHART_PLANET_ATTEMPTS 400
+
+/obj/structure/overmap/ship
+	/// Revealed anomaly charts still waiting for this ship to dock at their site
+	var/list/datum/rumor_chart/anomaly/active_anomaly_charts = list()
+
+/datum/rumor_chart/anomaly
+	name = "anomaly chart"
+	reveal_noun = "anomaly site"
+	keep_after_reveal = TRUE
+	spawn_zone = ZONE_YELLOW
+	/// The site-bound anomaly this chart surfaces
+	var/obj/effect/anomaly/anomaly_type
+	/// Percent chance the reveal tries a planet before a derelict
+	var/planet_chance = 50
+	/// The ship that revealed the chart; only its arrival surfaces the anomaly
+	var/obj/structure/overmap/ship/buyer
+	/// The revealed site
+	var/datum/weakref/site_ref
+	/// Set once the anomaly exists
+	var/surfaced = FALSE
+
+/datum/rumor_chart/anomaly/Destroy()
+	release_site()
+	if(buyer)
+		UnregisterSignal(buyer, list(COMSIG_VOIDCREW_SHIP_DOCKED, COMSIG_QDELETING))
+		buyer.active_anomaly_charts -= src
+		buyer.pending_rumors -= src
+		buyer = null
+	return ..()
+
+/datum/rumor_chart/anomaly/proc/waypoint_key()
+	return "anomaly_[REF(src)]"
+
+/datum/rumor_chart/anomaly/reveal(obj/structure/overmap/ship/ship)
+	if(QDELETED(ship) || revealed || !ispath(anomaly_type, /obj/effect/anomaly))
+		return null
+	var/obj/structure/overmap/site = pick_site(ship)
+	if(!site)
+		return null
+
+	revealed = TRUE
+	buyer = ship
+	site_ref = WEAKREF(site)
+	ship.active_anomaly_charts |= src
+	RegisterSignal(ship, COMSIG_VOIDCREW_SHIP_DOCKED, PROC_REF(on_buyer_docked))
+	RegisterSignal(ship, COMSIG_QDELETING, PROC_REF(on_buyer_deleted))
+	RegisterSignal(site, COMSIG_QDELETING, PROC_REF(on_site_deleted))
+
+	var/list/coords = site.get_relative_overmap_coords()
+	ship.add_waypoint(waypoint_key(), name, coords[1], coords[2], "Rumors", site)
+	log_game("Anomaly chart '[name]' revealed for [ship]: [site] ([site.type]) at ([coords[1]], [coords[2]])")
+	return site
+
+/**
+ * A planet or a fresh derelict in the chart's band, in random order, falling back
+ * to the other kind when the first has nothing to offer.
+ */
+/datum/rumor_chart/anomaly/proc/pick_site(obj/structure/overmap/ship/ship)
+	var/planet_first = prob(planet_chance)
+	var/obj/structure/overmap/site = planet_first ? pick_planet(ship) : spawn_derelict()
+	if(site)
+		return site
+	return planet_first ? spawn_derelict() : pick_planet(ship)
+
+/// A terrain planet in the chart's band that the buyer is not already docked at
+/datum/rumor_chart/anomaly/proc/pick_planet(obj/structure/overmap/ship/ship)
+	var/list/candidates = list()
+	for(var/obj/structure/overmap/planet/planet as anything in GLOB.overmap_planets)
+		if(QDELETED(planet) || planet.unloading || !planet.is_terrain_planet())
+			continue
+		if(!istype(get_turf(planet), /turf/open/overmap))
+			continue
+		if(planet.get_effective_zone_band() != spawn_zone)
+			continue
+		// The anomaly waits for an arrival, so the site has to be somewhere to arrive at
+		if(ship.docked == planet)
+			continue
+		candidates += planet
+	if(!length(candidates))
+		return null
+	return pick(candidates)
+
+/// A fresh ordinary derelict in the chart's band, left unloaded like any other signal
+/datum/rumor_chart/anomaly/proc/spawn_derelict()
+	var/list/live_templates = list()
+	for(var/obj/structure/overmap/space_ruin/live as anything in GLOB.space_ruin_signals)
+		if(!QDELETED(live) && live.ruin_template)
+			live_templates[live.ruin_template] = TRUE
+
+	var/list/weighted = list()
+	var/list/weighted_duplicates = list()
+	for(var/template_id in SSmapping.space_ruins_templates)
+		var/datum/map_template/ruin/space/template = SSmapping.space_ruins_templates[template_id]
+		if(!istype(template) || template.unpickable)
+			continue
+		// Oversized ruins take a whole z-level; keep charts to the ones that pack
+		if(template.width && !SSovermap.ruin_fits_in_slot(template))
+			continue
+		if(live_templates[template])
+			if(template.allow_duplicates)
+				weighted_duplicates[template] = template.placement_weight || 1
+			continue
+		weighted[template] = template.placement_weight || 1
+	if(!length(weighted))
+		weighted = weighted_duplicates
+	if(!length(weighted))
+		return null
+
+	var/turf/spawn_turf = SSovermap.get_unused_overmap_square_in_zone_band(spawn_zone)
+	if(!spawn_turf)
+		return null
+	var/obj/structure/overmap/space_ruin/ruin = new(spawn_turf)
+	ruin.set_ruin_template(pick_weight(weighted))
+	ruin.no_replacement = TRUE
+	return ruin
+
+/datum/rumor_chart/anomaly/proc/on_buyer_docked(obj/structure/overmap/ship/source)
+	SIGNAL_HANDLER
+	if(surfaced)
+		return
+	var/obj/structure/overmap/site = site_ref?.resolve()
+	if(!site || source.docked != site)
+		return
+	INVOKE_ASYNC(src, PROC_REF(surface_anomaly), site)
+
+/**
+ * The buyer has docked at the site: put the anomaly somewhere on it and tell the
+ * crew. If no spot is found the chart stays live for the next arrival.
+ */
+/datum/rumor_chart/anomaly/proc/surface_anomaly(obj/structure/overmap/site)
+	if(surfaced || QDELETED(src) || QDELETED(site) || QDELETED(buyer) || buyer.docked != site)
+		return FALSE
+	var/turf/spawn_turf = find_spawn_turf(site)
+	if(!spawn_turf)
+		buyer.ship_notify("Faint anomalous readings near [site.name].", "SENSORS", SHIP_NOTIFY_WARNING, 'voidcrew/sound/warn.ogg', 25)
+		return FALSE
+
+	surfaced = TRUE
+	var/obj/effect/anomaly/anomaly = new anomaly_type(spawn_turf)
+	var/where = describe_position(spawn_turf)
+	buyer.ship_notify("Anomalous readings: \a [anomaly] has formed [where].", "SENSORS", SHIP_NOTIFY_NOTICE, 'voidcrew/sound/notify.ogg', 50)
+	log_game("Anomaly chart '[name]' surfaced [anomaly] at [AREACOORD(spawn_turf)] for [buyer]")
+	qdel(src)
+	return TRUE
+
+/// "about 30 metres north of the ship", from the buyer's docking port
+/datum/rumor_chart/anomaly/proc/describe_position(turf/spawn_turf)
+	var/turf/ship_turf = get_turf(buyer?.shuttle)
+	if(!ship_turf || ship_turf.z != spawn_turf.z)
+		return "on the site"
+	var/distance = get_dist(ship_turf, spawn_turf)
+	var/direction = dir2text(get_dir(ship_turf, spawn_turf))
+	if(!direction || distance < 2)
+		return "right by the ship"
+	return "about [distance] metres [direction] of the ship"
+
+/datum/rumor_chart/anomaly/proc/find_spawn_turf(obj/structure/overmap/site)
+	if(istype(site, /obj/structure/overmap/space_ruin))
+		return find_derelict_turf(site)
+	if(istype(site, /obj/structure/overmap/planet))
+		return find_planet_turf(site)
+	return null
+
+/// Whether an anomaly may form on `candidate`: open walkable ground on the site itself
+/datum/rumor_chart/anomaly/proc/is_valid_spot(turf/candidate, datum/map_footprint/footprint)
+	if(!isopenturf(candidate) || isgroundlessturf(candidate) || isspaceturf(candidate))
+		return FALSE
+	if(islava(candidate) || istype(candidate, /turf/open/water))
+		return FALSE
+	if(candidate.is_blocked_turf(exclude_mobs = TRUE))
+		return FALSE
+	var/area/candidate_area = get_area(candidate)
+	if(istype(candidate_area, /area/shuttle) || istype(candidate_area, /area/space))
+		return FALSE
+	if(footprint && !footprint.contains_turf(candidate))
+		return FALSE
+	if(locate(/obj/effect/anomaly) in candidate)
+		return FALSE
+	return TRUE
+
+/// Open floor inside the derelict's own template, preferring a few steps from the ship
+/datum/rumor_chart/anomaly/proc/find_derelict_turf(obj/structure/overmap/space_ruin/ruin)
+	var/turf/corner = ruin.ruin_bottom_left
+	if(!ruin.loaded || !corner || !ruin.ruin_template?.width || !ruin.ruin_template?.height)
+		return null
+	var/turf/far_corner = locate(corner.x + ruin.ruin_template.width - 1, corner.y + ruin.ruin_template.height - 1, corner.z)
+	if(!far_corner)
+		return null
+	var/turf/ship_turf = get_turf(buyer?.shuttle)
+	var/list/near = list()
+	var/list/far = list()
+	for(var/turf/candidate as anything in block(corner, far_corner))
+		if(!is_valid_spot(candidate, ruin.footprint))
+			continue
+		if(ship_turf && get_dist(candidate, ship_turf) < ANOMALY_CHART_RUIN_MIN_DISTANCE)
+			near += candidate
+		else
+			far += candidate
+		CHECK_TICK
+	if(length(far))
+		return pick(far)
+	if(length(near))
+		return pick(near)
+	return null
+
+/// Open ground on the planet, well clear of the landing strip
+/datum/rumor_chart/anomaly/proc/find_planet_turf(obj/structure/overmap/planet/planet)
+	var/datum/map_footprint/footprint = planet.footprint
+	if(!planet.loaded || !footprint || isnull(footprint.low_x))
+		return null
+	var/strip_top = planet.get_dock_strip_top_y(footprint.level)
+	if(isnull(strip_top))
+		strip_top = footprint.low_y
+	var/min_x = footprint.low_x + 3
+	var/max_x = footprint.high_x - 3
+	var/max_y = footprint.high_y - 3
+	var/min_y = min(strip_top + ANOMALY_CHART_PLANET_CLEARANCE, max_y)
+	min_y = max(min_y, strip_top + 1)
+	if(min_x > max_x || min_y > max_y)
+		return null
+	for(var/_ in 1 to ANOMALY_CHART_PLANET_ATTEMPTS)
+		var/turf/candidate = locate(rand(min_x, max_x), rand(min_y, max_y), footprint.z_value)
+		if(is_valid_spot(candidate, footprint))
+			return candidate
+	return null
+
+/datum/rumor_chart/anomaly/proc/on_buyer_deleted(datum/source)
+	SIGNAL_HANDLER
+	qdel(src)
+
+/datum/rumor_chart/anomaly/proc/on_site_deleted(datum/source)
+	SIGNAL_HANDLER
+	if(surfaced)
+		return
+	INVOKE_ASYNC(src, PROC_REF(reseal))
+
+/// Forgets the site, drops the waypoint and stops listening to the site
+/datum/rumor_chart/anomaly/proc/release_site()
+	var/obj/structure/overmap/site = site_ref?.resolve()
+	if(site)
+		UnregisterSignal(site, COMSIG_QDELETING)
+	site_ref = null
+	if(buyer)
+		var/datum/ship_waypoint/waypoint = buyer.get_waypoint(waypoint_key())
+		if(waypoint)
+			buyer.delete_waypoint(waypoint)
+
+/**
+ * The site vanished before the buyer arrived. The chart goes back on the helm,
+ * sealed, so the crew can reveal it again for a new site.
+ */
+/datum/rumor_chart/anomaly/proc/reseal()
+	if(QDELETED(src) || surfaced || QDELETED(buyer))
+		return
+	var/obj/structure/overmap/ship/ship = buyer
+	release_site()
+	UnregisterSignal(ship, list(COMSIG_VOIDCREW_SHIP_DOCKED, COMSIG_QDELETING))
+	ship.active_anomaly_charts -= src
+	buyer = null
+	revealed = FALSE
+	ship.pending_rumors |= src
+	ship.ship_notify("The site on the \"[name]\" chart has dropped off the scopes.", "HELM", SHIP_NOTIFY_WARNING, 'voidcrew/sound/warn.ogg', 25)
+
+/**
+ * # Anomaly chart SKU
+ *
+ * Sold on Boffin's chart rotation. No goods change hands: the sealed chart goes
+ * straight to the buyer's ship, and its reveal and arrival do the rest. Stock is
+ * two, and an exhausted slot turns over to a different anomaly at the next
+ * convoy rather than refilling (see /datum/shop_rotation).
+ */
+/datum/shop_sku/anomaly_chart
+	category = "Anomalies"
+	icon_override = 'icons/obj/scrolls.dmi'
+	icon_state_override = "blueprints"
+	is_chart = TRUE
+	stock_min = 2
+	stock_max = 2
+	contract_reward = FALSE
+	/// The site-bound anomaly the chart surfaces
+	var/obj/effect/anomaly/anomaly_type
+	/// Zone band the chart's site is found in
+	var/spawn_zone = ZONE_YELLOW
+
+/datum/shop_sku/anomaly_chart/New()
+	. = ..()
+	if(!anomaly_type)
+		return
+	var/anomaly_name = initial(anomaly_type.name)
+	var/band_name = spawn_zone == ZONE_RED ? ZONE_NAME_RED : ZONE_NAME_YELLOW
+	name = "anomaly chart: [anomaly_name]"
+	desc = "Sensor logs on \a [anomaly_name] somewhere in the [band_name]."
+
+/datum/shop_sku/anomaly_chart/get_denial_reason(mob/living/user)
+	. = ..()
+	if(.)
+		return
+	if(!get_crew_ship(user))
+		return "No crew registration."
+
+/datum/shop_sku/anomaly_chart/try_purchase(mob/living/user, mob/living/basic/outpost_trader/vendor)
+	if(stock <= 0)
+		return FALSE
+	var/obj/structure/overmap/ship/ship = get_crew_ship(user)
+	if(!ship)
+		return FALSE
+
+	var/credit_price = get_credit_price(user)
+	var/datum/bank_account/account
+	if(credit_price > 0)
+		account = get_account(user)
+		if(!account || !account.has_money(credit_price))
+			return FALSE
+
+	if(price_vouchers > 0 && !consume_trade_vouchers(user, price_vouchers))
+		return FALSE
+	if(credit_price > 0 && !account.adjust_money(-credit_price, "Trader Outpost: [name]"))
+		return FALSE
+
+	stock--
+	ship.add_pending_rumor(create_chart())
+	metric_shop_purchase(src, user, credit_price, price_vouchers)
+	to_chat(user, span_notice("The chart is beamed to [ship]'s helm console."))
+	return TRUE
+
+/// A fresh sealed chart for one purchase
+/datum/shop_sku/anomaly_chart/proc/create_chart()
+	var/datum/rumor_chart/anomaly/chart = new
+	var/anomaly_name = initial(anomaly_type.name)
+	chart.name = capitalize(anomaly_name)
+	chart.desc = "[capitalize("\a [anomaly_name]")] in the [spawn_zone == ZONE_RED ? ZONE_NAME_RED : ZONE_NAME_YELLOW]."
+	chart.anomaly_type = anomaly_type
+	chart.spawn_zone = spawn_zone
+	return chart
+
+// Three bands, the same as the raw cores, at half the core's list price. Normal
+// favor discounts and specials apply.
+// The two rarest point into the lawless deep.
+
+/datum/shop_sku/anomaly_chart/flux
+	anomaly_type = /obj/effect/anomaly/flux/planetary
+	price_credits = 4000
+
+/datum/shop_sku/anomaly_chart/grav
+	anomaly_type = /obj/effect/anomaly/grav/planetary
+	price_credits = 4000
+
+/datum/shop_sku/anomaly_chart/hallucination
+	anomaly_type = /obj/effect/anomaly/hallucination/planetary
+	price_credits = 4000
+
+/datum/shop_sku/anomaly_chart/pyro
+	anomaly_type = /obj/effect/anomaly/pyro/planetary
+	price_credits = 4000
+
+/datum/shop_sku/anomaly_chart/bioscrambler
+	anomaly_type = /obj/effect/anomaly/bioscrambler/planetary
+	price_credits = 5000
+
+/datum/shop_sku/anomaly_chart/ectoplasm
+	anomaly_type = /obj/effect/anomaly/ectoplasm/planetary
+	price_credits = 5000
+
+/datum/shop_sku/anomaly_chart/dimensional
+	anomaly_type = /obj/effect/anomaly/dimensional/planetary
+	price_credits = 5000
+
+/datum/shop_sku/anomaly_chart/bluespace
+	anomaly_type = /obj/effect/anomaly/bluespace/planetary
+	price_credits = 6000
+	spawn_zone = ZONE_RED
+
+/datum/shop_sku/anomaly_chart/vortex
+	anomaly_type = /obj/effect/anomaly/bhole/planetary
+	price_credits = 6000
+	spawn_zone = ZONE_RED
+
+#undef ANOMALY_CHART_RUIN_MIN_DISTANCE
+#undef ANOMALY_CHART_PLANET_CLEARANCE
+#undef ANOMALY_CHART_PLANET_ATTEMPTS
diff --git a/voidcrew/modules/trade/blueprint_imprinter.dm b/voidcrew/modules/trade/blueprint_imprinter.dm
deleted file mode 100644
index 4f8ee4b2086..00000000000
--- a/voidcrew/modules/trade/blueprint_imprinter.dm
+++ /dev/null
@@ -1,389 +0,0 @@
-/**
- * # Neural Schematic Imprinter
- *
- * The outpost service that converts a physical blueprint into round-long
- * knowledge: feed it the schematic, climb into the cradle, pay the fee, and the
- * recipe is bound to your ckey until the round ends. The scroll is shredded in
- * the process.
- *
- * The trade-off is the point: a physical schematic is shareable, resellable
- * and stealable; an imprint is theft-proof but yours alone, and the paper is
- * gone for good. Fees scale with the schematic's tier.
- *
- * Usage is a chamber flow, like a skillsoft station: slot a schematic into the
- * open cradle, feed it cash if you don't want to pay by ID, then click it to
- * seal yourself in. The imprint UI only opens for the occupant. The fee is
- * drawn from loaded cash first and your bank account for any shortfall; a cash
- * eject button hands back whatever's still loaded as a holochip.
- *
- * Outpost furniture rules apply: indestructible, and attacking it is
- * aggression (resolved through get_trader_outpost_for_turf, like the walls).
- */
-
-#define IMPRINT_FEE_GREEN 750
-#define IMPRINT_FEE_YELLOW 1500
-#define IMPRINT_FEE_RED 3000
-
-/// How long the imprint channel runs once started, with the occupant sealed in.
-#define IMPRINT_WORK_TIME (3 SECONDS)
-
-/obj/machinery/blueprint_imprinter
-	name = "neural schematic imprinter"
-	desc = "A skull-shaped scanner cradle wired into a schematic shredder. Slot a schematic, climb in, pay the fee, and you'll know the recipe by heart. The shredder isn't optional."
-	icon = 'voidcrew/modules/trade/icons/trade.dmi'
-	icon_state = "imprinter"
-	density = FALSE // Becomes dense only while the cradle is sealed shut
-	use_power = NO_POWER_USE
-	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
-	occupant_typecache = list(/mob/living/carbon)
-	state_open = TRUE
-	// Only opens the UI when you're inside; usable while lying down (paraplegics etc.)
-	interaction_flags_atom = parent_type::interaction_flags_atom | INTERACT_ATOM_IGNORE_MOBILITY
-	/// The schematic currently slotted into the cradle, awaiting imprint.
-	var/obj/item/blueprint/inserted_blueprint
-	/// Physical credits loaded into the machine, spent before the bank account.
-	var/loaded_credits = 0
-	/// Whether an imprint channel is currently running.
-	var/working = FALSE
-	/// Timer handle for the running imprint channel.
-	var/work_timer
-
-/obj/machinery/blueprint_imprinter/Initialize(mapload)
-	. = ..()
-	update_appearance()
-
-/obj/machinery/blueprint_imprinter/Destroy()
-	inserted_blueprint = null
-	return ..()
-
-/obj/machinery/blueprint_imprinter/examine(mob/user)
-	. = ..()
-	. += span_notice("Imprint fees: [IMPRINT_FEE_GREEN] cr (green-tier) / [IMPRINT_FEE_YELLOW] cr (yellow-tier) / [IMPRINT_FEE_RED] cr (red-tier). Load cash into the cradle or pay by ID; the schematic is shredded.")
-	. += span_notice("An imprint lasts the rest of the round and nobody can steal it. The paper copy could have been sold instead.")
-	if(loaded_credits)
-		. += span_notice("Cradle holds <b>[loaded_credits] cr</b> in loaded cash.")
-	var/list/known = get_user_imprints(user)
-	if(length(known))
-		. += span_notice("You hold neural imprints for: <b>[known.Join(", ")]</b>.")
-
-/**
- * Names of everything this user has imprinted, for examine.
- */
-/obj/machinery/blueprint_imprinter/proc/get_user_imprints(mob/user)
-	var/list/names = list()
-	if(!user?.ckey)
-		return names
-	var/list/imprints = GLOB.blueprint_imprints[user.ckey]
-	if(!length(imprints))
-		return names
-	for(var/datum/crafting_recipe/recipe as anything in GLOB.crafting_recipes)
-		if(recipe.type in imprints)
-			names += recipe.name
-	return names
-
-/// The imprint fee for a given schematic's tier.
-/obj/machinery/blueprint_imprinter/proc/get_fee(obj/item/blueprint/print)
-	switch(print?.tier)
-		if(BLUEPRINT_TIER_GREEN)
-			return IMPRINT_FEE_GREEN
-		if(BLUEPRINT_TIER_RED)
-			return IMPRINT_FEE_RED
-	return IMPRINT_FEE_YELLOW
-
-// --- Icon ---------------------------------------------------------------
-
-/obj/machinery/blueprint_imprinter/update_icon_state()
-	icon_state = initial(icon_state)
-	if(state_open)
-		icon_state += "_open"
-	if(occupant)
-		icon_state += "_occupied"
-	return ..()
-
-/obj/machinery/blueprint_imprinter/update_overlays()
-	. = ..()
-	if(working)
-		. += "working"
-
-// --- Occupancy / cradle plumbing ---------------------------------------
-
-//Only usable by the person inside
-/obj/machinery/blueprint_imprinter/ui_state(mob/user)
-	return GLOB.contained_state
-
-/obj/machinery/blueprint_imprinter/relaymove(mob/living/user, direction)
-	open_machine()
-
-// The cradle has no lock; resisting pops the door without having to walk out.
-/obj/machinery/blueprint_imprinter/container_resist_act(mob/living/user)
-	open_machine()
-
-/obj/machinery/blueprint_imprinter/open_machine(drop = TRUE, density_to_set = FALSE)
-	interrupt_operation()
-	// Hand back any loaded cash as a holochip so nothing gets trapped when the
-	// cradle opens; the schematic drops with the rest of the contents.
-	eject_cash()
-	return ..()
-
-/obj/machinery/blueprint_imprinter/close_machine(atom/movable/target, density_to_set = TRUE)
-	. = ..()
-	if(occupant)
-		ui_interact(occupant)
-
-/obj/machinery/blueprint_imprinter/Exited(atom/movable/gone, direction)
-	. = ..()
-	if(gone == inserted_blueprint)
-		inserted_blueprint = null
-		interrupt_operation()
-
-/obj/machinery/blueprint_imprinter/power_change()
-	. = ..()
-	if(working && !is_operational)
-		interrupt_operation()
-
-/obj/machinery/blueprint_imprinter/proc/toggle_open(mob/user)
-	state_open ? close_machine() : open_machine()
-
-/obj/machinery/blueprint_imprinter/proc/interrupt_operation()
-	working = FALSE
-	if(work_timer)
-		deltimer(work_timer)
-		work_timer = null
-	update_appearance()
-
-/obj/machinery/blueprint_imprinter/interact(mob/user)
-	. = ..()
-	if(user == occupant)
-		ui_interact(user)
-	else
-		toggle_open(user)
-
-/obj/machinery/blueprint_imprinter/attackby(obj/item/attacking_item, mob/living/user, list/modifiers, list/attack_modifiers)
-	if(istype(attacking_item, /obj/item/blueprint))
-		insert_blueprint(attacking_item, user)
-		return TRUE
-	if(iscash(attacking_item))
-		load_cash(attacking_item, user)
-		return TRUE
-	return ..()
-
-/// Slot a schematic into the cradle.
-/obj/machinery/blueprint_imprinter/proc/insert_blueprint(obj/item/blueprint/print, mob/living/user)
-	if(inserted_blueprint)
-		balloon_alert(user, "already loaded!")
-		return
-	if(!print.recipe_type)
-		balloon_alert(user, "unreadable schematic!")
-		return
-	if(!user.transferItemToLoc(print, src))
-		return
-	inserted_blueprint = print
-	balloon_alert(user, "schematic loaded")
-	SStgui.update_uis(src)
-
-/// Feed physical currency into the cradle's cash reserve.
-/obj/machinery/blueprint_imprinter/proc/load_cash(obj/item/money, mob/living/user)
-	var/value = money.get_item_credit_value()
-	if(!value)
-		balloon_alert(user, "no value!")
-		return
-	loaded_credits += value
-	qdel(money)
-	balloon_alert(user, "loaded [value] cr")
-	playsound(src, 'sound/effects/cashregister.ogg', 40, TRUE)
-	SStgui.update_uis(src)
-
-/// Hand back all loaded cash as a holochip.
-/obj/machinery/blueprint_imprinter/proc/eject_cash(mob/living/to_hands)
-	if(loaded_credits <= 0)
-		return
-	var/obj/item/holochip/chip = new(drop_location(), loaded_credits)
-	loaded_credits = 0
-	if(to_hands)
-		to_hands.put_in_hands(chip)
-	SStgui.update_uis(src)
-
-/// Pop the slotted schematic back out.
-/obj/machinery/blueprint_imprinter/proc/eject_blueprint(mob/living/to_hands)
-	if(!inserted_blueprint)
-		return
-	var/obj/item/blueprint/print = inserted_blueprint
-	inserted_blueprint = null
-	interrupt_operation()
-	if(to_hands)
-		to_hands.put_in_hands(print)
-	else
-		print.forceMove(drop_location())
-	SStgui.update_uis(src)
-
-/obj/machinery/blueprint_imprinter/dump_contents()
-	. = ..()
-	inserted_blueprint = null
-
-// --- Imprint channel ---------------------------------------------------
-
-/// Begin the imprint channel. Assumes the occupant, schematic and funds have
-/// already been validated by ui_act.
-/obj/machinery/blueprint_imprinter/proc/start_imprint()
-	working = TRUE
-	work_timer = addtimer(CALLBACK(src, PROC_REF(finish_imprint)), IMPRINT_WORK_TIME, TIMER_STOPPABLE)
-	balloon_alert(occupant, "imprinting...")
-	update_appearance()
-
-/// Complete the imprint: re-validate, charge, bind the recipe and shred the scroll.
-/obj/machinery/blueprint_imprinter/proc/finish_imprint()
-	working = FALSE
-	work_timer = null
-	update_appearance()
-
-	var/mob/living/carbon/carbon_occupant = occupant
-	if(!istype(carbon_occupant) || !carbon_occupant.ckey)
-		return
-	if(QDELETED(inserted_blueprint))
-		return
-	var/obj/item/blueprint/print = inserted_blueprint
-
-	var/list/imprints = GLOB.blueprint_imprints[carbon_occupant.ckey]
-	if(imprints && (print.recipe_type in imprints))
-		balloon_alert(carbon_occupant, "already imprinted!")
-		return
-
-	var/fee = get_fee(print)
-	if(!charge_fee(carbon_occupant, fee, print.schematic_name))
-		balloon_alert(carbon_occupant, "payment failed!")
-		return
-
-	LAZYINITLIST(GLOB.blueprint_imprints[carbon_occupant.ckey])
-	GLOB.blueprint_imprints[carbon_occupant.ckey] |= print.recipe_type
-
-	playsound(src, 'sound/machines/ping.ogg', 50, TRUE)
-	carbon_occupant.visible_message(
-		span_notice("[src] scans [carbon_occupant] and shreds [print] into confetti."),
-		span_notice("Cold light sweeps across your skull. You know the [print.schematic_name] by heart now, and the schematic is confetti."),
-	)
-	inserted_blueprint = null
-	qdel(print)
-	SStgui.update_uis(src)
-
-/// Draw a fee from loaded cash first, then the occupant's bank account for any
-/// shortfall. Returns TRUE only if the whole fee was covered and charged.
-/obj/machinery/blueprint_imprinter/proc/charge_fee(mob/living/carbon/user, fee, schematic_name)
-	var/from_cash = min(loaded_credits, fee)
-	var/remainder = fee - from_cash
-	if(remainder > 0)
-		var/obj/item/card/id/id_card = user.get_idcard(TRUE)
-		var/datum/bank_account/account = id_card?.registered_account
-		if(!account || !account.has_money(remainder))
-			return FALSE
-		if(!account.adjust_money(-remainder, "Neural Imprint: [schematic_name]"))
-			return FALSE
-	loaded_credits -= from_cash
-	metric_outpost_service("neural_imprint", user, src, fee, 0, schematic_name, list("from_cash" = from_cash))
-	return TRUE
-
-// --- UI ----------------------------------------------------------------
-
-/obj/machinery/blueprint_imprinter/ui_interact(mob/user, datum/tgui/ui)
-	ui = SStgui.try_update_ui(user, src, ui)
-	if(!ui)
-		ui = new(user, src, "BlueprintImprinter", name)
-		ui.open()
-
-/obj/machinery/blueprint_imprinter/ui_data(mob/user)
-	var/list/data = list()
-	data["working"] = working
-	data["timeleft"] = work_timer ? timeleft(work_timer) : null
-	data["loaded_credits"] = loaded_credits
-
-	var/mob/living/carbon/carbon_occupant = occupant
-	data["has_occupant"] = istype(carbon_occupant)
-
-	var/obj/structure/overmap/trader_outpost/outpost = get_trader_outpost_for_turf(get_turf(src))
-	data["barred"] = outpost?.is_user_barred(carbon_occupant) ? TRUE : FALSE
-
-	var/datum/bank_account/account
-	if(istype(carbon_occupant))
-		var/obj/item/card/id/id_card = carbon_occupant.get_idcard(TRUE)
-		account = id_card?.registered_account
-	data["account_credits"] = account ? account.account_balance : null
-
-	data["blueprint_ready"] = inserted_blueprint ? TRUE : FALSE
-	if(inserted_blueprint)
-		var/fee = get_fee(inserted_blueprint)
-		data["schematic_name"] = inserted_blueprint.schematic_name
-		data["tier"] = inserted_blueprint.tier
-		data["fee"] = fee
-		var/already_known = FALSE
-		if(carbon_occupant?.ckey)
-			var/list/imprints = GLOB.blueprint_imprints[carbon_occupant.ckey]
-			already_known = imprints && (inserted_blueprint.recipe_type in imprints)
-		data["already_known"] = already_known
-		data["can_afford"] = (loaded_credits + (account ? account.account_balance : 0)) >= fee
-	return data
-
-/obj/machinery/blueprint_imprinter/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
-	. = ..()
-	if(.)
-		return
-	if(usr != occupant)
-		return
-	switch(action)
-		if("imprint")
-			if(working)
-				return TRUE
-			if(!inserted_blueprint)
-				balloon_alert(usr, "no schematic!")
-				return TRUE
-			var/obj/structure/overmap/trader_outpost/outpost = get_trader_outpost_for_turf(get_turf(src))
-			if(outpost?.is_user_barred(usr))
-				outpost.trader?.speak_line(TRADER_LINE_REFUSAL)
-				balloon_alert(usr, "trade embargo!")
-				return TRUE
-			var/mob/living/carbon/carbon_occupant = occupant
-			if(!istype(carbon_occupant) || !carbon_occupant.ckey)
-				return TRUE
-			var/list/imprints = GLOB.blueprint_imprints[carbon_occupant.ckey]
-			if(imprints && (inserted_blueprint.recipe_type in imprints))
-				balloon_alert(usr, "already imprinted!")
-				return TRUE
-			var/fee = get_fee(inserted_blueprint)
-			var/obj/item/card/id/id_card = carbon_occupant.get_idcard(TRUE)
-			var/datum/bank_account/account = id_card?.registered_account
-			if((loaded_credits + (account ? account.account_balance : 0)) < fee)
-				balloon_alert(usr, "needs [fee] cr!")
-				return TRUE
-			start_imprint()
-			return TRUE
-		if("eject_blueprint")
-			if(working)
-				return TRUE
-			eject_blueprint(occupant)
-			return TRUE
-		if("eject_cash")
-			if(working)
-				return TRUE
-			eject_cash(occupant)
-			return TRUE
-		if("open_door")
-			open_machine()
-			return TRUE
-
-// --- Outpost aggression -------------------------------------------------
-
-// Attacking outpost property is aggression, imprinter included
-/obj/machinery/blueprint_imprinter/attacked_by(obj/item/attacking_item, mob/living/user, list/modifiers, list/attack_modifiers)
-	if(attacking_item.force && !istype(attacking_item, /obj/item/blueprint) && !iscash(attacking_item))
-		var/obj/structure/overmap/trader_outpost/outpost = get_trader_outpost_for_turf(get_turf(src))
-		outpost?.register_aggression(user)
-	return ..()
-
-/obj/machinery/blueprint_imprinter/bullet_act(obj/projectile/hitting_projectile, def_zone, piercing_hit = FALSE)
-	if(isliving(hitting_projectile.firer))
-		var/obj/structure/overmap/trader_outpost/outpost = get_trader_outpost_for_turf(get_turf(src))
-		outpost?.register_aggression(hitting_projectile.firer)
-	return ..()
-
-#undef IMPRINT_FEE_GREEN
-#undef IMPRINT_FEE_YELLOW
-#undef IMPRINT_FEE_RED
-#undef IMPRINT_WORK_TIME
diff --git a/voidcrew/modules/trade/outpost.dm b/voidcrew/modules/trade/outpost.dm
index 34c152a40b2..483c3fd2002 100644
--- a/voidcrew/modules/trade/outpost.dm
+++ b/voidcrew/modules/trade/outpost.dm
@@ -89,6 +89,9 @@ GLOBAL_LIST_EMPTY(trader_outposts)
 	var/list/obj/machinery/porta_turret/outpost/turrets = list()
 	/// Looping timer id for the supply convoy restock
 	var/restock_timer
+	/// Board clock is independent of visits, acceptance and the supply convoy.
+	var/next_contract_refill = 0
+	var/contract_refill_timer
 
 /// A market, as against a crew's own colony. Both are "Outposts" on the readout.
 /obj/structure/overmap/trader_outpost/get_contact_variant()
@@ -102,7 +105,23 @@ GLOBAL_LIST_EMPTY(trader_outposts)
 	GLOB.trader_outposts += src
 	berths = new /list(OUTPOST_MAX_BERTHS)
 	ensure_main_shop()
-	restock_timer = addtimer(CALLBACK(src, PROC_REF(convoy_restock)), OUTPOST_RESTOCK_INTERVAL, TIMER_STOPPABLE | TIMER_LOOP)
+	if(SSovermap_zones.initialized)
+		start_contract_offers()
+	else
+		RegisterSignal(SSovermap_zones, COMSIG_SUBSYSTEM_POST_INITIALIZE, PROC_REF(on_contract_zones_ready))
+	restock_timer = addtimer(CALLBACK(src, PROC_REF(convoy_restock)), OUTPOST_RESTOCK_INTERVAL, TIMER_STOPPABLE | TIMER_LOOP | TIMER_DELETE_ME)
+
+/// Overmap construction precedes zone assignment; no contract may quote an unzoned site.
+/obj/structure/overmap/trader_outpost/proc/on_contract_zones_ready(datum/source)
+	SIGNAL_HANDLER
+	UnregisterSignal(source, COMSIG_SUBSYSTEM_POST_INITIALIZE)
+	INVOKE_ASYNC(src, PROC_REF(start_contract_offers))
+
+/obj/structure/overmap/trader_outpost/proc/start_contract_offers()
+	if(QDELETED(src) || contract_refill_timer || !SSovermap_zones.initialized)
+		return
+	ensure_shop_offers()
+	contract_refill_timer = addtimer(CALLBACK(src, PROC_REF(ensure_shop_offers)), OUTPOST_CONTRACT_REFILL_INTERVAL, TIMER_STOPPABLE | TIMER_LOOP | TIMER_DELETE_ME)
 
 /**
  * Creates the main shop on first need. SSovermap spawns outposts and pre-loads
@@ -119,6 +138,10 @@ GLOBAL_LIST_EMPTY(trader_outposts)
 	return shop
 
 /obj/structure/overmap/trader_outpost/Destroy()
+	UnregisterSignal(SSovermap_zones, COMSIG_SUBSYSTEM_POST_INITIALIZE)
+	if(contract_refill_timer)
+		deltimer(contract_refill_timer)
+		contract_refill_timer = null
 	if(restock_timer)
 		deltimer(restock_timer)
 		restock_timer = null
@@ -135,6 +158,7 @@ GLOBAL_LIST_EMPTY(trader_outposts)
 	QDEL_LIST_ASSOC_VAL(extra_shops)
 	template_bottom_left = null
 	embargoed_ships.Cut()
+	clear_checkpoint_state()
 	aggressor_minds.Cut()
 	aggressor_strikes.Cut()
 	aggressor_strike_times.Cut()
@@ -209,12 +233,20 @@ GLOBAL_LIST_EMPTY(trader_outposts)
 	)
 	if(!top_right)
 		return
+	var/list/obj/machinery/door/airlock/outpost/checkpoint/checkpoint_doors = list()
+	var/list/obj/effect/landmark/outpost_checkpoint_chamber/checkpoint_chambers = list()
+	var/list/obj/machinery/outpost_checkpoint_sensor/checkpoint_sensors = list()
 	for(var/turf/interior_turf as anything in block(template_bottom_left, top_right))
 		// block() iterates y-major then x, same order the hangar-side alcove
 		// collects in, so the elevator can map alcove turf i to alcove turf i.
 		for(var/obj/effect/landmark/outpost_elevator_alcove/alcove_mark in interior_turf)
 			lobby_alcove_turfs += interior_turf
 			qdel(alcove_mark)
+		for(var/obj/effect/landmark/outpost_network_pad_spot/pad_mark in interior_turf)
+			network_pad_spot = interior_turf
+			qdel(pad_mark)
+		for(var/obj/effect/landmark/outpost_checkpoint_chamber/chamber_mark in interior_turf)
+			checkpoint_chambers += chamber_mark
 		for(var/mob/living/basic/outpost_trader/npc in interior_turf)
 			npc.outpost = src
 			npc.shop = get_shop(npc.shop_type)
@@ -230,6 +262,10 @@ GLOBAL_LIST_EMPTY(trader_outposts)
 			else if(istype(machine, /obj/machinery/door/airlock/outpost))
 				var/obj/machinery/door/airlock/outpost/door = machine
 				door.outpost = src
+				if(istype(door, /obj/machinery/door/airlock/outpost/checkpoint))
+					checkpoint_doors += door
+			else if(istype(machine, /obj/machinery/outpost_checkpoint_sensor))
+				checkpoint_sensors += machine
 			else if(istype(machine, /obj/machinery/outpost_elevator))
 				var/obj/machinery/outpost_elevator/panel = machine
 				panel.outpost = src
@@ -244,6 +280,10 @@ GLOBAL_LIST_EMPTY(trader_outposts)
 		for(var/obj/fixture in interior_turf)
 			if(ismachinery(fixture) || isstructure(fixture))
 				fixture.AddElement(/datum/element/outpost_property)
+	// Only parts collected from this concourse reservation form a checkpoint
+	// (outpost_checkpoint.dm); the guards linked above are matched to theirs.
+	build_checkpoints(checkpoint_doors, checkpoint_chambers, checkpoint_sensors)
+	start_armed_sweep()
 	// The traders' names/appearances depend on their shops, so setup runs
 	// post-link. In the roundstart pre-load path the mobs haven't initialized
 	// yet, dressing the appearance dummy that early is unsafe, so those
@@ -446,8 +486,7 @@ GLOBAL_LIST_EMPTY(trader_outposts)
 
 	// Not over the line yet: warn and give them a chance to stand down.
 	if(strikes < OUTPOST_AGGRESSION_STRIKES)
-		var/remaining = OUTPOST_AGGRESSION_STRIKES - strikes
-		to_chat(offender, span_userdanger("Outpost defense systems train on you in warning. [remaining] more infraction\s and they fire."))
+		to_chat(offender, span_userdanger("Outpost defense systems train on you in warning."))
 		if(trader)
 			trader.speak_line(TRADER_LINE_WARNING)
 		return
@@ -455,11 +494,12 @@ GLOBAL_LIST_EMPTY(trader_outposts)
 	// Final strike: mark them and embargo their crew's ships.
 	aggressor_minds[offender.mind] = world.time + OUTPOST_AGGRESSION_MARK_DURATION
 
-	for(var/datum/team/voidcrew/team as anything in offender.mind.ship_teams)
+	var/datum/voidcrew_crew_record/crew = offender.mind.get_reputation_crew()
+	for(var/datum/team/voidcrew/team in crew?.teams)
 		if(team.ship)
 			embargo_ship(team.ship)
 
-	to_chat(offender, span_userdanger("Outpost defense systems lock onto you. Your trade privileges have been revoked for [OUTPOST_AGGRESSION_MARK_DURATION / (1 MINUTES)] minutes."))
+	to_chat(offender, span_userdanger("Outpost defense systems lock onto you."))
 	if(trader)
 		trader.speak_line(TRADER_LINE_AGGRESSION)
 
@@ -470,7 +510,7 @@ GLOBAL_LIST_EMPTY(trader_outposts)
 	if(!istype(ship))
 		return
 	embargoed_ships[ship] = world.time + OUTPOST_EMBARGO_DURATION
-	ship.ship_notify("[name] has placed your vessel under trade embargo for [OUTPOST_EMBARGO_DURATION / (1 MINUTES)] minutes.", "TRADE EMBARGO", SHIP_NOTIFY_WARNING, 'voidcrew/sound/notify2.ogg', 25)
+	ship.ship_notify("[name] has placed your vessel under trade embargo.", "TRADE EMBARGO", SHIP_NOTIFY_WARNING, 'voidcrew/sound/notify2.ogg', 25)
 
 /**
  * Whether a ship is currently embargoed here. Expired entries are pruned lazily.
@@ -501,14 +541,22 @@ GLOBAL_LIST_EMPTY(trader_outposts)
 
 /**
  * Whether this user is refused service: personally marked as an aggressor,
- * or crew of an embargoed ship.
+ * crew of an embargoed ship, or recently caught armed past the checkpoint
+ * (outpost_trespass.dm).
  */
 /obj/structure/overmap/trader_outpost/proc/is_user_barred(mob/user)
+	if(!user?.mind)
+		return FALSE
+	return is_aggression_barred(user) || is_trespass_barred(user.mind)
+
+/// Marked as an aggressor, or crew of an embargoed ship
+/obj/structure/overmap/trader_outpost/proc/is_aggression_barred(mob/user)
 	if(!user?.mind)
 		return FALSE
 	if(is_marked_aggressor(user.mind))
 		return TRUE
-	for(var/datum/team/voidcrew/team as anything in user.mind.ship_teams)
+	var/datum/voidcrew_crew_record/crew = user.mind.get_reputation_crew()
+	for(var/datum/team/voidcrew/team in crew?.teams)
 		if(team.ship && is_ship_embargoed(team.ship))
 			return TRUE
 	return FALSE
@@ -516,11 +564,12 @@ GLOBAL_LIST_EMPTY(trader_outposts)
 /**
  * Whether the outpost has barred this mob from the sanctuary: marked aggressors
  * AND crew of embargoed ships, an embargo means shot on sight, not just refused
- * service. Per-mind, so it holds for a player in any body. The turrets layer
+ * service. Armed trespassers too, for their shorter hostile window only
+ * (outpost_trespass.dm). Per-mind, so it holds for a player in any body. The turrets layer
  * their own on-sight rules (xenos, hostile wildlife) on top in valid_target().
  */
 /obj/structure/overmap/trader_outpost/proc/is_turret_target(mob/living/target)
-	return istype(target) && is_user_barred(target)
+	return istype(target) && (is_aggression_barred(target) || is_armed_trespasser(target.mind))
 
 /**
  * Resolves which trader outpost protects a turf by checking its concourse and
diff --git a/voidcrew/modules/trade/outpost_checkpoint.dm b/voidcrew/modules/trade/outpost_checkpoint.dm
new file mode 100644
index 00000000000..ee6b9486e98
--- /dev/null
+++ b/voidcrew/modules/trade/outpost_checkpoint.dm
@@ -0,0 +1,1030 @@
+/**
+ * # Trader outpost weapons checkpoint
+ *
+ * Every way into a trader outpost's interior runs through a scan chamber: a small room between an
+ * outer door (the lobby or the exterior) and an inner door (the concourse).
+ *
+ * - Only one of the two doors is ever open. The outer door opens for anyone while the inner door is
+ *   shut; when it closes on people, or someone in the chamber walks into the inner door, the chamber
+ *   scans everything on its floor: every person and everything they carry (bags, pockets, implants
+ *   and organs included), plus whatever lies loose. Contraband-shielded storage (a smuggler's satchel)
+ *   still hides what is inside it.
+ * - Clean (or carried by someone holding a weapons permit, see outpost_trespass.dm): the inner door
+ *   opens for a few seconds. Not clean, or anyone in there barred by the outpost: the inner door stays
+ *   shut, the guard (or the wall scanner, at a hatch with no guard) says so, and the outer door opens
+ *   and stays open until whatever was refused has been carried back out. The checkpoint never moves
+ *   anyone or anything: people walk out, and a gun left on the floor fails every scan until someone
+ *   takes it away.
+ * - Someone on the concourse side can walk into the inner door to cycle the chamber outward the same
+ *   way (the exterior hatches need that; the lobby checkpoints have a one-way exit gate as well).
+ * - The inner door can be pried open with a crowbar or jaws of life, or hacked with an emag. It takes
+ *   OUTPOST_CHECKPOINT_FORCE_TIME and raises the alarm; anyone who then goes through it from the
+ *   chamber is flagged as an armed trespasser (outpost_trespass.dm).
+ * - A door never closes on anyone in its doorway: it waits for them to move.
+ * - NPCs never work the doors by walking into them, and pathing never takes an NPC through a chamber.
+ *   Someone off the lift crosses by asking each door once (outpost_checkpoint_npcs.dm).
+ *
+ * The parts are mapped (doors, a chamber marker on every chamber tile, one wall scanner, the exit gate
+ * and lockers) and tied together by checkpoint_id when the outpost links its interior
+ * (build_checkpoints()). A scan shows as a beam of light sweeping the chamber, then a green or red
+ * wash: short-lived effects, nothing kept between scans. Nothing is stored on the doors between cycles
+ * either: permission to open is handed to one open() call at a time.
+ * Tiles of the chamber, its doors, the lobby and the exit gate belong to
+ * /area/voidcrew/trader_outpost/checkpoint, which is outside the checkpoint as far as the outpost's
+ * armed-trespass rules are concerned.
+ */
+
+/// The scan beam
+#define CHECKPOINT_SWEEP_COLOR "#7fd8ff"
+/// The wash after a clean scan
+#define CHECKPOINT_PASS_COLOR "#4dff7a"
+/// The wash after a refusal, and the wall scanner's alarm light
+#define CHECKPOINT_REFUSE_COLOR "#ff3b3b"
+/// The wall scanner's light while it waits
+#define CHECKPOINT_IDLE_LIGHT "#8cff9a"
+
+/// The checkpoint lobby, scan chambers and exterior hatches: outpost ground that is not past the checkpoint
+/area/voidcrew/trader_outpost/checkpoint
+	name = "\improper Outpost Checkpoint"
+
+/// Where a trader concourse puts its public network pad (outpost_network.dm). The tile beside it is the arrival spot.
+/obj/effect/landmark/outpost_network_pad_spot
+	name = "outpost network pad spot"
+
+/// Marks one tile of a scan chamber. The checkpoint scans these tiles.
+/obj/effect/landmark/outpost_checkpoint_chamber
+	name = "checkpoint chamber"
+	icon_state = "x4"
+	/// Shared with the chamber's doors
+	var/checkpoint_id
+
+/// Whether `thing` is something the checkpoint stops at the door
+/proc/outpost_checkpoint_weapon(atom/movable/thing)
+	return is_ladder_combat_gun(thing?.type) || istype(thing, /obj/item/mecha_parts/mecha_equipment/weapon)
+
+/// The living person carrying `thing` anywhere on them (hands, bags, pockets, implants), or null when nobody is
+/proc/outpost_weapon_carrier(atom/movable/thing)
+	var/atom/location = thing?.loc
+	while(location && !isturf(location))
+		if(isliving(location))
+			return location
+		location = location.loc
+	return null
+
+/// Whether `user` works a checkpoint door by walking into it or clicking it: a player, or anyone with a mind. NPCs never do.
+/proc/outpost_checkpoint_door_user(mob/user)
+	return !!(user?.client || user?.mind)
+
+/// The NPC (a living mob with no player and no mind) that `pass_info` plans a route for, or null
+/proc/outpost_checkpoint_npc_walker(datum/can_pass_info/pass_info)
+	var/mob/living/walker = pass_info?.requester_ref?.resolve()
+	if(!istype(walker) || walker.client || walker.mind)
+		return null
+	return walker
+
+// =========================================================================
+// THE CHECKPOINT
+// =========================================================================
+
+/datum/outpost_checkpoint
+	/// The id the mapped parts share
+	var/checkpoint_id
+	/// The outpost that built this checkpoint
+	var/obj/structure/overmap/trader_outpost/outpost
+	/// Opens onto the lobby or the exterior
+	var/obj/machinery/door/airlock/outpost/checkpoint/outer/outer_door
+	/// Opens onto the concourse
+	var/obj/machinery/door/airlock/outpost/checkpoint/inner/inner_door
+	/// The chamber: every tile with a chamber marker
+	var/list/turf/chamber_turfs = list()
+	/// The scanner on the chamber wall: it shows the checkpoint's state, and speaks where there is no guard
+	var/obj/machinery/outpost_checkpoint_sensor/sensor
+	/// The way the scan beam sweeps: from the outer door into the chamber
+	var/sweep_dir = NORTH
+	/// The tile in front of the outer door, outside the chamber
+	var/turf/lobby_turf
+	/// The tile beyond the inner door, on the concourse
+	var/turf/secured_turf
+	/// The guard at the desk, if this checkpoint has one
+	var/mob/living/basic/outpost_trader/checkpoint_guard/guard
+	/// CHECKPOINT_IDLE, _SCANNING, _PASSING, _REJECTING or _FORCED
+	var/state = CHECKPOINT_IDLE
+	/// The timer ending the current state
+	var/phase_timer
+	/// Someone is prying or hacking the inner door right now
+	var/forcing = FALSE
+	/// Scan as soon as the outer door has closed (someone asked to go through)
+	var/scan_when_closed = FALSE
+	/// The current cycle was asked for from the concourse side
+	var/exit_request = FALSE
+	/// The last line the checkpoint said, and when
+	var/last_line
+	var/last_line_at = 0
+	COOLDOWN_DECLARE(line_cooldown)
+
+/datum/outpost_checkpoint/New(obj/structure/overmap/trader_outpost/outpost, checkpoint_id)
+	. = ..()
+	src.outpost = outpost
+	src.checkpoint_id = checkpoint_id
+
+/datum/outpost_checkpoint/Destroy()
+	deltimer(phase_timer)
+	phase_timer = null
+	if(outpost?.checkpoints[checkpoint_id] == src)
+		outpost.checkpoints -= checkpoint_id
+	if(outer_door?.checkpoint == src)
+		outer_door.checkpoint = null
+	if(inner_door?.checkpoint == src)
+		inner_door.set_breached(FALSE)
+		inner_door.checkpoint = null
+	if(sensor?.checkpoint == src)
+		sensor.checkpoint = null
+		sensor.set_look("idle")
+	if(guard?.checkpoint == src)
+		guard.checkpoint = null
+	outer_door = null
+	inner_door = null
+	sensor = null
+	guard = null
+	outpost = null
+	lobby_turf = null
+	secured_turf = null
+	chamber_turfs.Cut()
+	return ..()
+
+/**
+ * Ties the mapped parts together. Fails (and logs) unless there is exactly one outer and one inner
+ * door, each touching the chamber on one side and open floor on the other. The wall scanner is
+ * optional; the first one with this id is used.
+ */
+/datum/outpost_checkpoint/proc/assemble(list/doors, list/markers, list/sensors)
+	for(var/obj/machinery/door/airlock/outpost/checkpoint/door as anything in doors)
+		if(istype(door, /obj/machinery/door/airlock/outpost/checkpoint/outer))
+			if(outer_door)
+				return fail_assembly("two outer doors")
+			outer_door = door
+		else if(istype(door, /obj/machinery/door/airlock/outpost/checkpoint/inner))
+			if(inner_door)
+				return fail_assembly("two inner doors")
+			inner_door = door
+	if(!outer_door || !inner_door)
+		return fail_assembly("a missing door")
+	for(var/obj/effect/landmark/outpost_checkpoint_chamber/marker as anything in markers)
+		var/turf/tile = get_turf(marker)
+		if(tile)
+			chamber_turfs |= tile
+	if(!length(chamber_turfs))
+		return fail_assembly("no chamber markers")
+	lobby_turf = door_far_side(outer_door)
+	secured_turf = door_far_side(inner_door)
+	if(!isopenturf(lobby_turf) || !isopenturf(secured_turf))
+		return fail_assembly("a door that does not lead from the chamber to open floor")
+	sweep_dir = get_dir(lobby_turf, get_turf(outer_door))
+	outer_door.checkpoint = src
+	inner_door.checkpoint = src
+	for(var/obj/machinery/outpost_checkpoint_sensor/fixture as anything in sensors)
+		if(QDELETED(fixture))
+			continue
+		sensor = fixture
+		sensor.checkpoint = src
+		break
+	update_sensor()
+	return TRUE
+
+/datum/outpost_checkpoint/proc/fail_assembly(problem)
+	log_mapping("OUTPOST CHECKPOINT: [outpost?.name] checkpoint '[checkpoint_id]' has [problem]; it is not linked.")
+	outer_door = null
+	inner_door = null
+	sensor = null
+	chamber_turfs.Cut()
+	return FALSE
+
+/// The tile across `door` from the chamber, or null when the door does not touch the chamber on exactly one side
+/datum/outpost_checkpoint/proc/door_far_side(obj/machinery/door/door)
+	var/turf/door_turf = get_turf(door)
+	var/turf/far_side
+	for(var/direction in GLOB.cardinals)
+		if(!(get_step(door_turf, direction) in chamber_turfs))
+			continue
+		if(far_side)
+			return null
+		far_side = get_step(door_turf, REVERSE_DIR(direction))
+	return far_side
+
+// ----- who and what is in there -----
+
+/// Things on the chamber floor the scan looks at
+/datum/outpost_checkpoint/proc/scannable(atom/movable/thing)
+	if(iseffect(thing) || isobserver(thing) || thing.invisibility >= INVISIBILITY_ABSTRACT)
+		return FALSE
+	return !istype(thing, /obj/machinery/outpost_checkpoint_sensor)
+
+/// Every living thing in the chamber, including anyone inside a mech, a locker or a bag in there
+/datum/outpost_checkpoint/proc/chamber_people()
+	. = list()
+	for(var/turf/tile as anything in chamber_turfs)
+		for(var/atom/movable/thing as anything in tile)
+			if(!scannable(thing))
+				continue
+			for(var/mob/living/person in thing.get_all_contents())
+				. |= person
+
+/// Whether a player is among `people` (the guard only talks to players)
+/datum/outpost_checkpoint/proc/includes_player(list/people)
+	for(var/mob/living/person as anything in people)
+		if(person.client)
+			return TRUE
+	return FALSE
+
+/**
+ * What the scan refuses: chamber atom -> CHECKPOINT_LINE_ARMED or CHECKPOINT_LINE_BARRED. A weapon
+ * passes when the person carrying it holds a valid permit; anything loose on the floor never does.
+ */
+/datum/outpost_checkpoint/proc/inspect_chamber()
+	var/list/refused = list()
+	for(var/turf/tile as anything in chamber_turfs)
+		for(var/atom/movable/thing as anything in tile)
+			if(!scannable(thing))
+				continue
+			for(var/atom/movable/content as anything in thing.get_all_contents_skipping_traits(TRAIT_CONTRABAND_BLOCKER))
+				if(isliving(content))
+					var/mob/living/person = content
+					if(person.mind && outpost?.is_user_barred(person))
+						refused[thing] = CHECKPOINT_LINE_BARRED
+				else if(outpost_checkpoint_weapon(content) && !refused[thing])
+					var/mob/living/carrier = outpost_weapon_carrier(content)
+					if(!carrier || !outpost?.has_weapons_permit(carrier))
+						refused[thing] = CHECKPOINT_LINE_ARMED
+	return refused
+
+// ----- speech and show -----
+
+/// The wall scanner's look follows the checkpoint
+/datum/outpost_checkpoint/proc/update_sensor()
+	if(QDELETED(sensor))
+		return
+	if(forcing || state == CHECKPOINT_FORCED)
+		sensor.set_look("alarm")
+	else if(state == CHECKPOINT_REJECTING)
+		sensor.set_look("refused")
+	else if(state == CHECKPOINT_SCANNING)
+		sensor.set_look("scanning")
+	else
+		sensor.set_look("idle")
+
+/// The checkpoint's voice: the guard if there is one, else the wall scanner. The same line is not repeated to someone stepping back and forth.
+/datum/outpost_checkpoint/proc/announce(category, urgent = FALSE)
+	if(!urgent && !COOLDOWN_FINISHED(src, line_cooldown))
+		return
+	if(category == last_line && world.time < last_line_at + OUTPOST_CHECKPOINT_REPEAT_LINE)
+		return
+	COOLDOWN_START(src, line_cooldown, OUTPOST_CHECKPOINT_LINE_COOLDOWN)
+	last_line = category
+	last_line_at = world.time
+	if(!QDELETED(guard) && guard.shop)
+		var/line = guard.shop.get_line(category)
+		if(line)
+			INVOKE_ASYNC(guard, TYPE_PROC_REF(/atom/movable, say), line)
+		return
+	var/line = sensor?.machine_line(category)
+	if(line)
+		INVOKE_ASYNC(sensor, TYPE_PROC_REF(/atom/movable, say), line)
+
+/datum/outpost_checkpoint/proc/sound_at_chamber(sound_file, volume = 40)
+	var/turf/middle = length(chamber_turfs) ? chamber_turfs[1] : null
+	if(middle)
+		playsound(middle, sound_file, volume, FALSE)
+
+/// A beam of light sweeps the chamber from the outer door to the far wall and back, for the length of a scan
+/datum/outpost_checkpoint/proc/sweep_chamber()
+	var/vertical = !!(sweep_dir & (EAST|WEST))
+	// One beam per line of tiles along the sweep, starting from its tile nearest the outer door
+	var/list/starts = list()
+	var/list/depths = list()
+	for(var/turf/tile as anything in chamber_turfs)
+		var/across = "[vertical ? tile.y : tile.x]"
+		depths[across] += 1
+		var/turf/current = starts[across]
+		if(!current || sweep_progress(tile) < sweep_progress(current))
+			starts[across] = tile
+	for(var/across in starts)
+		new /obj/effect/temp_visual/checkpoint_sweep(starts[across], sweep_dir, depths[across], 3, 240)
+		new /obj/effect/temp_visual/checkpoint_sweep(starts[across], sweep_dir, depths[across], 12, 80)
+
+/// How far along the sweep `tile` lies
+/datum/outpost_checkpoint/proc/sweep_progress(turf/tile)
+	switch(sweep_dir)
+		if(NORTH)
+			return tile.y
+		if(SOUTH)
+			return -tile.y
+		if(EAST)
+			return tile.x
+	return -tile.x
+
+/// A brief wash of `wash_color` over the chamber
+/datum/outpost_checkpoint/proc/wash_chamber(wash_color)
+	for(var/turf/tile as anything in chamber_turfs)
+		new /obj/effect/temp_visual/checkpoint_wash(tile, wash_color)
+
+// ----- doors -----
+
+/// Hands `door` permission for exactly one opening
+/datum/outpost_checkpoint/proc/open_door(obj/machinery/door/airlock/outpost/checkpoint/door, forced = DEFAULT_DOOR_CHECKS)
+	if(QDELETED(door) || !door.density)
+		return
+	door.opening_permitted = TRUE
+	INVOKE_ASYNC(door, TYPE_PROC_REF(/obj/machinery/door, open), forced)
+
+/// Whether someone (standing or lying) or something bulky is in `door`'s doorway, so it must not close yet
+/datum/outpost_checkpoint/proc/doorway_blocked(obj/machinery/door/door)
+	for(var/atom/movable/thing in get_turf(door))
+		if(thing == door || iseffect(thing))
+			continue
+		if(isliving(thing) || thing.density)
+			return TRUE
+	return FALSE
+
+/// Closes `door` once its doorway is clear, trying again until it is shut. Nobody is moved out of the way.
+/datum/outpost_checkpoint/proc/close_door(obj/machinery/door/airlock/outpost/checkpoint/door)
+	if(QDELETED(door) || QDELETED(src))
+		return
+	if(door.density)
+		on_door_closed(door)
+		return
+	if(door.operating || doorway_blocked(door))
+		addtimer(CALLBACK(src, PROC_REF(close_door), door), OUTPOST_CHECKPOINT_DOORWAY_WAIT, TIMER_UNIQUE | TIMER_DELETE_ME)
+		return
+	INVOKE_ASYNC(src, PROC_REF(finish_close), door)
+
+/datum/outpost_checkpoint/proc/finish_close(obj/machinery/door/airlock/outpost/checkpoint/door)
+	var/closed = door.close(FORCING_DOOR_CHECKS)
+	if(QDELETED(src) || QDELETED(door))
+		return
+	if(closed && door.density)
+		on_door_closed(door)
+	else
+		addtimer(CALLBACK(src, PROC_REF(close_door), door), OUTPOST_CHECKPOINT_DOORWAY_WAIT, TIMER_UNIQUE | TIMER_DELETE_ME)
+
+/datum/outpost_checkpoint/proc/on_door_closed(obj/machinery/door/airlock/outpost/checkpoint/door)
+	if(door == inner_door)
+		inner_door.set_breached(FALSE)
+		if(state == CHECKPOINT_PASSING || state == CHECKPOINT_FORCED)
+			set_state(CHECKPOINT_IDLE)
+		return
+	// The outer door
+	switch(state)
+		if(CHECKPOINT_FORCED)
+			return
+		if(CHECKPOINT_IDLE, CHECKPOINT_REJECTING)
+			var/requested = scan_when_closed
+			var/leaving = exit_request
+			scan_when_closed = FALSE
+			set_state(CHECKPOINT_IDLE)
+			exit_request = requested && leaving
+			if(requested || length(chamber_people()))
+				start_scan()
+
+/datum/outpost_checkpoint/proc/set_state(new_state)
+	state = new_state
+	deltimer(phase_timer)
+	phase_timer = null
+	if(new_state == CHECKPOINT_IDLE)
+		exit_request = FALSE
+	update_sensor()
+
+/// Whether the doors are busy with a cycle, so a walk into one of them is simply ignored
+/datum/outpost_checkpoint/proc/mid_cycle()
+	if(state == CHECKPOINT_SCANNING || state == CHECKPOINT_PASSING)
+		return TRUE
+	return outer_door?.operating || inner_door?.operating
+
+// ----- what people do to it -----
+
+/// Someone walks into or clicks the outer door. Returns TRUE if it opens.
+/datum/outpost_checkpoint/proc/request_outer(mob/user)
+	if(QDELETED(outer_door) || QDELETED(inner_door) || outer_door.operating)
+		return FALSE
+	if(!outer_door.density)
+		// A click on the open door shuts it (starting the scan if anyone is inside), unless it is held open for something refused
+		if(state == CHECKPOINT_IDLE || (state == CHECKPOINT_REJECTING && !length(inspect_chamber())))
+			deltimer(phase_timer)
+			phase_timer = null
+			close_door(outer_door)
+		return FALSE
+	switch(state)
+		if(CHECKPOINT_IDLE)
+			if(!inner_door.density || inner_door.operating)
+				return FALSE
+			open_door(outer_door)
+			phase_timer = addtimer(CALLBACK(src, PROC_REF(close_door), outer_door), OUTPOST_CHECKPOINT_OUTER_HOLD, TIMER_STOPPABLE | TIMER_DELETE_ME)
+			return TRUE
+		if(CHECKPOINT_FORCED)
+			// The alarm is up and the interlock with it: anyone may follow through
+			open_door(outer_door)
+			return TRUE
+	return FALSE
+
+/// Someone walks into or clicks the inner door: cycle the chamber. Returns TRUE if a scan starts.
+/datum/outpost_checkpoint/proc/request_cycle(mob/user)
+	if(QDELETED(outer_door) || QDELETED(inner_door) || forcing)
+		return FALSE
+	if(!inner_door.density || inner_door.operating || outer_door.operating)
+		return FALSE
+	if(state == CHECKPOINT_REJECTING)
+		// Held open for something refused: nothing more until it has been taken back out
+		if(length(inspect_chamber()))
+			return FALSE
+	else if(state != CHECKPOINT_IDLE)
+		return FALSE
+	var/leaving = !(get_turf(user) in chamber_turfs)
+	// A guarded checkpoint has its own way out (the exit gate); only the exterior hatches cycle outward
+	if(leaving && guard)
+		return FALSE
+	exit_request = leaving
+	if(!outer_door.density)
+		scan_when_closed = TRUE
+		deltimer(phase_timer)
+		phase_timer = null
+		close_door(outer_door)
+		return TRUE
+	start_scan()
+	return TRUE
+
+/datum/outpost_checkpoint/proc/start_scan()
+	set_state(CHECKPOINT_SCANNING)
+	sweep_chamber()
+	sound_at_chamber('sound/machines/scanner/scanner.ogg', 30)
+	phase_timer = addtimer(CALLBACK(src, PROC_REF(finish_scan)), OUTPOST_CHECKPOINT_SCAN_TIME, TIMER_STOPPABLE | TIMER_DELETE_ME)
+
+/datum/outpost_checkpoint/proc/finish_scan()
+	phase_timer = null
+	if(state != CHECKPOINT_SCANNING)
+		return
+	// Something opened mid-scan: nothing to decide about
+	if(!outer_door.density || !inner_door.density)
+		set_state(CHECKPOINT_IDLE)
+		return
+	var/list/refused = inspect_chamber()
+	var/list/people = chamber_people()
+	if(!length(refused))
+		if(length(people) || exit_request)
+			pass(people)
+		else
+			set_state(CHECKPOINT_IDLE)
+		return
+	var/barred = FALSE
+	for(var/atom/movable/thing as anything in refused)
+		if(refused[thing] == CHECKPOINT_LINE_BARRED)
+			barred = TRUE
+			break
+	reject(barred, people)
+
+/datum/outpost_checkpoint/proc/pass(list/people)
+	set_state(CHECKPOINT_PASSING)
+	wash_chamber(CHECKPOINT_PASS_COLOR)
+	sound_at_chamber('sound/machines/ping.ogg', 30)
+	if(includes_player(people))
+		announce(CHECKPOINT_LINE_PASS)
+	open_door(inner_door)
+	phase_timer = addtimer(CALLBACK(src, PROC_REF(close_door), inner_door), OUTPOST_CHECKPOINT_PASS_TIME, TIMER_STOPPABLE | TIMER_DELETE_ME)
+
+/// The inner door stays shut, the checkpoint says why, and the outer door opens for whoever it refused to walk back out
+/datum/outpost_checkpoint/proc/reject(barred, list/people)
+	var/leaving = exit_request
+	set_state(CHECKPOINT_REJECTING)
+	wash_chamber(CHECKPOINT_REFUSE_COLOR)
+	sound_at_chamber('sound/machines/scanner/scanbuzz.ogg', 40)
+	if(includes_player(people) || leaving)
+		announce(barred ? CHECKPOINT_LINE_BARRED : CHECKPOINT_LINE_ARMED, urgent = TRUE)
+	open_door(outer_door)
+	phase_timer = addtimer(CALLBACK(src, PROC_REF(check_refused)), OUTPOST_CHECKPOINT_REJECT_HOLD, TIMER_STOPPABLE | TIMER_DELETE_ME)
+
+/// The outer door stays open until whatever was refused is gone from the chamber, then shuts (scanning anyone still inside)
+/datum/outpost_checkpoint/proc/check_refused()
+	deltimer(phase_timer)
+	phase_timer = null
+	if(state != CHECKPOINT_REJECTING)
+		return
+	if(length(inspect_chamber()))
+		phase_timer = addtimer(CALLBACK(src, PROC_REF(check_refused)), OUTPOST_CHECKPOINT_REJECT_RECHECK, TIMER_STOPPABLE | TIMER_DELETE_ME)
+		return
+	close_door(outer_door)
+
+// ----- forcing the inner door -----
+
+/// `user` starts prying or hacking the inner door. Sleeps for the whole attempt; TRUE if it gave.
+/datum/outpost_checkpoint/proc/force_inner(mob/living/user, obj/item/tool)
+	if(forcing || state == CHECKPOINT_FORCED || QDELETED(inner_door) || !inner_door.density)
+		return FALSE
+	forcing = TRUE
+	update_sensor()
+	playsound(inner_door, 'sound/machines/warning-buzzer.ogg', 60, FALSE, MEDIUM_RANGE_SOUND_EXTRARANGE)
+	announce(CHECKPOINT_LINE_FORCING, urgent = TRUE)
+	log_game("OUTPOST CHECKPOINT: [key_name(user)] started forcing [inner_door] at [AREACOORD(inner_door)] with [tool].")
+	var/succeeded = do_after(user, OUTPOST_CHECKPOINT_FORCE_TIME, target = inner_door, extra_checks = CALLBACK(src, PROC_REF(still_forceable)))
+	if(QDELETED(src))
+		return FALSE
+	forcing = FALSE
+	if(!succeeded)
+		update_sensor()
+		return FALSE
+	breach(user)
+	return TRUE
+
+/datum/outpost_checkpoint/proc/still_forceable()
+	return !QDELETED(inner_door) && inner_door.density && state != CHECKPOINT_FORCED
+
+/// The inner door gives: it stays open for a while, and anyone going through it from the chamber is flagged
+/datum/outpost_checkpoint/proc/breach(mob/living/user)
+	log_game("OUTPOST CHECKPOINT: [key_name(user)] forced [inner_door] at [AREACOORD(inner_door)].")
+	set_state(CHECKPOINT_FORCED)
+	wash_chamber(CHECKPOINT_REFUSE_COLOR)
+	playsound(inner_door, 'sound/machines/warning-buzzer.ogg', 70, FALSE, MEDIUM_RANGE_SOUND_EXTRARANGE)
+	inner_door.set_breached(TRUE)
+	open_door(inner_door, BYPASS_DOOR_CHECKS)
+	phase_timer = addtimer(CALLBACK(src, PROC_REF(end_breach)), OUTPOST_CHECKPOINT_FORCED_OPEN_TIME, TIMER_STOPPABLE | TIMER_DELETE_ME)
+
+/datum/outpost_checkpoint/proc/end_breach()
+	phase_timer = null
+	if(!QDELETED(outer_door) && !outer_door.density)
+		close_door(outer_door)
+	close_door(inner_door)
+
+/// Someone stepped into the forced inner doorway
+/datum/outpost_checkpoint/proc/on_breach_entry(atom/movable/arrived, atom/old_loc)
+	if(state != CHECKPOINT_FORCED || !outpost)
+		return
+	var/turf/came_from = get_turf(old_loc)
+	if(came_from && !(came_from in chamber_turfs))
+		return // from the concourse side: already inside
+	var/flagged = FALSE
+	for(var/mob/living/person in arrived.get_all_contents())
+		if(person.mind && outpost.flag_trespasser(person))
+			flagged = TRUE
+	if(flagged)
+		announce(CHECKPOINT_LINE_INTRUDER, urgent = TRUE)
+
+// =========================================================================
+// THE DOORS
+// =========================================================================
+
+/**
+ * A checkpoint door. Its ordinary opening routes (bumps, clicks, ID swipes, wires, silicons, magic,
+ * prying) never open it; only its checkpoint does, one open() call at a time. Walking into it while
+ * the chamber is cycling does nothing at all, and an NPC walking into it never does anything.
+ */
+/obj/machinery/door/airlock/outpost/checkpoint
+	name = "checkpoint door"
+	desc = "An armored checkpoint door."
+	move_resist = INFINITY
+	autoclose = FALSE
+	// Pathing would skip an open door without this, and NPCs keep out of open chambers too
+	can_astar_pass = CANASTARPASS_ALWAYS_PROC
+	/// Shared with the chamber's markers and wall scanner and (for the lobby checkpoints) the guard
+	var/checkpoint_id
+	/// The checkpoint this door belongs to (set when the outpost links its interior)
+	var/datum/outpost_checkpoint/checkpoint
+	/// Permission for the next open() call only
+	var/opening_permitted = FALSE
+	COOLDOWN_DECLARE(deny_cooldown)
+
+/obj/machinery/door/airlock/outpost/checkpoint/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/outpost_property)
+
+/obj/machinery/door/airlock/outpost/checkpoint/Destroy()
+	if(checkpoint)
+		qdel(checkpoint)
+		checkpoint = null
+	return ..()
+
+/obj/machinery/door/airlock/outpost/checkpoint/open(forced = DEFAULT_DOOR_CHECKS)
+	if(!density)
+		return TRUE
+	if(!opening_permitted)
+		return FALSE
+	opening_permitted = FALSE
+	return ..()
+
+// Checkpoint permission bypasses the opening checks without selecting the pry sound for an ordinary cycle.
+/obj/machinery/door/airlock/outpost/checkpoint/try_to_force_door_open(force_type = DEFAULT_DOOR_CHECKS)
+	return ..(BYPASS_DOOR_CHECKS)
+
+// Someone got into the doorway as it shut: it opens again for them, and its checkpoint closes it once they have moved
+/obj/machinery/door/airlock/outpost/checkpoint/CheckForMobs()
+	if(!(locate(/mob/living) in get_turf(src)))
+		return
+	opening_permitted = TRUE
+	open()
+
+// A refusal shows at most once every OUTPOST_CHECKPOINT_DENY_COOLDOWN, however often the door is walked into
+/obj/machinery/door/airlock/outpost/checkpoint/run_animation(animation, force_type = DEFAULT_DOOR_CHECKS)
+	if(animation == DOOR_DENY_ANIMATION)
+		if(!COOLDOWN_FINISHED(src, deny_cooldown))
+			return
+		COOLDOWN_START(src, deny_cooldown, OUTPOST_CHECKPOINT_DENY_COOLDOWN)
+	return ..()
+
+/obj/machinery/door/airlock/outpost/checkpoint/emag_act(mob/user, obj/item/card/emag/emag_card)
+	return FALSE
+
+// NPCs never plan a route through a checkpoint; one going through it by the rules passes a door only once it is open
+/obj/machinery/door/airlock/outpost/checkpoint/CanAStarPass(to_dir, datum/can_pass_info/pass_info)
+	var/mob/living/walker = outpost_checkpoint_npc_walker(pass_info)
+	if(walker)
+		return !density && HAS_TRAIT(walker, TRAIT_CHECKPOINT_CROSSING)
+	return ..()
+
+/// A walk into or click on this door was refused: the deny light, unless the chamber is busy cycling
+/obj/machinery/door/airlock/outpost/checkpoint/proc/refuse()
+	if(checkpoint?.mid_cycle())
+		return
+	run_animation(DOOR_DENY_ANIMATION)
+
+/// The lobby (or exterior) side of a scan chamber
+/obj/machinery/door/airlock/outpost/checkpoint/outer
+
+/obj/machinery/door/airlock/outpost/checkpoint/outer/bumpopen(mob/user)
+	if(operating || !density || !outpost_checkpoint_door_user(user))
+		return
+	if(!checkpoint?.request_outer(user))
+		refuse()
+
+/obj/machinery/door/airlock/outpost/checkpoint/outer/try_to_activate_door(mob/living/user, access_bypass = FALSE)
+	add_fingerprint(user)
+	if(operating || !outpost_checkpoint_door_user(user))
+		return
+	if(!checkpoint?.request_outer(user) && density)
+		refuse()
+
+/// The concourse side of a scan chamber. Walking into it asks for a scan; prying or hacking it forces it.
+/obj/machinery/door/airlock/outpost/checkpoint/inner
+	/// Watching the doorway for anyone coming through while it is forced
+	var/breached = FALSE
+
+/obj/machinery/door/airlock/outpost/checkpoint/inner/Destroy()
+	set_breached(FALSE)
+	return ..()
+
+/obj/machinery/door/airlock/outpost/checkpoint/inner/bumpopen(mob/user)
+	if(operating || !density || !outpost_checkpoint_door_user(user))
+		return
+	if(!checkpoint?.request_cycle(user))
+		refuse()
+
+/obj/machinery/door/airlock/outpost/checkpoint/inner/try_to_activate_door(mob/living/user, access_bypass = FALSE)
+	add_fingerprint(user)
+	if(operating || !density || !outpost_checkpoint_door_user(user))
+		return
+	if(!checkpoint?.request_cycle(user))
+		refuse()
+
+// Outpost property lets a crowbar through to this one door (see /datum/element/outpost_property)
+/obj/machinery/door/airlock/outpost/checkpoint/inner/outpost_forceable()
+	return TRUE
+
+// Pathing goes in through a guarded checkpoint and out through its exit gate, never back through the chamber
+/obj/machinery/door/airlock/outpost/checkpoint/inner/CanAStarPass(to_dir, datum/can_pass_info/pass_info)
+	if(!outpost_checkpoint_npc_walker(pass_info) && checkpoint?.guard && !(get_step(src, to_dir) in checkpoint.chamber_turfs))
+		return !density
+	return ..()
+
+/obj/machinery/door/airlock/outpost/checkpoint/inner/crowbar_act(mob/living/user, obj/item/tool)
+	if(!density || !checkpoint)
+		return ITEM_INTERACT_BLOCKING
+	if(checkpoint.forcing)
+		balloon_alert(user, "already being forced!")
+		return ITEM_INTERACT_BLOCKING
+	INVOKE_ASYNC(checkpoint, TYPE_PROC_REF(/datum/outpost_checkpoint, force_inner), user, tool)
+	return ITEM_INTERACT_SUCCESS
+
+/obj/machinery/door/airlock/outpost/checkpoint/inner/emag_act(mob/user, obj/item/card/emag/emag_card)
+	if(!density || !checkpoint || !isliving(user) || checkpoint.forcing)
+		return FALSE
+	INVOKE_ASYNC(checkpoint, TYPE_PROC_REF(/datum/outpost_checkpoint, force_inner), user, emag_card)
+	return TRUE
+
+/obj/machinery/door/airlock/outpost/checkpoint/inner/proc/set_breached(new_state)
+	if(breached == new_state)
+		return
+	var/turf/doorway = get_turf(src)
+	breached = new_state
+	if(!doorway)
+		return
+	if(breached)
+		RegisterSignal(doorway, COMSIG_ATOM_ENTERED, PROC_REF(on_doorway_entered))
+	else
+		UnregisterSignal(doorway, COMSIG_ATOM_ENTERED)
+
+/obj/machinery/door/airlock/outpost/checkpoint/inner/proc/on_doorway_entered(turf/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs)
+	SIGNAL_HANDLER
+	if(arrived == src || iseffect(arrived))
+		return
+	checkpoint?.on_breach_entry(arrived, old_loc)
+
+// Door looks. Each map uses the style of the doors around its checkpoint.
+
+/obj/machinery/door/airlock/outpost/checkpoint/outer/security
+	icon = 'icons/obj/doors/airlocks/station/security.dmi'
+	overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
+	opacity = FALSE
+	glass = TRUE
+
+/obj/machinery/door/airlock/outpost/checkpoint/inner/security
+	icon = 'icons/obj/doors/airlocks/station/security.dmi'
+	overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi'
+	opacity = FALSE
+	glass = TRUE
+
+/obj/machinery/door/airlock/outpost/checkpoint/inner/glass
+	icon = 'icons/obj/doors/airlocks/public/glass.dmi'
+	overlays_file = 'icons/obj/doors/airlocks/public/overlays.dmi'
+	opacity = FALSE
+	glass = TRUE
+
+/obj/machinery/door/airlock/outpost/checkpoint/outer/grunge
+	icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi'
+	overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi'
+	can_be_glass = FALSE
+
+/obj/machinery/door/airlock/outpost/checkpoint/inner/grunge
+	icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi'
+	overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi'
+	can_be_glass = FALSE
+
+/// Whether outpost property lets a crowbar get to work on this. Only a checkpoint's inner door says yes.
+/obj/proc/outpost_forceable()
+	return FALSE
+
+// =========================================================================
+// THE WALL SCANNER
+// =========================================================================
+
+/// One per chamber, on its wall. Shows the scan and speaks for a hatch with no guard; the checkpoint does the deciding.
+/obj/machinery/outpost_checkpoint_sensor
+	name = "weapons scanner"
+	desc = "A weapons scanner set into the checkpoint wall."
+	icon = 'icons/obj/machines/wallmounts.dmi'
+	icon_state = "airlock_sensor_standby"
+	base_icon_state = "airlock_sensor"
+	density = FALSE
+	anchored = TRUE
+	move_resist = INFINITY
+	use_power = NO_POWER_USE
+	processing_flags = NONE
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+	interaction_flags_machine = NONE
+	light_range = 1.4
+	light_power = 0.8
+	light_color = CHECKPOINT_IDLE_LIGHT
+	/// Shared with the chamber's doors
+	var/checkpoint_id
+	/// Set when the outpost links its interior
+	var/datum/outpost_checkpoint/checkpoint
+	/// "idle", "scanning", "refused" or "alarm"
+	var/look = "idle"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/outpost_checkpoint_sensor, 24)
+
+/obj/machinery/outpost_checkpoint_sensor/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/outpost_property)
+	update_appearance(UPDATE_ICON_STATE)
+
+/obj/machinery/outpost_checkpoint_sensor/Destroy()
+	if(checkpoint?.sensor == src)
+		checkpoint.sensor = null
+	checkpoint = null
+	return ..()
+
+/obj/machinery/outpost_checkpoint_sensor/emag_act(mob/user, obj/item/card/emag/emag_card)
+	return FALSE
+
+/obj/machinery/outpost_checkpoint_sensor/update_icon_state()
+	switch(look)
+		if("refused")
+			icon_state = "[base_icon_state]_alert"
+		if("alarm")
+			icon_state = "[base_icon_state]_cycle"
+		else
+			icon_state = "[base_icon_state]_standby"
+	return ..()
+
+/// Sets what the scanner shows: "idle", "scanning", "refused" or "alarm"
+/obj/machinery/outpost_checkpoint_sensor/proc/set_look(new_look)
+	if(look == new_look)
+		return
+	look = new_look
+	switch(look)
+		if("scanning")
+			set_light_color(CHECKPOINT_SWEEP_COLOR)
+		if("refused", "alarm")
+			set_light_color(CHECKPOINT_REFUSE_COLOR)
+		else
+			set_light_color(CHECKPOINT_IDLE_LIGHT)
+	update_appearance(UPDATE_ICON_STATE)
+
+/// What the scanner says when there is no guard to say it
+/obj/machinery/outpost_checkpoint_sensor/proc/machine_line(category)
+	switch(category)
+		if(CHECKPOINT_LINE_ARMED)
+			return "Weapon detected."
+		if(CHECKPOINT_LINE_BARRED)
+			return "Entry refused."
+		if(CHECKPOINT_LINE_FORCING)
+			return "Tamper alarm."
+		if(CHECKPOINT_LINE_INTRUDER)
+			return "Armed intruder."
+	return null
+
+// =========================================================================
+// THE SCAN, SHOWN
+// =========================================================================
+
+/**
+ * A line of light swept across a scan chamber, from the outer door to the far wall and back over the
+ * length of a scan, across `depth` tiles in `sweep_dir`. `thickness` pixels thick; a thin bright one
+ * and a wide faint one make the beam and its glow.
+ */
+/obj/effect/temp_visual/checkpoint_sweep
+	icon = 'icons/effects/alphacolors.dmi'
+	icon_state = "white"
+	plane = ABOVE_LIGHTING_PLANE
+	randomdir = FALSE
+	duration = OUTPOST_CHECKPOINT_SCAN_TIME
+	color = CHECKPOINT_SWEEP_COLOR
+	alpha = 0
+
+/obj/effect/temp_visual/checkpoint_sweep/Initialize(mapload, sweep_dir = NORTH, depth = 1, thickness = 2, peak_alpha = 230)
+	. = ..()
+	SET_PLANE_IMPLICIT(src, ABOVE_LIGHTING_PLANE)
+	var/vertical = !!(sweep_dir & (EAST|WEST))
+	var/scale = thickness / ICON_SIZE_ALL
+	transform = vertical ? matrix(scale, 0, 0, 0, 1, 0) : matrix(1, 0, 0, 0, scale, 0)
+	var/sign = (sweep_dir & (NORTH|EAST)) ? 1 : -1
+	var/edge = ICON_SIZE_ALL / 2 - thickness / 2
+	var/start = -edge * sign
+	var/finish = ((depth - 1) * ICON_SIZE_ALL + edge) * sign
+	var/leg = duration / 2
+	if(vertical)
+		pixel_x = start
+		animate(src, pixel_x = finish, time = leg, easing = SINE_EASING)
+		animate(pixel_x = start, time = leg, easing = SINE_EASING)
+	else
+		pixel_y = start
+		animate(src, pixel_y = finish, time = leg, easing = SINE_EASING)
+		animate(pixel_y = start, time = leg, easing = SINE_EASING)
+	animate(src, alpha = peak_alpha, time = 0.2 SECONDS, flags = ANIMATION_PARALLEL)
+	animate(alpha = peak_alpha, time = duration - 0.5 SECONDS)
+	animate(alpha = 0, time = 0.3 SECONDS)
+
+/// A brief wash of colour over one chamber tile: green for a clean scan, red for a refusal
+/obj/effect/temp_visual/checkpoint_wash
+	icon = 'icons/effects/alphacolors.dmi'
+	icon_state = "white"
+	plane = ABOVE_LIGHTING_PLANE
+	randomdir = FALSE
+	duration = 1.2 SECONDS
+	alpha = 0
+
+/obj/effect/temp_visual/checkpoint_wash/Initialize(mapload, wash_color = CHECKPOINT_PASS_COLOR)
+	. = ..()
+	SET_PLANE_IMPLICIT(src, ABOVE_LIGHTING_PLANE)
+	color = wash_color
+	animate(src, alpha = 90, time = 0.2 SECONDS, easing = SINE_EASING)
+	animate(alpha = 0, time = 1 SECONDS, easing = SINE_EASING)
+
+// =========================================================================
+// THE EXIT GATE
+// =========================================================================
+
+/**
+ * A one-way light curtain. People and things go through it only in its dir (from the concourse to
+ * the lobby); from the other side nothing gets in, not even a thrown gun or a pulled crate. Anyone
+ * stepping into it is walked on through to the far side, so nobody stands in it to be handed things.
+ * NPC pathing only uses it for leaving the outpost.
+ */
+/obj/structure/outpost_exit_gate
+	name = "exit gate"
+	desc = "A one-way light curtain."
+	icon = 'icons/obj/structures.dmi'
+	icon_state = "oneway"
+	anchored = TRUE
+	density = FALSE
+	move_resist = INFINITY
+	layer = ABOVE_MOB_LAYER
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+	light_range = 1.5
+	light_power = 0.8
+	light_color = COLOR_BIOLUMINESCENCE_BLUE
+	// Not dense, so pathing would skip CanAStarPass() without this
+	can_astar_pass = CANASTARPASS_ALWAYS_PROC
+
+/obj/structure/outpost_exit_gate/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/outpost_property)
+	var/static/list/loc_connections = list(
+		COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
+	)
+	AddElement(/datum/element/connect_loc, loc_connections)
+
+/obj/structure/outpost_exit_gate/CanAllowThrough(atom/movable/mover, border_dir)
+	. = ..()
+	if(mover.movement_type & PHASING)
+		return TRUE
+	if(get_turf(mover) == get_turf(src))
+		return TRUE
+	return REVERSE_DIR(border_dir) == dir
+
+/obj/structure/outpost_exit_gate/CanAStarPass(to_dir, datum/can_pass_info/pass_info)
+	if(REVERSE_DIR(to_dir) != dir)
+		return FALSE
+	// The outpost's own people go out through it only when they are leaving for good
+	var/mob/living/basic/ambient_npc/townsperson = outpost_checkpoint_npc_walker(pass_info)
+	if(istype(townsperson) && !istype(townsperson.activity, /datum/ambient_activity/leave))
+		return FALSE
+	return TRUE
+
+/obj/structure/outpost_exit_gate/proc/on_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs)
+	SIGNAL_HANDLER
+	if(isliving(arrived) || istype(arrived, /obj/vehicle))
+		addtimer(CALLBACK(src, PROC_REF(carry_through), arrived), 1, TIMER_DELETE_ME)
+
+/obj/structure/outpost_exit_gate/proc/carry_through(atom/movable/passer)
+	if(QDELETED(passer) || passer.loc != loc)
+		return
+	var/turf/out = get_step(src, dir)
+	if(!out)
+		return
+	if(!step(passer, dir) && passer.loc == loc)
+		passer.forceMove(out)
+
+// =========================================================================
+// THE LOCKERS
+// =========================================================================
+
+/// Every checkpoint locker in the world, so a card claims only one per outpost
+GLOBAL_LIST_EMPTY(outpost_checkpoint_lockers)
+
+/**
+ * A free locker in the checkpoint lobby: swiping an ID while it is shut and unclaimed locks it to that
+ * ID. Emptied and shut, it is free again. One per card per outpost. Same armor as the rental stash.
+ */
+/obj/structure/closet/secure_closet/outpost_rental/checkpoint
+	name = "checkpoint locker"
+	desc = "A steel locker by the checkpoint, for whatever can't come along."
+
+/obj/structure/closet/secure_closet/outpost_rental/checkpoint/Initialize(mapload)
+	. = ..()
+	GLOB.outpost_checkpoint_lockers += src
+
+/obj/structure/closet/secure_closet/outpost_rental/checkpoint/Destroy()
+	GLOB.outpost_checkpoint_lockers -= src
+	return ..()
+
+// The rental stash's fee line does not apply
+/obj/structure/closet/secure_closet/outpost_rental/checkpoint/examine(mob/user)
+	. = list("[icon2html(src, user)] That's \a [src].", desc)
+	if(locked)
+		. += span_notice("It's locked.")
+
+/obj/structure/closet/secure_closet/outpost_rental/checkpoint/attackby(obj/item/weapon, mob/living/user, list/modifiers, list/attack_modifiers)
+	var/obj/item/card/id/id = weapon.GetID()
+	if(isnull(id) || opened || broken)
+		return ..()
+	if(id_card) // claimed: the lock handles the rest
+		togglelock(user)
+		return TRUE
+	var/obj/structure/overmap/trader_outpost/outpost = get_trader_outpost_for_turf(get_turf(src))
+	for(var/obj/structure/closet/secure_closet/outpost_rental/checkpoint/other as anything in GLOB.outpost_checkpoint_lockers)
+		if(other == src || other.id_card?.resolve() != id)
+			continue
+		if(get_trader_outpost_for_turf(get_turf(other)) == outpost)
+			balloon_alert(user, "you have one already!")
+			return TRUE
+	id_card = WEAKREF(id)
+	name = "[id.registered_name]'s locker"
+	locked = TRUE
+	play_closet_lock_sound()
+	balloon_alert(user, "locked to your card")
+	update_appearance()
+	return TRUE
+
+/obj/structure/closet/secure_closet/outpost_rental/checkpoint/close(mob/living/user)
+	. = ..()
+	if(!. || !id_card)
+		return
+	for(var/atom/movable/thing as anything in contents)
+		if(!iseffect(thing))
+			return
+	// Shut empty: free for the next person
+	id_card = null
+	name = initial(name)
+	locked = FALSE
+	update_appearance()
+
+#undef CHECKPOINT_SWEEP_COLOR
+#undef CHECKPOINT_PASS_COLOR
+#undef CHECKPOINT_REFUSE_COLOR
+#undef CHECKPOINT_IDLE_LIGHT
diff --git a/voidcrew/modules/trade/outpost_checkpoint_guard.dm b/voidcrew/modules/trade/outpost_checkpoint_guard.dm
new file mode 100644
index 00000000000..baa605f33b5
--- /dev/null
+++ b/voidcrew/modules/trade/outpost_checkpoint_guard.dm
@@ -0,0 +1,249 @@
+/**
+ * # Checkpoint guards and weapons permits
+ *
+ * Each trader outpost's lobby checkpoint has a guard in a sealed glass booth. The guard is an ordinary
+ * outpost trader (godmode, Trade and Talk radial, the TraderShop window) whose only stock is the
+ * weapons permit, and is the checkpoint's voice (outpost_checkpoint.dm announce()).
+ *
+ * The permit is a record the outpost keeps against the buyer's mind (grant_weapons_permit(),
+ * outpost_trespass.dm); the paper the guard hands over is a receipt and proves nothing by itself.
+ * It is sold like any SKU, so barred customers (aggressors, embargoed crews, armed trespassers) are
+ * refused by the shop flow before it gets this far.
+ */
+
+/mob/living/basic/outpost_trader/checkpoint_guard
+	name = "guard"
+	desc = "Outpost security, behind armored glass."
+	/// The checkpoint this guard keeps: matches its doors' checkpoint_id
+	var/checkpoint_id
+	/// Set when the outpost links its interior
+	var/datum/outpost_checkpoint/checkpoint
+
+/mob/living/basic/outpost_trader/checkpoint_guard/Destroy()
+	if(checkpoint?.guard == src)
+		checkpoint.guard = null
+	checkpoint = null
+	return ..()
+
+/mob/living/basic/outpost_trader/checkpoint_guard/halcyon
+	shop_type = /datum/outpost_shop/vendor/checkpoint/halcyon
+
+/mob/living/basic/outpost_trader/checkpoint_guard/quartermain
+	shop_type = /datum/outpost_shop/vendor/checkpoint/quartermain
+
+/mob/living/basic/outpost_trader/checkpoint_guard/undertow
+	shop_type = /datum/outpost_shop/vendor/checkpoint/undertow
+
+// =========================================================================
+// THE DESKS
+// =========================================================================
+
+/// Abstract: a checkpoint guard's desk. Sells nothing but the permit.
+/datum/outpost_shop/vendor/checkpoint
+	outpost_name = "\improper Checkpoint"
+	trader_name = "Guard"
+	categories = list("Permits")
+	sku_types = list(/datum/shop_sku/weapons_permit)
+
+/// Hollis keeps Halcyon's arrivals hall: polite, patient, unarmed-looking and very much not
+/datum/outfit/checkpoint_guard_halcyon
+	name = "Halcyon checkpoint guard"
+	uniform = /obj/item/clothing/under/rank/security/officer/blueshirt
+	suit = /obj/item/clothing/suit/armor/vest/blueshirt
+	head = /obj/item/clothing/head/helmet/blueshirt
+	gloves = /obj/item/clothing/gloves/color/black
+	shoes = /obj/item/clothing/shoes/jackboots
+
+/datum/outpost_shop/vendor/checkpoint/halcyon
+	outpost_name = "\improper Halcyon Arrivals"
+	trader_name = "Hollis"
+	trader_outfit = /datum/outfit/checkpoint_guard_halcyon
+	trader_gender = MALE
+	trader_voice_pack = "goon.speak_2"
+	trader_voice_pitch = 0.95
+	trader_lines = list(
+		CHECKPOINT_LINE_PASS = list(
+			"You're clear. Enjoy your stay.",
+			"Step through.",
+			"All clear. Welcome to Halcyon.",
+		),
+		CHECKPOINT_LINE_ARMED = list(
+			"Weapon on the scan. Back out, please.",
+			"Scanner's flagged a weapon. Back out.",
+		),
+		CHECKPOINT_LINE_BARRED = list(
+			"Not today. Back out, please.",
+			"You're not coming in. Back out.",
+		),
+		CHECKPOINT_LINE_FORCING = list(
+			"Step away from that door!",
+			"Hey! Hands off the gate!",
+		),
+		CHECKPOINT_LINE_INTRUDER = list(
+			"Armed intruder!",
+		),
+		TRADER_LINE_SALE = list(
+			"Permit's good for twenty minutes.",
+			"There you go. Twenty minutes. Keep it pointed at the floor.",
+		),
+		TRADER_LINE_REFUSAL = list(
+			"No permit for you, friend.",
+			"Not after that. Move along.",
+		),
+		TRADER_LINE_IDLE = list(
+			"Quiet shift. I like quiet shifts.",
+			"Keep the line moving, folks.",
+			"Wipe your boots. The janitor's been on at me about the floors.",
+			"Fourteen hours of nobody, then six crews at once. Every time.",
+		),
+	)
+
+/// Ruck works the depot gate: the same hard hat as everyone else at the Quartermain, plus a vest
+/datum/outfit/checkpoint_guard_quartermain
+	name = "Quartermain checkpoint guard"
+	uniform = /obj/item/clothing/under/rank/security/officer/grey
+	suit = /obj/item/clothing/suit/armor/vest
+	head = /obj/item/clothing/head/helmet/sec
+	gloves = /obj/item/clothing/gloves/color/black
+	shoes = /obj/item/clothing/shoes/jackboots
+
+/datum/outpost_shop/vendor/checkpoint/quartermain
+	outpost_name = "\improper Depot Gate"
+	trader_name = "Ruck"
+	trader_outfit = /datum/outfit/checkpoint_guard_quartermain
+	trader_gender = MALE
+	trader_voice_pack = "goon.speak_4"
+	trader_voice_pitch = 0.85
+	trader_lines = list(
+		CHECKPOINT_LINE_PASS = list(
+			"Clear. Go on.",
+			"Through you go.",
+			"Next.",
+		),
+		CHECKPOINT_LINE_ARMED = list(
+			"Weapon on the scan. Back out.",
+			"Iron on the scan. Back out and stow it.",
+		),
+		CHECKPOINT_LINE_BARRED = list(
+			"You're not getting in. Back out.",
+			"Not you. Out.",
+		),
+		CHECKPOINT_LINE_FORCING = list(
+			"Get off that door!",
+			"Somebody's on the gate!",
+		),
+		CHECKPOINT_LINE_INTRUDER = list(
+			"Armed intruder!",
+		),
+		TRADER_LINE_SALE = list(
+			"Permit's good for twenty minutes.",
+			"Twenty minutes. Don't make me regret it.",
+		),
+		TRADER_LINE_REFUSAL = list(
+			"No. Not you.",
+			"You've had your chance today.",
+		),
+		TRADER_LINE_IDLE = list(
+			"Line up. One crew at a time.",
+			"Sarge says nobody gets past me with iron. Nobody does.",
+			"You'd be amazed what people try to walk through that scanner.",
+			"Convoy days are the worst. Everybody's in a hurry.",
+		),
+	)
+
+/// Brick works the Undertow's door. Black suit, dark glasses, never seen sitting down.
+/datum/outfit/checkpoint_guard_undertow
+	name = "Undertow checkpoint guard"
+	uniform = /obj/item/clothing/under/suit/black
+	glasses = /obj/item/clothing/glasses/sunglasses
+	gloves = /obj/item/clothing/gloves/color/black
+	shoes = /obj/item/clothing/shoes/jackboots
+
+/datum/outpost_shop/vendor/checkpoint/undertow
+	outpost_name = "\improper The Door"
+	trader_name = "Brick"
+	trader_outfit = /datum/outfit/checkpoint_guard_undertow
+	trader_gender = MALE
+	trader_voice_pack = "goon.speak_3"
+	trader_voice_pitch = 0.75
+	trader_lines = list(
+		CHECKPOINT_LINE_PASS = list(
+			"Go on.",
+			"In.",
+			"Behave yourself in there.",
+		),
+		CHECKPOINT_LINE_ARMED = list(
+			"Weapon on the scan. Back out.",
+			"Nice try. Back out.",
+		),
+		CHECKPOINT_LINE_BARRED = list(
+			"You're done here. Back out.",
+			"Not tonight.",
+		),
+		CHECKPOINT_LINE_FORCING = list(
+			"Off the door. Now.",
+			"Bad idea. Real bad idea.",
+		),
+		CHECKPOINT_LINE_INTRUDER = list(
+			"Armed intruder!",
+		),
+		TRADER_LINE_SALE = list(
+			"Permit's good for twenty minutes.",
+			"Twenty minutes. Vex doesn't do refunds and neither do I.",
+		),
+		TRADER_LINE_REFUSAL = list(
+			"Your money's no good here.",
+			"No.",
+		),
+		TRADER_LINE_IDLE = list(
+			"Everybody's carrying something. Not past me, they aren't.",
+			"I don't care who you work for.",
+			"Keep it moving.",
+		),
+	)
+
+// =========================================================================
+// THE PERMIT
+// =========================================================================
+
+/// Sold only at a checkpoint desk. The record lives on the outpost; the paper is a receipt.
+/datum/shop_sku/weapons_permit
+	name = "weapons permit"
+	desc = "A personal permit to go armed past the checkpoint, for a while."
+	category = "Permits"
+	item_path = /obj/item/paper/weapons_permit
+	price_credits = OUTPOST_WEAPONS_PERMIT_PRICE
+	fixed_price = TRUE
+	contract_reward = FALSE
+	// Never sells out: the desk prints as many as people pay for
+	stock_min = 1
+	stock_max = 1
+
+/datum/shop_sku/weapons_permit/get_denial_reason(mob/living/user)
+	. = ..()
+	if(.)
+		return
+	if(!user.mind || !shop?.outpost)
+		return "No permit for you."
+
+/datum/shop_sku/weapons_permit/dispense(mob/living/user, mob/living/basic/outpost_trader/vendor)
+	stock = 1
+	var/obj/structure/overmap/trader_outpost/outpost = shop?.outpost
+	var/runs_out = outpost?.grant_weapons_permit(user)
+	var/obj/item/paper/weapons_permit/receipt = ..()
+	if(istype(receipt))
+		receipt.fill_in(user, outpost, runs_out)
+	return receipt
+
+/// A receipt for a weapons permit. Who is allowed to carry arms is the outpost's record, not this paper.
+/obj/item/paper/weapons_permit
+	name = "weapons permit"
+	desc = "A stamped slip from a checkpoint desk."
+
+/obj/item/paper/weapons_permit/proc/fill_in(mob/living/holder, obj/structure/overmap/trader_outpost/outpost, runs_out)
+	var/holder_name = holder?.real_name || "the bearer"
+	name = "weapons permit ([holder_name])"
+	var/where = outpost?.name || "this outpost"
+	var/until = runs_out ? station_time_timestamp("hh:mm", runs_out) : "--:--"
+	add_raw_text("<center><b>WEAPONS PERMIT</b><br>[where]</center><hr>Issued to: <b>[holder_name]</b><br>Valid until: <b>[until]</b> station time<br>Valid at this outpost only. Not transferable.")
+	update_appearance()
diff --git a/voidcrew/modules/trade/outpost_checkpoint_npcs.dm b/voidcrew/modules/trade/outpost_checkpoint_npcs.dm
new file mode 100644
index 00000000000..f15ed294af8
--- /dev/null
+++ b/voidcrew/modules/trade/outpost_checkpoint_npcs.dm
@@ -0,0 +1,152 @@
+/**
+ * # NPCs at the weapons checkpoint
+ *
+ * The outpost's people keep to their own side of the checkpoint (outpost_checkpoint.dm): an NPC
+ * never works a checkpoint door by walking into it, pathing never plans an NPC's route through a
+ * chamber, and an ambient NPC only uses an exit gate when it is leaving for good. Their activity spots
+ * already keep off the checkpoint area (ambient_outpost_tile_avoided(), get_loiter_floor()).
+ *
+ * The one who has to cross is someone stepping off the lift in the lobby while players are about
+ * (/datum/ambient_outpost_role/proc/arrive()). They go through like a player: up to the outer door,
+ * in when it is open, a wait through the scan, out through the inner door. They ask each door at
+ * most once every OUTPOST_CHECKPOINT_NPC_ASK_GAP and never walk into a shut one.
+ */
+
+/// The checkpoint that leads in from the lift lobby nearest `near`: one whose outer door opens onto the outpost, not space. Null if there is none.
+/obj/structure/overmap/trader_outpost/proc/lobby_checkpoint(atom/near)
+	var/datum/outpost_checkpoint/best
+	var/best_distance = INFINITY
+	for(var/checkpoint_id in checkpoints)
+		var/datum/outpost_checkpoint/post = checkpoints[checkpoint_id]
+		if(QDELETED(post) || !post.lobby_turf || !istype(post.lobby_turf.loc, /area/voidcrew/trader_outpost))
+			continue
+		var/distance = near ? get_dist(near, post.lobby_turf) : 0
+		if(distance < best_distance)
+			best = post
+			best_distance = distance
+	return best
+
+/// Sends `npc`, just off the lift on the lobby side of `outpost`'s checkpoint, through it first
+/proc/ambient_cross_checkpoint_on_arrival(mob/living/basic/ambient_npc/npc, obj/structure/overmap/trader_outpost/outpost)
+	if(QDELETED(npc) || !outpost || !length(outpost.checkpoints))
+		return
+	var/turf/here = get_turf(npc)
+	if(!here || !istype(here.loc, /area/voidcrew/trader_outpost/checkpoint))
+		return
+	npc.start_activity(new /datum/ambient_activity/cross_checkpoint(npc))
+
+/**
+ * Going through the checkpoint from the lift lobby. Ends on the concourse. Anyone still outside after
+ * OUTPOST_CHECKPOINT_NPC_PATIENCE goes back down the lift (or, stuck in the chamber, slips away).
+ */
+/datum/ambient_activity/cross_checkpoint
+	name = "going through the checkpoint"
+	priority = AMBIENT_PRIORITY_REACTION
+	/// The checkpoint they are going through
+	var/datum/weakref/checkpoint_ref
+	/// world.time they give up
+	var/give_up_at = 0
+	/// world.time they may ask a door again
+	var/next_ask_at = 0
+
+/datum/ambient_activity/cross_checkpoint/setup()
+	var/datum/ambient_place/outpost/outpost_place = doer.place
+	var/obj/structure/overmap/trader_outpost/outpost = istype(outpost_place) ? outpost_place.outpost() : null
+	var/datum/outpost_checkpoint/post = outpost?.lobby_checkpoint(doer)
+	if(!post)
+		return FALSE
+	checkpoint_ref = WEAKREF(post)
+	give_up_at = world.time + OUTPOST_CHECKPOINT_NPC_PATIENCE
+	ADD_TRAIT(doer, TRAIT_CHECKPOINT_CROSSING, REF(src))
+	go_to(post.lobby_turf, 1)
+	return TRUE
+
+/datum/ambient_activity/cross_checkpoint/Destroy()
+	checkpoint_ref = null
+	return ..()
+
+/datum/ambient_activity/cross_checkpoint/finish()
+	if(!QDELETED(doer))
+		REMOVE_TRAIT(doer, TRAIT_CHECKPOINT_CROSSING, REF(src))
+	return ..()
+
+/datum/ambient_activity/cross_checkpoint/act(seconds)
+	var/datum/outpost_checkpoint/post = checkpoint_ref?.resolve()
+	if(QDELETED(post) || QDELETED(post.outer_door) || QDELETED(post.inner_door) || world.time >= give_up_at)
+		give_up(post)
+		// Their next activity (if any) has replaced this one
+		return AMBIENT_STEP_CONTINUE
+	var/turf/here = get_turf(doer)
+	if(post.outpost?.is_secured_turf(here))
+		return AMBIENT_STEP_DONE
+	var/turf/inner_turf = get_turf(post.inner_door)
+	var/turf/outer_turf = get_turf(post.outer_door)
+	// In the chamber: through the inner door once it opens, asking for a scan if nobody has
+	if(here == inner_turf || (here in post.chamber_turfs))
+		if(here == inner_turf || (!post.inner_door.density && !post.inner_door.operating))
+			go_to(concourse_step(post))
+			return AMBIENT_STEP_MOVE
+		if(post.state == CHECKPOINT_IDLE && post.outer_door.density && !post.outer_door.operating && world.time >= next_ask_at)
+			next_ask_at = world.time + OUTPOST_CHECKPOINT_NPC_ASK_GAP
+			post.request_cycle(doer)
+		return AMBIENT_STEP_CONTINUE
+	// Outside: by the outer door until it is open for them, then in
+	if(here != outer_turf && get_dist(here, post.lobby_turf) > 1)
+		go_to(post.lobby_turf, 1)
+		return AMBIENT_STEP_MOVE
+	var/outer_open = !post.outer_door.density && !post.outer_door.operating
+	if(here == outer_turf || (outer_open && post.state == CHECKPOINT_IDLE))
+		var/turf/entry = chamber_entry(post)
+		if(entry)
+			go_to(entry)
+			return AMBIENT_STEP_MOVE
+		return AMBIENT_STEP_CONTINUE
+	if(post.state == CHECKPOINT_IDLE && !outer_open && post.inner_door.density && !post.outer_door.operating && !post.inner_door.operating && world.time >= next_ask_at)
+		next_ask_at = world.time + OUTPOST_CHECKPOINT_NPC_ASK_GAP
+		post.request_outer(doer)
+	return AMBIENT_STEP_CONTINUE
+
+/// A free chamber tile to step into, the one nearest the inner door first; null if the chamber is full
+/datum/ambient_activity/cross_checkpoint/proc/chamber_entry(datum/outpost_checkpoint/post)
+	var/turf/inner_turf = get_turf(post.inner_door)
+	var/turf/best
+	var/best_distance = INFINITY
+	for(var/turf/tile as anything in post.chamber_turfs)
+		if(tile != doer.loc && tile.is_blocked_turf(exclude_mobs = FALSE, source_atom = doer))
+			continue
+		var/distance = get_dist(tile, inner_turf)
+		if(distance < best_distance)
+			best = tile
+			best_distance = distance
+	return best
+
+/// The free concourse tile just past the inner door (the one straight ahead if it is free)
+/datum/ambient_activity/cross_checkpoint/proc/concourse_step(datum/outpost_checkpoint/post)
+	var/turf/ahead = post.secured_turf
+	if(!ahead.is_blocked_turf(exclude_mobs = FALSE, source_atom = doer))
+		return ahead
+	for(var/turf/beside as anything in RANGE_TURFS(1, ahead))
+		if(beside != ahead && post.outpost?.is_secured_turf(beside) && !beside.is_blocked_turf(exclude_mobs = FALSE, source_atom = doer))
+			return beside
+	return ahead
+
+/// They could not get through: back down the lift from the lobby, or gone from inside the chamber
+/datum/ambient_activity/cross_checkpoint/proc/give_up(datum/outpost_checkpoint/post)
+	// Starting the next activity ends this one, so hold on to them
+	var/mob/living/basic/ambient_npc/walker = doer
+	var/turf/here = get_turf(walker)
+	if(!QDELETED(post) && ((here in post.chamber_turfs) || here == get_turf(post.inner_door) || here == get_turf(post.outer_door)))
+		walker.fade_out()
+		return
+	if(!walker.start_activity(new /datum/ambient_activity/leave(walker)) && !QDELETED(walker))
+		walker.fade_out()
+
+// A walk that ended stuck (a door shut in their face) is simply tried again from where they stand
+/datum/ambient_activity/cross_checkpoint/spot_unreachable()
+	spot = null
+	arrived = FALSE
+
+/datum/ambient_activity/cross_checkpoint/shift_times(delay)
+	. = ..()
+	give_up_at = ambient_shifted(give_up_at, delay)
+	next_ask_at = ambient_shifted(next_ask_at, delay)
diff --git a/voidcrew/modules/trade/outpost_missions.dm b/voidcrew/modules/trade/outpost_missions.dm
index c4796a995c8..03bea36fe1f 100644
--- a/voidcrew/modules/trade/outpost_missions.dm
+++ b/voidcrew/modules/trade/outpost_missions.dm
@@ -2,9 +2,7 @@
  * # Outpost Supply Contracts
  *
  * The shop-specific mission loop: each trader outpost posts a couple of
- * supply requests ("bring me X"), and the pay is a FREE ITEM off the shop's
- * own shelves rather than credits. Gives a ship a reason to detour to an
- * outpost even with empty pockets.
+ * supply requests with fixed packages and currency settlements.
  *
  * The player-facing side is the trader NPC's Contracts radial (see
  * trader_npc.dm). Wiring rides the existing mission pipeline end to end:
@@ -13,15 +11,97 @@
  * pad, where the reward item spawns exactly like voucher/item rewards do.
  */
 
-/// How many contracts an outpost keeps posted at once
-#define OUTPOST_SHOP_OFFER_COUNT 4
+/// Exact request types; fish and bear hides are deliberate owner exceptions.
+/proc/is_outpost_procurement_type(item_type)
+	var/static/list/eligible_types = list(
+		/obj/item/fish,
+		/obj/item/stack/sheet/animalhide/bear,
+		/obj/item/stack/sheet/animalhide/goliath_hide,
+		/obj/item/stack/sheet/sinew,
+		/obj/item/stack/spice_pods,
+		/obj/item/sea_crystal,
+		/obj/item/stack/telecrystal_raw,
+		/obj/item/organ/monster_core/regenerative_core/legion,
+		/obj/item/stack/glacial_core,
+		// Salvaged suit goods; module matching stays exact at handover.
+		/obj/item/mod/construction/broken_core,
+		/obj/item/mod/control/pre_equipped,
+		/obj/item/mod/module/springlock,
+		/obj/item/mod/module/visor/rave,
+		/obj/item/mod/module/balloon,
+		/obj/item/mod/module/stamp,
+	)
+	return item_type in eligible_types
+
+/**
+ * A monster core that has rotted. Core buyers want one that is still fresh or
+ * was stabilized in time. Always check the very object being handed over, at
+ * hand-over, since a core can rot while it sits on a pad.
+ */
+/proc/is_dead_monster_core(obj/item/item)
+	if(!istype(item, /obj/item/organ/monster_core))
+		return FALSE
+	var/obj/item/organ/monster_core/core = item
+	return core.inert
+
+/// Fail closed on unsupported types or incomplete request rows.
+/datum/outpost_shop/proc/get_procurement_requests()
+	var/list/eligible_requests = list()
+	for(var/list/request as anything in mission_requests)
+		if(!islist(request) || !is_outpost_procurement_type(request["type"]))
+			continue
+		if(!istext(request["name"]) || !length(request["name"]))
+			continue
+		var/amount = request["amount"]
+		if(!isnum(amount) || amount < 1 || amount != round(amount))
+			continue
+		if(!(request["difficulty"] in list(MISSION_DIFFICULTY_EASY, MISSION_DIFFICULTY_MEDIUM, MISSION_DIFFICULTY_HARD)))
+			continue
+		if(ispath(request["type"], /obj/item/stack))
+			var/obj/item/stack/stack_type = request["type"]
+			if(amount > initial(stack_type.max_amount))
+				continue
+		eligible_requests += list(request)
+	return eligible_requests
+
+/// Procurement validates the configured ask again when goods are handed over.
+/datum/mission_objective/deliver/procurement
+
+/datum/mission_objective/deliver/procurement/matches_ask(obj/item/item)
+	if(QDELETED(item) || !is_outpost_procurement_type(required_type) || !..())
+		return FALSE
+	if(istype(item, /obj/item/mod/control/pre_equipped))
+		var/obj/item/mod/control/pre_equipped/control = item
+		return isnull(control.wearer)
+	// A loot module's descendants may be manufactured or have different sources.
+	if(istype(item, /obj/item/mod/module))
+		return item.type == required_type
+	return TRUE
+
+/datum/mission_objective/deliver/procurement/can_turn_in(obj/item/item)
+	if(completed || !matches_ask(item))
+		return FALSE
+	// Still the right goods (a near miss for the refusal), but no good to anyone.
+	if(is_dead_monster_core(item))
+		return FALSE
+	return ..()
+
+/datum/mission_objective/deliver/procurement/describe_turn_in_failure(obj/item/item)
+	if(is_dead_monster_core(item) && matches_ask(item))
+		return "That core's gone dead."
+	return ..()
+
+/datum/mission_objective/deliver/procurement/accept_item(obj/item/item, atom/reward_anchor)
+	if(!can_turn_in(item))
+		return MISSION_ITEM_REFUSED
+	// The parent forgets the quest atom before consuming stacks or loose goods.
+	return ..()
 
 /**
  * # Outpost Supply Mission
  *
  * Delivery-style: haul the asked goods to your ship's mission pad or any
- * trader. Pays no credits. The reward is one free item rolled off the
- * posting shop's SKU list at creation time.
+ * trader. The package and currency quote are fixed at posting.
  */
 /datum/mission/outpost_supply
 	name = "Supply Request"
@@ -34,6 +114,9 @@
 	var/required_type
 	var/required_name
 	var/required_amount = 1
+	/// Optional fixed target band for recovered suit goods.
+	var/request_pay_min
+	var/request_pay_max
 
 /datum/mission/outpost_supply/get_archetype()
 	return "procurement"
@@ -48,27 +131,33 @@
 	if(generation_failed)
 		return
 
-	// The pay: kit off the shelf, assembled to the difficulty band and floored
-	// by what the ask itself fetches at this trader's own buyback window. A
-	// contract for five glacial cores has to beat carrying those same cores
-	// twenty steps to the counter, or there is no reason to take it.
-	voucher_count = 0
-	if(!shop.roll_contract_reward(src, shop.get_counter_value(required_type, required_amount)))
+	var/datum/outpost_shop/reward_shop = contract_reward_shop || shop
+	var/ask_value = reward_shop.get_counter_value(required_type, required_amount)
+	if(ispath(required_type, /obj/item/mod/module))
+		ask_value = 250 * required_amount // Reference only; never a buyback.
+	if(!reward_shop.roll_contract_reward(src, ask_value))
 		generation_failed = TRUE
 
 /// Rolls the ask off the shop's request table. Override for themed asks.
 /datum/mission/outpost_supply/proc/pick_request()
-	var/list/request = length(shop.mission_requests) ? pick(shop.mission_requests) : null
+	var/list/eligible_requests = shop.get_procurement_requests()
+	var/list/request = length(eligible_requests) ? pick(eligible_requests) : null
 	if(!request)
 		generation_failed = TRUE
 		return
 	required_type = request["type"]
 	required_name = request["name"]
-	required_amount = request["amount"] || 1
-	difficulty = request["difficulty"] || MISSION_DIFFICULTY_MEDIUM
+	required_amount = request["amount"]
+	difficulty = request["difficulty"]
+	request_pay_min = request["pay_min"]
+	request_pay_max = request["pay_max"]
+	if(request["reward_shop"])
+		contract_reward_shop = shop.type == request["reward_shop"] ? shop : shop.outpost?.get_shop(request["reward_shop"])
+		if(!contract_reward_shop)
+			generation_failed = TRUE
 
 /datum/mission/outpost_supply/build_objectives()
-	var/datum/mission_objective/deliver/ask = new
+	var/datum/mission_objective/deliver/procurement/ask = new
 	ask.required_type = required_type
 	ask.required_name = required_name
 	ask.required_amount = required_amount
@@ -76,10 +165,8 @@
 
 /datum/mission/outpost_supply/update_text()
 	var/item_text = required_amount > 1 ? "[required_amount] [required_name]" : required_name
-	var/datum/mission_objective/deliver/ask = objectives[1]
 	name = "Supply Request: [item_text]"
-	desc = "[author] is paying in kit: deliver [item_text] to your ship's mission pad or any outpost trader.[ask.get_delivery_instructions()] \
-		Pays [get_contract_pay_summary()], straight off the shelf."
+	desc = "[author] wants [item_text]."
 
 /**
  * # Angler's Request
@@ -88,8 +175,7 @@
  * Bring a rod."
  *
  * A fish-shaped supply request posted only by outposts that actually run a
- * fishing stall (see the shop's extra_offer_mix). Same goods-for-goods deal;
- * trophy asks reach the exclusive shelf like any hard contract.
+ * fishing stall (see the shop's extra_offer_mix).
  */
 /datum/mission/outpost_supply/angler
 	/// Trophy gate in grams (0 = any fish)
@@ -123,8 +209,7 @@
 /datum/mission/outpost_supply/angler/update_text()
 	var/item_text = required_amount > 1 ? "[required_amount] [required_name]" : required_name
 	name = "Angler's Request: [item_text]"
-	desc = "[author] wants [item_text]. Any species is accepted, alive or dead. \
-		Hand in each fish separately at any outpost trader or your own mission pad. Pays [get_contract_pay_summary()], off the shelf."
+	desc = "[author] wants [item_text]."
 
 /**
  * # Kitchen Order
@@ -177,17 +262,8 @@
 
 /datum/mission/outpost_supply/cook/update_text()
 	var/item_text = required_amount > 1 ? "[required_amount] [required_name]" : required_name
-	var/obj/item/food/example_dish = /obj/item/food/pizza/mushroom
-	switch(min_complexity)
-		if(FOOD_COMPLEXITY_3)
-			example_dish = /obj/item/food/pizza/donkpocket
-		if(FOOD_COMPLEXITY_4)
-			example_dish = /obj/item/food/pizza/pineapple
 	name = "Kitchen Order: [item_text]"
-	desc = "[author] at the diner is buying [item_text], cooked or crafted by a player. \
-		Each dish needs recipe complexity [min_complexity] or higher; a player-made [initial(example_dish.name)] qualifies. \
-		Factory food and meals bought from the outpost diner do not qualify. \
-		Hand in each dish separately at any outpost trader or your own mission pad. Pays [get_contract_pay_summary()], off the shelf."
+	desc = "[author] at the diner wants [item_text]."
 
 // ===== OFFER MANAGEMENT (lives on the outpost) =====
 
@@ -198,32 +274,42 @@
  * folded in. Discards failed rolls (e.g. courier with no second outpost).
  */
 /obj/structure/overmap/trader_outpost/proc/ensure_shop_offers()
-	if(!shop)
+	if(!shop || !SSovermap_zones.initialized || world.time < next_contract_refill)
 		return
+	// Keep the original cadence if a visit beats a delayed timer callback.
+	if(!next_contract_refill)
+		next_contract_refill = world.time + OUTPOST_CONTRACT_REFILL_INTERVAL
+	else
+		next_contract_refill += (floor((world.time - next_contract_refill) / OUTPOST_CONTRACT_REFILL_INTERVAL) + 1) * OUTPOST_CONTRACT_REFILL_INTERVAL
 	var/static/list/offer_mix = list(
 		/datum/mission/outpost_supply = 40,
 		/datum/mission/recovery/kill/outpost = 25,
 		/datum/mission/recovery/outpost = 20,
 		/datum/mission/outpost_courier = 15,
 	)
-	var/list/mix = offer_mix
+	var/list/mix = offer_mix.Copy()
 	if(length(shop.extra_offer_mix))
-		mix = offer_mix.Copy()
 		for(var/offer_type in shop.extra_offer_mix)
 			mix[offer_type] = shop.extra_offer_mix[offer_type]
+	var/has_procurement = length(shop.get_procurement_requests()) > 0
+	if(!has_procurement)
+		mix -= /datum/mission/outpost_supply
 	// Prune offers that died on the board (e.g. their pinned target vanished
 	// before anyone accepted) so they don't hold a slot or count against caps
 	for(var/datum/mission/posted as anything in shop_offers.Copy())
 		if(QDELETED(posted))
 			shop_offers -= posted
+		else if(posted.failed || posted.completed || world.time - posted.posted_at >= OUTPOST_CONTRACT_EXPIRY)
+			shop_offers -= posted
+			tally_mission_offer(posted, null, "contract_offer_expired")
+			qdel(posted)
 	var/safety = 12
 	while(length(shop_offers) < OUTPOST_SHOP_OFFER_COUNT && safety-- > 0)
-		// Always keep at least one plain supply request on the board
+		// Keep a plain supply request on the board only when its pool is eligible.
 		var/offer_type = /datum/mission/outpost_supply
-		if(has_posted_offer_type(/datum/mission/outpost_supply))
+		if(!has_procurement || has_posted_offer_type(/datum/mission/outpost_supply))
 			offer_type = pick_weight(mix)
-		// Capped types (drug runs) count live missions AND posted offers; the
-		// ship-board roll enforces this in SSmissions, boards must match
+		// Only running work holds capacity; acceptance rechecks the shared cap.
 		if(!mission_type_within_limit(offer_type))
 			continue
 		var/datum/mission/offer = new offer_type(shop)
@@ -242,9 +328,8 @@
 
 /**
  * Whether another mission of this type may exist right now, per its
- * mission_limit: counts live accepted missions plus every outpost board's
- * unaccepted offers, so a capped contract can't be double-posted (or posted
- * while one is already being run). Limit 0 = uncapped.
+ * mission_limit: only accepted, running work holds global capacity.
+ * Unaccepted offers remain available to other crews. Limit 0 = uncapped.
  * * excluding - a mission datum that shouldn't count against itself, so the
  *   accept-time check can be run on an offer that is still sitting on a board.
  */
@@ -254,13 +339,221 @@
 	if(limit <= 0)
 		return TRUE
 	var/count = 0
-	for(var/datum/mission/active as anything in SSmissions.all_active_missions)
-		if(active.type == mission_type && active != excluding)
+	for(var/datum/mission/active in SSmissions.all_active_missions)
+		if(!QDELETED(active) && active.active && !active.failed && !active.completed && active.type == mission_type && active != excluding)
 			count++
-	for(var/obj/structure/overmap/trader_outpost/outpost as anything in GLOB.trader_outposts)
-		for(var/datum/mission/offer as anything in outpost.shop_offers)
-			if(!QDELETED(offer) && offer.type == mission_type && offer != excluding)
-				count++
 	return count < limit
 
-#undef OUTPOST_SHOP_OFFER_COUNT
+/// Both boards use the ship's admission path; keep its capacity refusal in character.
+/obj/structure/overmap/ship/accept_mission(datum/mission/mission)
+	if(mission && !mission_type_within_limit(mission.type, mission))
+		return "That contract is already taken."
+	return ..()
+
+
+// ===== BOARD QUOTES AND SETTLEMENT =====
+// Shared shell hooks live here so both trader and ship-pad handovers use them.
+
+/// Filter a view without deleting offers that another crew can still accept.
+/obj/structure/overmap/trader_outpost/proc/get_contract_offers_for(obj/structure/overmap/ship/ship)
+	var/list/offers = list()
+	if(QDELETED(ship))
+		return offers
+	for(var/datum/mission/offer in shop_offers)
+		if(offer.can_accept_work(ship))
+			offers += offer
+	return offers
+
+/datum/mission
+	/// Total value, fixed at posting; null on work outside this reward channel.
+	var/contract_quote
+	var/contract_no_vouchers = FALSE
+	/// May be the fitter while shop remains the outfitter that receives favor.
+	var/datum/outpost_shop/contract_reward_shop
+	/// Quoted item path -> live core SKU and its fixed value.
+	var/list/contract_stock
+	var/list/contract_item_values
+	var/contract_stock_reserved = FALSE
+	var/contract_settled = FALSE
+	var/contract_turning_in = FALSE
+	/// Shared crew purchase slots held by this package, keyed by quoted item path.
+	var/list/contract_purchase_claims = list()
+
+/datum/mission/proc/is_routine_contract()
+	if(!istype(src, /datum/mission/outpost_supply))
+		return FALSE
+	var/datum/mission/outpost_supply/supply = src
+	return istype(src, /datum/mission/outpost_supply/cook) || istype(src, /datum/mission/outpost_supply/angler) \
+		|| supply.required_type == /obj/item/fish || supply.required_type == /obj/item/stack/sheet/animalhide/bear
+
+/// Set both bounds: the shell rolls value after generate_details().
+/datum/mission/proc/set_contract_currency(remainder)
+	voucher_count = contract_no_vouchers ? 0 : floor(remainder / VOUCHER_CREDIT_VALUE)
+	value = remainder - voucher_count * VOUCHER_CREDIT_VALUE
+	value_min = value
+	value_max = value
+
+/// Admission and caps use the same record as the accepted receipt, never a helper's crew.
+/datum/mission/proc/contract_line_allowed(datum/shop_sku/sku, datum/voidcrew_crew_record/record, reserved = FALSE)
+	if(QDELETED(record))
+		record = null
+	if(QDELETED(sku) || (!reserved && sku.stock <= 0))
+		return FALSE
+	if(!isnum(sku.zone_permission) || sku.zone_permission < ZONE_PERMISSION_PUBLIC \
+		|| (record ? !record.has_zone_permission(sku.zone_permission) : sku.zone_permission != ZONE_PERMISSION_PUBLIC))
+		return FALSE
+	if(!reserved && sku.crew_limit > 0 && (!record || (record.favor_unique_purchases[sku.type] || 0) >= sku.crew_limit))
+		return FALSE
+	return TRUE
+
+/// Pure viewer projection: it cannot reserve stock or rewrite the shared quote.
+/datum/mission/proc/get_effective_contract_package(datum/voidcrew_crew_record/record)
+	if(isnull(contract_quote))
+		return null
+	var/list/items = list()
+	var/package_value = 0
+	for(var/item_path in contract_stock)
+		var/datum/shop_sku/sku = contract_stock[item_path]
+		if(!contract_line_allowed(sku, record, contract_stock_reserved))
+			continue
+		items += item_path
+		package_value += contract_item_values[item_path]
+	var/remainder = contract_quote - package_value
+	var/vouchers = contract_no_vouchers ? 0 : floor(remainder / VOUCHER_CREDIT_VALUE)
+	return list("items" = items, "item_value" = package_value, "vouchers" = vouchers, "credits" = remainder - vouchers * VOUCHER_CREDIT_VALUE)
+
+/// Return one held line and its purchase slot to the original crew.
+/datum/mission/proc/drop_contract_line(item_path)
+	var/datum/shop_sku/sku = contract_stock[item_path]
+	if(contract_stock_reserved && !QDELETED(sku))
+		sku.reserved_stock--
+		sku.stock++
+	var/purchase_type = contract_purchase_claims[item_path]
+	if(purchase_type)
+		accepting_crew?.release_purchase(purchase_type)
+		contract_purchase_claims -= item_path
+	contract_stock -= item_path
+	mission_rewards -= item_path
+	reward_amounts -= item_path
+
+/// Live permission loss converts held goods to their exact quoted currency value.
+/datum/mission/proc/revalidate_contract_package()
+	if(isnull(contract_quote) || !contract_stock_reserved || contract_settled)
+		return
+	var/package_value = 0
+	for(var/item_path in contract_stock.Copy())
+		if(!contract_line_allowed(contract_stock[item_path], accepting_crew, TRUE))
+			drop_contract_line(item_path)
+			continue
+		package_value += contract_item_values[item_path]
+	metric_item_value = package_value
+	set_contract_currency(contract_quote - package_value)
+
+/// No yields between checking and claiming stock. Lost shelf objects become currency.
+/datum/mission/proc/reserve_contract_stock()
+	if(isnull(contract_quote) || contract_stock_reserved || contract_settled)
+		return
+	contract_stock_reserved = TRUE
+	var/package_value = 0
+	for(var/item_path in contract_stock.Copy())
+		var/datum/shop_sku/sku = contract_stock[item_path]
+		if(!contract_line_allowed(sku, accepting_crew))
+			contract_stock -= item_path
+			mission_rewards -= item_path
+			reward_amounts -= item_path
+			continue
+		if(sku.crew_limit > 0)
+			if(!accepting_crew.claim_purchase(sku.type, sku.crew_limit))
+				contract_stock -= item_path
+				mission_rewards -= item_path
+				reward_amounts -= item_path
+				continue
+			contract_purchase_claims[item_path] = sku.type
+		sku.stock--
+		sku.reserved_stock++
+		package_value += contract_item_values[item_path]
+	metric_item_value = package_value
+	set_contract_currency(contract_quote - package_value)
+
+/// Completion consumes the hold; every other deletion releases it, once.
+/datum/mission/proc/release_contract_stock(consumed = FALSE)
+	if(!contract_stock_reserved)
+		return
+	contract_stock_reserved = FALSE
+	if(!consumed)
+		for(var/item_path in contract_purchase_claims)
+			accepting_crew?.release_purchase(contract_purchase_claims[item_path])
+	contract_purchase_claims.Cut()
+	for(var/item_path in contract_stock)
+		var/datum/shop_sku/sku = contract_stock[item_path]
+		if(QDELETED(sku))
+			continue
+		sku.reserved_stock--
+		if(!consumed)
+			sku.stock++
+
+/datum/mission/start_mission(obj/structure/overmap/ship/ship)
+	if(shop || !isnull(contract_quote))
+		if(QDELETED(src) || active || failed || completed || QDELETED(ship) || QDELETED(ship.ship_account))
+			return FALSE
+		if(!can_accept_work(ship))
+			return FALSE
+		accepting_crew = ship.get_crew_record()
+		reserve_contract_stock()
+	. = ..()
+	if(!. && !QDELETED(src))
+		release_contract_stock()
+
+/datum/mission/turn_in(atom/reward_anchor, obj/item/turned_in_item, force = FALSE)
+	if(shop || !isnull(contract_quote))
+		if(QDELETED(src) || !active || failed || completed || contract_turning_in || QDELETED(servant) || QDELETED(servant.ship_account))
+			return FALSE
+		if(!get_turf(reward_anchor) || !can_turn_in_at(reward_anchor))
+			return FALSE
+		contract_turning_in = TRUE
+	. = ..()
+	contract_turning_in = FALSE
+
+/datum/mission/distribute_rewards(atom/reward_anchor)
+	if(!isnull(contract_quote))
+		if(contract_settled)
+			return
+		revalidate_contract_package()
+		contract_settled = TRUE
+		release_contract_stock(consumed = TRUE)
+	return ..()
+
+/datum/mission/Destroy()
+	shop?.outpost?.shop_offers -= src
+	release_contract_stock()
+	contract_reward_shop = null
+	contract_stock = null
+	contract_item_values = null
+	contract_purchase_claims = null
+	return ..()
+
+/datum/mission/get_contract_pay_summary()
+	var/list/parts = list()
+	if(length(get_reward_types()))
+		parts += get_reward_summary()
+	if(voucher_count > 0)
+		parts += "[voucher_count] trade voucher[voucher_count > 1 ? "s" : ""]"
+	if(value > 0)
+		parts += "[value] cr"
+	return parts.Join(" + ")
+
+/// The fixed package may come from the fitter rather than the posting counter.
+/datum/mission/note_metric_item_value()
+	if(!isnull(contract_quote))
+		return // roll_contract_reward and acceptance track the actual reserved package.
+	return ..()
+
+/datum/mission/finish_mission(atom/reward_anchor)
+	if((shop || !isnull(contract_quote)) && (QDELETED(src) || !active || failed || completed || QDELETED(servant) || QDELETED(servant.ship_account) || !get_turf(reward_anchor)))
+		return
+	return ..()
+
+/datum/mission/get_reward_summary()
+	if(shop && !length(get_reward_types()))
+		return ""
+	return ..()
diff --git a/voidcrew/modules/trade/outpost_quests.dm b/voidcrew/modules/trade/outpost_quests.dm
index e4c6a94708f..aaf81c7e9fc 100644
--- a/voidcrew/modules/trade/outpost_quests.dm
+++ b/voidcrew/modules/trade/outpost_quests.dm
@@ -11,7 +11,7 @@
  * - Courier Run: haul a sealed freight pod to ANOTHER outpost; the pod
  *   only unloads at its destination trader (piracy bait by design)
  *
- * Hard contracts can roll the shop's exclusive_rewards. Items no shelf sells.
+ * Packages and currency are quoted when posted.
  */
 
 // ===== SALVAGE ORDER (outpost-authored recovery) =====
@@ -19,7 +19,7 @@
 /datum/mission/recovery/outpost
 	weight = 0 // board-posted only
 	mission_limit = 0
-	contract_pay_mult = 1.25 // a run out to a ruin and back
+	contract_pay_mult = 1.15
 
 /datum/mission/recovery/outpost/generate_details()
 	if(!shop)
@@ -27,7 +27,7 @@
 		return
 	author = shop.trader_name
 	..()
-	// Board contracts pay in goods, not money. The open market covers credits/vouchers
+	// Replace the console reward with the fixed board quote.
 	value = 0
 	value_min = 0
 	value_max = 0
@@ -36,12 +36,8 @@
 		generation_failed = TRUE
 
 /datum/mission/recovery/outpost/update_text()
-	var/reward_name = get_contract_pay_summary()
 	name = "Salvage Order: [objective_name]"
-	desc = "[author] of [shop?.outpost_name || "the outpost"] is paying for the [objective_name] out at ([target.target_x], [target.target_y]) in the [target_zone_name]. \
-		Deliver it to any outpost trader or your own mission pad. \
-		Pays in kit, [reward_name], no credits changing hands. \
-		Tap a GPS unit on a mission board to receive the objective's beacon ([gps_tag])."
+	desc = "[author] wants [objective_name] from ([target.target_x], [target.target_y]) in the [target_zone_name]."
 
 /datum/mission/recovery/outpost/get_archetype()
 	return "salvage"
@@ -51,7 +47,7 @@
 /datum/mission/recovery/kill/outpost
 	weight = 0
 	mission_limit = 0
-	contract_pay_mult = 1.5 // find a named boss at a hostile site and put it down
+	contract_pay_mult = 1.10
 
 /datum/mission/recovery/kill/outpost/generate_details()
 	if(!shop)
@@ -59,21 +55,24 @@
 		return
 	author = shop.trader_name
 	..()
-	// Board contracts pay in goods, not money. The open market covers credits/vouchers
+	// Replace the console reward with the fixed board quote.
 	value = 0
 	value_min = 0
 	value_max = 0
 	voucher_count = 0
+	switch(difficulty)
+		if(MISSION_DIFFICULTY_HARD)
+			contract_pay_mult = 0.55
+		if(MISSION_DIFFICULTY_MEDIUM)
+			contract_pay_mult = 0.95
+		else
+			contract_pay_mult = 1.10
 	if(!shop.roll_contract_reward(src))
 		generation_failed = TRUE
 
 /datum/mission/recovery/kill/outpost/update_text()
-	var/reward_name = get_contract_pay_summary()
 	name = "Kill Contract: [objective_name]"
-	desc = "[author] of [shop?.outpost_name || "the outpost"] wants [objective_name] gone, holed up at ([target.target_x], [target.target_y]) in the [target_zone_name]. \
-		Bring the identification tag to any outpost trader or your own mission pad. \
-		Pays in goods, [reward_name], settled on delivery. \
-		Tap a GPS unit on a mission board for the target's transponder ([gps_tag])."
+	desc = "[author] wants [objective_name] dead. Last seen at ([target.target_x], [target.target_y]) in the [target_zone_name]."
 
 /datum/mission/recovery/kill/outpost/get_archetype()
 	return "bounty"
@@ -86,7 +85,7 @@
 	duration = 35 MINUTES
 	value_min = 0
 	value_max = 0
-	contract_pay_mult = 1.3 // a long haul across the lanes, and pirates know the pod
+	contract_pay_mult = 1.10
 	quest_lost_policy = MISSION_QUEST_LOST_FAIL // pod destroyed = contract void
 
 	/// The pod-delivery objective (holds the live pod)
@@ -112,7 +111,7 @@
 
 /datum/mission/outpost_courier/generate_details()
 	author = shop.trader_name
-	// Board contracts pay in goods, not money
+	// Quote the fixed board package and currency.
 	voucher_count = 0
 	if(!shop.roll_contract_reward(src))
 		generation_failed = TRUE
@@ -127,13 +126,9 @@
 	return istype(destination) ? destination.outpost : null
 
 /datum/mission/outpost_courier/update_text()
-	var/reward_name = get_contract_pay_summary()
 	var/obj/structure/overmap/trader_outpost/destination = get_destination()
 	name = "Courier Run: [destination?.name || "lost destination"]"
-	desc = "[author] needs a sealed freight pod hauled to [destination?.name || "its destination"] at ([target.target_x], [target.target_y]) in the [target_zone_name]. \
-		Collect the pod beside [author] when you accept. \
-		The pod's seals only release at the destination's trader, and every pirate on the lane knows what a courier pod looks like. \
-		Pays in kit on delivery: [reward_name]."
+	desc = "Freight for [destination?.name || "its destination"] at ([target.target_x], [target.target_y]) in the [target_zone_name]."
 
 /datum/mission/outpost_courier/waypoint_label()
 	var/obj/structure/overmap/trader_outpost/destination = get_destination()
@@ -164,11 +159,11 @@
 	if(!istype(reward_anchor, /mob/living/basic/outpost_trader))
 		return FALSE
 	var/mob/living/basic/outpost_trader/npc = reward_anchor
-	return npc.outpost == get_destination()
+	return npc.outpost == get_destination() && npc.outpost?.contains_site_turf(get_turf(npc))
 
 /datum/mission/outpost_courier/get_wrong_location_reason(atom/reward_anchor)
 	var/obj/structure/overmap/trader_outpost/destination = get_destination()
-	return "The pod's seals only release at [destination?.name || "its destination"]'s trader."
+	return "Shipment for [destination?.name || "its destination"]."
 
 /**
  * # Courier Pod Objective
@@ -214,7 +209,7 @@
 	if(!pod)
 		return "Pod waiting with the posting trader"
 	var/datum/mission_target/target = mission?.target
-	return "Deliver the pod to its destination ([target?.target_x], [target?.target_y])"
+	return "Freight for ([target?.target_x], [target?.target_y])"
 
 /**
  * # Sealed Freight Pod
@@ -224,7 +219,7 @@
  */
 /obj/item/freight_pod
 	name = "sealed freight pod"
-	desc = "A tamper-sealed courier pod, bonded and manifest-locked. The seals only release at its destination outpost's contract board."
+	desc = "A tamper-sealed courier pod with a bonded manifest."
 	icon = 'voidcrew/modules/trade/icons/trade.dmi'
 	icon_state = "freight_pod"
 	inhand_icon_state = "freight_pod"
@@ -242,6 +237,6 @@
 	var/datum/mission/outpost_courier/mission = mission_ref?.resolve()
 	if(istype(mission) && !mission.failed && !mission.completed)
 		var/obj/structure/overmap/trader_outpost/destination = mission.get_destination()
-		. += span_notice("The manifest reads: deliver to <b>[destination?.name || "unknown"]</b>. Whoever hands it over gets paid.")
+		. += span_notice("The manifest reads: deliver to <b>[destination?.name || "unknown"]</b>.")
 	else
 		. += span_warning("Its contract has lapsed; the seals will never release.")
diff --git a/voidcrew/modules/trade/outpost_security.dm b/voidcrew/modules/trade/outpost_security.dm
index fb00e560829..9b89bbd6146 100644
--- a/voidcrew/modules/trade/outpost_security.dm
+++ b/voidcrew/modules/trade/outpost_security.dm
@@ -71,6 +71,7 @@ GLOBAL_DATUM_INIT(outpost_pvp_enforcement, /datum/outpost_pvp_enforcement, new)
 	RegisterSignal(living_mob, COMSIG_ATOM_PREHITBY, PROC_REF(on_outpost_pvp_thrown_item))
 	RegisterSignal(living_mob, COMSIG_ATOM_HULK_ATTACK, PROC_REF(on_outpost_pvp_hulk_attack))
 	RegisterSignal(living_mob, COMSIG_ATOM_ATTACK_MECH, PROC_REF(on_outpost_pvp_mech_attack))
+	RegisterSignal(living_mob, COMSIG_MOB_FIRED_GUN, PROC_REF(on_outpost_gun_fired))
 
 /**
  * Checks personal self-defense before applying strikes and embargoes. Both
@@ -120,6 +121,17 @@ GLOBAL_DATUM_INIT(outpost_pvp_enforcement, /datum/outpost_pvp_enforcement, new)
 	SIGNAL_HANDLER
 	register_pvp_aggression(victim, pilot)
 
+/// Firing a gun past a trader outpost's checkpoint without a permit marks the shooter as an armed trespasser (outpost_trespass.dm)
+/datum/outpost_pvp_enforcement/proc/on_outpost_gun_fired(mob/living/shooter, obj/item/gun/gun, atom/target)
+	SIGNAL_HANDLER
+	if(!outpost_checkpoint_weapon(gun))
+		return
+	var/turf/where = get_turf(shooter)
+	var/obj/structure/overmap/trader_outpost/outpost = get_trader_outpost_for_turf(where)
+	if(!outpost?.is_secured_turf(where) || !shooter.mind || outpost.has_weapons_permit(shooter, OUTPOST_WEAPONS_PERMIT_GRACE))
+		return
+	outpost.flag_trespasser(shooter)
+
 /obj/machinery/porta_turret/outpost
 	name = "outpost defense turret"
 	desc = "An over-engineered defense turret bearing a polite brass plaque: 'Violence is bad for business.'"
@@ -451,6 +463,9 @@ GLOBAL_DATUM_INIT(outpost_pvp_enforcement, /datum/outpost_pvp_enforcement, new)
 
 /datum/element/outpost_property/proc/block_tool(obj/source, mob/living/user, obj/item/tool)
 	SIGNAL_HANDLER
+	// A checkpoint's inner door can be forced (outpost_checkpoint.dm)
+	if(tool?.tool_behaviour == TOOL_CROWBAR && source.outpost_forceable())
+		return NONE
 	source.balloon_alert(user, "outpost property!")
 	return ITEM_INTERACT_BLOCKING
 
diff --git a/voidcrew/modules/trade/outpost_trespass.dm b/voidcrew/modules/trade/outpost_trespass.dm
new file mode 100644
index 00000000000..9074fbc0acd
--- /dev/null
+++ b/voidcrew/modules/trade/outpost_trespass.dm
@@ -0,0 +1,320 @@
+/**
+ * # Armed trespass at trader outposts
+ *
+ * Past a trader outpost's checkpoint (outpost_checkpoint.dm), a weapon is only carried openly with a
+ * weapons permit bought from the checkpoint guard. Anyone else is an armed trespasser when they are:
+ * - seen with a gun drawn (held in hand for OUTPOST_ARMED_SIGHTING_GRACE on the outpost's sweep),
+ * - heard firing one, or
+ * - caught going through a forced checkpoint door.
+ * A gun kept holstered or smuggled in a bag is not noticed until it comes out.
+ *
+ * An armed trespasser is personal (by mind, never their crew): the outpost's turrets treat them as
+ * hostile until OUTPOST_TRESPASS_HOSTILE_DURATION after they were last seen armed inside, and every
+ * trader, the permit desk and the checkpoint refuse them until OUTPOST_TRESPASS_BAR_DURATION after
+ * it. Attacks still go through the ordinary aggression rules (outpost.dm).
+ *
+ * Goods bought or paid out past the checkpoint come sealed when they hold a gun, so nobody is
+ * flagged for carrying home what they just bought.
+ */
+
+/obj/structure/overmap/trader_outpost
+	/// The interior's scan chambers (outpost_checkpoint.dm), keyed by checkpoint_id
+	var/list/datum/outpost_checkpoint/checkpoints = list()
+	/// Weapons permits: mind -> world.time it runs out
+	var/list/weapon_permits = list()
+	/// Permit holders already told their permit ran out: mind -> TRUE
+	var/list/permit_lapse_told = list()
+	/// Armed trespassers: mind -> world.time they were last seen armed past the checkpoint
+	var/list/armed_trespassers = list()
+	/// Refused service after armed trespass: mind -> world.time the bar lifts
+	var/list/trespass_bars = list()
+	/// Someone currently holding a gun past the checkpoint: mind -> world.time first seen doing it
+	var/list/armed_sightings = list()
+	/// Looping timer for armed_sweep()
+	var/armed_sweep_timer
+	/// The tile the public network pad goes on, if the map marks one (outpost_network.dm)
+	var/turf/network_pad_spot
+
+/// Called from the outpost's Destroy()
+/obj/structure/overmap/trader_outpost/proc/clear_checkpoint_state()
+	if(armed_sweep_timer)
+		deltimer(armed_sweep_timer)
+		armed_sweep_timer = null
+	QDEL_LIST_ASSOC_VAL(checkpoints)
+	weapon_permits.Cut()
+	permit_lapse_told.Cut()
+	armed_trespassers.Cut()
+	trespass_bars.Cut()
+	armed_sightings.Cut()
+	network_pad_spot = null
+
+/**
+ * Builds a scan chamber for every checkpoint_id found in the interior. `doors`, `markers` (chamber
+ * tiles) and `sensors` (wall scanners) hold only this concourse's parts, so ids never reach across
+ * outposts.
+ */
+/obj/structure/overmap/trader_outpost/proc/build_checkpoints(list/doors, list/markers, list/sensors)
+	var/list/doors_by_id = list()
+	var/list/markers_by_id = list()
+	var/list/sensors_by_id = list()
+	for(var/obj/machinery/door/airlock/outpost/checkpoint/door as anything in doors)
+		if(door.checkpoint_id)
+			LAZYADD(doors_by_id[door.checkpoint_id], door)
+	for(var/obj/effect/landmark/outpost_checkpoint_chamber/marker as anything in markers)
+		if(marker.checkpoint_id)
+			LAZYADD(markers_by_id[marker.checkpoint_id], marker)
+	for(var/obj/machinery/outpost_checkpoint_sensor/sensor as anything in sensors)
+		if(sensor.checkpoint_id)
+			LAZYADD(sensors_by_id[sensor.checkpoint_id], sensor)
+	for(var/checkpoint_id in doors_by_id)
+		if(checkpoints[checkpoint_id])
+			continue
+		var/datum/outpost_checkpoint/checkpoint = new(src, checkpoint_id)
+		if(!checkpoint.assemble(doors_by_id[checkpoint_id], markers_by_id[checkpoint_id], sensors_by_id[checkpoint_id]))
+			qdel(checkpoint)
+			continue
+		checkpoints[checkpoint_id] = checkpoint
+	for(var/mob/living/basic/outpost_trader/checkpoint_guard/guard in traders)
+		var/datum/outpost_checkpoint/post = checkpoints[guard.checkpoint_id]
+		if(post)
+			post.guard = guard
+			guard.checkpoint = post
+
+/// Whether `place` is past this outpost's checkpoint: its concourse, but not the checkpoint lobby, a scan chamber or the hangars
+/obj/structure/overmap/trader_outpost/proc/is_secured_turf(turf/place)
+	if(!place || !template_bottom_left || !outpost_template)
+		return FALSE
+	if(place.z != template_bottom_left.z || place.x < template_bottom_left.x || place.y < template_bottom_left.y)
+		return FALSE
+	if(place.x >= template_bottom_left.x + outpost_template.width || place.y >= template_bottom_left.y + outpost_template.height)
+		return FALSE
+	var/area/place_area = place.loc
+	return istype(place_area, /area/voidcrew/trader_outpost) && !istype(place_area, /area/voidcrew/trader_outpost/checkpoint)
+
+// ===== PERMITS =====
+
+/// Whether `holder` carries arms here legally, allowing `grace` past the permit's end
+/obj/structure/overmap/trader_outpost/proc/has_weapons_permit(mob/living/holder, grace = 0)
+	var/datum/mind/holder_mind = holder?.mind
+	if(!holder_mind)
+		return FALSE
+	var/runs_out = weapon_permits[holder_mind]
+	return runs_out && world.time < runs_out + grace
+
+/// Issues (or renews) `buyer`'s permit here. Returns the world.time it runs out, or null.
+/obj/structure/overmap/trader_outpost/proc/grant_weapons_permit(mob/living/buyer)
+	if(!buyer?.mind)
+		return null
+	weapon_permits[buyer.mind] = world.time + OUTPOST_WEAPONS_PERMIT_DURATION
+	permit_lapse_told -= buyer.mind
+	log_game("OUTPOST PERMIT: [key_name(buyer)] bought a weapons permit at [name].")
+	return weapon_permits[buyer.mind]
+
+// ===== TRESPASS =====
+
+/// Whether the turrets treat `offender_mind` as hostile for armed trespass
+/obj/structure/overmap/trader_outpost/proc/is_armed_trespasser(datum/mind/offender_mind)
+	var/last_seen = offender_mind && armed_trespassers[offender_mind]
+	return last_seen && world.time < last_seen + OUTPOST_TRESPASS_HOSTILE_DURATION
+
+/// Whether `offender_mind` is still refused service for armed trespass
+/obj/structure/overmap/trader_outpost/proc/is_trespass_barred(datum/mind/offender_mind)
+	var/lifts_at = offender_mind && trespass_bars[offender_mind]
+	if(!lifts_at)
+		return FALSE
+	if(world.time >= lifts_at)
+		trespass_bars -= offender_mind
+		armed_trespassers -= offender_mind
+		return FALSE
+	return TRUE
+
+/**
+ * `offender` was seen armed past the checkpoint without a permit (or came through a forced door).
+ * Starts or extends both clocks and voids any permit. Returns TRUE if they were not already hostile.
+ * Never sleeps: it runs from signal handlers.
+ */
+/obj/structure/overmap/trader_outpost/proc/flag_trespasser(mob/living/offender)
+	var/datum/mind/offender_mind = offender?.mind
+	if(!offender_mind)
+		return FALSE
+	var/newly_hostile = !is_armed_trespasser(offender_mind)
+	armed_trespassers[offender_mind] = world.time
+	trespass_bars[offender_mind] = max(trespass_bars[offender_mind], world.time + OUTPOST_TRESPASS_BAR_DURATION)
+	weapon_permits -= offender_mind
+	permit_lapse_told -= offender_mind
+	armed_sightings -= offender_mind
+	if(newly_hostile)
+		log_game("OUTPOST TRESPASS: [key_name(offender)] was marked as an armed trespasser at [name] ([AREACOORD(offender)]).")
+		to_chat(offender, span_userdanger("The outpost's turrets turn toward you."))
+	return newly_hostile
+
+/// Whether `visitor` has a weapon out: in hand, or mounted on the mech they sit in
+/proc/outpost_weapon_drawn(mob/living/visitor)
+	for(var/obj/item/held in visitor.held_items)
+		if(outpost_checkpoint_weapon(held))
+			return TRUE
+	if(istype(visitor.loc, /obj/vehicle/sealed/mecha))
+		var/obj/vehicle/sealed/mecha/mech = visitor.loc
+		for(var/obj/item/mecha_parts/mecha_equipment/equipment as anything in mech.flat_equipment)
+			if(outpost_checkpoint_weapon(equipment))
+				return TRUE
+	return FALSE
+
+/obj/structure/overmap/trader_outpost/proc/start_armed_sweep()
+	if(armed_sweep_timer)
+		return
+	armed_sweep_timer = addtimer(CALLBACK(src, PROC_REF(armed_sweep)), OUTPOST_ARMED_SWEEP_INTERVAL, TIMER_STOPPABLE | TIMER_LOOP | TIMER_DELETE_ME)
+
+/**
+ * Looks over everyone past the checkpoint for a drawn weapon, and tells permit holders whose permit
+ * has run out. A gun has to stay out for OUTPOST_ARMED_SIGHTING_GRACE; anyone restrained or out cold
+ * is not judged for what is in their hands. `candidates` defaults to every living player.
+ */
+/obj/structure/overmap/trader_outpost/proc/armed_sweep(list/candidates = GLOB.alive_player_list)
+	if(!template_bottom_left)
+		return
+	for(var/datum/mind/holder_mind as anything in weapon_permits.Copy())
+		var/runs_out = weapon_permits[holder_mind]
+		if(world.time < runs_out)
+			continue
+		if(!permit_lapse_told[holder_mind])
+			permit_lapse_told[holder_mind] = TRUE
+			if(holder_mind.current)
+				to_chat(holder_mind.current, span_warning("Your weapons permit at [name] has run out."))
+		if(world.time >= runs_out + OUTPOST_WEAPONS_PERMIT_GRACE)
+			weapon_permits -= holder_mind
+			permit_lapse_told -= holder_mind
+	var/list/still_armed = list()
+	for(var/mob/living/visitor as anything in candidates)
+		var/datum/mind/visitor_mind = visitor.mind
+		if(!visitor_mind || visitor.stat != CONSCIOUS || HAS_TRAIT(visitor, TRAIT_HANDS_BLOCKED))
+			continue
+		var/turf/where = get_turf(visitor)
+		if(!where || where.z != template_bottom_left.z || !is_secured_turf(where))
+			continue
+		if(!outpost_weapon_drawn(visitor) || has_weapons_permit(visitor, OUTPOST_WEAPONS_PERMIT_GRACE))
+			continue
+		var/first_seen = armed_sightings[visitor_mind] || world.time
+		still_armed[visitor_mind] = first_seen
+		// A gun still out on the next sweep flags (or keeps flagging) them
+		if(world.time - first_seen >= OUTPOST_ARMED_SIGHTING_GRACE)
+			flag_trespasser(visitor)
+			still_armed -= visitor_mind
+	armed_sightings = still_armed
+
+// ===== SEALED GOODS =====
+
+/// Whether `thing` is a weapon or carries one anywhere inside it
+/proc/outpost_holds_weapon(atom/movable/thing)
+	for(var/atom/movable/content as anything in thing.get_all_contents())
+		if(outpost_checkpoint_weapon(content))
+			return TRUE
+	return FALSE
+
+/**
+ * Goods handed over past the checkpoint come sealed when they are or hold a weapon: an item goes in
+ * a sealed case, a cache crate gets a seal on its lid. Returns what should be handed over (the case,
+ * or `goods` untouched). Anywhere else, `goods` passes through as it is.
+ */
+/proc/outpost_seal_goods(atom/movable/goods)
+	if(QDELETED(goods))
+		return goods
+	var/turf/where = get_turf(goods)
+	var/obj/structure/overmap/trader_outpost/outpost = get_trader_outpost_for_turf(where)
+	if(!outpost?.is_secured_turf(where))
+		return goods
+	if(istype(goods, /obj/structure/closet))
+		// Cache crates roll their contents when first opened, so the lid is sealed whatever is inside
+		if(istype(goods, /obj/structure/closet/crate/zone_loot) || outpost_holds_weapon(goods))
+			goods.AddComponent(/datum/component/outpost_sale_seal)
+		return goods
+	if(!isitem(goods) || !outpost_holds_weapon(goods))
+		return goods
+	var/obj/item/outpost_sealed_case/case = new(goods.loc)
+	case.seal_in(goods)
+	return case
+
+/**
+ * A case with the outpost's seal across the latch, holding goods bought past the checkpoint.
+ * It opens anywhere outside the checkpoint: the lobby, a hangar, a ship.
+ */
+/obj/item/outpost_sealed_case
+	name = "sealed case"
+	desc = "A hard case with an outpost's seal across the latch."
+	icon = 'icons/obj/storage/case.dmi'
+	icon_state = "lockbox+l"
+	inhand_icon_state = "lockbox"
+	lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/briefcase_righthand.dmi'
+	w_class = WEIGHT_CLASS_BULKY
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+
+/obj/item/outpost_sealed_case/Destroy()
+	var/turf/spill = get_turf(src)
+	for(var/atom/movable/inside as anything in contents)
+		if(spill)
+			inside.forceMove(spill)
+		else
+			qdel(inside)
+	return ..()
+
+/obj/item/outpost_sealed_case/proc/seal_in(atom/movable/goods)
+	goods.forceMove(src)
+	var/obj/item/sealed = goods
+	if(istype(sealed))
+		w_class = max(sealed.w_class, WEIGHT_CLASS_NORMAL)
+	name = "sealed case ([goods.name])"
+
+/obj/item/outpost_sealed_case/examine(mob/user)
+	. = ..()
+	for(var/atom/movable/inside as anything in contents)
+		. += span_notice("The label reads: [inside.name].")
+
+/obj/item/outpost_sealed_case/attack_self(mob/user)
+	. = ..()
+	if(.)
+		return
+	var/turf/where = get_turf(src)
+	var/obj/structure/overmap/trader_outpost/outpost = get_trader_outpost_for_turf(where)
+	if(outpost?.is_secured_turf(where))
+		balloon_alert(user, "sealed!")
+		return TRUE
+	playsound(src, 'sound/machines/locktoggle.ogg', 40, TRUE)
+	var/list/goods = contents.Copy()
+	user.temporarilyRemoveItemFromInventory(src)
+	for(var/atom/movable/inside as anything in goods)
+		inside.forceMove(where)
+		if(isitem(inside))
+			user.put_in_hands(inside)
+	to_chat(user, span_notice("You break the seal on [src]."))
+	qdel(src)
+	return TRUE
+
+/// A crate's lid sealed by an outpost: it will not open past that outpost's checkpoint. Gone once it has opened.
+/datum/component/outpost_sale_seal
+
+/datum/component/outpost_sale_seal/Initialize()
+	if(!istype(parent, /obj/structure/closet))
+		return COMPONENT_INCOMPATIBLE
+
+/datum/component/outpost_sale_seal/RegisterWithParent()
+	RegisterSignal(parent, COMSIG_CLOSET_PRE_OPEN, PROC_REF(on_pre_open))
+	RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine))
+
+/datum/component/outpost_sale_seal/UnregisterFromParent()
+	UnregisterSignal(parent, list(COMSIG_CLOSET_PRE_OPEN, COMSIG_ATOM_EXAMINE))
+
+/datum/component/outpost_sale_seal/proc/on_pre_open(obj/structure/closet/source, mob/living/user, force)
+	SIGNAL_HANDLER
+	var/turf/where = get_turf(source)
+	var/obj/structure/overmap/trader_outpost/outpost = get_trader_outpost_for_turf(where)
+	if(outpost?.is_secured_turf(where))
+		if(user)
+			source.balloon_alert(user, "sealed!")
+		return BLOCK_OPEN
+	qdel(src)
+	return NONE
+
+/datum/component/outpost_sale_seal/proc/on_examine(atom/source, mob/user, list/examine_list)
+	SIGNAL_HANDLER
+	examine_list += span_notice("An outpost's seal runs across the lid.")
diff --git a/voidcrew/modules/trade/resale.dm b/voidcrew/modules/trade/resale.dm
new file mode 100644
index 00000000000..99d2f8847dc
--- /dev/null
+++ b/voidcrew/modules/trade/resale.dm
@@ -0,0 +1,78 @@
+/// Stamp the delivery and its original contents, never later additions or crafted products.
+/proc/mark_trader_goods(atom/movable/goods)
+	if(QDELETED(goods))
+		return
+	ADD_TRAIT(goods, TRAIT_TRADER_GOODS, INNATE_TRAIT)
+	// Closets defer their stock until first opening. Roll it here before handing it over.
+	if(istype(goods, /obj/structure/closet))
+		var/obj/structure/closet/container = goods
+		if(!container.contents_initialized)
+			container.contents_initialized = TRUE
+			container.PopulateContents()
+			SEND_SIGNAL(container, COMSIG_CLOSET_CONTENTS_INITIALIZED)
+	for(var/atom/movable/inside in goods.contents)
+		mark_trader_goods(inside)
+
+/proc/is_trader_good(atom/goods)
+	return goods && HAS_TRAIT(goods, TRAIT_TRADER_GOODS)
+
+/// Stamp stacks before any automatic merge, including every stack in an oversized delivery.
+/proc/create_trader_goods(item_type, atom/location, amount = 1)
+	if(!ispath(item_type, /obj/item/stack))
+		var/atom/movable/goods = new item_type(location)
+		mark_trader_goods(goods)
+		return goods
+	var/obj/item/stack/stack_type = item_type
+	var/remaining = amount > 1 ? amount : initial(stack_type.amount)
+	while(remaining > 0)
+		var/quantity = min(remaining, initial(stack_type.max_amount))
+		var/obj/item/stack/goods = new item_type(location, quantity, FALSE)
+		mark_trader_goods(goods)
+		if(!.)
+			. = goods
+		remaining -= quantity
+
+/datum/export/applies_to(obj/exported_item, apply_elastic = TRUE, export_market)
+	if(is_trader_good(exported_item))
+		return FALSE
+	return ..()
+
+// The materials market has its own ask floor; point-shop deliveries retain their resale stamp.
+/datum/supply_pack/proc/is_order_console_delivery()
+	return (istype(src, /datum/supply_pack/custom) && !istype(src, /datum/supply_pack/custom/minerals)) || istype(src, /datum/supply_pack/bitrunning)
+
+/datum/supply_pack/generate(atom/A, datum/bank_account/paying_account)
+	. = ..()
+	if(is_order_console_delivery())
+		mark_trader_goods(.)
+
+// The manifest is generated after the pack's goods.
+/datum/supply_order/generate(atom/A)
+	. = ..()
+	if(pack.is_order_console_delivery())
+		mark_trader_goods(.)
+
+// Shipping calls this after the market entry has finished assembling its bundle.
+/datum/market_purchase/post_purchase_effects(atom/spawned_item)
+	. = ..()
+	mark_trader_goods(spawned_item)
+
+/obj/item/stack/split_stack(amount)
+	var/was_trader_good = is_trader_good(src)
+	. = ..()
+	if(was_trader_good && .)
+		mark_trader_goods(.)
+
+/obj/item/stack/merge_without_del(obj/item/stack/target_stack, limit)
+	var/was_trader_good = is_trader_good(src)
+	. = ..()
+	if(. > 0 && was_trader_good)
+		mark_trader_goods(target_stack)
+
+// Limbgrowers print the same organic types as natural donors. Capture only this synchronous build's output.
+/obj/machinery/limbgrower/build_item(list/modified_consumed_reagents_list)
+	var/atom/output_location = loc
+	var/list/previous_contents = output_location.contents.Copy()
+	. = ..()
+	for(var/obj/item/organ/printed in output_location.contents - previous_contents)
+		ADD_TRAIT(printed, TRAIT_PRINTED_ORGAN, INNATE_TRAIT)
diff --git a/voidcrew/modules/trade/rumor_charts.dm b/voidcrew/modules/trade/rumor_charts.dm
index dc5524f877f..50728c71cae 100644
--- a/voidcrew/modules/trade/rumor_charts.dm
+++ b/voidcrew/modules/trade/rumor_charts.dm
@@ -31,6 +31,11 @@
 	var/spawn_zone = ZONE_RED
 	/// One successful reveal per paid chart; failed placement remains retryable.
 	var/revealed = FALSE
+	/// What the helm calls the revealed target in its readout
+	var/reveal_noun = "rare signal"
+	/// Charts with work left after the reveal (anomaly charts wait for the crew to
+	/// arrive) manage their own lifetime instead of being deleted on reveal.
+	var/keep_after_reveal = FALSE
 
 /**
  * Spawns the chart's ruin at an unused square in the chart's zone band and
@@ -57,6 +62,8 @@
 		return null
 
 	var/obj/structure/overmap/space_ruin/ruin = new(spawn_turf)
+	if(QDELETED(ruin))
+		return null
 	ruin.set_ruin_template(template)
 	ruin.mark_rare()
 	revealed = TRUE
@@ -75,21 +82,22 @@
  */
 /obj/structure/overmap/ship/proc/add_pending_rumor(datum/rumor_chart/chart)
 	pending_rumors += chart
-	ship_notify("Encrypted rumor data received: \"[chart.name]\". Reveal it from the helm console when ready.", "HELM", SHIP_NOTIFY_NOTICE, 'voidcrew/sound/notify.ogg', 50)
+	ship_notify("Encrypted rumor data received: \"[chart.name]\".", "HELM", SHIP_NOTIFY_NOTICE, 'voidcrew/sound/notify.ogg', 50)
 
 /**
- * Reveals a pending rumor: spawns its ruin, charts the waypoint and consumes
- * the sealed entry. Returns the ruin, or null on failure (entry is kept).
+ * Reveals a pending rumor: spawns or picks its site, charts the waypoint and
+ * consumes the sealed entry. Returns the site, or null on failure (entry is kept).
  */
 /obj/structure/overmap/ship/proc/reveal_pending_rumor(datum/rumor_chart/chart)
 	if(!(chart in pending_rumors))
 		return null
-	var/obj/structure/overmap/space_ruin/ruin = chart.reveal(src)
-	if(!ruin)
+	var/obj/structure/overmap/site = chart.reveal(src)
+	if(!site)
 		return null
 	pending_rumors -= chart
-	qdel(chart)
-	return ruin
+	if(!chart.keep_after_reveal)
+		qdel(chart)
+	return site
 
 /**
  * Gets an unused overmap square in the given zone band (ZONE_RED/YELLOW/GREEN).
@@ -146,7 +154,7 @@
 		return
 	var/obj/structure/overmap/ship/ship = get_crew_ship(user)
 	if(!ship)
-		return "No crew registration, you need a ship to upload the rumor to."
+		return "No crew registration."
 
 /datum/shop_sku/ruin_chart/try_purchase(mob/living/user, mob/living/basic/outpost_trader/vendor)
 	if(stock <= 0)
@@ -178,6 +186,6 @@
 	chart.spawn_zone = spawn_zone
 	ship.add_pending_rumor(chart)
 
-	to_chat(user, span_notice("The rumor data is encrypted and beamed to [ship]'s helm console. Reveal it when your crew is ready to move."))
+	to_chat(user, span_notice("Encrypted rumor data received by [ship]."))
 	metric_shop_purchase(src, user, credit_price, price_vouchers)
 	return TRUE
diff --git a/voidcrew/modules/trade/shop.dm b/voidcrew/modules/trade/shop.dm
index 7b681b3ddfa..dc6f0b83a73 100644
--- a/voidcrew/modules/trade/shop.dm
+++ b/voidcrew/modules/trade/shop.dm
@@ -10,6 +10,9 @@
  * - CORE: the sku_types list, stocked every round.
  * - ROTATING: a few picks rolled from rotating_pool each round, limited supply.
  * - RARE: 1-2 showcase picks rolled from rare_pool, single unit each.
+ * - Weighted rotations (/datum/shop_rotation): small dedicated shelves with a
+ *   weighted pool of their own. Every sold-out slot swaps for a different pick
+ *   on convoy restock, so scarce goods never refill in place.
  * One credit-priced SKU per round also goes on special (discount_pct).
  *
  * Vouchers are deliberately the only road to the best stock ("the currency
@@ -58,9 +61,11 @@
 	var/list/rare_pool = list()
 	/// Max rare picks per round (min 1 whenever the pool is non-empty)
 	var/rare_picks_max = 2
-	/// SKU typepaths on the favor-locked back-room shelf, stocked every round
+	/// SKU typepaths on the reputation-gated back-room shelf, stocked every round
 	/// (see trader_favor.dm, supply is per-crew, not shared)
 	var/list/favor_sku_types = list()
+	/// Spoken on request when this crew can order from the back room.
+	var/back_room_line
 	/// Chart/rumor SKU typepaths this shop's chart shelf draws from. Every
 	/// outpost draws independently from the same catalog: charts are deliberately
 	/// zone-mixed, so which band a tip points at has nothing to do with which
@@ -68,6 +73,10 @@
 	var/list/chart_pool = list()
 	/// How many chart picks land on the shelf per round
 	var/chart_picks = 3
+	/// /datum/shop_rotation typepaths: dedicated weighted shelves (see below)
+	var/list/rotations = list()
+	/// Live rotation instances, one per entry in `rotations`
+	var/list/datum/shop_rotation/live_rotations = list()
 	/// Live SKU instances (hold the shared per-round stock)
 	var/list/datum/shop_sku/skus = list()
 	/// Buyback typepaths: what this trader buys from players (see shop_buyback.dm)
@@ -83,10 +92,6 @@
 	/// Supply request table for the outpost mission board: list of
 	/// list("type" = path, "name" = text, "amount" = num, "difficulty" = MISSION_DIFFICULTY_*)
 	var/list/mission_requests = list()
-	/// Items only ever awarded by this shop's hard contracts, never sold on
-	/// any shelf. The depth hook: chasing the trader's board is the sole road
-	/// to these.
-	var/list/exclusive_rewards = list()
 	/// Extra contract types this shop's board can post beyond the standard
 	/// mix, as typepath -> weight (the general outpost's angling requests)
 	var/list/extra_offer_mix = list()
@@ -106,6 +111,11 @@
 	// Each outpost deals its own chart shelf. Separate purchases reveal fresh sites.
 	for(var/sku_type in deal_chart_picks())
 		add_sku(sku_type, SHELF_ROTATING)
+	for(var/rotation_type in rotations)
+		var/datum/shop_rotation/rotation = new rotation_type
+		live_rotations += rotation
+		for(var/sku_type in rotation.deal(rotation.slots))
+			add_rotation_sku(rotation, sku_type)
 	roll_special()
 	for(var/buyback_type in buyback_types)
 		buybacks += new buyback_type
@@ -113,6 +123,7 @@
 /datum/outpost_shop/Destroy()
 	QDEL_LIST(skus)
 	QDEL_LIST(buybacks)
+	QDEL_LIST(live_rotations)
 	outpost = null
 	trader_npc = null
 	return ..()
@@ -162,17 +173,53 @@
 			sku.stock = FAVOR_UNIQUE_CREW_LIMIT
 	skus += sku
 
+/**
+ * Puts a SKU dealt by `rotation` on the rotating shelf and tags it, so the
+ * convoy swaps it through the rotation rather than the ordinary rotating pool.
+ */
+/datum/outpost_shop/proc/add_rotation_sku(datum/shop_rotation/rotation, sku_type)
+	add_sku(sku_type, SHELF_ROTATING)
+	var/datum/shop_sku/sku = skus[length(skus)]
+	sku.rotation = rotation
+	return sku
+
+/**
+ * Every sold-out rotation slot is replaced with a different weighted pick from
+ * the same rotation. Nothing refills in place: the shelf only ever shows what
+ * the convoy happened to bring.
+ */
+/datum/outpost_shop/proc/restock_rotations()
+	for(var/datum/shop_rotation/rotation as anything in live_rotations)
+		var/list/sold_out = list()
+		var/list/on_shelf = list()
+		for(var/datum/shop_sku/sku as anything in skus)
+			if(sku.rotation != rotation)
+				continue
+			on_shelf += sku.type
+			if(sku.stock <= 0 && !sku.restock_interval)
+				sold_out += sku
+		for(var/datum/shop_sku/gone as anything in sold_out)
+			skus -= gone
+			qdel(gone)
+			// The sold type and everything still on the shelf are held back, so
+			// a slot always turns over into something different
+			var/replacement = rotation.pick_one(on_shelf)
+			if(!replacement)
+				continue
+			on_shelf += replacement
+			add_rotation_sku(rotation, replacement)
+
 /**
  * Puts one random credit-priced SKU on special for the round (15-30% off).
  */
 /datum/outpost_shop/proc/roll_special()
 	var/list/eligible = list()
 	for(var/datum/shop_sku/sku as anything in skus)
-		// The back room never goes on special: a favor unique is already the
-		// cheapest it gets at Trusted, and specials stack on the max() in
-		// get_credit_price
+		// Back-room prices use only the crew's ordinary credit discount.
 		if(sku.shelf == SHELF_FAVOR)
 			continue
+		if(sku.fixed_price)
+			continue
 		if(sku.price_credits > 0 && !sku.discount_pct)
 			eligible += sku
 	if(!length(eligible))
@@ -188,8 +235,11 @@
 /datum/outpost_shop/proc/convoy_restock()
 	// Core shelves creep back toward full
 	for(var/datum/shop_sku/sku as anything in skus)
-		if(sku.shelf == SHELF_CORE && sku.stock < sku.stock_max)
-			sku.stock = min(sku.stock_max, sku.stock + max(1, round(sku.stock_max / 2)))
+		// Timed stock has its own clock; INFINITY keeps a finite shelf exhausted.
+		if(sku.restock_interval)
+			continue
+		if(sku.shelf == SHELF_CORE && sku.stock < sku.stock_max - sku.reserved_stock)
+			sku.stock = min(sku.stock_max - sku.reserved_stock, sku.stock + max(1, round(sku.stock_max / 2)))
 		// A new paid chart creates a fresh ruin, so named tips can be sold again.
 		else if(istype(sku, /datum/shop_sku/ruin_chart) && sku.stock < sku.stock_max)
 			sku.stock = sku.stock_max
@@ -200,7 +250,7 @@
 	// a sold tip for an unrelated good. Named tips replenish separately above.
 	var/list/depleted = list()
 	for(var/datum/shop_sku/sku as anything in skus)
-		if(sku.shelf == SHELF_ROTATING && !sku.is_chart && sku.stock <= 0)
+		if(sku.shelf == SHELF_ROTATING && !sku.is_chart && !sku.rotation && !sku.restock_interval && sku.stock <= 0)
 			depleted += sku
 	if(length(depleted))
 		var/datum/shop_sku/gone = pick(depleted)
@@ -211,6 +261,9 @@
 		qdel(gone)
 		add_sku(length(unstocked) ? pick(unstocked) : pick(rotating_pool), SHELF_ROTATING)
 
+	// Weighted rotations turn their sold-out slots over
+	restock_rotations()
+
 	// Yesterday's special is over; roll a new one
 	for(var/datum/shop_sku/sku as anything in skus)
 		sku.discount_pct = initial(sku.discount_pct)
@@ -250,122 +303,88 @@
 		return round(per_sale * amount / max(1, buyback.amount))
 	return 0
 
-/**
- * Assigns the item bundle an outpost-board contract pays out, drawn from this
- * shop's own stock. These contracts settle in goods rather than money, so the
- * bundle IS the pay and has to be assembled to hit a credit-equivalent target
- * instead of picked at random. A flat draw over the shelves hands out a 30cr
- * can of beans and a 4800cr engine board with exactly equal probability.
- *
- * The target comes from the difficulty band, floored by what the contracted
- * goods are worth over this shop's own counter, so accepting a job is never
- * worse than selling the haul at the buyback window.
- *
- * Hard contracts lead with a back-room exclusive no shelf sells. Whatever the
- * shelves can't cover is settled in trade vouchers, which keeps the "paid in
- * kit, not cash" premise intact while still landing the pay in band when the
- * shop has been picked over.
- *
- * Returns FALSE only if the shop has no priced stock at all, so the caller can
- * discard an unfundable contract.
- * * ask_value - credits the contracted goods fetch over the counter, if known
- */
+/// Build a fixed quote. Only available, credit-priced core stock can form its package.
 /datum/outpost_shop/proc/roll_contract_reward(datum/mission/mission, ask_value = 0)
-	// The shelves, valued. Assoc so the bundle builder can price a candidate
-	// without walking the SKU list again for every draw.
-	var/list/valued = list()
-	// Bundled stack sizes, so a contract paying "plasteel (10 sheets)" hands
-	// over ten sheets rather than the one a bare stack spawn would give
-	var/list/bundle_sizes = list()
-	for(var/datum/shop_sku/sku as anything in skus)
-		if(!sku.item_path)
-			continue
-		// Favor uniques are earned standing at the counter, never rolled into a
-		// contract's pay bundle, that would leak the back room past its gate
-		if(sku.shelf == SHELF_FAVOR)
-			continue
-		var/worth = get_sku_value(sku)
-		if(worth <= 0)
-			continue
-		valued[sku.item_path] = worth
-		if(sku.dispense_amount > 1)
-			bundle_sizes[sku.item_path] = sku.dispense_amount
-	if(!length(valued))
+	if(QDELETED(mission))
 		return FALSE
-
-	var/target
+	if(!isnull(mission.contract_quote))
+		return TRUE // Reopening or retargeting cannot reroll an existing quote.
+	var/band
+	var/service
 	switch(mission.difficulty)
 		if(MISSION_DIFFICULTY_HARD)
-			target = rand(CONTRACT_PAY_HARD_MIN, CONTRACT_PAY_HARD_MAX)
+			band = rand(CONTRACT_PAY_HARD_MIN, CONTRACT_PAY_HARD_MAX)
+			service = CONTRACT_SERVICE_HARD
 		if(MISSION_DIFFICULTY_MEDIUM)
-			target = rand(CONTRACT_PAY_MEDIUM_MIN, CONTRACT_PAY_MEDIUM_MAX)
+			band = rand(CONTRACT_PAY_MEDIUM_MIN, CONTRACT_PAY_MEDIUM_MAX)
+			service = CONTRACT_SERVICE_MEDIUM
 		else
-			target = rand(CONTRACT_PAY_EASY_MIN, CONTRACT_PAY_EASY_MAX)
-	target = round(target * mission.contract_pay_mult)
-	target = max(target, round(ask_value * CONTRACT_ASK_PREMIUM))
-
-	var/list/rewards = list()
-	var/list/rare_rewards = list()
-	var/remaining = target
-
-	// Hard contracts open the back room, and that prize covers most of the target
-	if(mission.difficulty == MISSION_DIFFICULTY_HARD && length(exclusive_rewards))
-		var/prize = pick(exclusive_rewards)
-		rewards += prize
-		rare_rewards += prize
-		remaining -= CONTRACT_EXCLUSIVE_VALUE
-
-	// Spend the rest down in as few items as possible, so the pay reads as one
-	// good piece of kit instead of a heap of consumables
-	while(remaining > CONTRACT_SHORTFALL_TOLERANCE && length(rewards) < CONTRACT_MAX_REWARD_ITEMS)
-		var/picked = pick_valued_reward(valued, remaining)
-		if(!picked)
+			band = rand(CONTRACT_PAY_EASY_MIN, CONTRACT_PAY_EASY_MAX)
+			service = CONTRACT_SERVICE_EASY
+	var/target = floor(band * mission.contract_pay_mult)
+	mission.contract_no_vouchers = mission.is_routine_contract()
+	if(istype(mission, /datum/mission/outpost_supply))
+		var/datum/mission/outpost_supply/supply = mission
+		if(supply.request_pay_min)
+			target = rand(supply.request_pay_min, supply.request_pay_max)
+		if(mission.contract_no_vouchers)
+			target = max(CEILING(ask_value * CONTRACT_EXCEPTION_PREMIUM, 1), min(floor(band * CONTRACT_EXCEPTION_MULT), service))
+		else
+			target = max(CEILING(ask_value * CONTRACT_ASK_PREMIUM, 1), min(target, ask_value + service))
+	else if(istype(mission, /datum/mission/outpost_courier))
+		var/datum/mission/outpost_courier/courier = mission
+		var/obj/structure/overmap/trader_outpost/destination = courier.get_destination()
+		if(!outpost || !destination)
+			return FALSE
+		target = min(target, CONTRACT_COURIER_DISTANCE_PAY * max(abs(outpost.x - destination.x), abs(outpost.y - destination.y)))
+
+	mission.contract_quote = target
+	mission.contract_reward_shop = src
+	mission.mission_reward = null
+	mission.mission_rewards = list()
+	mission.rare_reward_types = null
+	mission.reward_amounts = list()
+	mission.contract_stock = list()
+	mission.contract_item_values = list()
+	var/list/valued = list()
+	var/list/stock_by_path = list()
+	for(var/datum/shop_sku/sku as anything in skus)
+		if(!sku.item_path || sku.shelf != SHELF_CORE || !sku.contract_reward || sku.stock <= 0)
+			continue
+		if(sku.price_credits <= 0 || sku.price_vouchers > 0 || istype(sku, /datum/shop_sku/barter))
+			continue
+		valued[sku.item_path] = sku.price_credits
+		stock_by_path[sku.item_path] = sku
+	var/package_value = 0
+	var/budget = floor(target * CONTRACT_SHELF_SHARE)
+	while(length(mission.mission_rewards) < CONTRACT_MAX_REWARD_ITEMS)
+		var/item_path = pick_valued_reward(valued, budget - package_value)
+		if(!item_path)
 			break
-		rewards += picked
-		remaining -= valued[picked]
-		if(bundle_sizes[picked])
-			LAZYSET(mission.reward_amounts, picked, bundle_sizes[picked])
-		valued -= picked // one of each; a bundle of three identical items reads as filler
-
-	if(!length(rewards))
-		return FALSE
-
-	mission.mission_rewards = rewards
-	mission.rare_reward_types = rare_rewards
-	// Settle the gap in scrip rather than posting a contract that misses its band
-	if(remaining > CONTRACT_SHORTFALL_TOLERANCE)
-		mission.voucher_count += CEILING((remaining - CONTRACT_SHORTFALL_TOLERANCE) / VOUCHER_CREDIT_VALUE, 1)
+		var/datum/shop_sku/sku = stock_by_path[item_path]
+		mission.mission_rewards += item_path
+		mission.contract_stock[item_path] = sku
+		mission.contract_item_values[item_path] = valued[item_path]
+		mission.reward_amounts[item_path] = sku.dispense_amount
+		package_value += valued[item_path]
+		valued -= item_path
+	mission.metric_item_value = package_value
+	mission.set_contract_currency(target - package_value)
 	return TRUE
 
-/**
- * Draws one item from a valued pool, preferring the dearest thing that still
- * fits the budget so a bundle spends itself down in few, good items. Randomises
- * across the top of the affordable range so boards don't repeat the same item
- * every round, and falls back to the cheapest thing in stock when the budget
- * won't cover anything, so a thin shop still pays something.
- */
+/// Prefer the upper end of the affordable range, with no overshoot or fallback.
 /datum/outpost_shop/proc/pick_valued_reward(list/valued, budget)
-	if(!length(valued))
-		return null
-	// A little overshoot allowance, so a 2000cr budget lands the 2400cr item
-	// rather than falling all the way back to a 600cr one
-	var/ceiling = round(budget * 1.25)
 	var/best = 0
 	for(var/item_path in valued)
-		if(valued[item_path] <= ceiling)
+		if(valued[item_path] <= budget)
 			best = max(best, valued[item_path])
 	if(!best)
-		// Everything is over budget; take the cheapest thing on the shelf
-		var/cheapest
-		for(var/item_path in valued)
-			if(!cheapest || valued[item_path] < valued[cheapest])
-				cheapest = item_path
-		return cheapest
+		return null
 	var/list/contenders = list()
 	for(var/item_path in valued)
-		if(valued[item_path] <= ceiling && valued[item_path] >= best * 0.6)
+		if(valued[item_path] <= budget && valued[item_path] >= best * 0.6)
 			contenders += item_path
-	return length(contenders) ? pick(contenders) : null
+	return pick(contenders)
 
 /**
  * Returns a random personality line for the given TRADER_LINE_* category.
@@ -376,6 +395,15 @@
 		return null
 	return pick(lines)
 
+/datum/outpost_shop/proc/get_back_room_line(mob/user)
+	var/datum/voidcrew_crew_record/crew = get_crew_ship(user)?.get_crew_record()
+	if(!crew || !back_room_line)
+		return null
+	for(var/datum/shop_sku/sku in skus)
+		if(sku.shelf == SHELF_FAVOR && sku.has_zone_permission(crew))
+			return back_room_line
+	return null
+
 /**
  * # Shop SKU
  *
@@ -395,10 +423,10 @@
 	var/shelf = SHELF_CORE
 	/// The shop stocking this SKU (stamped by add_sku; favor pricing/gating read it)
 	var/datum/outpost_shop/shop
-	/// Favor points a buyer's crew needs before this sells (the back-room gate)
-	var/favor_required = 0
+	/// Continuing crew permission required by every occurrence of this SKU.
+	var/zone_permission = ZONE_PERMISSION_PUBLIC
 	/// Max units one crew may buy per round (0 = uncapped; favor uniques cap at
-	/// FAVOR_UNIQUE_CREW_LIMIT). Enforced per ship, see trader_favor.dm.
+	/// FAVOR_UNIQUE_CREW_LIMIT). Enforced on the continuing crew record.
 	var/crew_limit = 0
 	/// TRUE on the intel SKUs (star charts, ruin charts, rumor tips). Whenever
 	/// one of these lands on the rotating shelf, convoy_restock must never
@@ -417,15 +445,29 @@
 	var/stock_max = 4
 	/// Remaining stock this round
 	var/stock = 0
+	/// Units held for accepted board contracts, excluded from the sellable stock.
+	var/reserved_stock = 0
 	/// Author override when the item's initial icon renders wrong in the UI (GAGS etc.)
 	var/icon_override
 	var/icon_state_override
 	/// Cached base64 icon for the UI, computed once per instance
 	var/cached_icon
+	/// The weighted rotation that dealt this SKU, if any (see /datum/shop_rotation)
+	var/datum/shop_rotation/rotation
+	/// Ignores specials and crew favor discounts: the price on the tag is the price
+	var/fixed_price = FALSE
+	/// Whether outpost contracts may pay this out as part of a reward bundle
+	var/contract_reward = TRUE
+	/// 0 uses convoys; a positive interval returns one unit; INFINITY never refills.
+	var/restock_interval = 0
+	/// Independent of convoy arrivals, visits, specials and crew ownership.
+	var/restock_timer
 
 /datum/shop_sku/New()
 	..()
 	stock = rand(stock_min, stock_max)
+	if(restock_interval > 0 && restock_interval < INFINITY)
+		restock_timer = addtimer(CALLBACK(src, PROC_REF(restock_unit)), restock_interval, TIMER_STOPPABLE | TIMER_LOOP | TIMER_DELETE_ME)
 	if(item_path)
 		var/atom/movable/cast = item_path
 		if(!name)
@@ -434,21 +476,29 @@
 			desc = initial(cast.desc)
 
 /datum/shop_sku/Destroy()
+	if(restock_timer)
+		deltimer(restock_timer)
+		restock_timer = null
 	shop = null
+	rotation = null
 	return ..()
 
+/// Never bank missed deliveries while full, or replenish a reserved contract unit.
+/datum/shop_sku/proc/restock_unit()
+	stock = min(max(0, stock_max - reserved_stock), stock + 1)
+
 /**
  * The credit price after discounts, rounded down to a clean 5. With a buyer,
  * their crew's favor discount competes with the special: the better of the two
  * applies (max, not stacked. Favor shouldn't turn a 30%-off special into 45%).
  * Without a buyer (catalog/static contexts) only the authored special shows.
  */
-/datum/shop_sku/proc/get_credit_price(mob/living/user)
-	if(price_credits <= 0)
+/datum/shop_sku/proc/get_credit_price(mob/living/user, obj/structure/overmap/ship/crew_ship = get_crew_ship(user))
+	if(price_credits <= 0 || fixed_price)
 		return price_credits
 	var/pct = discount_pct
 	if(user && shop)
-		pct = max(pct, shop.get_discount_pct(get_crew_ship(user)))
+		pct = max(pct, shop.get_discount_pct(crew_ship))
 	if(!pct)
 		return price_credits
 	return max(5, round(price_credits * (100 - pct) / 100, 5))
@@ -484,52 +534,69 @@
  * Whether the user can pay right now (does not charge).
  */
 /datum/shop_sku/proc/can_afford(mob/living/user)
+	var/obj/structure/overmap/ship/crew_ship = get_crew_ship(user)
+	if(get_favor_denial(user, crew_ship))
+		return FALSE
 	if(price_vouchers > 0 && count_trade_vouchers(user) < price_vouchers)
 		return FALSE
-	if(get_credit_price(user) > 0)
-		var/datum/bank_account/account = get_account(user)
-		if(!account || !account.has_money(get_credit_price(user)))
+	var/credit_price = get_credit_price(user, crew_ship)
+	if(credit_price > 0)
+		var/datum/bank_account/account = get_account(user, crew_ship)
+		if(!account || !account.has_money(credit_price))
 			return FALSE
 	return TRUE
 
-/**
- * The favor-shelf gate: why this buyer's crew can't have it, or null when the
- * shelf is open to them. Split out so purchase and denial share one truth.
- */
-/datum/shop_sku/proc/get_favor_denial(mob/living/user)
-	if(favor_required <= 0)
-		return null
-	var/obj/structure/overmap/ship/crew_ship = get_crew_ship(user)
-	if(!crew_ship)
-		return "Back-room stock goes to standing crews only."
-	if(!shop)
-		return "Unavailable."
-	var/favor = shop.get_favor(crew_ship)
-	if(favor < favor_required)
-		return "Requires [favor_required] standing with [shop.favor_trader_name()]. Your crew has [favor]."
-	if(crew_limit > 0 && shop.get_crew_purchases(crew_ship, type) >= crew_limit)
-		return "Your crew has had its [crew_limit] this round."
+/// Shared by retail and contract packages; missing crew context has Public access.
+/datum/shop_sku/proc/has_zone_permission(datum/voidcrew_crew_record/crew)
+	if(zone_permission == ZONE_PERMISSION_PUBLIC)
+		return TRUE
+	return !QDELETED(crew) && crew.has_zone_permission(zone_permission)
+
+/// Legacy proc name retained for callers; trader favor no longer admits a buyer.
+/datum/shop_sku/proc/get_favor_denial(mob/living/user, obj/structure/overmap/ship/crew_ship = get_crew_ship(user))
+	if(crew_ship && get_crew_ship(user, crew_ship) != crew_ship)
+		return "I can't clear that shipment."
+	var/datum/voidcrew_crew_record/crew = crew_ship?.get_crew_record()
+	if(!has_zone_permission(crew) || (crew_limit > 0 && !crew))
+		return "Your crew isn't cleared for that yet."
+	if(crew_limit > 0 && (crew.favor_unique_purchases[type] || 0) >= crew_limit)
+		return "I've filled that order already."
 	return null
 
+/// Recheck the live counter even when the caller has a stale interactive UI.
+/datum/shop_sku/proc/can_trade(mob/living/user, mob/living/basic/outpost_trader/vendor)
+	if(QDELETED(src) || QDELETED(user))
+		return FALSE
+	if(shop && (QDELETED(shop) || !(src in shop.skus)))
+		return FALSE
+	if(vendor && (QDELETED(vendor) || vendor.shop != shop || !vendor.check_menu(user)))
+		return FALSE
+	var/obj/structure/overmap/trader_outpost/outpost = shop?.outpost
+	if(outpost && (QDELETED(outpost) || outpost.is_user_barred(user) || (vendor && (vendor.outpost != outpost || !outpost.contains_site_turf(get_turf(vendor))))))
+		return FALSE
+	return TRUE
+
 /**
  * Why the user can't buy, shown as a tooltip / chat line.
  */
 /datum/shop_sku/proc/get_denial_reason(mob/living/user)
 	if(stock <= 0 && shelf != SHELF_FAVOR)
 		return "Out of stock."
-	var/favor_denial = get_favor_denial(user)
+	var/obj/structure/overmap/ship/crew_ship = get_crew_ship(user)
+	var/favor_denial = get_favor_denial(user, crew_ship)
 	if(favor_denial)
 		return favor_denial
 	if(price_vouchers > 0)
 		var/carrying = count_trade_vouchers(user)
 		if(carrying < price_vouchers)
-			return "Need [price_vouchers] trade voucher[price_vouchers > 1 ? "s" : ""] (carrying [carrying])."
-	if(get_credit_price(user) > 0)
-		var/datum/bank_account/account = get_account(user)
+			return "Insufficient vouchers."
+	var/credit_price = get_credit_price(user, crew_ship)
+	if(credit_price > 0)
+		var/datum/bank_account/account = get_account(user, crew_ship)
 		if(!account)
-			return "No bank account on your ID."
-		if(!account.has_money(get_credit_price(user)))
-			return "Insufficient credits ([get_credit_price(user)] cr needed)."
+			return "No ship account."
+		if(!account.has_money(credit_price))
+			return "Insufficient credits."
 	return null
 
 /**
@@ -537,29 +604,40 @@
  * over the counter. Returns TRUE on success.
  */
 /datum/shop_sku/proc/try_purchase(mob/living/user, mob/living/basic/outpost_trader/vendor)
+	if(!can_trade(user, vendor))
+		return FALSE
 	if(stock <= 0 && shelf != SHELF_FAVOR)
 		return FALSE
-	if(get_favor_denial(user))
+	var/obj/structure/overmap/ship/crew_ship = get_crew_ship(user)
+	if(get_favor_denial(user, crew_ship))
 		return FALSE
 
 	// Validate the credit half before consuming any vouchers
-	var/credit_price = get_credit_price(user)
+	var/credit_price = get_credit_price(user, crew_ship)
 	var/datum/bank_account/account
 	if(credit_price > 0)
-		account = get_account(user)
+		account = get_account(user, crew_ship)
 		if(!account || !account.has_money(credit_price))
 			return FALSE
-
-	if(price_vouchers > 0 && !consume_trade_vouchers(user, price_vouchers))
+	if(price_vouchers > 0 && count_trade_vouchers(user) < price_vouchers)
 		return FALSE
+
+	// Reserve on the same continuing record before any debit or item creation.
+	var/datum/voidcrew_crew_record/capped_crew
+	if(crew_limit > 0)
+		capped_crew = crew_ship?.get_crew_record()
+		if(!capped_crew?.claim_purchase(type, crew_limit))
+			return FALSE
 	if(credit_price > 0 && !account.adjust_money(-credit_price, "Trader Outpost: [name]"))
+		capped_crew?.release_purchase(type)
+		return FALSE
+	if(price_vouchers > 0 && !consume_trade_vouchers(user, price_vouchers))
+		if(credit_price > 0)
+			account.adjust_money(credit_price, "Trader Outpost: [name] refund")
+		capped_crew?.release_purchase(type)
 		return FALSE
 
-	if(shelf == SHELF_FAVOR)
-		// The back room doesn't share stock; the sale counts against the crew's cap
-		if(crew_limit > 0)
-			shop?.record_crew_purchase(get_crew_ship(user), type)
-	else
+	if(shelf != SHELF_FAVOR)
 		stock--
 	dispense(user, vendor)
 	metric_shop_purchase(src, user, credit_price, price_vouchers)
@@ -571,25 +649,25 @@
  */
 /datum/shop_sku/proc/dispense(mob/living/user, mob/living/basic/outpost_trader/vendor)
 	var/atom/drop_loc = user.drop_location() || vendor?.drop_location()
-	var/atom/movable/goods
-	if(dispense_amount > 1 && ispath(item_path, /obj/item/stack))
-		goods = new item_path(drop_loc, dispense_amount)
+	var/atom/movable/goods = create_trader_goods(item_path, drop_loc, dispense_amount)
+	// Past a trader outpost's checkpoint a gun is handed over sealed (outpost_trespass.dm)
+	var/atom/movable/handed = outpost_seal_goods(goods)
+	mark_trader_goods(handed)
+	if(isitem(handed) && user.put_in_hands(handed))
+		to_chat(user, span_notice("You receive [handed]."))
 	else
-		goods = new item_path(drop_loc)
-	if(isitem(goods) && user.put_in_hands(goods))
-		to_chat(user, span_notice("You receive [goods]."))
-	else
-		to_chat(user, span_notice("[goods] is set down at your feet."))
+		to_chat(user, span_notice("[handed] is set down at your feet."))
 	// Returned so SKU subtypes can stamp what they hand over (the diner's
 	// plated shelf adds TRAIT_FOOD_CHEF_MADE here, see shop_catalog_diner.dm)
 	return goods
 
 /**
- * The bank account on the user's ID card.
+ * The selected ship's account, revalidated against the user's current crew.
  */
-/datum/shop_sku/proc/get_account(mob/living/user)
-	var/obj/item/card/id/id_card = user.get_idcard(TRUE)
-	return id_card?.registered_account
+/datum/shop_sku/proc/get_account(mob/living/user, obj/structure/overmap/ship/crew_ship = get_crew_ship(user))
+	if(!crew_ship || get_crew_ship(user, crew_ship) != crew_ship)
+		return null
+	return crew_ship.ship_account
 
 /**
  * # Barter SKU
@@ -630,7 +708,7 @@
 	return null
 
 /datum/shop_sku/barter/can_afford(mob/living/user)
-	return !!find_barter_item(user)
+	return !get_favor_denial(user) && !!find_barter_item(user)
 
 /datum/shop_sku/barter/get_denial_reason(mob/living/user)
 	if(stock <= 0 && shelf != SHELF_FAVOR)
@@ -639,43 +717,125 @@
 	if(favor_denial)
 		return favor_denial
 	if(!find_barter_item(user))
-		return "Hold the asked item in hand: [get_price_text()]."
+		return "That isn't what I asked for."
 	return null
 
 /datum/shop_sku/barter/try_purchase(mob/living/user, mob/living/basic/outpost_trader/vendor)
+	if(!can_trade(user, vendor))
+		return FALSE
 	if(stock <= 0 && shelf != SHELF_FAVOR)
 		return FALSE
-	if(get_favor_denial(user))
+	var/obj/structure/overmap/ship/crew_ship = get_crew_ship(user)
+	if(get_favor_denial(user, crew_ship))
 		return FALSE
 	var/obj/item/offered = find_barter_item(user)
 	if(!offered)
 		return FALSE
+	var/datum/voidcrew_crew_record/capped_crew
+	if(crew_limit > 0)
+		capped_crew = crew_ship?.get_crew_record()
+		if(!capped_crew?.claim_purchase(type, crew_limit))
+			return FALSE
 	if(isstack(offered))
 		var/obj/item/stack/offered_stack = offered
 		if(!offered_stack.use(barter_amount))
+			capped_crew?.release_purchase(type)
 			return FALSE
 	else
 		qdel(offered)
-	if(shelf == SHELF_FAVOR)
-		if(crew_limit > 0)
-			shop?.record_crew_purchase(get_crew_ship(user), type)
-	else
+	if(shelf != SHELF_FAVOR)
 		stock--
 	dispense(user, vendor)
 	metric_shop_purchase(src, user)
 	return TRUE
 
+/// Eligible hull contexts for the current crew. Roster order never chooses an account.
+/proc/get_crew_ships(mob/user)
+	var/list/ships = list()
+	var/datum/voidcrew_crew_record/record = user?.mind?.get_reputation_crew()
+	if(!record || !(user.mind in record.minds))
+		return ships
+	for(var/datum/team/voidcrew/team in record.teams)
+		var/obj/structure/overmap/ship/ship = team.ship
+		if(!QDELETED(ship) && ship.ship_team == team && team.crew_record == record && !ship.abandoned && !ship.retired_by_checkpoint && !ship.checkpoint_rebuilding)
+			ships |= ship
+	return ships
+
+/// Z3/Z5 may pass an explicit hull or persist it through select_crew_service_ship().
+/// Prefer a validated selection, then the hull aboard/alone at this site.
+/proc/get_crew_ship(mob/user, obj/structure/overmap/ship/requested_ship)
+	var/list/ships = get_crew_ships(user)
+	if(!length(ships))
+		return null
+	if(requested_ship)
+		return (requested_ship in ships) ? requested_ship : null
+	var/obj/structure/overmap/ship/selected = user.mind.crew_service_ship_ref?.resolve()
+	if(selected in ships)
+		return selected
+	var/obj/structure/overmap/ship/aboard = get_ship_from_atom(user)
+	if(aboard in ships)
+		return aboard
+	var/obj/structure/overmap/site = SSovermap_zones.get_overmap_object_for_turf(get_turf(user))
+	var/list/berthed = list()
+	if(site)
+		for(var/obj/structure/overmap/ship/ship in ships)
+			if(ship.docked == site)
+				berthed += ship
+	if(length(berthed) == 1)
+		return berthed[1]
+	if(length(ships) == 1)
+		return ships[1]
+	return null
+
+/// Revalidated on every subsequent action; membership switches clear the selection.
+/datum/mind/proc/select_crew_service_ship(obj/structure/overmap/ship/ship)
+	if(!current || !(ship in get_crew_ships(current)))
+		return FALSE
+	crew_service_ship_ref = WEAKREF(ship)
+	return TRUE
+
 /**
- * The first ship this user crews for (first team with a live ship), the same
- * mind-to-ship mapping the embargo and the contract board use.
+ * # Shop rotation
+ *
+ * A small dedicated shelf with its own weighted pool, for stock that should be
+ * scarce and changing rather than always on hand. `slots` distinct picks go up
+ * when the shop opens, each with whatever stock its SKU rolls (keep those at
+ * 1 for one-off goods). On every convoy restock each sold-out slot swaps for a
+ * different weighted pick (see /datum/outpost_shop/proc/restock_rotations).
+ *
+ * Kept apart from rotating_pool so a shop's ordinary rotating shelf is never
+ * diluted by it. A shop lists rotation typepaths in its `rotations` var.
  */
-/proc/get_crew_ship(mob/user)
-	if(!user?.mind)
+/datum/shop_rotation
+	/// SKU typepath -> weight. Higher weight turns up more often.
+	var/list/pool = list()
+	/// How many picks sit on the shelf at once
+	var/slots = 2
+
+/**
+ * Up to `count` distinct weighted picks from the pool.
+ */
+/datum/shop_rotation/proc/deal(count)
+	var/list/picked = list()
+	for(var/_ in 1 to count)
+		var/choice = pick_one(picked)
+		if(!choice)
+			break
+		picked += choice
+	return picked
+
+/**
+ * One weighted pick, skipping anything in `exclude`. Null when nothing is left.
+ */
+/datum/shop_rotation/proc/pick_one(list/exclude)
+	var/list/candidates = list()
+	for(var/sku_type in pool)
+		if(exclude && (sku_type in exclude))
+			continue
+		candidates[sku_type] = max(1, pool[sku_type])
+	if(!length(candidates))
 		return null
-	for(var/datum/team/voidcrew/team as anything in user.mind.ship_teams)
-		if(team.ship)
-			return team.ship
-	return null
+	return pick_weight(candidates)
 
 // The rumor SKU and every other chart line now live in shop_catalog_charts.dm,
 // keeping this file to machinery as its header describes.
diff --git a/voidcrew/modules/trade/shop_buyback.dm b/voidcrew/modules/trade/shop_buyback.dm
index c0bdad338a1..9ad15e40e0d 100644
--- a/voidcrew/modules/trade/shop_buyback.dm
+++ b/voidcrew/modules/trade/shop_buyback.dm
@@ -7,8 +7,8 @@
  * *demand* (how many sales the trader still wants this round).
  *
  * Selling accepts goods from anywhere in the seller's inventory (hands first),
- * one sale-unit per click or in bulk. Credits land on your ID's account;
- * voucher payouts materialize in hand.
+ * one sale-unit per click or in bulk. Credits land on the selected ship's account,
+ * falling back to the ID account; voucher payouts materialize in hand.
  *
  * Balance rule: entries that pay VOUCHERS must only ever buy loot that can't
  * be manufactured aboard a ship (planet minerals, fauna harvests, ruin finds).
@@ -92,6 +92,8 @@
  * Whether this item counts for this ledger entry.
  */
 /datum/shop_buyback/proc/matches(obj/item/offered)
+	if(is_trader_good(offered))
+		return FALSE
 	if(match_subtypes ? !istype(offered, item_path) : offered.type != item_path)
 		return FALSE
 	// No selling the trader a projection of the goods
@@ -153,6 +155,14 @@
 		units = length(find_offered_items(user))
 	return units
 
+/// Prefer the selected ship's account, then the seller's carried ID account.
+/proc/get_shop_buyback_account(mob/living/user)
+	var/datum/bank_account/account = get_crew_ship(user)?.ship_account
+	if(account)
+		return account
+	var/obj/item/card/id/id_card = user?.get_idcard(TRUE)
+	return id_card?.registered_account
+
 /**
  * Why the user can't sell right now, shown as a tooltip / chat line.
  */
@@ -160,6 +170,9 @@
 	if(demand <= 0)
 		return "Not buying any more this shift."
 	if(count_carried_units(user) < 1)
+		for(var/obj/item/offered in user.get_all_contents())
+			if(istype(offered, item_path) && is_trader_good(offered))
+				return "I don't buy back shop stock."
 		// Exact-type ledgers (match_subtypes = FALSE) refuse processed/lab-made
 		// variants of the wanted goods. Without this, a player holding a refined
 		// bluespace crystal at the "natural bluespace crystals" window just got
@@ -169,9 +182,8 @@
 			return "Won't take [near_miss.name] - only [name], nothing processed or lab-made."
 		return "Carrying none of the goods: [get_wanted_text()]."
 	if(pay_credits > 0)
-		var/obj/item/card/id/id_card = user.get_idcard(TRUE)
-		if(!id_card?.registered_account)
-			return "No bank account on your ID to pay into."
+		if(!get_shop_buyback_account(user))
+			return "No bank account on your ID."
 	return null
 
 /**
@@ -186,8 +198,7 @@
 	// Credits need a live account before we consume anything
 	var/datum/bank_account/account
 	if(pay_credits > 0)
-		var/obj/item/card/id/id_card = user.get_idcard(TRUE)
-		account = id_card?.registered_account
+		account = get_shop_buyback_account(user)
 		if(!account)
 			return FALSE
 
diff --git a/voidcrew/modules/trade/shop_catalog_black_market.dm b/voidcrew/modules/trade/shop_catalog_black_market.dm
index 542719d825d..84f5ae0fd8f 100644
--- a/voidcrew/modules/trade/shop_catalog_black_market.dm
+++ b/voidcrew/modules/trade/shop_catalog_black_market.dm
@@ -34,6 +34,7 @@
 	shoes = /obj/item/clothing/shoes/laceup
 
 /datum/outpost_shop/black_market
+	back_room_line = "All right. Let's talk business."
 	outpost_name = "\improper Undertow Exchange"
 	outpost_desc = "A heavily armored den of fences and quartermasters who don't ask questions. Somehow, nobody has ever managed to rob it."
 	trader_name = "Vex"
@@ -52,21 +53,20 @@
 		"Infiltration",
 		"Combat Medical",
 		"Intel & Charts",
-		"Blueprints",
 		"Mystery Cargo",
 		"Sundries",
 		"Back Room",
 	)
 	sku_types = list(
 		// Weapons
-		/datum/shop_sku/black_market/pistol,
+		/datum/shop_sku/black_market/boarding_axe,
+		/datum/shop_sku/black_market/cutlass,
+		/datum/shop_sku/black_market/c20r,
+		/datum/shop_sku/black_market/wt550,
+		/datum/shop_sku/black_market/rotating/mateba,
 		/datum/shop_sku/black_market/pistol_mag,
-		/datum/shop_sku/black_market/revolver,
 		/datum/shop_sku/black_market/speedloader,
-		/datum/shop_sku/black_market/suppressor,
 		/datum/shop_sku/black_market/quiet_word_mag,
-		/datum/shop_sku/black_market/combat_knife,
-		/datum/shop_sku/black_market/switchblade,
 		// Explosives
 		/datum/shop_sku/black_market/c4,
 		/datum/shop_sku/black_market/emp_grenade,
@@ -112,10 +112,6 @@
 		// Intel & Charts: named ruin tips are dealt onto the rotating shelf
 		// from chart_pool below; the generic tip is the cheap standing rung.
 		/datum/shop_sku/rumor,
-		// Blueprints
-		/datum/shop_sku/black_market/saw_blueprint,
-		/datum/shop_sku/black_market/sniper_blueprint,
-		/datum/shop_sku/black_market/bulldog_blueprint,
 		// Mystery Cargo
 		/datum/shop_sku/black_market/mystery_cache,
 		/datum/shop_sku/black_market/mystery_cache_rare,
@@ -141,25 +137,19 @@
 	)
 	chart_picks = 3
 	rotating_pool = list(
-		/datum/shop_sku/black_market/rotating/mateba,
-		/datum/shop_sku/black_market/rotating/ebow,
 		/datum/shop_sku/black_market/rotating/minibomb,
-		/datum/shop_sku/black_market/rotating/dart_pistol,
 		/datum/shop_sku/black_market/rotating/mod_flamethrower,
 		/datum/shop_sku/black_market/rotating/mod_chameleon,
-		/datum/shop_sku/black_market/rotating/mod_active_sonar,
 		/datum/shop_sku/black_market/rotating/ew_runaway_burn,
 		/datum/shop_sku/black_market/rotating/ew_helm_poltergeist,
 	)
 	rare_pool = list(
 		/datum/shop_sku/black_market/rare/energy_sword,
-		/datum/shop_sku/black_market/rare/energy_shield,
 		/datum/shop_sku/black_market/rare/mod_adrenaline,
 	)
-	// The back room: Trusted-standing uniques, per-crew supply (trader_favor.dm)
+	// The back room: Crew-reputation uniques, per-crew supply (trader_favor.dm)
 	favor_sku_types = list(
 		/datum/shop_sku/favor/vex_insurance,
-		/datum/shop_sku/favor/quiet_word,
 	)
 	// The consignment window: Vex fences planet exotics and ruin loot at the
 	// best rates in the system. Voucher payouts are strictly planet/danger-gated.
@@ -174,25 +164,9 @@
 	)
 	// Vex's supply requests want the rare stuff. The free item makes it worth it
 	mission_requests = list(
-		list("type" = /obj/item/stack/ore/uranium, "name" = "uranium ore", "amount" = 8, "difficulty" = MISSION_DIFFICULTY_HARD),
-		list("type" = /obj/item/stack/ore/diamond, "name" = "diamond ore", "amount" = 4, "difficulty" = MISSION_DIFFICULTY_HARD),
-		list("type" = /obj/item/stack/ore/bluespace_crystal, "name" = "bluespace crystals", "amount" = 2, "difficulty" = MISSION_DIFFICULTY_HARD),
-		list("type" = /obj/item/stack/sheet/mineral/plasma, "name" = "plasma sheets", "amount" = 20, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
 		list("type" = /obj/item/stack/telecrystal_raw, "name" = "raw telecrystal", "amount" = 10, "difficulty" = MISSION_DIFFICULTY_HARD),
 		list("type" = /obj/item/organ/monster_core/regenerative_core/legion, "name" = "legion core", "amount" = 1, "difficulty" = MISSION_DIFFICULTY_HARD),
 	)
-	// The back shelf: hard contracts only, never sold. Each of these is the top
-	// of a ladder Vex otherwise stops short of, the elite suit above the
-	// syndicate one, the Spider Clan chassis above that, and the one combat
-	// board that is on no shelf anywhere.
-	exclusive_rewards = list(
-		/obj/item/mod/control/pre_equipped/traitor_elite,
-		/obj/item/mod/control/pre_equipped/empty/ninja,
-		/obj/item/circuitboard/machine/ship_combat/cloak_device,
-		// The one piece of chrome Splice can't get: a prototype drop-leg frame
-		// that never reached his supplier. Hard contracts only.
-		/obj/item/organ/cyberimp/cyberware/piledriver,
-	)
 	trader_lines = list(
 		TRADER_LINE_GREETING = list(
 			"Welcome to the Undertow. Touch nothing you can't pay for.",
@@ -230,7 +204,6 @@
 			"Stock's limited. The galaxy is not a reliable supplier.",
 			"Raw telecrystal. The burning worlds are full of it, and the fools who mine it. Bring me both. Just kidding. Just the crystal.",
 			"The mystery caches? Sealed when they got here. I make a point of not knowing.",
-			"Somebody asked what the imprinter does with the schematics. Confetti. Expensive confetti.",
 			"Legion cores keep better than legionnaires. Cooler's under the counter.",
 			"Quartermain will sell you a mining suit. I sell the ones with the Cybersun stamp still on the plating.",
 			"The bare chassis are cheaper for a reason. You're buying a frame and a cell, not a loadout.",
@@ -249,65 +222,28 @@
 
 // ===== WEAPONS =====
 
-/datum/shop_sku/black_market/pistol
-	category = "Weapons"
-	item_path = /obj/item/gun/ballistic/automatic/pistol
-	price_vouchers = 2
-	price_credits = 1500
-	stock_min = 2
-	stock_max = 4
-
 /datum/shop_sku/black_market/pistol_mag
 	category = "Weapons"
 	item_path = /obj/item/ammo_box/magazine/m9mm
-	price_credits = 900
+	price_credits = 200
 	stock_min = 4
 	stock_max = 8
 
-/datum/shop_sku/black_market/revolver
-	category = "Weapons"
-	item_path = /obj/item/gun/ballistic/revolver
-	price_vouchers = 3
-	stock_min = 1
-	stock_max = 2
-
 /datum/shop_sku/black_market/speedloader
 	category = "Weapons"
 	item_path = /obj/item/ammo_box/a357
-	price_credits = 1800
+	price_credits = 300
 	stock_min = 2
 	stock_max = 5
 
-/datum/shop_sku/black_market/suppressor
-	category = "Weapons"
-	item_path = /obj/item/suppressor
-	price_credits = 1200
-	stock_min = 2
-	stock_max = 4
-
-// Feeds the back room's Quiet Word (and any 10mm pistol); on the open shelf so
-// the gun stays fed after the one-per-crew purchase is spent
+// Reloads for salvaged 10mm pistols.
 /datum/shop_sku/black_market/quiet_word_mag
 	category = "Weapons"
 	item_path = /obj/item/ammo_box/magazine/m10mm/quiet_word
-	price_credits = 1000 // PROVISIONAL BALANCE. A shade over the 9mm mag; 10mm hits harder
+	price_credits = 250// PROVISIONAL BALANCE. A shade over the 9mm mag; 10mm hits harder
 	stock_min = 3
 	stock_max = 6
 
-/datum/shop_sku/black_market/combat_knife
-	category = "Weapons"
-	item_path = /obj/item/knife/combat
-	price_credits = 1050
-	stock_min = 2
-	stock_max = 4
-
-/datum/shop_sku/black_market/switchblade
-	category = "Weapons"
-	item_path = /obj/item/switchblade
-	price_credits = 900
-	stock_min = 2
-	stock_max = 4
-
 // ===== EXPLOSIVES =====
 
 /datum/shop_sku/black_market/c4
@@ -354,9 +290,10 @@
 //   one that still owes a bench a full loadout.
 
 /datum/shop_sku/black_market/mod_chassis_syndicate
+	zone_permission = ZONE_PERMISSION_ADVANCED
 	category = "MODsuits"
 	name = "syndicate MOD chassis"
-	desc = "A blood-red MODsuit frame with a super cell in the core and no modules whatsoever. Cheaper than a kitted suit because you're buying the armor and nothing else."
+	desc = "A blood-red MODsuit frame, sold without modules."
 	item_path = /obj/item/mod/control/pre_equipped/empty/syndicate
 	price_vouchers = 2
 	price_credits = 3600
@@ -364,9 +301,10 @@
 	stock_max = 2
 
 /datum/shop_sku/black_market/mod_chassis_elite
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "MODsuits"
 	name = "elite MOD chassis"
-	desc = "The heavier plating the Syndicate issues to people it expects to get shot at, sold bare. Same deal as the red one: frame, core, cell, no modules."
+	desc = "A heavy Syndicate MODsuit frame, sold without modules."
 	item_path = /obj/item/mod/control/pre_equipped/empty/elite
 	price_vouchers = 3
 	price_credits = 5400
@@ -374,6 +312,7 @@
 	stock_max = 1
 
 /datum/shop_sku/black_market/mod_interdyne
+	zone_permission = ZONE_PERMISSION_ADVANCED
 	category = "MODsuits"
 	name = "Interdyne MODsuit"
 	desc = "A field surgery suit: combat defibrillator, health analyzer, injector and a loaded surgical processor. Sawbones next door thinks it's the best thing Vex sells."
@@ -384,34 +323,38 @@
 	stock_max = 1
 
 /datum/shop_sku/black_market/mod_infiltrator
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "MODsuits"
 	name = "infiltrator MODsuit"
-	desc = "Silent footsteps, no name on examine, and it doesn't register as contraband. Comes with the stealth core programs already welded in."
+	desc = "A matte-black MODsuit with an unmarked control unit."
 	item_path = /obj/item/mod/control/pre_equipped/infiltrator
 	price_vouchers = 4
 	stock_min = 1
 	stock_max = 1
 
 /datum/shop_sku/black_market/mod_traitor
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "MODsuits"
 	name = "syndicate MODsuit (equipped)"
-	desc = "The full loadout: syndicate storage, EMP shielding, shock absorbers, magnetic harness, jetpack and a DNA lock. An expedition's worth of vouchers, and it shows."
+	desc = "A blood-red MODsuit with a full complement of Syndicate modules."
 	item_path = /obj/item/mod/control/pre_equipped/traitor
 	price_vouchers = 5
 	stock_min = 1
 	stock_max = 1
 
 /datum/shop_sku/black_market/mod_storage
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "MODsuits"
-	desc = "Cybersun compression storage. Twenty-one items in a back panel, and it fits things a normal storage module won't."
+	desc = "A Cybersun compression storage module."
 	item_path = /obj/item/mod/module/storage/syndicate
 	price_vouchers = 1
 	stock_min = 1
 	stock_max = 3
 
 /datum/shop_sku/black_market/mod_plate_compression
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "MODsuits"
-	desc = "Squeezes a stowed suit down to normal size so it fits in a bag. Nothing else fits in the suit afterwards."
+	desc = "A compact plate-compression assembly for a MODsuit."
 	item_path = /obj/item/mod/module/plate_compression
 	price_vouchers = 1
 	price_credits = 1800
@@ -419,16 +362,18 @@
 	stock_max = 2
 
 /datum/shop_sku/black_market/mod_energy_shield
+	zone_permission = ZONE_PERMISSION_ADVANCED
 	category = "MODsuits"
-	desc = "A back-mounted deflector that eats one incoming attack and then needs ten seconds to come back. The best defensive module money can buy here."
+	desc = "A back-mounted energy deflector."
 	item_path = /obj/item/mod/module/energy_shield
 	price_vouchers = 3
 	stock_min = 1
 	stock_max = 1
 
 /datum/shop_sku/black_market/mod_wraith_cloak
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "MODsuits"
-	desc = "Bends light around the suit until you're nearly invisible. Taking a hit or throwing a punch drops it, and it drinks power."
+	desc = "An unmarked optical shroud for a MODsuit."
 	item_path = /obj/item/mod/module/stealth/wraith
 	price_vouchers = 3
 	stock_min = 1
@@ -441,9 +386,10 @@
 // defensive and dirty half, and the cloak board is a contract reward only.
 
 /datum/shop_sku/black_market/shield_generator_board
+	zone_permission = ZONE_PERMISSION_ADVANCED
 	category = "Ship Systems"
 	name = "shield generator board"
-	desc = "The machine board for a ship shield generator. If your ship didn't spawn with one, this is the only place in the galaxy that will sell you the part."
+	desc = "The circuit board for a ship shield generator."
 	item_path = /obj/item/circuitboard/machine/ship_combat/shield_generator
 	price_vouchers = 4
 	price_credits = 6000
@@ -451,9 +397,10 @@
 	stock_max = 1
 
 /datum/shop_sku/black_market/interdictor_board
+	zone_permission = ZONE_PERMISSION_ADVANCED
 	category = "Ship Systems"
 	name = "interdiction system board"
-	desc = "Board for an interdictor. Holds a ship in place so it can't jump away from the fight it started."
+	desc = "The circuit board for a ship interdiction system."
 	item_path = /obj/item/circuitboard/machine/ship_combat/interdictor
 	price_vouchers = 3
 	price_credits = 4800
@@ -461,9 +408,10 @@
 	stock_max = 1
 
 /datum/shop_sku/black_market/data_siphon_board
+	zone_permission = ZONE_PERMISSION_ADVANCED
 	category = "Ship Systems"
 	name = "data siphon board"
-	desc = "Pirate hardware that pulls credits off another ship's account while you hold a lock on it. Vex sells it without comment."
+	desc = "An off-ledger data siphon circuit board."
 	item_path = /obj/item/circuitboard/machine/ship_combat/data_siphon
 	price_vouchers = 3
 	price_credits = 3600
@@ -471,9 +419,10 @@
 	stock_max = 1
 
 /datum/shop_sku/black_market/ew_suite_board
+	zone_permission = ZONE_PERMISSION_ADVANCED
 	category = "Ship Systems"
 	name = "electronic warfare suite board"
-	desc = "The machine board for an electronic warfare suite. Links to a weapons console and runs whatever exploit software you load into it."
+	desc = "The circuit board for an electronic warfare suite."
 	item_path = /obj/item/circuitboard/machine/ship_combat/ew_suite
 	price_vouchers = 3
 	price_credits = 3200
@@ -533,7 +482,7 @@
 /datum/shop_sku/black_market/ew_comms_blackout
 	category = "Exploit Software"
 	name = "Comms Blackout exploit cartridge"
-	desc = "Jams the target ship's internal radio net for a full minute."
+	desc = "An encrypted radio-jamming cartridge."
 	item_path = /obj/item/ew_exploit/comms_blackout
 	price_credits = 1000
 	stock_min = 1
@@ -542,7 +491,7 @@
 /datum/shop_sku/black_market/ew_sensor_ghosts
 	category = "Exploit Software"
 	name = "Ghost Contacts exploit cartridge"
-	desc = "Feeds three phantom ship contacts into the target's sensor picture."
+	desc = "An encrypted sensor-spoofing cartridge."
 	item_path = /obj/item/ew_exploit/sensor_ghosts
 	price_credits = 950
 	stock_min = 1
@@ -601,13 +550,14 @@
 /datum/shop_sku/black_market/emag
 	category = "Infiltration"
 	name = "cryptographic sequencer"
-	desc = "Opens outpost rental lockers, the cargo console's restricted list, and some colosseum machinery. That's the whole list, hence the price."
+	desc = "A cryptographic sequencer with its serial number filed off."
 	item_path = /obj/item/card/emag
 	price_vouchers = 2
 	stock_min = 1
 	stock_max = 1
 
 /datum/shop_sku/black_market/thermals
+	zone_permission = ZONE_PERMISSION_YELLOW
 	category = "Infiltration"
 	item_path = /obj/item/clothing/glasses/thermal/syndi
 	price_vouchers = 3
@@ -661,55 +611,33 @@
 // Every chart SKU now lives in shop_catalog_charts.dm and reaches this shelf
 // through chart_pool above. The generic rumor rides the core shelf.
 
-// ===== BLUEPRINTS =====
-// The only trader route to these guns; build them via their schematics.
-// Reusable, so priced at the top of the ladder.
-
-/datum/shop_sku/black_market/saw_blueprint
-	category = "Blueprints"
-	item_path = /obj/item/blueprint/gun/l6_saw
-	price_vouchers = 5
-	stock_min = 1
-	stock_max = 1
-
-/datum/shop_sku/black_market/sniper_blueprint
-	category = "Blueprints"
-	item_path = /obj/item/blueprint/gun/sniper_rifle
-	price_vouchers = 5
-	stock_min = 1
-	stock_max = 1
-
-/datum/shop_sku/black_market/bulldog_blueprint
-	category = "Blueprints"
-	item_path = /obj/item/blueprint/gun/bulldog
-	price_vouchers = 5
-	stock_min = 1
-	stock_max = 1
-
 // ===== MYSTERY CARGO =====
-// The gamble channel, sold over the counter: sealed caches rolling the zone
-// loot tables. The crate pins its band to the spawn turf, bought at the
-// Undertow, it rolls on lawless odds. The reinforced one is not a different
-// table, just a fuller crate; nothing here is unobtainable from a cache
-// found in the field.
+// Bought caches keep syndicate supplies but use freight weapon odds and classes.
+// The premium crate adds nonweapon draws only.
 
 /datum/shop_sku/black_market/mystery_cache
 	category = "Mystery Cargo"
 	name = "sealed cache"
 	desc = "A locked syndicate supply cache, contents sight-unseen. Vex guarantees it's worth something. Vex guarantees nothing else."
-	item_path = /obj/structure/closet/crate/zone_loot/syndicate
+	item_path = /obj/structure/closet/crate/zone_loot/syndicate/trader
 	price_vouchers = 2
-	stock_min = 2
-	stock_max = 3
+	stock_min = 1
+	stock_max = 1
+	restock_interval = INFINITY
+	fixed_price = TRUE
+	contract_reward = FALSE
 
 /datum/shop_sku/black_market/mystery_cache_rare
 	category = "Mystery Cargo"
 	name = "reinforced cache"
 	desc = "The good crate. The one from the back room. Even Vex looks curious when one moves."
-	item_path = /obj/structure/closet/crate/zone_loot/syndicate/reinforced
+	item_path = /obj/structure/closet/crate/zone_loot/syndicate/trader/reinforced
 	price_vouchers = 4
 	stock_min = 1
 	stock_max = 1
+	restock_interval = INFINITY
+	fixed_price = TRUE
+	contract_reward = FALSE
 
 // ===== SUNDRIES =====
 
@@ -717,7 +645,7 @@
 /datum/shop_sku/black_market/soap
 	category = "Sundries"
 	item_path = /obj/item/soap/syndie
-	price_credits = 150
+	price_credits = 80
 	stock_min = 3
 	stock_max = 6
 
@@ -731,51 +659,43 @@
 /datum/shop_sku/black_market/syndie_cigarettes
 	category = "Sundries"
 	item_path = /obj/item/storage/fancy/cigarettes/cigpack_syndicate
-	price_credits = 150
+	price_credits = 80
 	stock_min = 2
 	stock_max = 4
 
 // ===== ROTATING SHELF =====
 
 /datum/shop_sku/black_market/rotating/mateba
+	zone_permission = ZONE_PERMISSION_YELLOW
 	category = "Weapons"
 	item_path = /obj/item/gun/ballistic/revolver/mateba
-	price_vouchers = 4
-
-/datum/shop_sku/black_market/rotating/ebow
-	category = "Weapons"
-	name = "miniature energy crossbow"
-	item_path = /obj/item/gun/energy/recharge/ebow
-	price_vouchers = 6
+	price_vouchers = 1
+	price_credits = 3000
+	stock_min = 1
+	stock_max = 1
+	restock_interval = 1 HOURS
+	fixed_price = TRUE
+	contract_reward = FALSE
 
 /datum/shop_sku/black_market/rotating/minibomb
 	category = "Explosives"
 	item_path = /obj/item/grenade/syndieminibomb
 	price_vouchers = 3
 
-/datum/shop_sku/black_market/rotating/dart_pistol
-	category = "Weapons"
-	item_path = /obj/item/gun/syringe/syndicate
-	price_vouchers = 2
-
 /datum/shop_sku/black_market/rotating/mod_flamethrower
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "MODsuits"
-	desc = "A suit-mounted flamethrower. Three seconds between bursts and it costs a lot of charge, so pick your moment."
+	desc = "A suit-mounted flamethrower."
 	item_path = /obj/item/mod/module/flamethrower
 	price_vouchers = 3
 
 /datum/shop_sku/black_market/rotating/mod_chameleon
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "MODsuits"
 	desc = "Disguises the whole stowed suit as some other object. Useful for walking a MODsuit past people who would object to a MODsuit."
 	item_path = /obj/item/mod/module/chameleon
 	price_vouchers = 2
 
-/datum/shop_sku/black_market/rotating/mod_active_sonar
-	category = "MODsuits"
-	desc = "Pings for living things around you and puts them on your HUD. Everyone in earshot hears the ping too."
-	item_path = /obj/item/mod/module/active_sonar
-	price_vouchers = 2
-
 /datum/shop_sku/black_market/rotating/ew_runaway_burn
 	category = "Exploit Software"
 	name = "Runaway Burn exploit cartridge"
@@ -786,25 +706,28 @@
 /datum/shop_sku/black_market/rotating/ew_helm_poltergeist
 	category = "Exploit Software"
 	name = "Poltergeist exploit cartridge"
-	desc = "Yanks the target's helm onto a new random heading every few seconds."
+	desc = "An encrypted helm-control exploit cartridge."
 	item_path = /obj/item/ew_exploit/helm_poltergeist
 	price_vouchers = 2
 
 // ===== RARE SHOWCASE =====
 
 /datum/shop_sku/black_market/rare/energy_sword
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "Weapons"
 	item_path = /obj/item/melee/energy/sword/saber
 	price_vouchers = 4
-
-/datum/shop_sku/black_market/rare/energy_shield
-	category = "Weapons"
-	item_path = /obj/item/shield/energy
-	price_vouchers = 3
+	price_credits = 4000
+	stock_min = 1
+	stock_max = 1
+	restock_interval = INFINITY
+	fixed_price = TRUE
+	contract_reward = FALSE
 
 /datum/shop_sku/black_market/rare/mod_adrenaline
+	zone_permission = ZONE_PERMISSION_ELITE
 	category = "MODsuits"
-	desc = "Spider Clan chemistry in a suit module. Clears stamina damage and every immobilizing effect, then needs 20u of radium before it will do it again. Can't be uninstalled once fitted."
+	desc = "A sealed Spider Clan chemical injector for a MODsuit."
 	item_path = /obj/item/mod/module/adrenaline_boost
 	price_vouchers = 3
 
@@ -834,6 +757,19 @@
 	demand_min = 2
 	demand_max = 4
 
+// Fresh or stabilized only. A core rots a few minutes after the legion dies, so
+// cores can't be banked for vouchers without the stabilizer. matches() runs on
+// the very core try_sell() consumes, at the moment of sale.
+/datum/shop_buyback/black_market/legion_core/matches(obj/item/offered)
+	return ..() && !is_dead_monster_core(offered)
+
+/datum/shop_buyback/black_market/legion_core/get_denial_reason(mob/living/user)
+	if(demand > 0 && count_carried_units(user) < 1)
+		for(var/obj/item/offered in user.get_all_contents())
+			if(istype(offered, item_path) && is_dead_monster_core(offered) && !is_trader_good(offered))
+				return "That core's gone dead."
+	return ..()
+
 /datum/shop_buyback/black_market/bluespace_crystals
 	name = "natural bluespace crystals"
 	desc = "Unrefined crystal straight out of dangerous rock. Vex can tell the lab-grown ones apart by smell, apparently."
@@ -890,18 +826,155 @@
 	demand_max = 5
 
 // ===== BACK ROOM =====
-// Vex's favor uniques: Trusted standing only, up to FAVOR_UNIQUE_CREW_LIMIT
+// Vex's favor unique: Crew reputation only, up to FAVOR_UNIQUE_CREW_LIMIT
 // per crew per round. Priced above the rare shelf on purpose, standing opens
 // the door, it doesn't pay the bill. All prices PROVISIONAL BALANCE.
 
 /datum/shop_sku/favor/vex_insurance
+	zone_permission = ZONE_PERMISSION_ELITE
 	name = "Vex's insurance policy"
-	desc = "A one-shot casualty implant: the first time your body starts shutting down, it floods you with stabilizer and recalls you to your registered ship. One claim per policy. Vex does not discuss the actuarial tables."
+	desc = "A casualty implant bearing Vex's seal."
 	item_path = /obj/item/implanter/vex_insurance
 	price_credits = 3000
 	price_vouchers = 3
 
-/datum/shop_sku/favor/quiet_word
-	item_path = /obj/item/gun/ballistic/automatic/pistol/clandestine/quiet_word
-	price_credits = 2000
+// ===== COUNTER ARMS =====
+
+/datum/shop_sku/black_market/boarding_axe
+	category = "Weapons"
+	item_path = /obj/item/fireaxe/boardingaxe
+	price_credits = 2400
+	price_vouchers = 0
+	stock_min = 1
+	stock_max = 1
+
+/datum/shop_sku/black_market/cutlass
+	category = "Weapons"
+	item_path = /obj/item/claymore/cutlass
+	price_credits = 3000
 	price_vouchers = 3
+	stock_min = 1
+	stock_max = 1
+	restock_interval = INFINITY
+	fixed_price = TRUE
+	contract_reward = FALSE
+
+/datum/shop_sku/black_market/c20r
+	zone_permission = ZONE_PERMISSION_YELLOW
+	category = "Weapons"
+	item_path = /obj/item/gun/ballistic/automatic/c20r/unrestricted
+	price_credits = 3600
+	price_vouchers = 2
+	stock_min = 1
+	stock_max = 1
+	restock_interval = 1 HOURS
+	fixed_price = TRUE
+	contract_reward = FALSE
+
+/datum/shop_sku/black_market/wt550
+	zone_permission = ZONE_PERMISSION_YELLOW
+	category = "Weapons"
+	item_path = /obj/item/gun/ballistic/automatic/wt550
+	price_credits = 4200
+	price_vouchers = 2
+	stock_min = 1
+	stock_max = 1
+	restock_interval = 1 HOURS
+	fixed_price = TRUE
+	contract_reward = FALSE
+
+/// Counter-bought caches retain themed supplies, with a single freight weapon roll.
+/// Kept separate from guarded caches so buying a crate cannot buy advanced guns.
+/obj/structure/closet/crate/zone_loot/syndicate/trader
+	var/manifest_opened = FALSE
+
+/obj/structure/closet/crate/zone_loot/syndicate/trader/reinforced
+	name = "reinforced syndicate cache"
+	desc = "A matte-black drop crate in an extra layer of plating."
+	bonus_draws = 2
+
+/// Replaces the guarded-cache payout; deliberately does not call its parent.
+/obj/structure/closet/crate/zone_loot/syndicate/trader/PopulateContents()
+	if(manifest_opened)
+		return
+	manifest_opened = TRUE
+	if(isnull(loot_zone))
+		loot_zone = SSovermap_zones.get_zone_type_anywhere(spawn_turf)
+	if(isnull(loot_zone))
+		loot_zone = ZONE_GREEN
+	spawn_turf = null
+
+	var/list/pools = get_supply_pools()
+	var/draws_min = ZONE_LOOT_DRAWS_MIN_GREEN
+	var/draws_max = ZONE_LOOT_DRAWS_MAX_GREEN
+	var/list/tier_odds = ZONE_LOOT_ODDS_GREEN
+	switch(loot_zone)
+		if(ZONE_YELLOW)
+			draws_min = ZONE_LOOT_DRAWS_MIN_YELLOW
+			draws_max = ZONE_LOOT_DRAWS_MAX_YELLOW
+			tier_odds = ZONE_LOOT_ODDS_YELLOW
+		if(ZONE_RED)
+			draws_min = ZONE_LOOT_DRAWS_MIN_RED
+			draws_max = ZONE_LOOT_DRAWS_MAX_RED
+			tier_odds = ZONE_LOOT_ODDS_RED
+	// The weapon replaces one ordinary draw; premium draws remain supplies.
+	roll_loot_draws(src, pools, rand(draws_min, draws_max) - 1 + bonus_draws, tier_odds)
+	var/weapon_path = roll_weapon()
+	new weapon_path(src)
+	var/spare_ammo = GLOB.loot_gun_spare_ammo[weapon_path]
+	if(spare_ammo)
+		new spare_ammo(src)
+
+/// Working copies only: filtering a bought crate must never change field loot.
+/obj/structure/closet/crate/zone_loot/syndicate/trader/proc/get_supply_pools()
+	var/datum/loot_theme/loot_theme = GLOB.loot_themes[theme]
+	var/list/pools = list(
+		"[LOOT_TIER_COMMON]" = loot_theme.loot_common.Copy(),
+		"[LOOT_TIER_UNCOMMON]" = loot_theme.loot_uncommon.Copy(),
+		"[LOOT_TIER_PRIME]" = loot_theme.loot_prime.Copy(),
+		"[LOOT_TIER_UNIQUE]" = loot_theme.loot_uniques.Copy(),
+	)
+	for(var/tier in pools)
+		var/list/pool = pools[tier]
+		for(var/loot_path in pool.Copy())
+			if(ispath(loot_path, /obj/item/gun) || ispath(loot_path, /obj/item/knife) || ispath(loot_path, /obj/item/melee) \
+				|| ispath(loot_path, /obj/item/claymore) || ispath(loot_path, /obj/item/katana) || ispath(loot_path, /obj/item/fireaxe) \
+				|| ispath(loot_path, /obj/item/spear) || ispath(loot_path, /obj/item/hatchet) || ispath(loot_path, /obj/item/mjollnir) \
+				|| ispath(loot_path, /obj/item/organ/cyberimp) || ispath(loot_path, /obj/item/organ/eyes/robotic/cyberware) \
+				|| ispath(loot_path, /obj/item/cyberware_pair_case) || ispath(loot_path, /obj/item/storage/case/cyberware))
+				pool -= loot_path
+	return pools
+
+/obj/structure/closet/crate/zone_loot/syndicate/trader/proc/get_gun_chance()
+	switch(loot_zone)
+		if(ZONE_YELLOW)
+			return 19
+		if(ZONE_RED)
+			return 33
+	return 8
+
+/obj/structure/closet/crate/zone_loot/syndicate/trader/proc/get_weapon_class_weights(gun)
+	switch(loot_zone)
+		if(ZONE_YELLOW)
+			return gun ? list("green" = 45, "yellow" = 54, "red" = 1) : list("green" = 35, "yellow" = 64, "red" = 1)
+		if(ZONE_RED)
+			return gun ? list("green" = 15, "yellow" = 35, "red" = 50) : list("green" = 10, "yellow" = 45, "red" = 45)
+	return gun ? list("green" = 940, "yellow" = 59, "red" = 1) : list("green" = 900, "yellow" = 99, "red" = 1)
+
+/obj/structure/closet/crate/zone_loot/syndicate/trader/proc/get_weapon_pool(gun, weapon_class)
+	if(gun)
+		if(weapon_class == "green")
+			return list(/obj/item/gun/ballistic/rifle/boltaction/surplus, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver/c38/detective, /obj/item/gun/ballistic/shotgun/doublebarrel)
+		// Freight substitutes ordinary guns even when the advanced class wins.
+		return list(/obj/item/gun/ballistic/shotgun/riot, /obj/item/gun/ballistic/automatic/tommygun, /obj/item/gun/ballistic/automatic/mini_uzi)
+	switch(weapon_class)
+		if("green")
+			return list(/obj/item/knife/combat/survival, /obj/item/spear, /obj/item/hatchet, /obj/item/melee/baseball_bat)
+		if("yellow")
+			return list(/obj/item/knife/combat, /obj/item/claymore/shortsword, /obj/item/melee/baseball_bat/ablative, /obj/item/fireaxe, /obj/item/melee/cleric_mace, /obj/item/melee/sabre)
+		if("red")
+			return list(/obj/item/claymore, /obj/item/claymore/cutlass, /obj/item/katana, /obj/item/mjollnir, /obj/item/melee/energy/sword/saber, /obj/item/melee/energy/sword/pirate)
+
+/obj/structure/closet/crate/zone_loot/syndicate/trader/proc/roll_weapon()
+	var/gun = prob(get_gun_chance())
+	return pick(get_weapon_pool(gun, pick_weight(get_weapon_class_weights(gun))))
diff --git a/voidcrew/modules/trade/shop_catalog_black_market_vendors.dm b/voidcrew/modules/trade/shop_catalog_black_market_vendors.dm
index 39ce8dffa9f..be0f48f384d 100644
--- a/voidcrew/modules/trade/shop_catalog_black_market_vendors.dm
+++ b/voidcrew/modules/trade/shop_catalog_black_market_vendors.dm
@@ -226,7 +226,7 @@
 	name = "box of donk-pockets"
 	desc = "Six factory donk-pockets, the official cuisine of people being shot at. Microwave not included."
 	item_path = /obj/item/storage/box/donkpockets
-	price_credits = 220
+	price_credits = 200
 	stock_min = 1
 	stock_max = 3
 
@@ -391,7 +391,6 @@
 		/datum/shop_buyback/clinic/liver,
 		/datum/shop_buyback/clinic/lungs,
 		/datum/shop_buyback/clinic/monster_gland,
-		/datum/shop_buyback/clinic/used_defib,
 	)
 	trader_lines = list(
 		TRADER_LINE_SALE = list(
@@ -461,7 +460,7 @@
 	name = "O- blood pack"
 	desc = "Universal donor blood. Sawbones swears it's O negative and mostly blood."
 	item_path = /obj/item/reagent_containers/blood/o_minus
-	price_credits = 300
+	price_credits = 150
 	stock_min = 2
 	stock_max = 4
 
@@ -558,7 +557,7 @@
 	name = "pre-owned heart"
 	desc = "One careful owner. Sawbones guarantees it was beating recently."
 	item_path = /obj/item/organ/heart
-	price_credits = 450
+	price_credits = 300
 	stock_min = 1
 	stock_max = 2
 
@@ -567,7 +566,7 @@
 	name = "lightly used liver"
 	desc = "Some cosmetic wear, consistent with the previous owner drinking at the Dregs."
 	item_path = /obj/item/organ/liver
-	price_credits = 400
+	price_credits = 200
 	stock_min = 1
 	stock_max = 2
 
@@ -576,7 +575,7 @@
 	name = "reconditioned lungs"
 	desc = "Aired out and everything. Non-smoker, allegedly."
 	item_path = /obj/item/organ/lungs
-	price_credits = 400
+	price_credits = 200
 	stock_min = 1
 	stock_max = 2
 
@@ -609,7 +608,7 @@
 /datum/shop_sku/clinic/rotating/survival_pen
 	category = "Field Medicine"
 	item_path = /obj/item/reagent_containers/hypospray/medipen/survival
-	price_credits = 400
+	price_credits = 300
 
 /datum/shop_sku/clinic/rotating/prescription_stimulants
 	category = "Back Room"
@@ -637,8 +636,13 @@
 	price_vouchers = 0
 
 // ===== SAWBONES' INTAKE LEDGER (buybacks) =====
-// Credits only, and nothing a ship lathe can print: organs, monster glands,
-// and pre-owned defibs (the medical equivalent of Vex's gun fencing).
+// Natural donor organs and monster glands only.
+
+/datum/shop_buyback/clinic/matches(obj/item/offered)
+	if(!..() || !istype(offered, /obj/item/organ))
+		return FALSE
+	var/obj/item/organ/organ = offered
+	return (organ.organ_flags & ORGAN_ORGANIC) && !(organ.organ_flags & ORGAN_ROBOTIC) && !HAS_TRAIT(organ, TRAIT_PRINTED_ORGAN)
 
 /datum/shop_buyback/clinic/heart
 	name = "donor heart"
@@ -676,11 +680,14 @@
 	demand_min = 3
 	demand_max = 5
 
-/datum/shop_buyback/clinic/used_defib
-	name = "defibrillator (pre-owned)"
-	desc = "Sawbones buys defibs with a history. Scorch marks are fine. Scorch marks are expected."
-	category = "Equipment Intake"
-	item_path = /obj/item/defibrillator
-	pay_credits = 250
-	demand_min = 2
-	demand_max = 4
+// Fresh or stabilized only, like Vex's cores. matches() runs on the very gland
+// try_sell() consumes, at the moment of sale.
+/datum/shop_buyback/clinic/monster_gland/matches(obj/item/offered)
+	return ..() && !is_dead_monster_core(offered)
+
+/datum/shop_buyback/clinic/monster_gland/get_denial_reason(mob/living/user)
+	if(demand > 0 && count_carried_units(user) < 1)
+		for(var/obj/item/offered in user.get_all_contents())
+			if(istype(offered, item_path) && is_dead_monster_core(offered) && !is_trader_good(offered))
+				return "That core's gone dead."
+	return ..()
diff --git a/voidcrew/modules/trade/shop_catalog_charts.dm b/voidcrew/modules/trade/shop_catalog_charts.dm
index fddfb02add2..9c79caf1fce 100644
--- a/voidcrew/modules/trade/shop_catalog_charts.dm
+++ b/voidcrew/modules/trade/shop_catalog_charts.dm
@@ -67,7 +67,7 @@
 	is_chart = TRUE
 	// One price at every outpost, since all three now sell the same galaxy-wide
 	// tip rather than their own band's local gossip.
-	price_credits = 1500
+	price_credits = 400
 	stock_min = 2
 	stock_max = 4
 
diff --git a/voidcrew/modules/trade/shop_catalog_diner.dm b/voidcrew/modules/trade/shop_catalog_diner.dm
index c464f84f03b..5a20c3b1341 100644
--- a/voidcrew/modules/trade/shop_catalog_diner.dm
+++ b/voidcrew/modules/trade/shop_catalog_diner.dm
@@ -239,35 +239,35 @@
 /datum/shop_sku/diner/plated/carbonara
 	category = "Chef's Table"
 	item_path = /obj/item/food/spaghetti/carbonara
-	price_credits = 220
+	price_credits = 150
 	stock_min = 1
 	stock_max = 2
 
 /datum/shop_sku/diner/plated/bibimbap
 	category = "Chef's Table"
 	item_path = /obj/item/food/salad/bibimbap
-	price_credits = 240
+	price_credits = 160
 	stock_min = 1
 	stock_max = 2
 
 /datum/shop_sku/diner/plated/katsu_curry
 	category = "Chef's Table"
 	item_path = /obj/item/food/salad/katsu_curry
-	price_credits = 260
+	price_credits = 180
 	stock_min = 1
 	stock_max = 2
 
 /datum/shop_sku/diner/plated/tonkotsu_ramen
 	category = "Chef's Table"
 	item_path = /obj/item/food/spaghetti/shoyu_tonkotsu_ramen
-	price_credits = 260
+	price_credits = 180
 	stock_min = 1
 	stock_max = 2
 
 /datum/shop_sku/diner/plated/big_blue
 	category = "Chef's Table"
 	item_path = /obj/item/food/burger/big_blue
-	price_credits = 280
+	price_credits = 200
 	stock_min = 1
 	stock_max = 2
 
@@ -277,7 +277,7 @@
 	category = "Chef's Table"
 	name = "meat-lover's pizza (whole)"
 	item_path = /obj/item/food/pizza/meat
-	price_credits = 320
+	price_credits = 280
 	stock_min = 1
 	stock_max = 2
 
@@ -285,7 +285,7 @@
 	category = "Chef's Table"
 	name = "chocolate cake (whole)"
 	item_path = /obj/item/food/cake/chocolate
-	price_credits = 330
+	price_credits = 300
 	stock_min = 1
 	stock_max = 2
 
@@ -293,7 +293,7 @@
 	category = "Chef's Table"
 	name = "actually grilled cheese"
 	item_path = /obj/item/food/grilled_cheese
-	price_credits = 240
+	price_credits = 130
 	stock_min = 1
 	stock_max = 2
 
@@ -382,27 +382,27 @@
 	category = "Blue Plate Specials"
 	desc = "The chowder pot's southern cousin. Roux insists they are different pots and refuses to elaborate."
 	item_path = /obj/item/food/salad/gumbo
-	price_credits = 180
+	price_credits = 150
 
 /datum/shop_sku/diner/plated/rotating/risotto
 	category = "Blue Plate Specials"
 	item_path = /obj/item/food/salad/risotto
-	price_credits = 180
+	price_credits = 150
 
 /datum/shop_sku/diner/plated/rotating/pho
 	category = "Chef's Table"
 	item_path = /obj/item/food/spaghetti/pho
-	price_credits = 220
+	price_credits = 180
 
 /datum/shop_sku/diner/plated/rotating/pad_thai
 	category = "Chef's Table"
 	item_path = /obj/item/food/spaghetti/pad_thai
-	price_credits = 220
+	price_credits = 180
 
 /datum/shop_sku/diner/plated/rotating/kitsune_udon
 	category = "Chef's Table"
 	item_path = /obj/item/food/spaghetti/kitsune_udon
-	price_credits = 200
+	price_credits = 160
 
 // The one rotating slot that isn't a plate: a sealed ingredient crate off the
 // convoy manifest. Factory goods, so no /plated parent.
@@ -421,19 +421,19 @@
 	category = "Chef's Table"
 	desc = "The recipe is a guarded secret among cafe owners across human space, and Roux will not say what she traded for it. Eating it is said to replenish the soul. The pot has opinions about that claim."
 	item_path = /obj/item/food/salad/setagaya_curry
-	price_credits = 600
+	price_credits = 400
 
 /datum/shop_sku/diner/plated/rare/birthday_cake
 	category = "Chef's Table"
 	name = "birthday cake"
 	desc = "Somebody on your crew has a birthday coming. Statistically."
 	item_path = /obj/item/food/cake/birthday
-	price_credits = 400
+	price_credits = 350
 
 /datum/shop_sku/diner/plated/rare/berry_clafoutis
 	category = "Chef's Table"
 	item_path = /obj/item/food/pie/berryclafoutis
-	price_credits = 300
+	price_credits = 240
 
 // ===== ROUX'S ORDER WHEEL (buybacks) =====
 // She pays for real cooking only: TRAIT_FOOD_CHEF_MADE from any source except
diff --git a/voidcrew/modules/trade/shop_catalog_general.dm b/voidcrew/modules/trade/shop_catalog_general.dm
index 3e504607310..2147bd3416d 100644
--- a/voidcrew/modules/trade/shop_catalog_general.dm
+++ b/voidcrew/modules/trade/shop_catalog_general.dm
@@ -2,7 +2,7 @@
  * # Waystation Halcyon: the green-zone general store
  *
  * Sundries, survival kit and honest prices for the safe inner ring. Credits
- * only; the most dangerous thing on the shelf is the chili in the rations.
+ * only, with surplus arms behind the counter.
  * Shop machinery lives in shop.dm; this file is pure catalog.
  */
 
@@ -22,6 +22,7 @@
 	r_hand = /obj/item/reagent_containers/cup/glass/coffee
 
 /datum/outpost_shop/general
+	back_room_line = "I'll put a word in at the depot."
 	outpost_name = "\improper Waystation Halcyon"
 	outpost_desc = "A sleepy general store and rest stop on the safe inner ring. The coffee is bad and the prices are honest."
 	trader_name = "Barnaby"
@@ -34,6 +35,7 @@
 		"Tools & Repair",
 		"Medical",
 		"Prospecting",
+		"Arms",
 		"Fuel & Gas",
 		"Galley & Comforts",
 		"Ship Sundries",
@@ -49,35 +51,29 @@
 		/datum/shop_sku/general/breath_mask,
 		/datum/shop_sku/general/eva_suit,
 		/datum/shop_sku/general/eva_helmet,
-		/datum/shop_sku/general/gps,
 		/datum/shop_sku/general/flare,
 		/datum/shop_sku/general/glowstick,
 		/datum/shop_sku/general/survival_medipen,
 		/datum/shop_sku/general/oxygen_canister,
 		/datum/shop_sku/general/jetpack,
 		// Tools & Repair
-		/datum/shop_sku/general/toolbelt,
-		/datum/shop_sku/general/big_welder,
 		/datum/shop_sku/general/welding_fuel,
-		/datum/shop_sku/general/light_replacer,
-		/datum/shop_sku/general/holofan,
-		/datum/shop_sku/general/rcd,
 		// Medical
 		/datum/shop_sku/general/medkit,
 		/datum/shop_sku/general/burn_kit,
 		/datum/shop_sku/general/o2_kit,
-		/datum/shop_sku/general/health_analyzer,
 		/datum/shop_sku/general/epipen,
 		/datum/shop_sku/general/gauze,
 		/datum/shop_sku/general/suture,
 		/datum/shop_sku/general/regen_mesh,
 		// Prospecting
-		/datum/shop_sku/general/pickaxe,
-		/datum/shop_sku/general/mesons,
 		/datum/shop_sku/general/ore_bag,
-		/datum/shop_sku/general/mining_scanner,
 		/datum/shop_sku/general/adv_mining_scanner,
 		/datum/shop_sku/general/diamond_pick,
+		// Arms
+		/datum/shop_sku/general/hunting_knife,
+		/datum/shop_sku/general/survival_knife,
+		/datum/shop_sku/general/surplus_rifle,
 		// Fuel & Gas
 		/datum/shop_sku/general/plasma_canister,
 		/datum/shop_sku/general/plasma_sheets,
@@ -113,14 +109,9 @@
 		/datum/shop_sku/general/rotating/freight_crate,
 		/datum/shop_sku/general/rotating/metalfoam,
 		/datum/shop_sku/general/rotating/bikehorn,
-		/datum/shop_sku/general/rotating/welding_goggles,
 		/datum/shop_sku/general/rotating/guitar,
 	)
-	rare_pool = list(
-		/datum/shop_sku/general/rare/bluespace_bodybag,
-		/datum/shop_sku/general/rare/drill,
-	)
-	// The back room: Trusted-standing uniques, per-crew supply (trader_favor.dm)
+	// The back room: Crew-reputation uniques, per-crew supply (trader_favor.dm)
 	favor_sku_types = list(
 		/datum/shop_sku/favor/pike_ledger,
 		/datum/shop_sku/favor/field_contract_pad,
@@ -163,20 +154,11 @@
 		/datum/mission/outpost_supply/cook = 15,
 	)
 	mission_requests = list(
-		list("type" = /obj/item/stack/ore/iron, "name" = "iron ore", "amount" = 15, "difficulty" = MISSION_DIFFICULTY_EASY),
-		list("type" = /obj/item/stack/sheet/glass, "name" = "glass sheets", "amount" = 10, "difficulty" = MISSION_DIFFICULTY_EASY),
-		list("type" = /obj/item/stack/ore/plasma, "name" = "plasma ore", "amount" = 8, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
 		list("type" = /obj/item/fish, "name" = "fish", "amount" = 1, "difficulty" = MISSION_DIFFICULTY_EASY),
 		list("type" = /obj/item/stack/sheet/animalhide/bear, "name" = "bear hide", "amount" = 1, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
 		list("type" = /obj/item/stack/spice_pods, "name" = "wild spice pods", "amount" = 6, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
 		list("type" = /obj/item/sea_crystal, "name" = "sea crystal", "amount" = 1, "difficulty" = MISSION_DIFFICULTY_HARD),
 	)
-	// Under the counter: hard contracts only, never sold
-	exclusive_rewards = list(
-		/obj/item/storage/bag/ore/holding,
-		/obj/item/fishing_rod/telescopic/master,
-		/obj/item/pickaxe/drill/jackhammer,
-	)
 	trader_lines = list(
 		TRADER_LINE_GREETING = list(
 			"Welcome to Halcyon! Mind the gift shop on your way out. We are the gift shop.",
@@ -212,7 +194,6 @@
 			"The pod foragers come back smelling like a spice rack and looking like they lost a fight. I pay them anyway.",
 			"Pearl clams! Don't shake them, dear. I candle them cold in the back and never crack a single one.",
 			"Take a rumor with you, dear. The lanes talk to me and I do love to pass it on.",
-			"We had a jackhammer in the back once. Contract work only, mind. Ask at the board.",
 		),
 		TRADER_LINE_RESTOCK = list(
 			"The supply run's in! Fresh everything, and the biscuit tin's full again.",
@@ -262,11 +243,6 @@
 	stock_min = 10
 	stock_max = 20
 
-/datum/shop_sku/general/gps
-	category = "Survival & EVA"
-	item_path = /obj/item/gps
-	price_credits = 200
-
 /datum/shop_sku/general/flare
 	category = "Survival & EVA"
 	item_path = /obj/item/flashlight/flare
@@ -284,13 +260,13 @@
 /datum/shop_sku/general/survival_medipen
 	category = "Survival & EVA"
 	item_path = /obj/item/reagent_containers/hypospray/medipen/survival
-	price_credits = 450
+	price_credits = 300
 	stock_min = 2
 	stock_max = 4
 
 /datum/shop_sku/general/oxygen_canister
 	name = "oxygen canister (full)"
-	desc = "A full canister of breathable oxygen. Wheel it into a compartment that lost its air, crack the valve, and give it a minute. The waystation moves a lot of these."
+	desc = "A full canister of breathable oxygen."
 	category = "Survival & EVA"
 	item_path = /obj/machinery/portable_atmospherics/canister/oxygen
 	price_credits = 1200
@@ -299,7 +275,7 @@
 
 /datum/shop_sku/general/jetpack
 	name = "jetpack (oxygen)"
-	desc = "A compressed oxygen tank rigged for propulsion. It will breathe you or fly you, but not both for very long. Standard kit for anyone patching a hull from the outside."
+	desc = "A compressed oxygen tank rigged for propulsion."
 	category = "Survival & EVA"
 	item_path = /obj/item/tank/jetpack/oxygen
 	price_credits = 2100
@@ -308,54 +284,22 @@
 
 // ===== TOOLS & REPAIR =====
 
+// Retained for the ordinary-shelf unit-test fixture; not sold at an outpost.
 /datum/shop_sku/general/toolbelt
 	category = "Tools & Repair"
 	item_path = /obj/item/storage/belt/utility/full
-	desc = "A loaded repair belt with hand tools, a multitool and cable. Supplies the tools and wiring needed to assemble a replacement autolathe and link a research bay."
+	desc = "A loaded repair belt with hand tools and cable."
 	price_credits = 500
 
-// The large-tank welder only prints on a hacked lathe, so this is the cheap
-// rung on a shelf that otherwise starts at 250 cr.
-/datum/shop_sku/general/big_welder
-	category = "Tools & Repair"
-	item_path = /obj/item/weldingtool/largetank
-	price_credits = 300
-
 /datum/shop_sku/general/welding_fuel
 	name = "welding fuel tank"
-	desc = "A thousand units of industrial welding fuel in a tank you can drag aboard. Enough to keep a repair crew going for a long shift. Don't weld it."
+	desc = "A wheeled tank of industrial welding fuel."
 	category = "Tools & Repair"
 	item_path = /obj/structure/reagent_dispensers/fueltank
 	price_credits = 400
 	stock_min = 2
 	stock_max = 4
 
-/datum/shop_sku/general/light_replacer
-	category = "Tools & Repair"
-	item_path = /obj/item/lightreplacer
-	price_credits = 400
-	stock_min = 1
-	stock_max = 3
-
-/datum/shop_sku/general/holofan
-	category = "Tools & Repair"
-	name = "holofan projector"
-	item_path = /obj/item/holosign_creator/atmos
-	price_credits = 600
-	stock_min = 1
-	stock_max = 2
-
-// The expensive rung on the repair shelf, and the reason ships limp back here
-// instead of to a depot: a breach closes in seconds instead of a welding shift.
-/datum/shop_sku/general/rcd
-	name = "rapid construction device"
-	desc = "Lays and removes walls, floors and airlocks out of stored matter. The fast way to shut a breach while the compartment is still venting. Feed it iron, glass, or compressed matter cartridges."
-	category = "Tools & Repair"
-	item_path = /obj/item/construction/rcd
-	price_credits = 2400
-	stock_min = 1
-	stock_max = 2
-
 // ===== MEDICAL =====
 
 /datum/shop_sku/general/medkit
@@ -370,19 +314,14 @@
 	stock_min = 10
 	category = "Medical"
 	item_path = /obj/item/storage/medkit/fire
-	price_credits = 400
+	price_credits = 300
 
 /datum/shop_sku/general/o2_kit
 	stock_max = 20
 	stock_min = 10
 	category = "Medical"
 	item_path = /obj/item/storage/medkit/o2
-	price_credits = 400
-
-/datum/shop_sku/general/health_analyzer
-	category = "Medical"
-	item_path = /obj/item/healthanalyzer
-	price_credits = 200
+	price_credits = 300
 
 /datum/shop_sku/general/epipen
 	category = "Medical"
@@ -420,31 +359,16 @@
 
 // ===== PROSPECTING =====
 
-/datum/shop_sku/general/pickaxe
-	category = "Prospecting"
-	item_path = /obj/item/pickaxe
-	price_credits = 200
-
-/datum/shop_sku/general/mesons
-	category = "Prospecting"
-	item_path = /obj/item/clothing/glasses/meson
-	price_credits = 400
-
 /datum/shop_sku/general/ore_bag
 	category = "Prospecting"
 	item_path = /obj/item/storage/bag/ore
-	price_credits = 200
-
-/datum/shop_sku/general/mining_scanner
-	category = "Prospecting"
-	item_path = /obj/item/t_scanner/adv_mining_scanner/lesser
-	price_credits = 450
+	price_credits = 100
 
 /datum/shop_sku/general/adv_mining_scanner
-	desc = "The full-range model of the scanner on the shelf beside it: seven tiles of rock instead of four, and it re-sweeps half again as fast. Worth it on a planet where the good seams sit deep."
+	desc = "An industrial mineral scanner with a reinforced casing."
 	category = "Prospecting"
 	item_path = /obj/item/t_scanner/adv_mining_scanner
-	price_credits = 1500
+	price_credits = 300
 	stock_min = 1
 	stock_max = 3
 
@@ -489,7 +413,7 @@
 /datum/shop_sku/general/cards
 	category = "Galley & Comforts"
 	item_path = /obj/item/toy/cards/deck
-	price_credits = 80
+	price_credits = 60
 
 /datum/shop_sku/general/plushie
 	category = "Galley & Comforts"
@@ -530,7 +454,7 @@
 
 /datum/shop_sku/general/plasteel
 	name = "plasteel sheets (20)"
-	desc = "Twenty sheets of plasteel for serious hull work. It needs a smelter to make and most ships don't carry one, so this is the honest way to get it."
+	desc = "Twenty sheets of plasteel, bundled for shipment."
 	category = "Ship Sundries"
 	item_path = /obj/item/stack/sheet/plasteel
 	dispense_amount = 20
@@ -553,7 +477,7 @@
 // The ore is the cheaper option per sheet, but only if you can actually smelt it.
 /datum/shop_sku/general/plasma_sheets
 	name = "solid plasma (20)"
-	desc = "Twenty sheets of solid plasma, the grade portable generators burn. Buy these if your ship has no way to smelt its own ore."
+	desc = "Twenty sheets of solid plasma."
 	category = "Fuel & Gas"
 	item_path = /obj/item/stack/sheet/mineral/plasma
 	dispense_amount = 20
@@ -563,20 +487,20 @@
 
 /datum/shop_sku/general/plasma_ore
 	name = "plasma ore (15)"
-	desc = "Fifteen chunks of raw plasma ore, cheaper by weight than the refined sheets. You need an ore redemption machine to get anything out of it. A welder will not do the job."
+	desc = "Fifteen chunks of raw plasma ore."
 	category = "Fuel & Gas"
 	item_path = /obj/item/stack/ore/plasma
 	dispense_amount = 15
-	price_credits = 220
+	price_credits = 300
 	stock_min = 2
 	stock_max = 4
 
 /datum/shop_sku/general/scoop_board
 	name = "nebula ram scoop board"
-	desc = "The circuit board for a nebula ram scoop. Park inside a nebula and drink your fuel straight out of the cloud. Barnaby keeps them behind the counter with the good stock."
+	desc = "The circuit board for a nebula ram scoop."
 	category = "Fuel & Gas"
 	item_path = /obj/item/circuitboard/machine/shuttle/scoop
-	price_credits = 600
+	price_credits = 250
 	stock_min = 1
 	stock_max = 2
 
@@ -584,10 +508,10 @@
 // engine can at least keep the lights and the air handlers running.
 /datum/shop_sku/general/portable_generator
 	name = "portable plasma generator"
-	desc = "A P.A.C.M.A.N. generator that burns solid plasma for power. Bolt it down, wire it to the grid, and it will hold up the essentials while the engine is out. It eats the plasma sheets Barnaby stocks two shelves over."
+	desc = "A portable P.A.C.M.A.N. plasma generator."
 	category = "Fuel & Gas"
 	item_path = /obj/machinery/power/port_gen/pacman
-	price_credits = 1800
+	price_credits = 1200
 	stock_min = 1
 	stock_max = 2
 
@@ -603,10 +527,10 @@
 // autosurgeon because there was no other way to get one.)
 /datum/shop_sku/general/autolathe_board
 	name = "autolathe board"
-	desc = "The circuit board for an autolathe. If yours is gone, this is the only way to start fabricating again, so Barnaby keeps a couple in the back."
+	desc = "The circuit board for an autolathe."
 	category = "Ship Sundries"
 	item_path = /obj/item/circuitboard/machine/autolathe
-	price_credits = 500 // invented, unplaytested
+	price_credits = 250// invented, unplaytested
 	stock_min = 3
 	stock_max = 6
 
@@ -618,7 +542,7 @@
 	desc = "The circuit board for a ship supply console, the one that calls the cargo shuttle. Barnaby finds it very funny to sell you the thing you buy things with."
 	category = "Ship Sundries"
 	item_path = /obj/item/circuitboard/computer/voidcrew_cargo
-	price_credits = 500 // invented, unplaytested
+	price_credits = 250// invented, unplaytested
 	stock_min = 3
 	stock_max = 6
 
@@ -634,8 +558,13 @@
 	category = "Ship Sundries"
 	name = "unclaimed freight"
 	desc = "A sealed crate somebody never came back for. Barnaby hasn't looked inside, and he'd rather you opened it somewhere else."
-	item_path = /obj/structure/closet/crate/zone_loot/syndicate
+	item_path = /obj/structure/closet/crate/zone_loot/syndicate/trader
 	price_credits = 750
+	stock_min = 1
+	stock_max = 1
+	restock_interval = INFINITY
+	fixed_price = TRUE
+	contract_reward = FALSE
 
 /datum/shop_sku/general/rotating/metalfoam
 	category = "Ship Sundries"
@@ -648,27 +577,12 @@
 	item_path = /obj/item/bikehorn
 	price_credits = 80
 
-/datum/shop_sku/general/rotating/welding_goggles
-	category = "Tools & Repair"
-	item_path = /obj/item/clothing/glasses/welding
-	price_credits = 180
-
 /datum/shop_sku/general/rotating/guitar
 	item_path = /obj/item/instrument/guitar
 	price_credits = 400
 
 // ===== RARE SHOWCASE =====
 
-/datum/shop_sku/general/rare/bluespace_bodybag
-	category = "Ship Sundries"
-	item_path = /obj/item/bodybag/bluespace
-	price_credits = 3000
-
-/datum/shop_sku/general/rare/drill
-	category = "Prospecting"
-	item_path = /obj/item/pickaxe/drill
-	price_credits = 1800
-
 // ===== BARNABY'S PROSPECTOR COUNTER (buybacks) =====
 
 /datum/shop_buyback/general/gold_ore
@@ -756,21 +670,24 @@
 	stock_max = 4
 
 // ===== BACK ROOM =====
-// Barnaby's favor uniques: Trusted standing only, up to FAVOR_UNIQUE_CREW_LIMIT
+// Barnaby's favor uniques: Crew reputation only, up to FAVOR_UNIQUE_CREW_LIMIT
 // per crew per round. Priced above the rare shelf on purpose, standing opens
 // the door, it doesn't pay the bill. All prices PROVISIONAL BALANCE.
 
 /datum/shop_sku/favor/pike_ledger
+	zone_permission = ZONE_PERMISSION_YELLOW
 	item_path = /obj/item/pike_ledger
 	price_credits = 3200
 	price_vouchers = 2
 
 /datum/shop_sku/favor/field_contract_pad
+	zone_permission = ZONE_PERMISSION_YELLOW
 	item_path = /obj/item/field_contract_pad
 	price_credits = 3600
 	price_vouchers = 2
 
 /datum/shop_sku/favor/freight_beacon
+	zone_permission = ZONE_PERMISSION_YELLOW
 	item_path = /obj/item/freight_beacon
 	price_credits = 2400
 	price_vouchers = 1
@@ -778,9 +695,37 @@
 // The replacement lathe cannot print its own construction parts.
 /datum/shop_sku/general/basic_parts
 	name = "basic machine parts box"
-	desc = "Three each of basic matter bins, servos, capacitors, micro-lasers and scanners. Enough parts to rebuild an autolathe; bring a board, five iron sheets for its frame, five cables and one glass sheet."
+	desc = "A boxed assortment of basic machine components."
 	category = "Ship Sundries"
 	item_path = /obj/item/storage/box/stockparts/basic
 	price_credits = 300
 	stock_min = 3
 	stock_max = 6
+// ===== ARMS =====
+
+/datum/shop_sku/general/hunting_knife
+	category = "Arms"
+	item_path = /obj/item/knife/hunting
+	price_credits = 200
+	price_vouchers = 0
+	stock_min = 4
+	stock_max = 4
+
+/datum/shop_sku/general/survival_knife
+	category = "Arms"
+	item_path = /obj/item/knife/combat/survival
+	price_credits = 350
+	price_vouchers = 0
+	stock_min = 4
+	stock_max = 4
+
+/datum/shop_sku/general/surplus_rifle
+	category = "Arms"
+	item_path = /obj/item/gun/ballistic/rifle/boltaction/surplus
+	price_credits = 900
+	price_vouchers = 0
+	stock_min = 2
+	stock_max = 2
+	restock_interval = 1 HOURS
+	fixed_price = TRUE
+	contract_reward = FALSE
diff --git a/voidcrew/modules/trade/shop_catalog_general_vendors.dm b/voidcrew/modules/trade/shop_catalog_general_vendors.dm
index 144476a6820..c80c5fc9c0e 100644
--- a/voidcrew/modules/trade/shop_catalog_general_vendors.dm
+++ b/voidcrew/modules/trade/shop_catalog_general_vendors.dm
@@ -12,11 +12,8 @@
  *   and grower's supply, Pike owns tackle and the rods. Pike's stall stocks
  *   nothing a stock ship autolathe prints for free, that ruled out the
  *   aquarium kit and fish case.
- * - Fern's hand tools ARE autolathe designs, and they're priced like it: pocket
- *   change, sold for the crew that wants a garden running before they've built
- *   a lathe or walked back to one. Her tray board is the real sale, it sits
- *   behind the hydroponics techweb node, so a ship with no R&D bay has no other
- *   way to add a tray.
+ * - Fern stocks seeds and supplies rather than printable hand tools. Her
+ *   tray board is the fabrication-gated infrastructure for adding a garden.
  * - Fern's produce and graft buybacks pay pocket change on purpose: it's the
  *   "sell your harvest at the waystation" fantasy, not an economy. Her graft
  *   ledger refuses plain repeated-harvest cuttings so a tray of wheat can't be
@@ -78,13 +75,6 @@
 		/datum/shop_sku/potting/robust_harvest,
 		/datum/shop_sku/potting/left4zed,
 		/datum/shop_sku/potting/overalls,
-		// Grower's Supply: hand tools
-		/datum/shop_sku/potting/cultivator,
-		/datum/shop_sku/potting/spade,
-		/datum/shop_sku/potting/hatchet,
-		/datum/shop_sku/potting/secateurs,
-		/datum/shop_sku/potting/watering_can,
-		/datum/shop_sku/potting/plant_analyzer,
 		// Grower's Supply: the tray itself
 		/datum/shop_sku/potting/tray_board,
 		// The Apiary
@@ -129,7 +119,6 @@
 			"The bees know the way to the pond and back. Nobody taught them. I don't ask.",
 			"Bring me grafts with something actually in them. A cutting off a wheat stalk is just a cutting.",
 			"Tray boards are on the shelf behind me. Two bins, a servo, a sheet of glass, and you've got a garden.",
-			"Take the tools while you're here. They're cheap, and I'd rather you weren't pulling weeds with your hands.",
 			"Ash flora seeds off the burning worlds. I pay proper credits. They grow ANYWHERE. It's terrifying. I love them.",
 			"Pike keeps saying fish fertilizer would double my yield. Pike is banned from the conservatory.",
 		),
@@ -247,64 +236,8 @@
 	stock_min = 1
 	stock_max = 3
 
-// ----- Hand tools -----
-// Every one of these is a service autolathe design, so a ship with a working
-// lathe can print the set for scrap. Priced accordingly: this is the rack you
-// grab on the way out rather than a supply line.
-
-/datum/shop_sku/potting/cultivator
-	category = "Grower's Supply"
-	desc = "A hand rake for turning weeds out of a tray. Fern sells them by the bundle and still finds people pulling weeds by hand."
-	item_path = /obj/item/cultivator
-	price_credits = 30
-	stock_min = 4
-	stock_max = 8
-
-/datum/shop_sku/potting/spade
-	category = "Grower's Supply"
-	desc = "For digging a plant out of a tray without killing it, and for repotting whatever you dug up."
-	item_path = /obj/item/shovel/spade
-	price_credits = 30
-	stock_min = 4
-	stock_max = 8
-
-/datum/shop_sku/potting/hatchet
-	category = "Grower's Supply"
-	desc = "Chops down a tower cap, splits logs, and harvests anything too woody for bare hands. Fern would like it noted that it is a gardening tool."
-	item_path = /obj/item/hatchet
-	price_credits = 50
-	stock_min = 3
-	stock_max = 6
-
-/datum/shop_sku/potting/secateurs
-	category = "Grower's Supply"
-	desc = "Pruning shears sharp enough to take a clean graft off a stem. The cutting keeps whatever trait the parent was carrying."
-	item_path = /obj/item/secateurs
-	price_credits = 50
-	stock_min = 3
-	stock_max = 6
-
-/datum/shop_sku/potting/watering_can
-	category = "Grower's Supply"
-	desc = "Holds enough water for a row of trays. Fill it at any sink, or at Pike's pond if you want to hear his opinion about it."
-	item_path = /obj/item/reagent_containers/cup/watering_can
-	price_credits = 40
-	stock_min = 3
-	stock_max = 6
-
-/datum/shop_sku/potting/plant_analyzer
-	category = "Grower's Supply"
-	desc = "Reads a plant's stats and traits, and a tray's water, nutrients and pest level. Growing without one works, but you're guessing."
-	item_path = /obj/item/plant_analyzer
-	price_credits = 60
-	stock_min = 3
-	stock_max = 6
-
 // ----- The tray itself -----
-// Unlike the hand tools this one is genuinely gated: the design sits behind the
-// hydroponics techweb node, so it's the only tray a ship without an R&D bay can
-// get hold of. Priced so two boards plus the tools still cost more loose than
-// the botany starter pack in shop_catalog_job_packs.dm.
+// Infrastructure for crews adding a garden without an existing research bay.
 
 /datum/shop_sku/potting/tray_board
 	category = "Grower's Supply"
@@ -486,9 +419,6 @@
 		/datum/shop_sku/bait/rotating/carp_plushie,
 		/datum/shop_sku/bait/rotating/stocked_aquarium,
 	)
-	rare_pool = list(
-		/datum/shop_sku/bait/rare/tech_rod,
-	)
 	buyback_types = list(
 		/datum/shop_buyback/bait/pike,
 		/datum/shop_buyback/bait/donkfish,
@@ -560,7 +490,7 @@
 	category = "Bait & Tackle"
 	item_path = /obj/item/storage/box/fishing_lures
 	desc = "One of every artificial lure, instruction sheet still in the lid. Nothing eats them, so a set lasts, but each one only interests a particular sort of fish and every one of them has to be spun while you wait."
-	price_credits = 425
+	price_credits = 420
 	stock_min = 1
 	stock_max = 2
 
@@ -647,15 +577,6 @@
 	item_path = /obj/structure/aquarium/prefilled
 	price_credits = 600
 
-// ===== RARE SHOWCASE =====
-
-/datum/shop_sku/bait/rare/tech_rod
-	category = "Rods & Reels"
-	desc = "A self-reeling smart rod. Pike calls it cheating and stocks it anyway, because cheating sells."
-	item_path = /obj/item/fishing_rod/tech
-	price_vouchers = 1
-	price_credits = 600
-
 // ===== PIKE'S TROPHY LEDGER (buybacks) =====
 // The weird stuff only. Barnaby handles the by-the-fin chowder trade.
 
diff --git a/voidcrew/modules/trade/shop_catalog_outfitter.dm b/voidcrew/modules/trade/shop_catalog_outfitter.dm
index 63bbe27e028..f9c271d8ef6 100644
--- a/voidcrew/modules/trade/shop_catalog_outfitter.dm
+++ b/voidcrew/modules/trade/shop_catalog_outfitter.dm
@@ -26,6 +26,7 @@
 	shoes = /obj/item/clothing/shoes/jackboots
 
 /datum/outpost_shop/outfitter
+	back_room_line = "The wardens speak well of you. I'll clear it."
 	outpost_name = "\improper Quartermain Depot"
 	outpost_desc = "A fortified outfitter's depot serving the contested lanes. Armored like it expects its customers to be the problem."
 	trader_name = "Sarge"
@@ -36,6 +37,7 @@
 	categories = list(
 		"Armor",
 		"Firearms & Ammo",
+		"Melee",
 		"Ship Systems",
 		"Ship Ordnance",
 		"Security Gear",
@@ -46,7 +48,6 @@
 		"Fuel & Gas",
 		"Colonial Registry",
 		"Intel & Charts",
-		"Blueprints",
 		"Barter Deals",
 		"Back Room",
 	)
@@ -60,14 +61,19 @@
 		/datum/shop_sku/outfitter/disabler,
 		/datum/shop_sku/outfitter/energy_gun,
 		/datum/shop_sku/outfitter/laser_gun,
-		/datum/shop_sku/outfitter/double_barrel,
 		/datum/shop_sku/outfitter/rubbershot,
 		/datum/shop_sku/outfitter/lethalshot,
-		/datum/shop_sku/outfitter/boltaction,
 		/datum/shop_sku/outfitter/rifle_clip,
 		/datum/shop_sku/outfitter/smg_mag,
 		/datum/shop_sku/outfitter/wt550_mag,
 		/datum/shop_sku/outfitter/firing_pin,
+		/datum/shop_sku/outfitter/riot_shotgun,
+		// Melee
+		/datum/shop_sku/outfitter/combat_knife,
+		/datum/shop_sku/outfitter/shortsword,
+		/datum/shop_sku/outfitter/ablative_bat,
+		/datum/shop_sku/outfitter/fireaxe,
+		/datum/shop_sku/outfitter/sabre,
 		// Ship Systems
 		/datum/shop_sku/outfitter/engine_plasma,
 		/datum/shop_sku/outfitter/engine_expulsion,
@@ -80,9 +86,6 @@
 		/datum/shop_sku/outfitter/warhead_standard,
 		/datum/shop_sku/outfitter/missile_light,
 		// Security Gear
-		/datum/shop_sku/outfitter/seclite,
-		/datum/shop_sku/outfitter/flash,
-		/datum/shop_sku/outfitter/bola,
 		/datum/shop_sku/outfitter/security_belt,
 		/datum/shop_sku/outfitter/pepper_spray,
 		/datum/shop_sku/outfitter/riot_shield,
@@ -92,7 +95,6 @@
 		/datum/shop_sku/outfitter/advanced_medkit,
 		/datum/shop_sku/outfitter/stimpack,
 		/datum/shop_sku/outfitter/suture,
-		/datum/shop_sku/outfitter/health_hud,
 		// Mess Tin
 		/datum/shop_sku/outfitter/rations,
 		/datum/shop_sku/outfitter/energy_bar,
@@ -100,8 +102,6 @@
 		/datum/shop_sku/outfitter/hot_sauce,
 		// Utility
 		/datum/shop_sku/outfitter/gas_mask,
-		/datum/shop_sku/outfitter/jaws,
-		/datum/shop_sku/outfitter/magboots,
 		// Hull Stock
 		/datum/shop_sku/outfitter/plasteel_stock,
 		/datum/shop_sku/outfitter/iron_stock,
@@ -114,10 +114,6 @@
 		/datum/shop_sku/outpost_deed,
 		// Intel & Charts: the dealt chart shelf adds to this from chart_pool
 		/datum/shop_sku/rumor,
-		// Blueprints
-		/datum/shop_sku/outfitter/smg_blueprint,
-		/datum/shop_sku/outfitter/wt550_blueprint,
-		/datum/shop_sku/outfitter/carbine_blueprint,
 		// Barter
 		/datum/shop_sku/barter/plasteel_for_shield,
 	)
@@ -150,11 +146,9 @@
 	)
 	rare_pool = list(
 		/datum/shop_sku/outfitter/rare/ablative_vest,
-		/datum/shop_sku/outfitter/rare/compact_defib,
-		/datum/shop_sku/outfitter/rare/ion_rifle,
 		/datum/shop_sku/outfitter/rare/missile_heavy,
 	)
-	// The back room: Trusted-standing uniques, per-crew supply (trader_favor.dm)
+	// The back room: Crew-reputation uniques, per-crew supply (trader_favor.dm)
 	favor_sku_types = list(
 		/datum/shop_sku/favor/skunkworks_cell,
 		/datum/shop_sku/favor/fitter_gauntlets,
@@ -168,26 +162,12 @@
 		/datum/shop_buyback/outfitter/sinew,
 		/datum/shop_buyback/outfitter/glacial_core,
 	)
-	// Depot resupply runs: industrial quantities, decent free kit
+	// Field harvests for depot resupply
 	mission_requests = list(
-		list("type" = /obj/item/stack/sheet/plasteel, "name" = "plasteel sheets", "amount" = 10, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
-		list("type" = /obj/item/stack/ore/titanium, "name" = "titanium ore", "amount" = 12, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
-		list("type" = /obj/item/stack/ore/silver, "name" = "silver ore", "amount" = 10, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
-		// Stack asks are settled from ONE stack, so never ask above max_amount -
-		// cable coil caps at MAXCOIL (30) and a bigger ask can never be paid
-		list("type" = /obj/item/stack/cable_coil, "name" = "cable coil", "amount" = 30, "difficulty" = MISSION_DIFFICULTY_EASY),
 		list("type" = /obj/item/stack/sheet/animalhide/goliath_hide, "name" = "goliath hide plates", "amount" = 4, "difficulty" = MISSION_DIFFICULTY_HARD),
 		list("type" = /obj/item/stack/sheet/sinew, "name" = "beast sinew", "amount" = 4, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
 		list("type" = /obj/item/stack/glacial_core, "name" = "glacial cores", "amount" = 5, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
 	)
-	// The armory back room: hard contracts only, never sold. Everything here has
-	// to be unobtainable elsewhere, so no item that drops in a zone loot theme
-	// and nothing that appears on the Ship Systems shelf.
-	exclusive_rewards = list(
-		/obj/item/circuitboard/machine/ship_combat/missile_launcher,
-		/obj/item/circuitboard/machine/engine/void,
-		/obj/item/gun/energy/laser/captain,
-	)
 	trader_lines = list(
 		TRADER_LINE_GREETING = list(
 			"Quartermain Depot. State your needs, keep your sidearm holstered.",
@@ -224,7 +204,6 @@
 			"Firing pins. Everyone forgets the firing pins. Don't be everyone.",
 			"Thruster boards are on the back wall. If your ship's limping, that's the fix, and it beats buying a new ship.",
 			"Most crews can't build a turret. Most crews also can't afford mine. Work on the second problem.",
-			"The schematics I stock are legal. The fun ones are two zones that way.",
 		),
 		TRADER_LINE_RESTOCK = list(
 			"Convoy made it through. Shelves are full, for now.",
@@ -271,28 +250,31 @@
 	price_credits = 400
 	stock_min = 1
 	stock_max = 3
+	restock_interval = 1 HOURS
+	fixed_price = TRUE
+	contract_reward = FALSE
 
 /datum/shop_sku/outfitter/energy_gun
+	zone_permission = ZONE_PERMISSION_YELLOW
 	category = "Firearms & Ammo"
 	item_path = /obj/item/gun/energy/e_gun
 	price_vouchers = 0
-	price_credits = 1500
+	price_credits = 2400
 	stock_min = 1
-	stock_max = 2
+	stock_max = 1
+	restock_interval = 1 HOURS
+	fixed_price = TRUE
+	contract_reward = FALSE
 
 /datum/shop_sku/outfitter/laser_gun
 	category = "Firearms & Ammo"
 	item_path = /obj/item/gun/energy/laser
-	price_credits = 600
-	stock_min = 1
-	stock_max = 2
-
-/datum/shop_sku/outfitter/double_barrel
-	category = "Firearms & Ammo"
-	item_path = /obj/item/gun/ballistic/shotgun/doublebarrel
-	price_credits = 900
+	price_credits = 1500
 	stock_min = 1
-	stock_max = 2
+	stock_max = 1
+	restock_interval = 1 HOURS
+	fixed_price = TRUE
+	contract_reward = FALSE
 
 /datum/shop_sku/outfitter/rubbershot
 	category = "Firearms & Ammo"
@@ -308,13 +290,6 @@
 	stock_min = 10
 	stock_max = 20
 
-/datum/shop_sku/outfitter/boltaction
-	category = "Firearms & Ammo"
-	item_path = /obj/item/gun/ballistic/rifle/boltaction
-	price_credits = 900
-	stock_min = 1
-	stock_max = 2
-
 /datum/shop_sku/outfitter/rifle_clip
 	category = "Firearms & Ammo"
 	item_path = /obj/item/ammo_box/strilka310
@@ -322,12 +297,10 @@
 	stock_min = 10
 	stock_max = 20
 
-// Magazines for the two ballistics whose blueprints are on the shelf below.
-// Print the gun once, buy the ammo forever.
 /datum/shop_sku/outfitter/smg_mag
 	category = "Firearms & Ammo"
 	name = "c-20r magazine"
-	desc = "A loaded .45 magazine for a C-20r. Sarge stocks these because the schematic's on her own shelf."
+	desc = "A loaded .45 magazine for a C-20r."
 	item_path = /obj/item/ammo_box/magazine/smgm45
 	price_credits = 250
 	stock_min = 10
@@ -342,7 +315,6 @@
 	stock_min = 10
 	stock_max = 20
 
-// The quiet backbone of the blueprint economy: no pin, no gun
 /datum/shop_sku/outfitter/firing_pin
 	category = "Firearms & Ammo"
 	item_path = /obj/item/firing_pin
@@ -359,52 +331,52 @@
 /datum/shop_sku/outfitter/engine_plasma
 	category = "Ship Systems"
 	name = "plasma thruster board"
-	desc = "Board for a plasma thruster, the standard workhorse drive. It draws fuel from a heater mounted right behind it, so you need one of those in the line too."
+	desc = "The circuit board for a plasma thruster."
 	item_path = /obj/item/circuitboard/machine/engine/plasma
-	price_credits = 1800
+	price_credits = 400
 	stock_min = 1
 	stock_max = 3
 
 /datum/shop_sku/outfitter/engine_expulsion
 	category = "Ship Systems"
 	name = "expulsion thruster board"
-	desc = "Board for an expulsion thruster. It burns whatever gas is in the heater and wastes most of it, which is the point when plasma is scarce."
+	desc = "The circuit board for an expulsion thruster."
 	item_path = /obj/item/circuitboard/machine/engine/expulsion
-	price_credits = 1200
+	price_credits = 500
 	stock_min = 1
 	stock_max = 3
 
 /datum/shop_sku/outfitter/engine_ion
 	category = "Ship Systems"
 	name = "ion thruster board"
-	desc = "Board for an ion thruster. No fuel line and no heater, just a heavy draw on the powernet, at about 40% of a plasma thruster's push."
+	desc = "The circuit board for an ion thruster."
 	item_path = /obj/item/circuitboard/machine/engine/electric
-	price_credits = 2400
+	price_credits = 600
 	stock_min = 1
 	stock_max = 2
 
 /datum/shop_sku/outfitter/engine_oil
 	category = "Ship Systems"
 	name = "oil thruster board"
-	desc = "Board for an oil thruster, which burns liquid fuel instead of gas. Buying one here skips the shuttle research your lathe would need to print it."
+	desc = "The circuit board for an oil thruster."
 	item_path = /obj/item/circuitboard/machine/engine/oil
-	price_credits = 1800
+	price_credits = 400
 	stock_min = 1
 	stock_max = 2
 
 /datum/shop_sku/outfitter/engine_heater
 	category = "Ship Systems"
 	name = "engine heater board"
-	desc = "Board for a fueled engine heater. Plasma and expulsion thrusters latch onto one to draw fuel and won't fire without it."
+	desc = "The circuit board for an engine heater."
 	item_path = /obj/item/circuitboard/machine/shuttle/heater
-	price_credits = 900
+	price_credits = 300
 	stock_min = 2
 	stock_max = 4
 
 /datum/shop_sku/outfitter/laser_turret_board
 	category = "Ship Systems"
 	name = "laser turret board"
-	desc = "Board for a hull-mounted laser turret. It takes a standard power cell you can swap out for a bigger one, and Sarge will not discuss where the crate came from."
+	desc = "The circuit board for a hull-mounted laser turret."
 	item_path = /obj/item/circuitboard/machine/ship_combat/laser_turret
 	price_vouchers = 0
 	price_credits = 2000
@@ -432,7 +404,7 @@
 /datum/shop_sku/outfitter/missile_light
 	category = "Ship Ordnance"
 	name = "light missile (armed)"
-	desc = "A ready-to-fire light missile. Drag it straight onto a ship launcher, no assembly, no fuss."
+	desc = "A light ship-to-ship missile, packed for shipment."
 	item_path = /obj/structure/ship_missile/armed/light
 	price_vouchers = 0
 	price_credits = 800
@@ -441,21 +413,6 @@
 
 // ===== SECURITY GEAR =====
 
-/datum/shop_sku/outfitter/seclite
-	category = "Security Gear"
-	item_path = /obj/item/flashlight/seclite
-	price_credits = 450
-
-/datum/shop_sku/outfitter/flash
-	category = "Security Gear"
-	item_path = /obj/item/assembly/flash/handheld
-	price_credits = 750
-
-/datum/shop_sku/outfitter/bola
-	category = "Security Gear"
-	item_path = /obj/item/restraints/legcuffs/bola
-	price_credits = 600
-
 /datum/shop_sku/outfitter/security_belt
 	category = "Security Gear"
 	item_path = /obj/item/storage/belt/security/full
@@ -471,7 +428,7 @@
 /datum/shop_sku/outfitter/riot_shield
 	category = "Security Gear"
 	item_path = /obj/item/shield/riot
-	price_credits = 2400
+	price_credits = 1200
 	stock_min = 1
 	stock_max = 2
 
@@ -513,17 +470,6 @@
 	stock_min = 10
 	stock_max = 20
 
-// Triage glasses. Reads live health off everyone in view, which is worth more
-// in a boarding action than knowing who a station flagged as wanted.
-/datum/shop_sku/outfitter/health_hud
-	category = "Combat Medical"
-	name = "medical HUD sunglasses"
-	desc = "Tinted health-scanner glasses. Everyone in view gets a status icon, so you can tell who's down from who's dead without walking over."
-	item_path = /obj/item/clothing/glasses/hud/health/sunglasses
-	price_credits = 1500
-	stock_min = 1
-	stock_max = 3
-
 // ===== MESS TIN =====
 // Field chow. Nothing here is cooking. It's calories that survive a webbing
 // pouch, a decompression and the customer. Every outpost feeds its lane;
@@ -534,7 +480,7 @@
 	name = "field ration pack"
 	desc = "A sealed ration pack off the depot's own pallet. The main varies. The crackers do not."
 	item_path = /obj/item/food/rationpack
-	price_credits = 45
+	price_credits = 40
 	stock_min = 6
 	stock_max = 12
 
@@ -569,22 +515,6 @@
 	item_path = /obj/item/clothing/mask/gas
 	price_credits = 200
 
-/datum/shop_sku/outfitter/jaws
-	category = "Utility"
-	name = "jaws of life"
-	item_path = /obj/item/crowbar/power
-	price_vouchers = 1
-	price_credits = 750
-	stock_min = 1
-	stock_max = 2
-
-/datum/shop_sku/outfitter/magboots
-	category = "Utility"
-	item_path = /obj/item/clothing/shoes/magboots
-	price_credits = 1200
-	stock_min = 1
-	stock_max = 2
-
 // ===== HULL STOCK =====
 // Bulk repair material for crews who can't mine or can't wait. Sold by the
 // stack, priced above what an ore redemption run costs you in time.
@@ -634,7 +564,7 @@
 
 /datum/shop_sku/outfitter/welding_fuel
 	name = "welding fuel tank"
-	desc = "A full tank of welding fuel on a wheeled frame. Drag it aboard and stop rationing your repairs."
+	desc = "A full tank of welding fuel on a wheeled frame."
 	category = "Fuel & Gas"
 	item_path = /obj/structure/reagent_dispensers/fueltank
 	price_credits = 400
@@ -650,35 +580,10 @@
 	stock_min = 10
 	stock_max = 20
 
-// ===== BLUEPRINTS =====
-// Yellow-tier guns, carried or imprinted, crafted anywhere. The charts and
-// rumor tips that used to share this shelf now come off chart_pool.
-
-/datum/shop_sku/outfitter/smg_blueprint
-	category = "Blueprints"
-	item_path = /obj/item/blueprint/gun/c20r
-	price_vouchers = 3
-	stock_min = 1
-	stock_max = 1
-
-/datum/shop_sku/outfitter/wt550_blueprint
-	category = "Blueprints"
-	item_path = /obj/item/blueprint/gun/wt550
-	price_vouchers = 3
-	stock_min = 1
-	stock_max = 1
-
-/datum/shop_sku/outfitter/carbine_blueprint
-	category = "Blueprints"
-	item_path = /obj/item/blueprint/gun/laser_carbine
-	price_vouchers = 2
-	price_credits = 3000
-	stock_min = 1
-	stock_max = 1
-
 // ===== ROTATING SHELF =====
 
 /datum/shop_sku/outfitter/rotating/riot_suit
+	zone_permission = ZONE_PERMISSION_YELLOW
 	category = "Armor"
 	item_path = /obj/item/clothing/suit/armor/riot
 	price_credits = 4500
@@ -721,6 +626,7 @@
 // ===== RARE SHOWCASE =====
 
 /datum/shop_sku/outfitter/rare/ablative_vest
+	zone_permission = ZONE_PERMISSION_YELLOW
 	category = "Armor"
 	item_path = /obj/item/clothing/suit/armor/laserproof
 	price_vouchers = 1
@@ -731,16 +637,10 @@
 	item_path = /obj/item/defibrillator/compact
 	price_credits = 2400
 
-/datum/shop_sku/outfitter/rare/ion_rifle
-	category = "Firearms & Ammo"
-	item_path = /obj/item/gun/energy/ionrifle
-	price_vouchers = 2
-	price_credits = 3000
-
 /datum/shop_sku/outfitter/rare/missile_heavy
 	category = "Ship Ordnance"
 	name = "heavy missile (armed)"
-	desc = "A ready-to-fire heavy missile: devastating, and priced like it. Drag it onto a launcher and pity whatever's downrange."
+	desc = "A heavy ship-to-ship missile in a reinforced shipping cradle."
 	item_path = /obj/structure/ship_missile/armed/heavy
 	price_vouchers = 0
 	price_credits = 2000
@@ -807,21 +707,77 @@
 	stock_max = 2
 
 // ===== BACK ROOM =====
-// Sarge's favor uniques: Trusted standing only, up to FAVOR_UNIQUE_CREW_LIMIT
+// Sarge's favor uniques: Crew reputation only, up to FAVOR_UNIQUE_CREW_LIMIT
 // per crew per round. Priced above the rare shelf on purpose, standing opens
 // the door, it doesn't pay the bill. All prices PROVISIONAL BALANCE.
 
 /datum/shop_sku/favor/skunkworks_cell
+	zone_permission = ZONE_PERMISSION_ADVANCED
 	item_path = /obj/item/stock_parts/power_store/cell/skunkworks
 	price_credits = 4200
 	price_vouchers = 2
 
 /datum/shop_sku/favor/fitter_gauntlets
+	zone_permission = ZONE_PERMISSION_YELLOW
 	item_path = /obj/item/clothing/gloves/tinkerer/fitter
 	price_credits = 3600
 	price_vouchers = 2
 
 /datum/shop_sku/favor/maneuvering_harness
+	zone_permission = ZONE_PERMISSION_ADVANCED
 	item_path = /obj/item/tank/jetpack/oxygen/harness/prototype
 	price_credits = 3800
 	price_vouchers = 2
+/datum/shop_sku/outfitter/riot_shotgun
+	zone_permission = ZONE_PERMISSION_YELLOW
+	category = "Firearms & Ammo"
+	item_path = /obj/item/gun/ballistic/shotgun/riot
+	price_credits = 1800
+	price_vouchers = 0
+	stock_min = 1
+	stock_max = 1
+	restock_interval = 1 HOURS
+	fixed_price = TRUE
+	contract_reward = FALSE
+
+// ===== MELEE =====
+
+/datum/shop_sku/outfitter/combat_knife
+	category = "Melee"
+	item_path = /obj/item/knife/combat
+	price_credits = 900
+	price_vouchers = 0
+	stock_min = 3
+	stock_max = 3
+
+/datum/shop_sku/outfitter/shortsword
+	category = "Melee"
+	item_path = /obj/item/claymore/shortsword
+	price_credits = 1200
+	price_vouchers = 0
+	stock_min = 2
+	stock_max = 2
+
+/datum/shop_sku/outfitter/ablative_bat
+	category = "Melee"
+	item_path = /obj/item/melee/baseball_bat/ablative
+	price_credits = 1000
+	price_vouchers = 0
+	stock_min = 2
+	stock_max = 2
+
+/datum/shop_sku/outfitter/fireaxe
+	category = "Melee"
+	item_path = /obj/item/fireaxe
+	price_credits = 1500
+	price_vouchers = 0
+	stock_min = 2
+	stock_max = 2
+
+/datum/shop_sku/outfitter/sabre
+	category = "Melee"
+	item_path = /obj/item/melee/sabre
+	price_credits = 1800
+	price_vouchers = 0
+	stock_min = 1
+	stock_max = 1
diff --git a/voidcrew/modules/trade/shop_catalog_outfitter_vendors.dm b/voidcrew/modules/trade/shop_catalog_outfitter_vendors.dm
index 9640fdcd4df..a97e4259c55 100644
--- a/voidcrew/modules/trade/shop_catalog_outfitter_vendors.dm
+++ b/voidcrew/modules/trade/shop_catalog_outfitter_vendors.dm
@@ -13,6 +13,12 @@
  * - Boffin's tier-2 parts and cells offer immediate upgrades while a crew is
  *   still assembling or researching its fabrication equipment. Cargo remains
  *   cheaper in bulk, and a working laboratory rewards making parts aboard ship.
+ * - Boffin is the only store that sells raw anomaly cores (cargo no longer
+ *   carries them) and anomaly charts. Both sit on small weighted rotations of
+ *   two slots, one unit each. A sold slot turns over to a different type at
+ *   the next convoy. Both take the normal favor discounts and specials. The
+ *   400 cr core buyback is far below any core's price, so buying to resell
+ *   loses money.
  * - The buyback ledger only wants what a ship can't print: anomaly cores,
  *   slime extracts, and raw exotics out of the ground. No circuit boards.
  *   Anything a lathe spits out is a money loop waiting to happen.
@@ -50,6 +56,7 @@
 		"Gadgetry",
 		"Ship Retrofit",
 		"Power & Optics",
+		"Anomalies",
 		"Job Packs",
 	)
 	sku_types = list(
@@ -84,6 +91,10 @@
 		/datum/shop_sku/skunk/rare/deluxe_parts,
 		/datum/shop_sku/skunk/rare/hyper_cell,
 	)
+	rotations = list(
+		/datum/shop_rotation/skunk_cores,
+		/datum/shop_rotation/skunk_anomaly_charts,
+	)
 	buyback_types = list(
 		/datum/shop_buyback/skunk/anomaly_core,
 		/datum/shop_buyback/skunk/slime_extract,
@@ -107,7 +118,6 @@
 			"Bring me anomaly cores. Intact, please. INTACT. We've had incidents.",
 			"The imprinter is perfectly safe. The screaming is a licensing formality.",
 			"Slime extracts, glands, crystals: if a planet made it and it shouldn't exist, I'm buying.",
-			"A better servo saves material and print time. Check which part your machine actually needs.",
 			"The convoy escort calls this annex 'the spooky room'. The convoy escort is correct.",
 		),
 		TRADER_LINE_RESTOCK = list(
@@ -126,14 +136,14 @@
 /datum/shop_sku/skunk/signaler
 	category = "Gadgetry"
 	item_path = /obj/item/assembly/signaler
-	price_credits = 150
+	price_credits = 80
 	stock_min = 3
 	stock_max = 6
 
 /datum/shop_sku/skunk/adv_analyzer
 	category = "Gadgetry"
 	item_path = /obj/item/healthanalyzer/advanced
-	price_credits = 900
+	price_credits = 400
 	stock_min = 1
 	stock_max = 2
 
@@ -147,9 +157,9 @@
 /datum/shop_sku/skunk/alien_sample
 	category = "Gadgetry"
 	name = "alien crowbar sample"
-	desc = "An alien tool for destructive research. Each sample is consumed to reveal one alien research field. Bring three to investigate all three fields."
+	desc = "An alien crowbar with an unfamiliar metal finish."
 	item_path = /obj/item/crowbar/abductor
-	price_credits = 1500
+	price_credits = 900
 	stock_min = 3
 	stock_max = 3
 
@@ -183,7 +193,7 @@
 /datum/shop_sku/skunk/rped
 	category = "Ship Retrofit"
 	name = "rapid part exchange device"
-	desc = "Point at machine, click, parts swap themselves. Sold empty; the parts are the shelf above."
+	desc = "An empty rapid part exchange device."
 	item_path = /obj/item/storage/part_replacer
 	price_credits = 300
 	stock_min = 1
@@ -199,12 +209,12 @@
 /datum/shop_sku/skunk/science_glasses
 	category = "Power & Optics"
 	item_path = /obj/item/clothing/glasses/science
-	price_credits = 900
+	price_credits = 200
 
 /datum/shop_sku/skunk/diagnostic_hud
 	category = "Power & Optics"
 	item_path = /obj/item/clothing/glasses/hud/diagnostic
-	price_credits = 1800
+	price_credits = 400
 	stock_min = 1
 	stock_max = 3
 
@@ -234,11 +244,12 @@
 /datum/shop_sku/skunk/rotating/foam_grenade
 	category = "Gadgetry"
 	name = "smart metal foam grenade"
-	desc = "A hull-patch grenade. Set it off near a breach and the foam finds the hole on its own."
+	desc = "A canister of expanding hull-patch foam."
 	item_path = /obj/item/grenade/chem_grenade/smart_metal_foam
-	price_credits = 500
+	price_credits = 150
 
 /datum/shop_sku/skunk/rotating/thermal_glasses
+	zone_permission = ZONE_PERMISSION_YELLOW
 	category = "Power & Optics"
 	item_path = /obj/item/clothing/glasses/thermal
 	price_vouchers = 2
@@ -259,6 +270,81 @@
 	item_path = /obj/item/stock_parts/power_store/cell/hyper
 	price_credits = 1200
 
+// ===== ANOMALIES =====
+// Raw cores still need the refinery and a bomb. Rarer types turn up less often
+// and cost more. The charts for the same types live in anomaly_charts.dm.
+
+/datum/shop_rotation/skunk_cores
+	slots = 2
+	pool = list(
+		/datum/shop_sku/skunk/anomaly_core/flux = 6,
+		/datum/shop_sku/skunk/anomaly_core/grav = 6,
+		/datum/shop_sku/skunk/anomaly_core/hallucination = 6,
+		/datum/shop_sku/skunk/anomaly_core/pyro = 6,
+		/datum/shop_sku/skunk/anomaly_core/bioscrambler = 3,
+		/datum/shop_sku/skunk/anomaly_core/ectoplasm = 3,
+		/datum/shop_sku/skunk/anomaly_core/dimensional = 3,
+		/datum/shop_sku/skunk/anomaly_core/bluespace = 1,
+		/datum/shop_sku/skunk/anomaly_core/vortex = 1,
+	)
+
+/datum/shop_rotation/skunk_anomaly_charts
+	slots = 4
+	pool = list(
+		/datum/shop_sku/anomaly_chart/flux = 6,
+		/datum/shop_sku/anomaly_chart/grav = 6,
+		/datum/shop_sku/anomaly_chart/hallucination = 6,
+		/datum/shop_sku/anomaly_chart/pyro = 6,
+		/datum/shop_sku/anomaly_chart/bioscrambler = 3,
+		/datum/shop_sku/anomaly_chart/ectoplasm = 3,
+		/datum/shop_sku/anomaly_chart/dimensional = 3,
+		/datum/shop_sku/anomaly_chart/bluespace = 1,
+		/datum/shop_sku/anomaly_chart/vortex = 1,
+	)
+
+/// Raw cores: normal favor discounts and specials apply; contracts never pay them out
+/datum/shop_sku/skunk/anomaly_core
+	category = "Anomalies"
+	stock_min = 1
+	stock_max = 1
+	contract_reward = FALSE
+
+/datum/shop_sku/skunk/anomaly_core/flux
+	item_path = /obj/item/raw_anomaly_core/flux
+	price_credits = 8000
+
+/datum/shop_sku/skunk/anomaly_core/grav
+	item_path = /obj/item/raw_anomaly_core/grav
+	price_credits = 8000
+
+/datum/shop_sku/skunk/anomaly_core/hallucination
+	item_path = /obj/item/raw_anomaly_core/hallucination
+	price_credits = 8000
+
+/datum/shop_sku/skunk/anomaly_core/pyro
+	item_path = /obj/item/raw_anomaly_core/pyro
+	price_credits = 8000
+
+/datum/shop_sku/skunk/anomaly_core/bioscrambler
+	item_path = /obj/item/raw_anomaly_core/bioscrambler
+	price_credits = 10000
+
+/datum/shop_sku/skunk/anomaly_core/ectoplasm
+	item_path = /obj/item/raw_anomaly_core/ectoplasm
+	price_credits = 10000
+
+/datum/shop_sku/skunk/anomaly_core/dimensional
+	item_path = /obj/item/raw_anomaly_core/dimensional
+	price_credits = 10000
+
+/datum/shop_sku/skunk/anomaly_core/bluespace
+	item_path = /obj/item/raw_anomaly_core/bluespace
+	price_credits = 12000
+
+/datum/shop_sku/skunk/anomaly_core/vortex
+	item_path = /obj/item/raw_anomaly_core/vortex
+	price_credits = 12000
+
 // ===== BOFFIN'S SPECIMEN LEDGER (buybacks) =====
 // Nothing a lathe can print. Planet exotics and things that glow wrong.
 
diff --git a/voidcrew/modules/trade/shop_catalog_suit_vendor.dm b/voidcrew/modules/trade/shop_catalog_suit_vendor.dm
index 9787ef08644..47e7837e11a 100644
--- a/voidcrew/modules/trade/shop_catalog_suit_vendor.dm
+++ b/voidcrew/modules/trade/shop_catalog_suit_vendor.dm
@@ -79,7 +79,6 @@
 		/datum/shop_sku/fitter/frame_boots,
 		/datum/shop_sku/fitter/plating_civilian,
 		// Cores & Power
-		/datum/shop_sku/fitter/core_standard,
 		/datum/shop_sku/fitter/core_plasma,
 		/datum/shop_sku/fitter/cell,
 		// Mobility
@@ -198,23 +197,14 @@
 		/datum/shop_buyback/fitter/salvage_spacesuit,
 		/datum/shop_buyback/fitter/salvage_space_helmet,
 	)
-	// A suit shop eats refined metal and very little else
+	// These requests share Sarge's board; Wick supplies the quoted package.
 	mission_requests = list(
-		list("type" = /obj/item/stack/sheet/mineral/titanium, "name" = "titanium sheets", "amount" = 10, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
-		list("type" = /obj/item/stack/sheet/mineral/plasma, "name" = "plasma sheets", "amount" = 15, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
-		list("type" = /obj/item/stack/sheet/mineral/silver, "name" = "silver sheets", "amount" = 8, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
-		list("type" = /obj/item/stack/sheet/mineral/gold, "name" = "gold sheets", "amount" = 6, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
-		list("type" = /obj/item/stack/sheet/mineral/uranium, "name" = "uranium sheets", "amount" = 6, "difficulty" = MISSION_DIFFICULTY_MEDIUM),
-		list("type" = /obj/item/stack/sheet/plasteel, "name" = "plasteel sheets", "amount" = 14, "difficulty" = MISSION_DIFFICULTY_HARD),
-		list("type" = /obj/item/stack/ore/bluespace_crystal, "name" = "bluespace crystals", "amount" = 4, "difficulty" = MISSION_DIFFICULTY_HARD),
-	)
-	// Never on a shelf: two chassis Nakamura doesn't retail, and the two
-	// anomaly modules that come with their core already seated
-	exclusive_rewards = list(
-		/obj/item/mod/control/pre_equipped/magnate,
-		/obj/item/mod/control/pre_equipped/safeguard,
-		/obj/item/mod/module/anomaly_locked/kinesis/prebuilt,
-		/obj/item/mod/module/anomaly_locked/teleporter/prebuilt,
+		list("type" = /obj/item/mod/construction/broken_core, "name" = "Recovered MOD cores", "amount" = 2, "difficulty" = MISSION_DIFFICULTY_EASY, "pay_min" = 600, "pay_max" = 700, "reward_shop" = /datum/outpost_shop/vendor/suit_fitter),
+		list("type" = /obj/item/mod/control/pre_equipped, "name" = "Salvaged MOD control unit", "amount" = 1, "difficulty" = MISSION_DIFFICULTY_MEDIUM, "pay_min" = 850, "pay_max" = 850, "reward_shop" = /datum/outpost_shop/vendor/suit_fitter),
+		list("type" = /obj/item/mod/module/springlock, "name" = "Recovered springlock module", "amount" = 1, "difficulty" = MISSION_DIFFICULTY_MEDIUM, "pay_min" = 600, "pay_max" = 600, "reward_shop" = /datum/outpost_shop/vendor/suit_fitter),
+		list("type" = /obj/item/mod/module/visor/rave, "name" = "Recovered rave visor", "amount" = 1, "difficulty" = MISSION_DIFFICULTY_MEDIUM, "pay_min" = 600, "pay_max" = 600, "reward_shop" = /datum/outpost_shop/vendor/suit_fitter),
+		list("type" = /obj/item/mod/module/balloon, "name" = "Recovered balloon module", "amount" = 1, "difficulty" = MISSION_DIFFICULTY_MEDIUM, "pay_min" = 600, "pay_max" = 600, "reward_shop" = /datum/outpost_shop/vendor/suit_fitter),
+		list("type" = /obj/item/mod/module/stamp, "name" = "Recovered stamp module", "amount" = 1, "difficulty" = MISSION_DIFFICULTY_MEDIUM, "pay_min" = 600, "pay_max" = 600, "reward_shop" = /datum/outpost_shop/vendor/suit_fitter),
 	)
 	trader_lines = list(
 		TRADER_LINE_SALE = list(
@@ -232,10 +222,8 @@
 			"Everyone wants the advanced chassis. Almost nobody's been measured for one.",
 			"Standard cores ship empty. Boffin's got the good cells two doors down.",
 			"Bench install is free. Doing it yourself in a corridor is how people lose fingers.",
-			"Plasma core runs on plasma sheets. If your engines burn it, you're already carrying the fuel.",
 			"The civilian chassis is not spaceworthy. It says so on the plate. People still ask.",
 			"Bring me a wrecked control unit and I'll take it, modules and all.",
-			"Core, then helmet, chest, gauntlets, boots, then plating. In that order, or you start again.",
 		),
 		TRADER_LINE_RESTOCK = list(
 			"Convoy's in. New chassis on the rack and the plating rotation changed.",
@@ -258,7 +246,7 @@
 	desc = "A light powered suit fitted with storage, a welder and a light. It is not spaceworthy. The civilian frame trades the seal for speed and takes fewer modules than the industrial ones."
 	item_path = /obj/item/mod/control/pre_equipped/civilian
 	icon_state_override = "civilian-control"
-	price_credits = 2400
+	price_credits = 1800
 	stock_min = 1
 	stock_max = 2
 
@@ -288,7 +276,7 @@
 // move its plating by the same amount or the parity breaks.
 /datum/shop_sku/fitter/shell
 	category = "MOD Chassis"
-	desc = "The empty frame a suit gets built inside. Core first, then helmet, chestplate, gauntlets, boots, then plating, with a screwdriver and a wrench along the way."
+	desc = "An empty MODsuit construction frame."
 	item_path = /obj/item/mod/construction/shell
 	price_credits = 400
 	stock_min = 1
@@ -317,7 +305,7 @@
 /datum/shop_sku/fitter/plating_civilian
 	category = "MOD Chassis"
 	name = "MOD civilian plating"
-	desc = "The last piece of a build. Finishes a shell into a civilian suit: light, quick, and no protection from vacuum."
+	desc = "Light civilian MODsuit plating."
 	item_path = /obj/item/mod/construction/plating/civilian
 	icon_state_override = "civilian-plating"
 	price_credits = 400
@@ -328,19 +316,10 @@
 // Boffin owns the cell ladder. Wick stocks exactly one basic cell so a bare
 // core is usable the moment you buy it, and points at the Skunkworks for more.
 
-/datum/shop_sku/fitter/core_standard
-	category = "Cores & Power"
-	name = "MOD standard core"
-	desc = "The baseline power core. It ships empty, so drop a cell in it or the suit won't run. Boffin stocks the higher grades."
-	item_path = /obj/item/mod/core/standard
-	price_credits = 300
-	stock_min = 2
-	stock_max = 3
-
 /datum/shop_sku/fitter/core_plasma
 	category = "Cores & Power"
 	name = "MOD plasma core"
-	desc = "Refuels on plasma ore and plasma sheets instead of a charger. If your ship burns plasma you're already carrying the fuel."
+	desc = "A plasma-fueled MODsuit core."
 	item_path = /obj/item/mod/core/plasma
 	price_vouchers = 1
 	price_credits = 750
@@ -349,7 +328,7 @@
 
 /datum/shop_sku/fitter/cell
 	category = "Cores & Power"
-	desc = "A basic cell to seat in a standard core. Fine for a shift; the Skunkworks sells the ones that last."
+	desc = "A standard MODsuit power cell."
 	item_path = /obj/item/stock_parts/power_store/cell
 	price_credits = 100
 	stock_min = 3
@@ -381,7 +360,7 @@
 /datum/shop_sku/fitter/mod_longfall
 	category = "Mobility"
 	item_path = /obj/item/mod/module/longfall
-	price_credits = 1050
+	price_credits = 500
 
 // ===== UTILITY MODULES =====
 
@@ -398,17 +377,17 @@
 /datum/shop_sku/fitter/mod_mouthhole
 	category = "Utility Modules"
 	item_path = /obj/item/mod/module/mouthhole
-	price_credits = 600
+	price_credits = 150
 
 /datum/shop_sku/fitter/mod_thermal_regulator
 	category = "Utility Modules"
 	item_path = /obj/item/mod/module/thermal_regulator
-	price_credits = 1200
+	price_credits = 400
 
 /datum/shop_sku/fitter/mod_status_readout
 	category = "Utility Modules"
 	item_path = /obj/item/mod/module/status_readout
-	price_credits = 900
+	price_credits = 250
 
 // ===== INDUSTRIAL MODULES =====
 
@@ -420,30 +399,30 @@
 /datum/shop_sku/fitter/mod_gps
 	category = "Industrial Modules"
 	item_path = /obj/item/mod/module/gps
-	price_credits = 750
+	price_credits = 400
 
 /datum/shop_sku/fitter/mod_rad_protection
 	category = "Industrial Modules"
 	item_path = /obj/item/mod/module/rad_protection
-	price_credits = 1350
+	price_credits = 750
 
 /datum/shop_sku/fitter/mod_headprotector
 	category = "Industrial Modules"
 	item_path = /obj/item/mod/module/headprotector
-	price_credits = 750
+	price_credits = 250
 
 /datum/shop_sku/fitter/mod_drill
 	category = "Industrial Modules"
 	item_path = /obj/item/mod/module/drill
-	price_vouchers = 1
-	price_credits = 1200
+	price_vouchers = 0
+	price_credits = 600
 	stock_min = 1
 	stock_max = 3
 
 /datum/shop_sku/fitter/mod_orebag
 	category = "Industrial Modules"
 	item_path = /obj/item/mod/module/orebag
-	price_credits = 1200
+	price_credits = 300
 	stock_min = 1
 	stock_max = 3
 
@@ -452,37 +431,37 @@
 /datum/shop_sku/fitter/mod_health_analyzer
 	category = "Medical Modules"
 	item_path = /obj/item/mod/module/health_analyzer
-	price_credits = 1050
+	price_credits = 600
 
 /datum/shop_sku/fitter/mod_injector
 	category = "Medical Modules"
 	item_path = /obj/item/mod/module/injector
-	price_vouchers = 1
-	price_credits = 1200
+	price_vouchers = 0
+	price_credits = 800
 	stock_min = 1
 	stock_max = 2
 
 /datum/shop_sku/fitter/mod_quick_carry
 	category = "Medical Modules"
 	item_path = /obj/item/mod/module/quick_carry
-	price_credits = 1200
+	price_credits = 600
 
 // ===== VISORS & SENSORS =====
 
 /datum/shop_sku/fitter/mod_visor_meson
 	category = "Visors & Sensors"
 	item_path = /obj/item/mod/module/visor/meson
-	price_credits = 1200
+	price_credits = 400
 
 /datum/shop_sku/fitter/mod_visor_medhud
 	category = "Visors & Sensors"
 	item_path = /obj/item/mod/module/visor/medhud
-	price_credits = 1050
+	price_credits = 600
 
 /datum/shop_sku/fitter/mod_visor_diaghud
 	category = "Visors & Sensors"
 	item_path = /obj/item/mod/module/visor/diaghud
-	price_credits = 1050
+	price_credits = 600
 
 // ===== ENVIRONMENT GEAR =====
 // The non-MOD half of the stall. Barnaby has the EVA suit and the breath
@@ -516,7 +495,7 @@
 
 /datum/shop_sku/fitter/insuls
 	category = "Environment Gear"
-	desc = "Insulated gloves. The suit's own insulation stops at the wrist on most frames, so these still matter."
+	desc = "A pair of insulated work gloves."
 	item_path = /obj/item/clothing/gloves/color/yellow
 	price_credits = 450
 	stock_min = 1
@@ -583,9 +562,10 @@
 	price_credits = 3600
 
 /datum/shop_sku/fitter/rotating/suit_security
+	zone_permission = ZONE_PERMISSION_YELLOW
 	category = "MOD Chassis"
 	name = "security MODsuit"
-	desc = "Sealed and properly armored, with a jetpack, a weapon harness and pepper shoulders fitted. Wick sells it to anyone; the depot's only rule is that you pay."
+	desc = "An armored security MODsuit with a jetpack and weapon harness fitted."
 	item_path = /obj/item/mod/control/pre_equipped/security
 	icon_state_override = "security-control"
 	price_vouchers = 1
@@ -626,9 +606,10 @@
 	price_credits = 600
 
 /datum/shop_sku/fitter/rotating/plating_security
+	zone_permission = ZONE_PERMISSION_YELLOW
 	category = "MOD Chassis"
 	name = "MOD security plating"
-	desc = "Finishes a shell into a security suit. This is the armored plate, and it costs like it."
+	desc = "Armored security MODsuit plating."
 	item_path = /obj/item/mod/construction/plating/security
 	icon_state_override = "security-plating"
 	price_vouchers = 1
@@ -639,12 +620,12 @@
 /datum/shop_sku/fitter/rotating/mod_joint_torsion
 	category = "Mobility"
 	item_path = /obj/item/mod/module/joint_torsion
-	price_credits = 1200
+	price_credits = 600
 
 /datum/shop_sku/fitter/rotating/mod_shock_absorber
 	category = "Mobility"
 	item_path = /obj/item/mod/module/shock_absorber
-	price_credits = 1350
+	price_credits = 750
 
 /datum/shop_sku/fitter/rotating/mod_emp_shield
 	category = "Mobility"
@@ -654,37 +635,37 @@
 /datum/shop_sku/fitter/rotating/mod_storage_large
 	category = "Utility Modules"
 	item_path = /obj/item/mod/module/storage/large_capacity
-	price_credits = 1650
+	price_credits = 1000
 
 /datum/shop_sku/fitter/rotating/mod_dna_lock
 	category = "Utility Modules"
 	item_path = /obj/item/mod/module/dna_lock
-	price_credits = 1350
+	price_credits = 300
 
 /datum/shop_sku/fitter/rotating/mod_signlang_radio
 	category = "Utility Modules"
 	item_path = /obj/item/mod/module/signlang_radio
-	price_credits = 750
+	price_credits = 200
 
 /datum/shop_sku/fitter/rotating/mod_plasma_stabilizer
 	category = "Utility Modules"
 	item_path = /obj/item/mod/module/plasma_stabilizer
-	price_credits = 900
+	price_credits = 400
 
 /datum/shop_sku/fitter/rotating/mod_recycler
 	category = "Utility Modules"
 	item_path = /obj/item/mod/module/recycler
-	price_credits = 1500
+	price_credits = 600
 
 /datum/shop_sku/fitter/rotating/mod_hat_stabilizer
 	category = "Utility Modules"
 	item_path = /obj/item/mod/module/hat_stabilizer
-	price_credits = 600
+	price_credits = 150
 
 /datum/shop_sku/fitter/rotating/mod_fishing_glove
 	category = "Utility Modules"
 	item_path = /obj/item/mod/module/fishing_glove
-	price_credits = 1050
+	price_credits = 400
 
 /datum/shop_sku/fitter/rotating/mod_dispenser
 	category = "Utility Modules"
@@ -694,33 +675,33 @@
 /datum/shop_sku/fitter/rotating/mod_microwave_beam
 	category = "Utility Modules"
 	item_path = /obj/item/mod/module/microwave_beam
-	price_credits = 1050
+	price_credits = 400
 
 /datum/shop_sku/fitter/rotating/mod_t_ray
 	category = "Industrial Modules"
 	item_path = /obj/item/mod/module/t_ray
-	price_credits = 900
+	price_credits = 300
 
 /datum/shop_sku/fitter/rotating/mod_constructor
 	category = "Industrial Modules"
 	item_path = /obj/item/mod/module/constructor
-	price_vouchers = 1
-	price_credits = 1800
+	price_vouchers = 0
+	price_credits = 900
 
 /datum/shop_sku/fitter/rotating/mod_mister_atmos
 	category = "Industrial Modules"
 	item_path = /obj/item/mod/module/mister/atmos
-	price_credits = 1200
+	price_credits = 600
 
 /datum/shop_sku/fitter/rotating/mod_mister_cleaner
 	category = "Industrial Modules"
 	item_path = /obj/item/mod/module/mister/cleaner
-	price_credits = 900
+	price_credits = 400
 
 /datum/shop_sku/fitter/rotating/mod_clamp
 	category = "Industrial Modules"
 	item_path = /obj/item/mod/module/clamp
-	price_credits = 1200
+	price_credits = 500
 
 /datum/shop_sku/fitter/rotating/mod_hydraulic
 	category = "Industrial Modules"
@@ -736,12 +717,12 @@
 /datum/shop_sku/fitter/rotating/mod_disposal_connector
 	category = "Industrial Modules"
 	item_path = /obj/item/mod/module/disposal_connector
-	price_credits = 1050
+	price_credits = 400
 
 /datum/shop_sku/fitter/rotating/mod_paper_dispenser
 	category = "Industrial Modules"
 	item_path = /obj/item/mod/module/paper_dispenser
-	price_credits = 600
+	price_credits = 150
 
 /datum/shop_sku/fitter/rotating/mod_defibrillator
 	category = "Medical Modules"
@@ -752,17 +733,17 @@
 /datum/shop_sku/fitter/rotating/mod_organizer
 	category = "Medical Modules"
 	item_path = /obj/item/mod/module/organizer
-	price_credits = 1500
+	price_credits = 400
 
 /datum/shop_sku/fitter/rotating/mod_thread_ripper
 	category = "Medical Modules"
 	item_path = /obj/item/mod/module/thread_ripper
-	price_credits = 1350
+	price_credits = 500
 
 /datum/shop_sku/fitter/rotating/mod_patient_transport
 	category = "Medical Modules"
 	item_path = /obj/item/mod/module/criminalcapture/patienttransport
-	price_credits = 1500
+	price_credits = 750
 
 /datum/shop_sku/fitter/rotating/mod_visor_night
 	category = "Visors & Sensors"
@@ -772,9 +753,10 @@
 /datum/shop_sku/fitter/rotating/mod_reagent_scanner
 	category = "Visors & Sensors"
 	item_path = /obj/item/mod/module/reagent_scanner
-	price_credits = 1200
+	price_credits = 400
 
 /datum/shop_sku/fitter/rotating/mod_active_sonar
+	zone_permission = ZONE_PERMISSION_YELLOW
 	category = "Visors & Sensors"
 	item_path = /obj/item/mod/module/active_sonar
 	price_vouchers = 1
@@ -783,17 +765,17 @@
 /datum/shop_sku/fitter/rotating/mod_magnetic_harness
 	category = "Visors & Sensors"
 	item_path = /obj/item/mod/module/magnetic_harness
-	price_credits = 1200
+	price_credits = 600
 
 /datum/shop_sku/fitter/rotating/mod_holster
 	category = "Visors & Sensors"
 	item_path = /obj/item/mod/module/holster
-	price_credits = 1350
+	price_credits = 400
 
 /datum/shop_sku/fitter/rotating/mod_megaphone
 	category = "Visors & Sensors"
 	item_path = /obj/item/mod/module/megaphone
-	price_credits = 750
+	price_credits = 200
 
 // ----- rotating environment gear -----
 
@@ -830,14 +812,14 @@
 
 /datum/shop_sku/fitter/rotating/engine_goggles
 	category = "Environment Gear"
-	desc = "Meson and t-ray scanning in one pair of goggles. Worth carrying even once you have the visor module, since goggles work without a suit."
+	desc = "A pair of combination meson and t-ray goggles."
 	item_path = /obj/item/clothing/glasses/meson/engine
-	price_credits = 750
+	price_credits = 400
 
 /datum/shop_sku/fitter/rotating/hazard_vest
 	category = "Environment Gear"
 	item_path = /obj/item/clothing/suit/hazardvest
-	price_credits = 200
+	price_credits = 100
 
 // =========================================================================
 // RARE RACK
@@ -845,21 +827,24 @@
 // =========================================================================
 
 /datum/shop_sku/fitter/rare/suit_advanced
+	zone_permission = ZONE_PERMISSION_ADVANCED
 	category = "MOD Chassis"
 	name = "advanced MODsuit"
-	desc = "Nakamura's flagship: fireproof, acid-resistant, insulated to zero, with advanced magboots built into the chassis. Ships with a jetpack, a tether and expanded storage."
+	desc = "A sealed industrial MODsuit with reinforced plating and a fitted jetpack."
 	item_path = /obj/item/mod/control/pre_equipped/advanced
 	icon_state_override = "advanced-control"
 	price_vouchers = 2
 	price_credits = 6000
 
 /datum/shop_sku/fitter/rare/mod_jetpack_advanced
+	zone_permission = ZONE_PERMISSION_ADVANCED
 	category = "Mobility"
 	item_path = /obj/item/mod/module/jetpack/advanced
 	price_vouchers = 2
 	price_credits = 2700
 
 /datum/shop_sku/fitter/rare/mod_jump_jet
+	zone_permission = ZONE_PERMISSION_ADVANCED
 	category = "Mobility"
 	item_path = /obj/item/mod/module/jump_jet
 	price_vouchers = 2
@@ -874,12 +859,13 @@
 /datum/shop_sku/fitter/rare/mod_antigrav
 	category = "Mobility"
 	name = "MOD anti-gravity module (cored)"
-	desc = "An anti-gravity module with a gravitational anomaly core already seated, so it works the moment it's installed. Wick does not say where the core came from."
-	item_path = /obj/item/mod/module/anomaly_locked/antigrav/prebuilt
+	desc = "An anti-gravity module with a sealed core. Wick does not say where it came from."
+	item_path = /obj/item/mod/module/anomaly_locked/antigrav/prebuilt/locked
 	price_vouchers = 2
 	price_credits = 2400
 
 /datum/shop_sku/fitter/rare/mod_visor_thermal
+	zone_permission = ZONE_PERMISSION_YELLOW
 	category = "Visors & Sensors"
 	item_path = /obj/item/mod/module/visor/thermal
 	price_vouchers = 2
@@ -894,12 +880,14 @@
 	price_credits = 2100
 
 /datum/shop_sku/fitter/rare/mod_emp_shield_advanced
+	zone_permission = ZONE_PERMISSION_ADVANCED
 	category = "Utility Modules"
 	item_path = /obj/item/mod/module/emp_shield/advanced
 	price_vouchers = 1
 	price_credits = 2400
 
 /datum/shop_sku/fitter/rare/mod_projectile_dampener
+	zone_permission = ZONE_PERMISSION_ADVANCED
 	category = "Mobility"
 	item_path = /obj/item/mod/module/projectile_dampener
 	price_vouchers = 2
@@ -965,3 +953,14 @@
 	pay_credits = 20
 	demand_min = 3
 	demand_max = 5
+
+/// One ordinary request pool gives all nine asks equal weight in the existing slots.
+/datum/outpost_shop/outfitter/New(obj/structure/overmap/trader_outpost/outpost)
+	. = ..()
+	// Request lists belong to instances; initial() on the type cannot read them.
+	var/datum/outpost_shop/vendor/suit_fitter/fitter = outpost?.get_shop(/datum/outpost_shop/vendor/suit_fitter)
+	if(!fitter)
+		fitter = new
+	mission_requests += fitter.mission_requests
+	if(!outpost)
+		qdel(fitter)
diff --git a/voidcrew/modules/trade/trader_favor.dm b/voidcrew/modules/trade/trader_favor.dm
index 9a6a7860412..eaf6b898b9d 100644
--- a/voidcrew/modules/trade/trader_favor.dm
+++ b/voidcrew/modules/trade/trader_favor.dm
@@ -1,28 +1,180 @@
-/**
- * # Trader Favor
- *
- * Standing a crew earns with a trader by completing that trader's board
- * contracts. Favor buys nothing by itself: it discounts credit prices by tier
- * and, at the top tier, unlocks the trader's back-room shelf (SHELF_FAVOR) of
- * bespoke uniques, each capped at FAVOR_UNIQUE_CREW_LIMIT per crew per round.
- *
- * "Per crew" means the ship, same as the embargo and the contract board
- * (get_crew_ship). The ledger lives on the ship datum and dies with the hull
- * on purpose, a crew that loses its ship starts over with every trader.
- *
- * Favor is keyed by the outpost's MAIN shop type, not the shop instance:
- * a trader is a character (every general outpost is Barnaby's waystation),
- * and the vendor stalls on an outpost honor the host trader's standing rather
- * than running ledgers of their own. Voucher prices are never discounted.
- * Contracts pay vouchers, so a voucher discount would double-dip.
+GLOBAL_LIST_EMPTY(voidcrew_crew_records)
+GLOBAL_LIST_EMPTY(voidcrew_crew_roster)
+GLOBAL_VAR_INIT(voidcrew_crew_serial, 0)
+
+/** Round-only identity. The registry owns its lifetime, including after all hulls are lost.
+ * Z2 claims immutable encounter/family receipt keys here before any yielding payout.
+ * Z3/Z4 consume get_zone_permission(); neither favor nor imported knowledge changes it.
  */
+/datum/voidcrew_crew_record
+	var/crew_id
+	var/list/teams = list()
+	var/list/minds = list()
+	var/list/ckeys = list()
+	/// The founder, then the oldest surviving hull's captain or earliest remaining member.
+	var/datum/mind/leader
+	/// Join order for current characters. Cryo keeps affiliation but relinquishes leadership.
+	var/list/leadership_members = list()
+	/// Trader keys are main-shop typepaths; SKU keys are SKU typepaths.
+	var/list/trader_favor = list()
+	var/list/favor_unique_purchases = list()
+	/// Band keys are strings because numeric ZONE_* values are list indices in DM.
+	var/list/zone_totals = list("1" = 0, "2" = 0, "3" = 0)
+	var/list/zone_families = list()
+	/// Immutable encounter/family serial strings, shared by aliases of one settlement.
+	var/list/settlement_claims = list()
+	/// One suit and one gadget across all of the crew's hulls this round.
+	var/mission_suit_paid = FALSE
+	var/mission_gadget_paid = FALSE
+	/// Experiment grants shared by every source disk, server and hull in this crew.
+	var/list/research_reward_ledger = list()
+
+/datum/voidcrew_crew_record/New()
+	crew_id = ++GLOB.voidcrew_crew_serial
+	GLOB.voidcrew_crew_records += src
+	for(var/band in list(ZONE_GREEN, ZONE_YELLOW, ZONE_RED))
+		var/list/families = list()
+		for(var/family in zone_reputation_families())
+			families[family] = 0
+		zone_families["[band]"] = families
+	return ..()
+
+/datum/voidcrew_crew_record/Destroy()
+	GLOB.voidcrew_crew_records -= src
+	for(var/rostered_ckey in ckeys)
+		if(GLOB.voidcrew_crew_roster[rostered_ckey] == src)
+			GLOB.voidcrew_crew_roster -= rostered_ckey
+	for(var/datum/team/voidcrew/team in teams.Copy())
+		team.crew_record = null
+	for(var/datum/mind/member in minds.Copy())
+		member.leave_reputation_crew()
+	teams.Cut()
+	minds.Cut()
+	ckeys.Cut()
+	leader = null
+	leadership_members.Cut()
+	return ..()
+
+/datum/voidcrew_crew_record/proc/join_leadership_roster(datum/mind/member)
+	leadership_members |= member
+	if(!leader)
+		leader = member
+
+/datum/voidcrew_crew_record/proc/leave_leadership_roster(datum/mind/member)
+	leadership_members -= member
+	if(leader != member)
+		return
+	leader = null
+	// teams retain hull enrollment order, including when several were built in one tick.
+	for(var/datum/team/voidcrew/team in teams)
+		var/obj/structure/overmap/ship/ship = team.ship
+		if(QDELETED(ship) || ship.abandoned || ship.retired_by_checkpoint)
+			continue
+		for(var/datum/mind/candidate in leadership_members)
+			if(ship.is_ship_captain_mind(candidate))
+				leader = candidate
+				break
+		break // Without a captain on the oldest hull, fall back to member join order.
+	if(!leader && length(leadership_members))
+		leader = leadership_members[1]
+	if(leader && !QDELETED(src))
+		var/leader_name = leader.current?.real_name || leader.name
+		for(var/datum/mind/crewmate in minds)
+			to_chat(crewmate.current, span_notice("[leader_name] now leads the crew."))
+
+/// Round cleanup/admin disposal, not hull teardown. Never serialize these records.
+/proc/clear_voidcrew_crew_records()
+	for(var/datum/voidcrew_crew_record/record in GLOB.voidcrew_crew_records.Copy())
+		qdel(record)
+	GLOB.voidcrew_crew_roster.Cut()
+
+/proc/zone_reputation_families()
+	return list(ZONE_FAMILY_NAMED_KILL, ZONE_FAMILY_HUNT, ZONE_FAMILY_CAPTURE, ZONE_FAMILY_POACHERS, ZONE_FAMILY_PYLONS, ZONE_FAMILY_EXTRACTION, ZONE_FAMILY_CRIMINAL_BOUNTY, ZONE_FAMILY_LAIR)
+
+/// Mission subtype map: ordinary surveys, stakes and suppression are excluded. Bounties and lairs settle separately.
+/proc/zone_reputation_family(mission_type)
+	if(ispath(mission_type, /datum/mission/recovery/kill))
+		return ZONE_FAMILY_NAMED_KILL
+	if(ispath(mission_type, /datum/mission/big_game_hunt))
+		return ZONE_FAMILY_HUNT
+	if(ispath(mission_type, /datum/mission/live_capture))
+		return ZONE_FAMILY_CAPTURE
+	if(ispath(mission_type, /datum/mission/poacher_bust))
+		return ZONE_FAMILY_POACHERS
+	if(ispath(mission_type, /datum/mission/recovery/survey) || ispath(mission_type, /datum/mission/research/core_sample))
+		return ZONE_FAMILY_PYLONS
+	if(ispath(mission_type, /datum/mission/recovery/extraction))
+		return ZONE_FAMILY_EXTRACTION
+	return null
+
+/// Shared E/M/H weight for existing board favor and Z2's console/board receipts.
+/proc/zone_work_reward(difficulty)
+	switch(difficulty)
+		if(MISSION_DIFFICULTY_HARD)
+			return FAVOR_GAIN_HARD
+		if(MISSION_DIFFICULTY_MEDIUM)
+			return FAVOR_GAIN_MEDIUM
+	return FAVOR_GAIN_EASY
 
-/obj/structure/overmap/ship
-	/// Favor points this crew holds per trader, keyed by the outpost's main
-	/// shop typepath (see /datum/outpost_shop/proc/favor_key)
-	var/list/trader_favor
-	/// Units of each favor-shelf unique this crew has bought, keyed by SKU type
-	var/list/favor_unique_purchases
+/// Returns credited points, claiming even a capped receipt. Caller validates successful work.
+/// No yield: simultaneous aliases cannot both claim. Never pass a proof object's ref as key.
+/datum/voidcrew_crew_record/proc/claim_zone_work(family, band, difficulty, receipt_key)
+	var/list/families = zone_families["[band]"]
+	if(!families || !(family in families) || !(difficulty in list(MISSION_DIFFICULTY_EASY, MISSION_DIFFICULTY_MEDIUM, MISSION_DIFFICULTY_HARD)) \
+		|| !istext(receipt_key) || !length(receipt_key) || settlement_claims[receipt_key])
+		return 0
+	settlement_claims[receipt_key] = TRUE
+	var/permission_before = get_zone_permission()
+	var/cap = band == ZONE_GREEN ? ZONE_REPUTATION_GREEN_FAMILY_CAP : ZONE_REPUTATION_DANGER_FAMILY_CAP
+	var/gain = min(zone_work_reward(difficulty), max(0, cap - families[family]))
+	families[family] += gain
+	zone_totals["[band]"] += gain
+	if(get_zone_permission() > permission_before)
+		for(var/datum/mind/member in minds)
+			to_chat(member.current, span_notice("Word's out about your crew. Better work is open to you."))
+	return gain
+
+/datum/voidcrew_crew_record/proc/get_zone_permission()
+	if(zone_totals["[ZONE_GREEN]"] < ZONE_REPUTATION_GREEN_REQUIRED)
+		return ZONE_PERMISSION_PUBLIC
+	if(zone_totals["[ZONE_YELLOW]"] < ZONE_REPUTATION_YELLOW_REQUIRED)
+		return ZONE_PERMISSION_YELLOW
+	if(zone_totals["[ZONE_RED]"] < ZONE_REPUTATION_RED_REQUIRED)
+		return ZONE_PERMISSION_ADVANCED
+	return ZONE_PERMISSION_ELITE
+
+/datum/voidcrew_crew_record/proc/has_zone_permission(required_permission)
+	return isnum(required_permission) && required_permission >= ZONE_PERMISSION_PUBLIC && required_permission <= get_zone_permission()
+
+/// Targetless routine asks are Public; unknown targeted bands fail closed.
+/datum/voidcrew_crew_record/proc/can_work_in_zone(band)
+	switch(band)
+		if(ZONE_GREEN)
+			return TRUE
+		if(ZONE_YELLOW)
+			return has_zone_permission(ZONE_PERMISSION_YELLOW)
+		if(ZONE_RED)
+			return has_zone_permission(ZONE_PERMISSION_ADVANCED)
+	return FALSE
+
+/// Atomic shared-cap reservation for Z3. Call before payment/grant; release on failure.
+/datum/voidcrew_crew_record/proc/claim_purchase(sku_type, limit = FAVOR_UNIQUE_CREW_LIMIT)
+	var/bought = favor_unique_purchases[sku_type] || 0
+	if(limit <= 0 || bought >= limit)
+		return FALSE
+	favor_unique_purchases[sku_type] = bought + 1
+	return TRUE
+
+/datum/voidcrew_crew_record/proc/release_purchase(sku_type)
+	var/bought = favor_unique_purchases[sku_type] || 0
+	if(bought > 0)
+		favor_unique_purchases[sku_type] = bought - 1
+
+/// Only never-used provisional identities may be discarded before round cleanup.
+/datum/voidcrew_crew_record/proc/is_unfounded()
+	return !length(teams) && !length(minds) && !length(ckeys) && !length(trader_favor) && !length(favor_unique_purchases) && !length(settlement_claims) \
+		&& !zone_totals["[ZONE_GREEN]"] && !zone_totals["[ZONE_YELLOW]"] && !zone_totals["[ZONE_RED]"] \
+		&& !mission_suit_paid && !mission_gadget_paid && !length(research_reward_ledger)
 
 /// The key a shop's standing is stored under: its outpost's main shop type.
 /// Falls back to our own type for shops with no outpost (shouldn't happen).
@@ -37,9 +189,8 @@
 
 /// Favor points `crew_ship` holds with this shop's trader
 /datum/outpost_shop/proc/get_favor(obj/structure/overmap/ship/crew_ship)
-	if(!crew_ship || !crew_ship.trader_favor)
-		return 0
-	return crew_ship.trader_favor[favor_key()] || 0
+	var/datum/voidcrew_crew_record/record = crew_ship?.get_crew_record()
+	return record?.trader_favor[favor_key()] || 0
 
 /// Favor tier for `crew_ship`: 0 stranger, 1 regular, 2 partner, 3 trusted
 /datum/outpost_shop/proc/get_favor_tier(obj/structure/overmap/ship/crew_ship)
@@ -85,60 +236,39 @@
 			return FAVOR_TIER_TRUSTED
 	return 0
 
-/**
- * Credits `amount` favor to `crew_ship` and announces tier crossings. The
- * routine +N line rides the mission-complete toast (finish_mission), so this
- * only speaks up when a threshold is actually crossed.
- */
+/// Credits trader favor without exposing internal standing to players.
 /datum/outpost_shop/proc/grant_favor(obj/structure/overmap/ship/crew_ship, amount)
-	if(!crew_ship || amount <= 0)
+	var/datum/voidcrew_crew_record/record = crew_ship?.get_crew_record()
+	if(!record || amount <= 0)
 		return
-	var/old_tier = get_favor_tier(crew_ship)
-	LAZYSET(crew_ship.trader_favor, favor_key(), get_favor(crew_ship) + amount)
-	var/new_tier = get_favor_tier(crew_ship)
-	if(new_tier <= old_tier)
-		return
-	var/perk_text
-	switch(new_tier)
-		if(3)
-			perk_text = "[FAVOR_DISCOUNT_TRUSTED]% off credit prices, and the back-room shelf is open to your crew."
-		if(2)
-			perk_text = "[FAVOR_DISCOUNT_PARTNER]% off credit prices."
-		else
-			perk_text = "[FAVOR_DISCOUNT_REGULAR]% off credit prices."
-	crew_ship.ship_notify("[favor_trader_name()] now counts your crew as [LOWER_TEXT(get_favor_tier_name(new_tier))]: [perk_text]", \
-		"TRADER STANDING", SHIP_NOTIFY_NOTICE, 'voidcrew/sound/notify.ogg', 50)
+	record.trader_favor[favor_key()] = get_favor(crew_ship) + amount
 
 /// How many units of `sku_type` this crew has bought off the favor shelf
 /datum/outpost_shop/proc/get_crew_purchases(obj/structure/overmap/ship/crew_ship, sku_type)
-	if(!crew_ship || !crew_ship.favor_unique_purchases)
-		return 0
-	return crew_ship.favor_unique_purchases[sku_type] || 0
+	var/datum/voidcrew_crew_record/record = crew_ship?.get_crew_record()
+	return record?.favor_unique_purchases[sku_type] || 0
 
 /// Records a favor-shelf purchase against the crew's per-round cap
 /datum/outpost_shop/proc/record_crew_purchase(obj/structure/overmap/ship/crew_ship, sku_type)
-	if(!crew_ship)
+	var/datum/voidcrew_crew_record/record = crew_ship?.get_crew_record()
+	if(!record)
 		return
-	LAZYSET(crew_ship.favor_unique_purchases, sku_type, get_crew_purchases(crew_ship, sku_type) + 1)
+	return record.claim_purchase(sku_type)
 
 /**
  * # Back-room SKU base
  *
- * The favor-shelf line item: standing-gated behind Trusted, supplied per crew
+ * The back-room line item: gated by crew reputation, supplied per crew
  * rather than per shelf. Catalog files subtype this next to their other SKUs.
  */
 /datum/shop_sku/favor
 	category = "Back Room"
-	favor_required = FAVOR_TIER_TRUSTED
 	crew_limit = FAVOR_UNIQUE_CREW_LIMIT
 
 /// Favor this mission pays its posting trader on completion (0 off-board)
 /datum/mission/proc/get_favor_reward()
 	if(!shop)
 		return 0
-	switch(difficulty)
-		if(MISSION_DIFFICULTY_HARD)
-			return FAVOR_GAIN_HARD
-		if(MISSION_DIFFICULTY_MEDIUM)
-			return FAVOR_GAIN_MEDIUM
-	return FAVOR_GAIN_EASY
+	if(is_routine_contract())
+		return FAVOR_GAIN_EASY
+	return zone_work_reward(difficulty)
diff --git a/voidcrew/modules/trade/trader_npc.dm b/voidcrew/modules/trade/trader_npc.dm
index 04d13058640..61caf49402d 100644
--- a/voidcrew/modules/trade/trader_npc.dm
+++ b/voidcrew/modules/trade/trader_npc.dm
@@ -30,7 +30,7 @@
 
 /mob/living/basic/outpost_trader
 	name = "trader"
-	desc = "An independent merchant. The prices aren't negotiable, and the turrets are on their side."
+	desc = "An independent merchant behind a well-worn counter."
 	icon = 'icons/mob/simple/simple_human.dmi'
 	unique_name = FALSE
 	combat_mode = FALSE
@@ -120,7 +120,7 @@
 /mob/living/basic/outpost_trader/examine(mob/user)
 	. = ..()
 	if(shop)
-		. += span_notice("[name] runs the counter at [shop.outpost_name]. Click them from anywhere along the counter to do business.")
+		. += span_notice("[name] runs the counter at [shop.outpost_name].")
 	if(outpost?.is_user_barred(user))
 		. += span_warning("[name] is pointedly ignoring you.")
 
@@ -193,7 +193,7 @@
 		if(TRADER_NPC_OPTION_TRADE)
 			shop_ui.ui_interact(user)
 		if(TRADER_NPC_OPTION_TALK)
-			speak_line(TRADER_LINE_IDLE)
+			speak_line(TRADER_LINE_IDLE, shop.get_back_room_line(user))
 		if(TRADER_NPC_OPTION_ASK)
 			bounty_outpost_ask(src, user)
 		if(TRADER_NPC_OPTION_CONTRACTS)
@@ -213,12 +213,12 @@
  * Rate-limited except for aggression lines, which always go through. Barks
  * fire automatically through the mob's say() (see modules/voice_barks).
  */
-/mob/living/basic/outpost_trader/proc/speak_line(category)
+/mob/living/basic/outpost_trader/proc/speak_line(category, line)
 	if(!shop)
 		return
 	if(category != TRADER_LINE_AGGRESSION && !COOLDOWN_FINISHED(src, speak_cooldown))
 		return
-	var/line = shop.get_line(category)
+	line ||= shop.get_line(category)
 	if(!line)
 		return
 	COOLDOWN_START(src, speak_cooldown, 3 SECONDS)
@@ -323,6 +323,35 @@
 /datum/outpost_trader_ui/ui_state(mob/user)
 	return GLOB.trader_counter_state
 
+/// Account choices contain only live hulls belonging to the viewer's current crew.
+/datum/outpost_trader_ui/proc/add_crew_context_data(list/data, mob/user)
+	var/list/ships = list()
+	for(var/obj/structure/overmap/ship/ship in get_crew_ships(user))
+		ships += list(list("ref" = REF(ship), "name" = ship.name))
+	var/obj/structure/overmap/ship/selected = get_crew_ship(user)
+	data["crew_ships"] = ships
+	data["crew_ship_ref"] = selected ? REF(selected) : null
+	return selected
+
+/datum/outpost_trader_ui/proc/select_service_ship(mob/living/user, ship_ref)
+	if(QDELETED(npc) || !npc.check_menu(user) || npc.outpost?.is_user_barred(user))
+		return FALSE
+	if(npc.outpost && !npc.outpost.contains_site_turf(get_turf(npc)))
+		return FALSE
+	var/obj/structure/overmap/ship/selected = locate(ship_ref) in get_crew_ships(user)
+	return selected && user.mind.select_crew_service_ship(selected)
+
+/// The selected crew's standing at this outpost: its tier and name, never the points behind it.
+/// Null without a crew ship, or at a stall with no outpost behind it (nothing there earns standing).
+/datum/outpost_trader_ui/proc/get_favor_data(datum/outpost_shop/shop, obj/structure/overmap/ship/crew_ship)
+	if(!shop?.outpost || !crew_ship)
+		return null
+	var/tier = shop.get_favor_tier(crew_ship)
+	return list(
+		"tier" = tier,
+		"tier_name" = shop.get_favor_tier_name(tier),
+	)
+
 /**
  * # tgui state: the trader's counter
  *
@@ -354,8 +383,8 @@ GLOBAL_DATUM_INIT(trader_counter_state, /datum/ui_state/trader_counter, new)
  *
  * The buy/sell tgui, sold against the outpost's shared /datum/outpost_shop
  * stock. Payment is stateless. Nothing is inserted or escrowed. At purchase
- * time it checks the buyer's hands for vouchers / barter goods and their ID's
- * bank account for credits, then charges and dispenses.
+ * time it checks the buyer's hands for vouchers / barter goods and the selected
+ * ship's bank account for credits, then charges and dispenses.
  */
 /datum/outpost_trader_ui/shop/ui_interact(mob/user, datum/tgui/ui)
 	ui = SStgui.try_update_ui(user, src, ui)
@@ -387,10 +416,10 @@ GLOBAL_DATUM_INIT(trader_counter_state, /datum/ui_state/trader_counter, new)
 				"price_credits" = sku.price_credits,
 				"final_credits" = sku.get_credit_price(),
 				"price_vouchers" = sku.price_vouchers,
+				// Today's special only; a crew's standing discount rides final_credits in ui_data
 				"discount_pct" = sku.discount_pct,
 				"price_text" = sku.get_price_text(),
 				"barter" = istype(sku, /datum/shop_sku/barter),
-				"favor_required" = sku.favor_required,
 				"crew_limit" = sku.crew_limit,
 			))
 	data["catalog"] = catalog
@@ -423,28 +452,15 @@ GLOBAL_DATUM_INIT(trader_counter_state, /datum/ui_state/trader_counter, new)
 	var/restock_remaining = timeleft(npc.outpost?.restock_timer)
 	data["restock_remaining"] = isnull(restock_remaining) ? null : max(0, restock_remaining)
 
-	// The viewer's crew standing with this trader, for the header and the
-	// back-room shelf. Everything favor is per-viewer, so it all rides ui_data.
-	var/obj/structure/overmap/ship/crew_ship = isliving(user) ? get_crew_ship(user) : null
-	if(shop)
-		var/tier = shop.get_favor_tier(crew_ship)
-		data["favor"] = list(
-			"points" = shop.get_favor(crew_ship),
-			"tier" = tier,
-			"tier_name" = shop.get_favor_tier_name(tier),
-			"discount_pct" = shop.get_discount_pct(crew_ship),
-			"next_at" = shop.get_next_tier_threshold(crew_ship),
-			"trader" = shop.favor_trader_name(),
-		)
-
-	// Buyer's wallet snapshot, for the header. Vouchers count from the whole
-	// inventory, same as payment accepts them
+	var/obj/structure/overmap/ship/crew_ship = add_crew_context_data(data, user)
+	// Sent as null too, so a stale standing never lingers in tgui's merged data
+	data["favor"] = get_favor_data(shop, crew_ship)
+
+	// The same selected ship account used for purchases. Vouchers remain personal.
 	data["held_vouchers"] = isliving(user) ? count_trade_vouchers(user) : 0
-	var/obj/item/card/id/id_card
-	if(isliving(user))
-		var/mob/living/living_user = user
-		id_card = living_user.get_idcard(TRUE)
-	data["account_credits"] = id_card?.registered_account ? id_card.registered_account.account_balance : null
+	data["account_credits"] = crew_ship?.ship_account?.account_balance
+	var/datum/bank_account/sell_account = isliving(user) ? get_shop_buyback_account(user) : null
+	data["sell_account_credits"] = sell_account?.account_balance
 
 	var/list/stock_states = list()
 	if(shop)
@@ -489,24 +505,30 @@ GLOBAL_DATUM_INIT(trader_counter_state, /datum/ui_state/trader_counter, new)
 		return
 
 	var/mob/living/user = ui.user
+	if(action == "select_ship")
+		return select_service_ship(user, params["ref"])
 	var/datum/outpost_shop/shop = npc.shop
-	if(!istype(user) || !shop)
+	if(!istype(user) || !shop || !npc.check_menu(user))
+		return
+	if(npc.outpost && !npc.outpost.contains_site_turf(get_turf(npc)))
 		return
 
 	switch(action)
 		if("buy")
 			if(npc.outpost?.is_user_barred(user))
 				npc.speak_line(TRADER_LINE_REFUSAL)
-				to_chat(user, span_warning("Trade embargo in effect. Service refused."))
+				to_chat(user, span_warning("Service refused."))
 				npc.play_denial()
 				return TRUE
 			var/datum/shop_sku/sku = locate(params["ref"]) in shop.skus
 			if(!sku)
 				return TRUE
-			if(sku.stock <= 0)
+			if(sku.stock <= 0 && sku.shelf != SHELF_FAVOR)
 				to_chat(user, span_warning("Out of stock."))
 				npc.play_denial()
 				return TRUE
+			if(!sku.can_trade(user, npc))
+				return TRUE
 			var/denial = sku.get_denial_reason(user)
 			if(denial)
 				to_chat(user, span_warning(denial))
@@ -519,7 +541,7 @@ GLOBAL_DATUM_INIT(trader_counter_state, /datum/ui_state/trader_counter, new)
 		if("sell")
 			if(npc.outpost?.is_user_barred(user))
 				npc.speak_line(TRADER_LINE_REFUSAL)
-				to_chat(user, span_warning("Trade embargo in effect. Service refused."))
+				to_chat(user, span_warning("Service refused."))
 				npc.play_denial()
 				return TRUE
 			var/datum/shop_buyback/buyback = locate(params["ref"]) in shop.buybacks
@@ -541,7 +563,7 @@ GLOBAL_DATUM_INIT(trader_counter_state, /datum/ui_state/trader_counter, new)
 		if("sell_all")
 			if(npc.outpost?.is_user_barred(user))
 				npc.speak_line(TRADER_LINE_REFUSAL)
-				to_chat(user, span_warning("Trade embargo in effect. Service refused."))
+				to_chat(user, span_warning("Service refused."))
 				npc.play_denial()
 				return TRUE
 			var/datum/shop_buyback/buyback = locate(params["ref"]) in shop.buybacks
@@ -582,28 +604,18 @@ GLOBAL_DATUM_INIT(trader_counter_state, /datum/ui_state/trader_counter, new)
 	data["trader_name"] = shop ? shop.trader_name : ""
 	data["barred"] = outpost ? outpost.is_user_barred(user) : FALSE
 
-	var/obj/structure/overmap/ship/ship = get_crew_ship(user)
+	var/obj/structure/overmap/ship/ship = add_crew_context_data(data, user)
 	data["ship_name"] = ship ? ship.name : null
 	data["ship_mission_slots_free"] = ship ? (ship.max_missions - length(ship.active_missions)) : 0
-
-	// Standing with this trader, so the board shows what the contracts build toward
-	if(shop)
-		var/tier = shop.get_favor_tier(ship)
-		data["favor"] = list(
-			"points" = shop.get_favor(ship),
-			"tier" = tier,
-			"tier_name" = shop.get_favor_tier_name(tier),
-			"discount_pct" = shop.get_discount_pct(ship),
-			"next_at" = shop.get_next_tier_threshold(ship),
-			"trader" = shop.favor_trader_name(),
-		)
+	data["favor"] = get_favor_data(shop, ship)
 
 	var/list/offers = list()
 	if(outpost)
-		for(var/datum/mission/offer as anything in outpost.shop_offers)
+		for(var/datum/mission/offer as anything in outpost.get_contract_offers_for(ship))
 			if(QDELETED(offer))
 				continue
-			var/list/offer_data = offer.get_ui_data()
+			var/list/offer_data = offer.get_ui_data(ship.get_crew_record())
+			offer_data["quote_value"] = offer.contract_quote
 			offer_data["wanted_text"] = offer.get_progress_string()
 			offers += list(offer_data)
 	data["offers"] = offers
@@ -617,6 +629,7 @@ GLOBAL_DATUM_INIT(trader_counter_state, /datum/ui_state/trader_counter, new)
 			if(QDELETED(mission))
 				continue
 			var/list/mission_data = mission.get_ui_data()
+			mission_data["quote_value"] = mission.contract_quote
 			mission_data["from_this_shop"] = (mission.shop == outpost?.shop)
 			var/location_ok = mission.can_turn_in_at(npc)
 			mission_data["location_ok"] = location_ok
@@ -631,7 +644,7 @@ GLOBAL_DATUM_INIT(trader_counter_state, /datum/ui_state/trader_counter, new)
 			else if(!location_ok)
 				turn_in_hint = mission.get_wrong_location_reason(npc)
 			else if(!holding_valid)
-				turn_in_hint = offered ? mission.get_failure_reason(offered) : "Hold the contract goods in hand."
+				turn_in_hint = offered ? mission.get_failure_reason(offered) : "Shipment declined."
 			mission_data["turn_in_hint"] = turn_in_hint
 			ship_missions += list(mission_data)
 	data["ship_missions"] = ship_missions
@@ -644,23 +657,25 @@ GLOBAL_DATUM_INIT(trader_counter_state, /datum/ui_state/trader_counter, new)
 		return
 
 	var/mob/living/user = ui.user
+	if(action == "select_ship")
+		return select_service_ship(user, params["ref"])
 	var/obj/structure/overmap/trader_outpost/outpost = npc.outpost
-	if(!istype(user) || !outpost?.shop)
+	if(!istype(user) || !outpost?.shop || !npc.can_use_contracts(user))
 		return
 
 	switch(action)
 		if("accept")
 			if(outpost.is_user_barred(user))
 				npc.speak_line(TRADER_LINE_REFUSAL)
-				to_chat(user, span_warning("Trade embargo in effect. Service refused."))
+				to_chat(user, span_warning("Service refused."))
 				return TRUE
 			var/obj/structure/overmap/ship/ship = get_crew_ship(user)
 			if(!ship)
 				npc.balloon_alert(user, "you have no ship!")
 				return TRUE
 			var/datum/mission/offer = locate(params["ref"]) in outpost.shop_offers
-			if(!offer || QDELETED(offer))
-				npc.balloon_alert(user, "offer no longer posted!")
+			if(!offer || QDELETED(offer) || offer.active || offer.failed || offer.completed || world.time - offer.posted_at >= OUTPOST_CONTRACT_EXPIRY)
+				npc.balloon_alert(user, "offer closed!")
 				return TRUE
 
 			// Ride the standard accept path so limits/bookkeeping all apply
@@ -673,7 +688,6 @@ GLOBAL_DATUM_INIT(trader_counter_state, /datum/ui_state/trader_counter, new)
 				return TRUE
 
 			outpost.shop_offers -= offer
-			outpost.ensure_shop_offers()
 			npc.balloon_alert(user, "contract accepted!")
 			playsound(npc, 'sound/machines/ding.ogg', 50, TRUE)
 			npc.speak_line(TRADER_LINE_GREETING)
@@ -682,7 +696,7 @@ GLOBAL_DATUM_INIT(trader_counter_state, /datum/ui_state/trader_counter, new)
 		if("turn_in")
 			if(outpost.is_user_barred(user))
 				npc.speak_line(TRADER_LINE_REFUSAL)
-				to_chat(user, span_warning("Trade embargo in effect. Service refused."))
+				to_chat(user, span_warning("Service refused."))
 				return TRUE
 			var/obj/structure/overmap/ship/ship = get_crew_ship(user)
 			if(!ship)
@@ -706,6 +720,17 @@ GLOBAL_DATUM_INIT(trader_counter_state, /datum/ui_state/trader_counter, new)
 			npc.speak_line(TRADER_LINE_SALE)
 			return TRUE
 
+/// Stale UI actions must still originate from a crew member at the actual counter.
+/mob/living/basic/outpost_trader/proc/can_use_contracts(mob/living/user)
+	if(!check_menu(user) || QDELETED(outpost) || outpost.trader != src || shop != outpost.shop)
+		return FALSE
+	if(!outpost.contains_site_turf(get_turf(src)))
+		return FALSE
+	if(!get_crew_ship(user))
+		to_chat(user, span_warning("Crew access only."))
+		return FALSE
+	return TRUE
+
 #undef TRADER_COUNTER_RANGE
 #undef TRADER_NPC_OPTION_TRADE
 #undef TRADER_NPC_OPTION_TALK
diff --git a/voidcrew/modules/unit_tests/_unit_tests.dm b/voidcrew/modules/unit_tests/_unit_tests.dm
index c06795ee683..41a53663d35 100644
--- a/voidcrew/modules/unit_tests/_unit_tests.dm
+++ b/voidcrew/modules/unit_tests/_unit_tests.dm
@@ -29,6 +29,8 @@
 #include "voidcrew_ambient_recruiters.dm"
 #include "voidcrew_ambient_strays.dm"
 #include "voidcrew_ammo_box_materials.dm"
+#include "voidcrew_anomaly_rewards.dm"
+#include "voidcrew_anomaly_trade.dm"
 #include "voidcrew_assault_pod.dm"
 #include "voidcrew_autopilot_course.dm"
 #include "voidcrew_autotranslate_morph.dm"
@@ -72,12 +74,15 @@
 #include "voidcrew_derelict_leash.dm"
 #include "voidcrew_derelict_outpost.dm"
 #include "voidcrew_derelict_themes.dm"
+#include "voidcrew_destructive_analyzer.dm"
 #include "voidcrew_dissection_tiers.dm"
 #include "voidcrew_drug_lab.dm"
 #include "voidcrew_drug_recipe.dm"
 #include "voidcrew_dynamic_events.dm"
 #include "voidcrew_economy_metrics.dm"
+#include "voidcrew_event_horizon.dm"
 #include "voidcrew_fleet_waypoints.dm"
+#include "voidcrew_fresh_cores.dm"
 #include "voidcrew_helm_access.dm"
 #include "voidcrew_helpers.dm"
 #include "voidcrew_hull_containment.dm"
@@ -96,12 +101,16 @@
 #include "voidcrew_megafauna_aggro.dm"
 #include "voidcrew_mining_input.dm"
 #include "voidcrew_mining_qol.dm"
+#include "voidcrew_mission_board_rewards.dm"
+#include "voidcrew_mission_console_rewards.dm"
 #include "voidcrew_mission_gps.dm"
 #include "voidcrew_mission_metrics.dm"
 #include "voidcrew_missions.dm"
 #include "voidcrew_nanite_research.dm"
 #include "voidcrew_npc_boarding_docking.dm"
 #include "voidcrew_npc_disarm.dm"
+#include "voidcrew_npc_zone_profiles.dm"
+#include "voidcrew_ore_balance.dm"
 #include "voidcrew_outpost_admin.dm"
 #include "voidcrew_outpost_admin_bays.dm"
 #include "voidcrew_outpost_admin_checkpoints.dm"
@@ -168,6 +177,7 @@
 #include "voidcrew_outpost_yard_droids.dm"
 #include "voidcrew_overmap_management.dm"
 #include "voidcrew_pandora_links.dm"
+#include "voidcrew_planet_anomalies.dm"
 #include "voidcrew_planet_cleanup.dm"
 #include "voidcrew_planet_definitions.dm"
 #include "voidcrew_planet_shared_air.dm"
@@ -176,14 +186,17 @@
 #include "voidcrew_plumbing_shuttle_move.dm"
 #include "voidcrew_puzzle_containment.dm"
 #include "voidcrew_repair_robotics.dm"
+#include "voidcrew_resale.dm"
 #include "voidcrew_research_lifecycle.dm"
 #include "voidcrew_research_movement.dm"
 #include "voidcrew_respawn_timer.dm"
 #include "voidcrew_rnd_kit.dm"
+#include "voidcrew_round_end.dm"
 #include "voidcrew_round_metrics.dm"
 #include "voidcrew_ruin_bounds.dm"
 #include "voidcrew_ruin_cleanup.dm"
 #include "voidcrew_ruin_reservation.dm"
+#include "voidcrew_ruin_turrets.dm"
 #include "voidcrew_science_program.dm"
 #include "voidcrew_ship_abandonment.dm"
 #include "voidcrew_ship_access.dm"
@@ -195,6 +208,7 @@
 #include "voidcrew_ship_modules.dm"
 #include "voidcrew_ship_orders.dm"
 #include "voidcrew_ship_silicons.dm"
+#include "voidcrew_ship_starting_guns.dm"
 #include "voidcrew_ship_turret_targeting.dm"
 #include "voidcrew_shop_catalog.dm"
 #include "voidcrew_silicon_ship_systems.dm"
@@ -205,6 +219,7 @@
 #include "voidcrew_survey_capabilities.dm"
 #include "voidcrew_survey_identity.dm"
 #include "voidcrew_survey_research_links.dm"
+#include "voidcrew_trader_checkpoint.dm"
 #include "voidcrew_trader_rental_locker.dm"
 #include "voidcrew_vestige.dm"
 #include "voidcrew_vestige_abductor.dm"
@@ -223,9 +238,166 @@
 #include "voidcrew_vestige_status.dm"
 #include "voidcrew_vestige_visuals.dm"
 #include "voidcrew_wall_break_atmos.dm"
+#include "voidcrew_weapon_ladder.dm"
 #include "voidcrew_weather_sites.dm"
 #include "voidcrew_windoor_survey.dm"
+#include "voidcrew_zone_identity.dm"
 #include "voidcrew_zone_logging.dm"
+#include "voidcrew_zone_missions.dm"
+#include "voidcrew_zone_research.dm"
+#include "voidcrew_zone_shops.dm"
 #include "voidcrew_zone_teleport.dm"
 #include "weather_mob_targeting.dm"
 // END_INCLUDE
+
+// Z5 integration checks use the included Z2 fixtures and the real settlement pipeline.
+// Fork defines follow this harness, so bands and permissions below use their literal values.
+/datum/unit_test/voidcrew_zone_missions/presentation
+	abstract_type = /datum/unit_test/voidcrew_zone_missions/presentation
+	var/list/presentation_old_pending
+
+/datum/unit_test/voidcrew_zone_missions/presentation/New()
+	. = ..()
+	presentation_old_pending = SSmetrics.pending
+	SSmetrics.pending = list()
+	SSmetrics.accepting = TRUE
+
+/datum/unit_test/voidcrew_zone_missions/presentation/Destroy()
+	var/restore_accepting = old_metrics
+	old_metrics = FALSE
+	SSmetrics.accepting = FALSE
+	. = ..()
+	SSmetrics.accepting = restore_accepting
+	SSmetrics.pending = presentation_old_pending
+
+/// One receipt, its accepting crew and a single crossing survive aliases and a hull crew change.
+/datum/unit_test/voidcrew_zone_missions/presentation/receipts/Run()
+	var/obj/structure/overmap/ship/ship = make_ship()
+	var/datum/voidcrew_crew_record/record = ship.get_crew_record()
+	record.claim_zone_work("hunt", 1, 1, "metric_setup_hunt")
+	record.claim_zone_work("capture", 1, 1, "metric_setup_capture")
+	var/datum/mission/mission = allocate(/datum/mission/recovery/kill/zone_missions_test)
+	var/datum/mission/alias = allocate(/datum/mission/recovery/kill/outpost/zone_missions_test)
+	alias.work_receipt = mission.work_receipt
+	SSmetrics.pending = list()
+	TEST_ASSERT(mission.start_mission(ship), "Metric fixture did not accept work")
+	TEST_ASSERT(alias.start_mission(ship), "Metric fixture did not accept its encounter alias")
+	var/list/row = SSmetrics.pending[1]
+	var/list/details = json_decode(row["details"])
+	TEST_ASSERT_EQUAL(details["crew_id"], record.crew_id, "Acceptance omitted its continuing crew")
+	TEST_ASSERT_EQUAL(details["work_receipt_serial"], mission.work_receipt.serial, "Acceptance omitted the receipt serial")
+	TEST_ASSERT_EQUAL(details["work_family"], "named_kill", "Acceptance used the prize family instead of the canonical work family")
+	TEST_ASSERT_EQUAL(details["work_band"], "green", "Acceptance omitted its pinned work band")
+	var/obj/structure/overmap/ship/other = make_ship()
+	var/datum/voidcrew_crew_record/different = other.get_crew_record()
+	ship.ship_team.set_crew_record(different)
+	SSmetrics.pending = list()
+	TEST_ASSERT(mission.turn_in(run_loc_floor_bottom_left, null), "Metric fixture did not settle")
+	TEST_ASSERT_EQUAL(length(SSmetrics.pending), 3, "A new permission needs one claim, one crossing and one ordinary payout row")
+	row = SSmetrics.pending[1]
+	details = json_decode(row["details"])
+	TEST_ASSERT_EQUAL(row["event"], "zone_work_claimed", "Claim diagnostics were not logged")
+	TEST_ASSERT_EQUAL(row["points"], 1, "Metric gain differs from the capped award")
+	TEST_ASSERT_EQUAL(row["credits"], 0, "A claim diagnostic duplicated mission money")
+	TEST_ASSERT_EQUAL(details["crew_id"], record.crew_id, "A hull crew change redirected metric attribution")
+	TEST_ASSERT_EQUAL(details["attempted_gain"], 1, "Claim diagnostics omitted the attempted award")
+	TEST_ASSERT_EQUAL(details["capped_gain"], 0, "An uncapped award was reported as clamped")
+	TEST_ASSERT_EQUAL(details["permission_before"], 0, "Wrong permission before settlement")
+	TEST_ASSERT_EQUAL(details["permission_after"], 1, "Wrong permission after settlement")
+	row = SSmetrics.pending[2]
+	TEST_ASSERT_EQUAL(row["event"], "zone_permission_crossed", "The permission crossing was not logged")
+	TEST_ASSERT_EQUAL(row["subject"], "Yellow", "The crossing named the wrong permission")
+	TEST_ASSERT_EQUAL(row["round_seconds"], metric_round_seconds(), "The access timestamp differs from the settlement time")
+	row = SSmetrics.pending[3]
+	details = json_decode(row["details"])
+	TEST_ASSERT_EQUAL(row["event"], "mission_completed", "Ordinary reward metrics disappeared")
+	TEST_ASSERT_EQUAL(row["credits"], 100, "Progression logging changed the existing payout")
+	TEST_ASSERT_EQUAL(details["zone_gain"], 1, "The payout row omitted its credited gain")
+	SSmetrics.pending = list()
+	TEST_ASSERT(alias.turn_in(run_loc_floor_bottom_left, null), "The alias lost its ordinary reward")
+	TEST_ASSERT_EQUAL(length(SSmetrics.pending), 1, "An alias duplicated claim or permission metrics")
+	row = SSmetrics.pending[1]
+	details = json_decode(row["details"])
+	TEST_ASSERT_EQUAL(details["zone_gain"], 0, "The alias payout counted the original gain again")
+	ship.ship_team.set_crew_record(record)
+	var/datum/mission/capped = allocate(/datum/mission/recovery/kill/zone_missions_test)
+	TEST_ASSERT(capped.start_mission(ship), "Capped family prevented ordinary acceptance")
+	SSmetrics.pending = list()
+	TEST_ASSERT(capped.turn_in(run_loc_floor_bottom_left, null), "Capped family prevented ordinary settlement")
+	TEST_ASSERT_EQUAL(length(SSmetrics.pending), 2, "Capped work needs a claim and payout, without another crossing")
+	row = SSmetrics.pending[1]
+	details = json_decode(row["details"])
+	TEST_ASSERT_EQUAL(row["points"], 0, "Capped work metrics invented a gain")
+	TEST_ASSERT_EQUAL(details["capped_gain"], 1, "Fully capped work was not reported")
+	TEST_ASSERT_EQUAL(record.zone_totals["1"], 3, "Metrics changed the crew ledger")
+
+/// Higher permissions and a partial family clamp report the same gains as the real ledger.
+/datum/unit_test/voidcrew_zone_missions/presentation/higher_permissions/Run()
+	var/obj/structure/overmap/ship/ship = make_ship(1)
+	var/datum/voidcrew_crew_record/record = ship.get_crew_record()
+	record.claim_zone_work("hunt", 2, 3, "yellow_hunt_hard")
+	record.claim_zone_work("hunt", 2, 1, "yellow_hunt_easy")
+	record.claim_zone_work("capture", 2, 1, "yellow_capture")
+	var/datum/mission/yellow = allocate(/datum/mission/big_game_hunt/zone_missions_test, null, 2)
+	TEST_ASSERT(yellow.start_mission(ship), "Eligible yellow work was refused")
+	SSmetrics.pending = list()
+	TEST_ASSERT(yellow.turn_in(run_loc_floor_bottom_left, null), "Yellow work did not settle")
+	TEST_ASSERT_EQUAL(length(SSmetrics.pending), 3, "Advanced permission crossing was not logged once")
+	var/list/row = SSmetrics.pending[1]
+	var/list/details = json_decode(row["details"])
+	TEST_ASSERT_EQUAL(row["points"], 1, "Partially capped yellow gain was not recorded")
+	TEST_ASSERT_EQUAL(details["attempted_gain"], 2, "Medium work has the wrong attempted gain")
+	TEST_ASSERT_EQUAL(details["capped_gain"], 1, "Partial clamp amount was not recorded")
+	row = SSmetrics.pending[2]
+	TEST_ASSERT_EQUAL(row["subject"], "Advanced", "Yellow work logged the wrong new permission")
+	record.claim_zone_work("named_kill", 3, 3, "red_kill_first")
+	record.claim_zone_work("named_kill", 3, 3, "red_kill_second")
+	record.claim_zone_work("capture", 3, 3, "red_capture")
+	var/datum/mission/red = allocate(/datum/mission/big_game_hunt/zone_missions_test, null, 3)
+	TEST_ASSERT(red.start_mission(ship), "Eligible red work was refused")
+	SSmetrics.pending = list()
+	TEST_ASSERT(red.turn_in(run_loc_floor_bottom_left, null), "Red work did not settle")
+	TEST_ASSERT_EQUAL(length(SSmetrics.pending), 3, "Elite permission crossing was not logged once")
+	row = SSmetrics.pending[1]
+	TEST_ASSERT_EQUAL(row["points"], 3, "Red work metrics changed the hard-work gain")
+	row = SSmetrics.pending[2]
+	TEST_ASSERT_EQUAL(row["subject"], "Elite", "Red work logged the wrong new permission")
+
+/// Admin edits preserve caps and shared identity; resetting cannot replay spent encounters.
+/datum/unit_test/voidcrew_zone_missions/presentation/admin_record/Run()
+	var/obj/structure/overmap/ship/first = make_ship()
+	var/obj/structure/overmap/ship/second = make_ship()
+	var/datum/voidcrew_crew_record/record = first.get_crew_record()
+	second.ship_team.set_crew_record(record)
+	var/id_before = record.crew_id
+	TEST_ASSERT(!record.admin_set_zone_family("waves", 1, 1), "Admin accepted a noncanonical family")
+	TEST_ASSERT(!record.admin_set_zone_family("hunt", 99, 1), "Admin accepted an unknown band")
+	TEST_ASSERT(!record.admin_set_zone_family("hunt", 1, 2), "Admin exceeded the green family cap")
+	TEST_ASSERT(!record.admin_set_zone_family("hunt", 2, 6), "Admin exceeded the danger family cap")
+	TEST_ASSERT(!record.admin_set_zone_family("hunt", 2, -1), "Admin accepted negative standing")
+	TEST_ASSERT(!record.admin_set_zone_family("hunt", 2, 1.5), "Admin accepted fractional standing")
+	for(var/family in list("named_kill", "hunt", "capture"))
+		TEST_ASSERT(record.admin_set_zone_family(family, 1, 1), "Admin could not set a valid family contribution")
+	TEST_ASSERT_EQUAL(record.get_zone_permission(), 1, "Admin totals did not derive the correct permission")
+	TEST_ASSERT(record.admin_set_zone_family("hunt", 2, 5), "Admin could not set the yellow cap")
+	TEST_ASSERT(record.admin_set_zone_family("capture", 2, 1), "Admin could not set a second yellow family")
+	TEST_ASSERT_EQUAL(record.get_zone_permission(), 2, "Admin totals did not open advanced access")
+	TEST_ASSERT(record.admin_set_zone_family("hunt", 2, 2), "Admin could not lower a contribution")
+	TEST_ASSERT_EQUAL(record.zone_totals["2"], 3, "Admin edits added to the old total instead of recomputing it")
+	record.claim_zone_work("extraction", 1, 1, "spent_before_reset")
+	record.trader_favor[/datum/outpost_shop] = 6
+	record.claim_purchase(/datum/shop_sku/favor)
+	TEST_ASSERT(record.admin_reset_zone_record(), "Admin could not reset the record")
+	TEST_ASSERT_EQUAL(record.get_zone_permission(), 0, "Reset left zone access open")
+	TEST_ASSERT_EQUAL(record.crew_id, id_before, "Reset replaced the continuing crew identity")
+	TEST_ASSERT_EQUAL(first.get_crew_record(), record, "Reset detached the first hull")
+	TEST_ASSERT_EQUAL(second.get_crew_record(), record, "Reset detached the second hull")
+	TEST_ASSERT_EQUAL(length(record.trader_favor), 0, "Reset left trader favor behind")
+	TEST_ASSERT_EQUAL(length(record.favor_unique_purchases), 0, "Reset left purchase history behind")
+	TEST_ASSERT(record.settlement_claims["spent_before_reset"], "Reset forgot a spent encounter")
+	TEST_ASSERT_EQUAL(record.claim_zone_work("extraction", 1, 1, "spent_before_reset"), 0, "Reset enabled a spent encounter replay")
+	for(var/band in record.zone_families)
+		var/list/families = record.zone_families[band]
+		TEST_ASSERT_EQUAL(record.zone_totals[band], 0, "Reset left a band total behind")
+		for(var/family in families)
+			TEST_ASSERT_EQUAL(families[family], 0, "Reset left a family contribution behind")
diff --git a/voidcrew/modules/unit_tests/armor_partial_modifiers.dm b/voidcrew/modules/unit_tests/armor_partial_modifiers.dm
index ee784100a49..8263ff48ecf 100644
--- a/voidcrew/modules/unit_tests/armor_partial_modifiers.dm
+++ b/voidcrew/modules/unit_tests/armor_partial_modifiers.dm
@@ -15,3 +15,239 @@
 	qdel(scaled)
 	qdel(added)
 	qdel(base)
+
+/// Landed-hit accounting deliberately permits one fully protected, underfunded final hit.
+/datum/unit_test/armor_partial_modifiers/nanites
+	abstract_type = /datum/unit_test/armor_partial_modifiers/nanites
+	var/mob/living/carbon/human/patient
+	var/datum/component/nanites/swarm
+	var/datum/nanite_program/hardening/hardening
+	var/datum/nanite_program/refractive/refractive
+	var/obj/projectile/projectile
+	var/test_armor_flag = BULLET
+
+/datum/unit_test/armor_partial_modifiers/nanites/proc/setup(safety = 50)
+	patient = allocate(/mob/living/carbon/human/consistent)
+	swarm = patient.AddComponent(/datum/component/nanites)
+	STOP_PROCESSING(SSnanites, swarm)
+	swarm.regen_rate = 0
+	swarm.safety_threshold = safety
+	hardening = allocate(/datum/nanite_program/hardening)
+	refractive = allocate(/datum/nanite_program/refractive)
+	TEST_ASSERT_EQUAL(swarm.add_program(null, hardening), 1, "Hardening installation failed") // COMPONENT_PROGRAM_INSTALLED
+	TEST_ASSERT_EQUAL(swarm.add_program(null, refractive), 1, "Refractive installation failed")
+	hardening.enable_passive_effect()
+	refractive.enable_passive_effect()
+	TEST_ASSERT(hardening.passive_enabled && refractive.passive_enabled, "Armor fixture did not activate")
+	projectile = allocate(/obj/projectile)
+	projectile.damage = 20
+	projectile.damage_type = BRUTE
+	projectile.wound_bonus = CANT_WOUND
+
+/// Keep endurance independent of survival and limb caps, without yielding between hits.
+/datum/unit_test/armor_partial_modifiers/nanites/proc/hit(armor_flag = test_armor_flag, penetration = 0, weak = FALSE, cap = 90)
+	patient.heal_overall_damage(1000, 1000)
+	projectile.armor_flag = armor_flag
+	projectile.damage_type = (armor_flag == LASER || armor_flag == ENERGY) ? BURN : BRUTE
+	projectile.armour_penetration = penetration
+	projectile.weak_against_armour = weak
+	var/blocked = min(cap, patient.run_armor_check(BODY_ZONE_CHEST, armor_flag, armour_penetration = penetration, silent = TRUE, weak_against_armour = weak))
+	return patient.apply_damage(20, projectile.damage_type, BODY_ZONE_CHEST, blocked, wound_bonus = CANT_WOUND, attacking_item = projectile, wound_clothing = FALSE)
+
+/datum/unit_test/armor_partial_modifiers/nanites/endurance/Run()
+	setup()
+	var/start_tick = world.time
+	for(var/shot in 1 to 8)
+		TEST_ASSERT(abs(hit() - 14) < 0.01, "Funded bullet [shot] did not deal 14 damage")
+		TEST_ASSERT(abs(swarm.nanite_volume - (100 - 6 * shot)) < 0.01, "Bullet [shot] did not cost 6 nanites")
+	TEST_ASSERT(abs(hit() - 14) < 0.01, "Underfunded ninth bullet lost its accepted full protection")
+	TEST_ASSERT_EQUAL(swarm.nanite_volume, 50, "Ninth bullet crossed the safety threshold")
+	TEST_ASSERT(!hardening.passive_enabled && !refractive.passive_enabled, "Depletion did not immediately remove both armor contributions")
+	TEST_ASSERT_EQUAL(patient.getarmor(BODY_ZONE_CHEST, BULLET), 0, "Depleted Hardening retained armor")
+	TEST_ASSERT_EQUAL(patient.getarmor(BODY_ZONE_CHEST, LASER), 0, "Depleted Refractive retained armor")
+	TEST_ASSERT(abs(hit() - 20) < 0.01, "A second underfunded hit received free armor")
+	TEST_ASSERT_EQUAL(swarm.nanite_volume, 50, "Unarmored hit spent reserved nanites")
+	TEST_ASSERT_EQUAL(world.time, start_tick, "Endurance fixture yielded between hits")
+
+/datum/unit_test/armor_partial_modifiers/nanites/endurance/refractive
+	test_armor_flag = LASER
+
+/datum/unit_test/armor_partial_modifiers/nanites/safety_zero/Run()
+	setup(0)
+	for(var/shot in 1 to 16)
+		TEST_ASSERT(abs(hit() - 14) < 0.01, "Zero-safety bullet [shot] did not receive full armor")
+		TEST_ASSERT(abs(swarm.nanite_volume - (100 - 6 * shot)) < 0.01, "Zero-safety bullet [shot] had the wrong cost")
+	TEST_ASSERT(abs(hit() - 14) < 0.01, "Underfunded seventeenth bullet lost full protection")
+	TEST_ASSERT_NULL(patient.GetComponent(/datum/component/nanites), "An empty zero-safety swarm was not removed")
+	TEST_ASSERT_EQUAL(patient.getarmor(BODY_ZONE_CHEST, BULLET), 0, "Deleting the empty swarm retained armor")
+	TEST_ASSERT(abs(hit() - 20) < 0.01, "A hit after zero-safety depletion received armor")
+
+/datum/unit_test/armor_partial_modifiers/nanites/safety_zero/refractive
+	test_armor_flag = LASER
+
+/datum/unit_test/armor_partial_modifiers/nanites/channels/Run()
+	setup()
+	for(var/armor_flag in list(MELEE, BULLET, LASER, ENERGY))
+		var/before = swarm.nanite_volume
+		TEST_ASSERT(abs(hit(armor_flag) - 14) < 0.01, "[armor_flag] did not receive the existing +30 armor")
+		TEST_ASSERT(abs(before - swarm.nanite_volume - 6) < 0.01, "[armor_flag] was billed to both programs or to neither")
+	var/before = swarm.nanite_volume
+	for(var/armor_flag in list(BOMB, FIRE, ACID))
+		hit(armor_flag)
+	TEST_ASSERT_EQUAL(swarm.nanite_volume, before, "Unprotected armor categories spent nanites")
+	patient.apply_damage(5, TOX, blocked = 30)
+	patient.apply_damage(20, BRUTE, BODY_ZONE_CHEST, 0, TRUE, wound_bonus = CANT_WOUND)
+	patient.apply_damage(0, BRUTE, BODY_ZONE_CHEST, 30)
+	patient.apply_damage(-20, BRUTE, BODY_ZONE_CHEST, 30)
+	var/obj/item/bodypart/chest = patient.get_bodypart(BODY_ZONE_CHEST)
+	chest.receive_damage(20, blocked = 30, wound_bonus = CANT_WOUND)
+	TEST_ASSERT_EQUAL(swarm.nanite_volume, before, "Forced, nonphysical, zero, healing or direct limb damage spent nanites")
+
+/// Exercise the real forced spread hit with a nonzero armor check, without relying on RNG.
+/datum/action/cooldown/cyberware/piledriver_leap/nanite_accounting_test/should_spread_crush_damage()
+	return TRUE
+
+/datum/unit_test/armor_partial_modifiers/nanites/forced_piledriver/Run()
+	setup()
+	var/mob/living/carbon/human/jumper = allocate(/mob/living/carbon/human/consistent)
+	var/obj/item/organ/cyberimp/cyberware/piledriver/frame = allocate(/obj/item/organ/cyberimp/cyberware/piledriver)
+	var/datum/action/cooldown/cyberware/piledriver_leap/nanite_accounting_test/leap = allocate(/datum/action/cooldown/cyberware/piledriver_leap/nanite_accounting_test, frame)
+	TEST_ASSERT_EQUAL(patient.run_armor_check(attack_flag = MELEE, silent = TRUE), 30, "Forced-hit fixture has no armor to bypass")
+	var/before = swarm.nanite_volume
+	leap.crush_victim(jumper, patient)
+	TEST_ASSERT(abs(patient.getBruteLoss() - 60) <= DAMAGE_PRECISION, "Forced Piledriver spread damage was reduced by armor") // CYBERWARE_PILEDRIVER_CRUSH_DAMAGE
+	TEST_ASSERT_EQUAL(swarm.nanite_volume, before, "Forced Piledriver damage spent nanites on bypassed armor")
+	TEST_ASSERT(hardening.passive_enabled && refractive.passive_enabled, "Forced damage disabled funded nanite armor")
+
+/datum/armor/nanite_accounting_test
+	melee = 75
+	bullet = 75
+	laser = 75
+	energy = 75
+
+/obj/item/clothing/suit/nanite_accounting_test
+	body_parts_covered = CHEST
+	armor_type = /datum/armor/nanite_accounting_test
+
+/datum/unit_test/armor_partial_modifiers/nanites/clothing_chrome/Run()
+	setup()
+	var/obj/item/clothing/suit/nanite_accounting_test/suit = allocate(/obj/item/clothing/suit/nanite_accounting_test)
+	TEST_ASSERT(patient.equip_to_slot_if_possible(suit, ITEM_SLOT_OCLOTHING), "Could not equip armor fixture")
+	TEST_ASSERT(abs(hit() - 3.5) < 0.01, "75 bullet clothing did not combine multiplicatively")
+	TEST_ASSERT(abs(swarm.nanite_volume - 98.5) < 0.01, "Nanites were charged for clothing's protection")
+	var/obj/item/organ/cyberimp/cyberware/dermal_mesh/mesh = allocate(/obj/item/organ/cyberimp/cyberware/dermal_mesh)
+	mesh.Insert(patient, TRUE)
+	TEST_ASSERT_EQUAL(patient.physiology.armor.get_rating(BULLET), 45, "Chrome fixture did not stack with Hardening")
+	TEST_ASSERT(abs(hit() - 2.75) < 0.06, "Clothing/chrome/nanite armor stack changed damage")
+	TEST_ASSERT(abs(swarm.nanite_volume - 97) < 0.01, "Nanites paid for chrome's armor contribution")
+	TEST_ASSERT(abs(hit(BULLET, 20) - 3.4375) < 0.06, "Penetration changed the clothing/chrome stack incorrectly")
+	TEST_ASSERT(abs(swarm.nanite_volume - 95.125) < 0.01, "Penetration billed clothing/chrome to nanites")
+	hardening.disable_passive_effect()
+	TEST_ASSERT_EQUAL(patient.physiology.armor.get_rating(BULLET), 15, "Disabling nanites removed chrome armor")
+	mesh.Remove(patient, TRUE)
+	TEST_ASSERT_EQUAL(patient.physiology.armor.get_rating(BULLET), 0, "Removing chrome left phantom armor")
+
+/datum/unit_test/armor_partial_modifiers/nanites/penetration_caps_modifiers/Run()
+	setup()
+	TEST_ASSERT(abs(hit(BULLET, 20) - 17.5) < 0.01, "Penetration did not reduce nanite armor")
+	TEST_ASSERT(abs(swarm.nanite_volume - 97.5) < 0.01, "Penetrating bullet had the wrong drain")
+	TEST_ASSERT(abs(hit(BULLET, 100) - 20) < 0.01, "Full penetration retained nanite protection")
+	TEST_ASSERT(abs(swarm.nanite_volume - 97.5) < 0.01, "Full penetration spent nanites")
+	TEST_ASSERT(abs(hit(BULLET, 0, TRUE) - 8) < 0.01, "Armor weakness modifier was lost")
+	TEST_ASSERT(abs(swarm.nanite_volume - 85.5) < 0.01, "Armor weakness had the wrong drain")
+	patient.physiology.brute_mod = 0.5
+	TEST_ASSERT(abs(hit() - 7) < 0.01, "Physiology damage modifier was lost")
+	TEST_ASSERT(abs(swarm.nanite_volume - 82.5) < 0.01, "Damage modifier was not reflected in armor cost")
+	patient.physiology.brute_mod = 1
+	patient.physiology.armor = patient.physiology.armor.generate_new_with_modifiers(list(BULLET = 80))
+	TEST_ASSERT(abs(hit() - 2) < 0.01, "Projectile armor cap changed")
+	TEST_ASSERT(abs(swarm.nanite_volume - 80.5) < 0.01, "Nanites paid for protection above the armor cap")
+	patient.physiology.armor = patient.physiology.armor.generate_new_with_modifiers(list(BULLET = 15))
+	hit()
+	TEST_ASSERT(abs(swarm.nanite_volume - 80.5) < 0.01, "Already capped non-nanite armor was billed to the swarm")
+
+/datum/unit_test/armor_partial_modifiers/nanites/upkeep_lifecycle/Run()
+	setup()
+	swarm.nanite_volume = 52
+	hardening.on_process()
+	TEST_ASSERT_EQUAL(swarm.nanite_volume, 51, "Hardening upkeep changed")
+	TEST_ASSERT(hardening.passive_enabled && refractive.passive_enabled, "Funded armor was disabled early")
+	refractive.on_process()
+	TEST_ASSERT_EQUAL(swarm.nanite_volume, 50, "Refractive upkeep changed")
+	TEST_ASSERT(!hardening.passive_enabled && !refractive.passive_enabled, "Upkeep reaching safety retained armor")
+	hardening.on_process()
+	TEST_ASSERT_EQUAL(swarm.nanite_volume, 50, "Unfunded upkeep crossed safety")
+	swarm.nanite_volume = 50.5
+	hardening.on_process()
+	TEST_ASSERT_EQUAL(swarm.nanite_volume, 50.5, "Partial upkeep was consumed")
+	TEST_ASSERT(!hardening.passive_enabled, "Partial upkeep enabled armor")
+	swarm.nanite_volume = 51
+	hardening.on_process()
+	TEST_ASSERT_EQUAL(swarm.nanite_volume, 50, "Exact upkeep was not consumed")
+	TEST_ASSERT(!hardening.passive_enabled, "Upkeep leaving no hit reserve enabled armor")
+	swarm.nanite_volume = 51.25
+	hardening.on_process()
+	TEST_ASSERT(hardening.passive_enabled, "Regenerated armor failed to resume through upkeep")
+	TEST_ASSERT_EQUAL(swarm.nanite_volume, 50.25, "Resuming skipped upkeep")
+	TEST_ASSERT(abs(hit() - 14) < 0.01, "Fractionally funded hit lost full protection")
+	TEST_ASSERT_EQUAL(swarm.nanite_volume, 50, "Fractionally funded hit crossed safety")
+	TEST_ASSERT(!hardening.passive_enabled, "Fractionally funded armor remained enabled")
+	swarm.nanite_volume = 100
+	hardening.enable_passive_effect()
+	hardening.enable_passive_effect()
+	TEST_ASSERT_EQUAL(patient.getarmor(BODY_ZONE_CHEST, BULLET), 30, "Repeated activation stacked armor")
+	hardening.disable_passive_effect()
+	hardening.disable_passive_effect()
+	TEST_ASSERT_EQUAL(patient.getarmor(BODY_ZONE_CHEST, BULLET), 0, "Repeated deactivation subtracted other armor")
+	hardening.enable_passive_effect()
+	refractive.enable_passive_effect()
+	qdel(swarm)
+	TEST_ASSERT_EQUAL(patient.getarmor(BODY_ZONE_CHEST, BULLET), 0, "Swarm removal retained Hardening")
+	TEST_ASSERT_EQUAL(patient.getarmor(BODY_ZONE_CHEST, LASER), 0, "Swarm removal retained Refractive")
+
+/datum/unit_test/armor_partial_modifiers/nanites/proc/block_hit()
+	SIGNAL_HANDLER
+	return SUCCESSFUL_BLOCK
+
+/datum/unit_test/armor_partial_modifiers/nanites/queries_misses_blocks/Run()
+	setup()
+	for(var/query in 1 to 20)
+		patient.getarmor(BODY_ZONE_CHEST, BULLET)
+		patient.run_armor_check(BODY_ZONE_CHEST, MELEE, silent = TRUE)
+		patient.get_incoming_damage_modifier(14, BRUTE, BODY_ZONE_CHEST)
+	TEST_ASSERT_EQUAL(swarm.nanite_volume, 100, "Pure armor/modifier queries spent nanites")
+	var/mob/living/carbon/human/attacker = allocate(/mob/living/carbon/human/consistent)
+	attacker.set_combat_mode(TRUE)
+	ADD_TRAIT(attacker, TRAIT_PERFECT_ATTACKER, TRAIT_SOURCE_UNIT_TESTS)
+	// A zero lower bound selects the guaranteed miss branch, even with a nonzero upper bound.
+	for(var/obj/item/bodypart/arm in attacker.hand_bodyparts)
+		arm.unarmed_damage_low = 0
+		arm.unarmed_damage_high = 20
+	patient.attack_hand(attacker, list(RIGHT_CLICK = FALSE))
+	TEST_ASSERT_EQUAL(patient.getBruteLoss(), 0, "Miss fixture landed a hit")
+	TEST_ASSERT_EQUAL(swarm.nanite_volume, 100, "Missed punch spent nanites")
+	RegisterSignal(patient, COMSIG_LIVING_CHECK_BLOCK, PROC_REF(block_hit))
+	var/obj/item/storage/toolbox/weapon = allocate(/obj/item/storage/toolbox)
+	weapon.force = 20
+	weapon.throwforce = 20
+	patient.attacked_by(weapon, attacker)
+	patient.hitby(weapon)
+	projectile.armor_flag = BULLET
+	patient.bullet_act(projectile, BODY_ZONE_CHEST)
+	TEST_ASSERT_EQUAL(patient.getBruteLoss(), 0, "Shield-block fixture allowed damage")
+	TEST_ASSERT_EQUAL(swarm.nanite_volume, 100, "Shield-blocked melee, thrown or projectile attack spent nanites")
+	UnregisterSignal(patient, COMSIG_LIVING_CHECK_BLOCK)
+	patient.attacked_by(weapon, attacker)
+	TEST_ASSERT(abs(swarm.nanite_volume - 94) < 0.01, "Landed item attack was not charged once")
+	patient.heal_overall_damage(1000, 1000)
+	patient.hitby(weapon, hitpush = FALSE)
+	TEST_ASSERT(abs(swarm.nanite_volume - 88) < 0.01, "Landed thrown attack was not charged once")
+	for(var/obj/item/bodypart/arm in attacker.hand_bodyparts)
+		arm.unarmed_damage_low = 20
+		arm.unarmed_damage_high = 20
+	patient.heal_overall_damage(1000, 1000)
+	patient.attack_hand(attacker, list(RIGHT_CLICK = FALSE))
+	TEST_ASSERT(abs(swarm.nanite_volume - 82) < 0.01, "Landed unarmed attack was not charged once")
+	patient.heal_overall_damage(1000, 1000)
+	patient.apply_projectile_effects(projectile, BODY_ZONE_CHEST, patient.check_projectile_armor(BODY_ZONE_CHEST, projectile, TRUE))
+	TEST_ASSERT(abs(swarm.nanite_volume - 76) < 0.01, "Landed projectile effects were not charged once")
diff --git a/voidcrew/modules/unit_tests/voidcrew_anomaly_rewards.dm b/voidcrew/modules/unit_tests/voidcrew_anomaly_rewards.dm
new file mode 100644
index 00000000000..a346073c6ab
--- /dev/null
+++ b/voidcrew/modules/unit_tests/voidcrew_anomaly_rewards.dm
@@ -0,0 +1,244 @@
+/// Small footprints borrow the test level without owning its ground or teardown.
+/datum/unit_test/voidcrew_anomaly_rewards
+	abstract_type = /datum/unit_test/voidcrew_anomaly_rewards
+	var/list/planets = list()
+
+/datum/unit_test/voidcrew_anomaly_rewards/Destroy()
+	for(var/obj/structure/overmap/planet/planet in planets)
+		planet.footprint = null
+		planet.mapzone = null
+	planets.Cut()
+	return ..()
+
+/datum/unit_test/voidcrew_anomaly_rewards/proc/attach_surface(obj/structure/overmap/planet/planet, turf/site)
+	var/datum/map_footprint/footprint = allocate(/datum/map_footprint, null, "planet", 1, planet)
+	footprint.attach_level(SSmapping.z_list[site.z])
+	footprint.set_rect(site.x, site.y, 1, 1)
+	planet.footprint = footprint
+	planet.loaded = TRUE
+	return footprint
+
+/datum/unit_test/voidcrew_anomaly_rewards/proc/make_planet(turf/site, band = 1)
+	var/obj/structure/overmap/planet/planet = allocate(/obj/structure/overmap/planet)
+	planets += planet
+	planet.zone_band = band // ZONE_GREEN/YELLOW/RED are included after test files.
+	attach_surface(planet, site)
+	return planet
+
+/datum/unit_test/voidcrew_anomaly_rewards/proc/make_demon(demon_type, turf/site, chance = 100)
+	var/mob/living/demon = allocate(demon_type, site)
+	var/datum/component/ice_demon_core_reward/reward = demon.GetComponent(/datum/component/ice_demon_core_reward)
+	TEST_ASSERT_NOTNULL(reward, "[demon_type] has no core reward component")
+	if(istype(demon, /mob/living/basic/mining/ice_demon))
+		var/mob/living/basic/mining/ice_demon/watcher = demon
+		TEST_ASSERT_EQUAL(reward.drop_chance, 5, "Watcher core probability changed")
+		TEST_ASSERT_EQUAL(watcher.crusher_loot, /obj/item/crusher_trophy/ice_demon_cube, "Watcher lost its crusher trophy")
+		watcher.basic_mob_flags &= ~DEL_ON_DEATH
+	else
+		var/mob/living/simple_animal/hostile/asteroid/old_demon/primordial = demon
+		TEST_ASSERT_EQUAL(reward.drop_chance, 20, "Primordial core probability changed")
+		primordial.del_on_death = FALSE
+	reward.drop_chance = chance
+	return demon
+
+/datum/unit_test/voidcrew_anomaly_rewards/proc/cores_on(turf/site)
+	. = 0
+	for(var/obj/item/item in site)
+		if(istype(item, /obj/item/raw_anomaly_core) || istype(item, /obj/item/assembly/signaler/anomaly))
+			.++
+
+/datum/unit_test/voidcrew_anomaly_rewards/proc/ore_on(turf/site)
+	. = 0
+	for(var/obj/item/stack/ore/bluespace_crystal/ore in site)
+		. += ore.amount
+
+/// The two-core allowance is shared by raw and stabilized drops in every zone.
+/datum/unit_test/voidcrew_anomaly_rewards/combined_cap/Run()
+	for(var/band in 1 to 3)
+		var/turf/site = locate(run_loc_floor_bottom_left.x + band - 1, run_loc_floor_bottom_left.y, run_loc_floor_bottom_left.z)
+		var/obj/structure/overmap/planet/planet = make_planet(site, band)
+		var/mob/living/watcher = make_demon(/mob/living/basic/mining/ice_demon, site)
+		watcher.death(FALSE)
+		TEST_ASSERT_EQUAL(ore_on(site), 3, "Watcher ore drop changed")
+		TEST_ASSERT_NOTNULL(locate(/obj/item/raw_anomaly_core/bluespace) in site, "Watcher did not emit its raw core")
+		var/mob/living/primordial = make_demon(/mob/living/simple_animal/hostile/asteroid/old_demon, site)
+		primordial.death(FALSE)
+		TEST_ASSERT_EQUAL(ore_on(site), 13, "Primordial ore drop changed")
+		TEST_ASSERT_NOTNULL(locate(/obj/item/assembly/signaler/anomaly/bluespace) in site, "Primordial did not emit its stabilized core")
+		for(var/demon_type in list(/mob/living/basic/mining/ice_demon, /mob/living/simple_animal/hostile/asteroid/old_demon))
+			var/mob/living/excess = make_demon(demon_type, site)
+			excess.death(FALSE)
+		TEST_ASSERT_EQUAL(cores_on(site), 2, "Band [band] bypassed PLANET_ICE_DEMON_CORE_CAP")
+		TEST_ASSERT_EQUAL(planet.ice_demon_cores_emitted, 2, "The shared counter does not match emitted items")
+		TEST_ASSERT_EQUAL(ore_on(site), 26, "The core cap suppressed ore")
+
+/// Both successful and failed first rolls remain final after repeated deaths and revival.
+/datum/unit_test/voidcrew_anomaly_rewards/repeated_deaths/Run()
+	var/turf/site = run_loc_floor_bottom_left
+	var/list/demon_types = list(/mob/living/basic/mining/ice_demon, /mob/living/simple_animal/hostile/asteroid/old_demon)
+	for(var/demon_type in demon_types)
+		var/obj/structure/overmap/planet/planet = make_planet(site)
+		var/mob/living/missed = make_demon(demon_type, site, 0)
+		missed.death(FALSE)
+		TEST_ASSERT_EQUAL(planet.ice_demon_cores_emitted, 0, "A failed roll consumed the allowance")
+		var/datum/component/ice_demon_core_reward/reward = missed.GetComponent(/datum/component/ice_demon_core_reward)
+		reward.drop_chance = 100
+		missed.death(FALSE)
+		missed.revive(HEAL_ALL)
+		TEST_ASSERT_EQUAL(missed.stat, CONSCIOUS, "The failed-roll fixture did not revive")
+		missed.death(FALSE)
+		TEST_ASSERT_EQUAL(cores_on(site), 0, "A failed roll was rerolled by death or revival")
+		var/mob/living/success = make_demon(demon_type, site)
+		success.death(FALSE)
+		success.death(FALSE)
+		success.revive(HEAL_ALL)
+		TEST_ASSERT_EQUAL(success.stat, CONSCIOUS, "The successful-roll fixture did not revive")
+		success.death(FALSE)
+		TEST_ASSERT_EQUAL(cores_on(site), 1, "A successful roll was repeated by death or revival")
+		TEST_ASSERT_EQUAL(planet.ice_demon_cores_emitted, 1, "Repeated deaths changed the source allowance")
+		// Retire this footprint before the next variant borrows the same test tile.
+		qdel(planet.footprint)
+		planet.footprint = null
+		for(var/obj/item/item in site)
+			qdel(item)
+
+/// Real unload/relocation replaces the footprint, while transported demons retain their source.
+/datum/unit_test/voidcrew_anomaly_rewards/transport_reload/Run()
+	var/turf/home = run_loc_floor_bottom_left
+	var/turf/away = get_step(home, EAST)
+	var/turf/reloaded = get_step(home, NORTH)
+	var/obj/structure/overmap/planet/source = make_planet(home)
+	var/obj/structure/overmap/planet/neighbour = make_planet(away)
+	var/mob/living/first = make_demon(/mob/living/basic/mining/ice_demon, home)
+	var/mob/living/transported = make_demon(/mob/living/simple_animal/hostile/asteroid/old_demon, home)
+	first.forceMove(away)
+	transported.forceMove(away)
+	first.death(FALSE)
+	TEST_ASSERT_EQUAL(source.ice_demon_cores_emitted, 1, "Transport escaped the source allowance")
+	TEST_ASSERT_EQUAL(neighbour.ice_demon_cores_emitted, 0, "A transported demon charged its destination")
+	// An empty level list exercises the real teardown without wiping borrowed test ground.
+	var/datum/map_zone/zone = allocate(/datum/map_zone)
+	zone.slots = list(source.footprint)
+	zone.slot_capacity = 1
+	source.footprint.zone = zone
+	source.mapzone = zone
+	var/datum/map_footprint/old_footprint = source.footprint
+	TEST_ASSERT(source.unload_level(), "The source planet did not unload")
+	TEST_ASSERT(QDELETED(old_footprint), "Unloading did not replace the old footprint")
+	TEST_ASSERT_EQUAL(source.ice_demon_cores_emitted, 1, "Unloading or relocation reset the allowance")
+	attach_surface(source, reloaded)
+	transported.death(FALSE)
+	TEST_ASSERT_EQUAL(source.ice_demon_cores_emitted, 2, "A transported demon lost its source after unload")
+	var/mob/living/excess = make_demon(/mob/living/basic/mining/ice_demon, reloaded)
+	excess.death(FALSE)
+	TEST_ASSERT_EQUAL(cores_on(reloaded), 0, "Reloading reset the allowance")
+	var/mob/living/local = make_demon(/mob/living/simple_animal/hostile/asteroid/old_demon, away)
+	local.death(FALSE)
+	TEST_ASSERT_EQUAL(neighbour.ice_demon_cores_emitted, 1, "Independent planets shared an allowance")
+	TEST_ASSERT_EQUAL(cores_on(away), 3, "Transport or independent planets lost an allowed core")
+
+/// Roundstart surfaces receive their marker after mapped mobs, using the original spawn tile.
+/datum/unit_test/voidcrew_anomaly_rewards/preloaded_source/Run()
+	var/turf/home = run_loc_floor_bottom_left
+	var/turf/away = get_step(home, EAST)
+	var/was_initialized = SSovermap.initialized
+	SSovermap.initialized = FALSE
+	var/mob/living/demon = make_demon(/mob/living/basic/mining/ice_demon, home)
+	SSovermap.initialized = was_initialized
+	var/datum/component/ice_demon_core_reward/reward = demon.GetComponent(/datum/component/ice_demon_core_reward)
+	TEST_ASSERT_EQUAL(reward.pending_spawn_turf, home, "The early spawn did not remember its source tile")
+	var/obj/structure/overmap/planet/source = make_planet(home)
+	var/obj/structure/overmap/planet/neighbour = make_planet(away)
+	demon.forceMove(away)
+	reward.on_overmap_initialized(SSovermap)
+	TEST_ASSERT_EQUAL(reward.source_planet_ref?.resolve(), source, "Early-spawn adoption followed a moved demon")
+	TEST_ASSERT_NULL(reward.pending_spawn_turf, "Early-spawn adoption retained a turf reference")
+	demon.death(FALSE)
+	TEST_ASSERT_EQUAL(source.ice_demon_cores_emitted, 1, "The preloaded source did not consume its allowance")
+	TEST_ASSERT_EQUAL(neighbour.ice_demon_cores_emitted, 0, "Preloaded adoption charged the destination")
+
+/// Drive every supermatter spawn branch, with and without changed lifespans.
+/datum/unit_test/voidcrew_anomaly_rewards/supermatter/Run()
+	var/list/hazards = list(
+		FLUX_ANOMALY = /obj/effect/anomaly/flux/supermatter,
+		GRAVITATIONAL_ANOMALY = /obj/effect/anomaly/grav/supermatter,
+		PYRO_ANOMALY = /obj/effect/anomaly/pyro/supermatter,
+		HALLUCINATION_ANOMALY = /obj/effect/anomaly/hallucination/supermatter/coreless,
+		VORTEX_ANOMALY = /obj/effect/anomaly/bhole/supermatter,
+		BIOSCRAMBLER_ANOMALY = /obj/effect/anomaly/bioscrambler/docile/supermatter,
+		DIMENSIONAL_ANOMALY = /obj/effect/anomaly/dimensional/supermatter,
+	)
+	for(var/hazard in hazards)
+		for(var/changed_lifespan in list(FALSE, TRUE))
+			supermatter_anomaly_gen(run_loc_floor_bottom_left, hazard, 0, changed_lifespan)
+			var/obj/effect/anomaly/anomaly = locate(/obj/effect/anomaly) in run_loc_floor_bottom_left
+			TEST_ASSERT_NOTNULL(anomaly, "Supermatter failed to spawn [hazard]")
+			TEST_ASSERT_EQUAL(anomaly.type, hazards[hazard], "Supermatter used the wrong hazard subtype")
+			TEST_ASSERT_NULL(anomaly.anomaly_core, "Supermatter created a core inside [hazard]")
+			if(istype(anomaly, /obj/effect/anomaly/hallucination/supermatter))
+				var/obj/effect/anomaly/hallucination/hallucination = anomaly
+				TEST_ASSERT(!hallucination.spawn_decoys, "The coreless hallucination hazard regained decoys")
+			if(hazard == VORTEX_ANOMALY)
+				TEST_ASSERT_EQUAL(anomaly.lifespan, 2 SECONDS, "Supermatter vortex lifespan changed")
+			else if(!changed_lifespan)
+				TEST_ASSERT_EQUAL(anomaly.lifespan, initial(anomaly.lifespan), "Default hazard lifespan changed")
+			anomaly.anomalyNeutralize()
+			TEST_ASSERT(QDELETED(anomaly), "The coreless hazard did not neutralize")
+			TEST_ASSERT_EQUAL(cores_on(run_loc_floor_bottom_left), 0, "Neutralizing [hazard] yielded a core")
+	var/obj/effect/anomaly/grav/ordinary = allocate(/obj/effect/anomaly/grav)
+	TEST_ASSERT_NOTNULL(ordinary.anomaly_core, "Supermatter's core suppression affected ordinary anomalies")
+
+/// Catalog entries supply functioning modules whose seated cores resist the real tool path.
+/datum/unit_test/voidcrew_anomaly_rewards/trader_modules/Run()
+	var/datum/outpost_shop/vendor/suit_fitter/shop = allocate(/datum/outpost_shop/vendor/suit_fitter)
+	// Automatic Hard-board draws are gone; verify the former prize types stay locked.
+	TEST_ASSERT(!("exclusive_rewards" in shop.vars), "The fitter retained the retired automatic exclusive pool")
+	var/list/module_types = list(
+		/obj/item/mod/module/anomaly_locked/kinesis/prebuilt/locked,
+		/obj/item/mod/module/anomaly_locked/teleporter/prebuilt/locked,
+	)
+	var/datum/shop_sku/fitter/rare/mod_antigrav/sku = allocate(/datum/shop_sku/fitter/rare/mod_antigrav)
+	module_types += sku.item_path
+	TEST_ASSERT_EQUAL(length(module_types), 3, "The locked anomaly module coverage changed")
+	TEST_ASSERT(/obj/item/mod/module/anomaly_locked/kinesis/prebuilt/locked in module_types, "The kinesis reward is not locked")
+	TEST_ASSERT(/obj/item/mod/module/anomaly_locked/teleporter/prebuilt/locked in module_types, "The teleporter reward is not locked")
+	TEST_ASSERT(/obj/item/mod/module/anomaly_locked/antigrav/prebuilt/locked in module_types, "The anti-gravity SKU is not locked")
+	var/mob/living/carbon/human/wearer = allocate(/mob/living/carbon/human/consistent)
+	var/obj/item/screwdriver/tool = allocate(/obj/item/screwdriver)
+	for(var/module_type in module_types)
+		wearer.forceMove(run_loc_floor_bottom_left)
+		var/obj/item/mod/control/pre_equipped/suit = allocate(/obj/item/mod/control/pre_equipped)
+		var/obj/item/mod/module/anomaly_locked/module = allocate(module_type)
+		TEST_ASSERT_NOTNULL(module.core, "[module_type] arrived without a core")
+		TEST_ASSERT(!module.core_removable, "[module_type] has an extractable core")
+		var/obj/item/assembly/signaler/anomaly/seated_core = module.core
+		module.screwdriver_act(wearer, tool)
+		TEST_ASSERT_EQUAL(module.core, seated_core, "The screwdriver extracted [module_type]'s core")
+		TEST_ASSERT_EQUAL(seated_core.loc, module, "The seated core escaped its module")
+		suit.install(module)
+		TEST_ASSERT_EQUAL(module.mod, suit, "[module_type] could not be installed")
+		suit.wearer = wearer
+		suit.active = TRUE
+		module.part_activated = TRUE
+		TEST_ASSERT(module.activate(), "[module_type] could not activate")
+		// Keep the ability check independent of any initial use cooldown.
+		COOLDOWN_RESET(module, cooldown_timer)
+		TEST_ASSERT(module.on_active_process(1), "[module_type] failed its powered core check")
+		if(istype(module, /obj/item/mod/module/anomaly_locked/antigrav))
+			TEST_ASSERT(!wearer.has_gravity(), "The locked anti-gravity module did not work")
+		else if(istype(module, /obj/item/mod/module/anomaly_locked/kinesis))
+			var/obj/item/mod/module/anomaly_locked/kinesis/kinesis = module
+			var/obj/item/target = allocate(/obj/item, get_step(run_loc_floor_bottom_left, EAST))
+			// The cursor catcher requires a real client; exercise the use and targeting gates headlessly.
+			TEST_ASSERT(kinesis.range_check(target), "The locked kinesis module cannot reach a nearby item")
+			TEST_ASSERT(kinesis.can_grab(target), "The locked kinesis module rejected an ordinary item")
+			TEST_ASSERT(kinesis.used(), "The locked kinesis module failed its ability use check")
+		else
+			var/obj/item/mod/module/anomaly_locked/teleporter/teleporter = module
+			teleporter.teleport_time = 0
+			var/turf/destination = get_step(run_loc_floor_bottom_left, NORTH)
+			teleporter.on_select_use(destination)
+			TEST_ASSERT_EQUAL(get_turf(wearer), destination, "The locked teleporter did not teleport")
+		module.deactivate(FALSE)
+		suit.uninstall(module)
+		suit.wearer = null
diff --git a/voidcrew/modules/unit_tests/voidcrew_anomaly_trade.dm b/voidcrew/modules/unit_tests/voidcrew_anomaly_trade.dm
new file mode 100644
index 00000000000..49443b75945
--- /dev/null
+++ b/voidcrew/modules/unit_tests/voidcrew_anomaly_trade.dm
@@ -0,0 +1,320 @@
+// Fork defines are included after upstream unit tests, so the signal and zone values
+// below are the literals behind them: COMSIG_VOIDCREW_SHIP_DOCKED is
+// "voidcrew_ship_docked" (voidcrew/_DEFINES/ship_defines.dm).
+
+/// The nine raw anomaly crates are gone from every cargo console.
+/datum/unit_test/voidcrew_anomaly_cargo_hidden/Run()
+	var/list/raw_packs = list(
+		/datum/supply_pack/science/raw_flux_anomaly,
+		/datum/supply_pack/science/raw_hallucination_anomaly,
+		/datum/supply_pack/science/raw_grav_anomaly,
+		/datum/supply_pack/science/raw_vortex_anomaly,
+		/datum/supply_pack/science/raw_ectoplasm_anomaly,
+		/datum/supply_pack/science/raw_bluespace_anomaly,
+		/datum/supply_pack/science/raw_pyro_anomaly,
+		/datum/supply_pack/science/raw_bioscrambler_anomaly,
+		/datum/supply_pack/science/raw_dimensional_anomaly,
+	)
+	for(var/pack_type in raw_packs)
+		var/datum/supply_pack/pack = allocate(pack_type)
+		TEST_ASSERT_NULL(pack.contains, "[pack_type] still has contents, so SSshuttle registers it")
+	for(var/pack_id in SSshuttle.supply_packs)
+		var/datum/supply_pack/pack = SSshuttle.supply_packs[pack_id]
+		for(var/item in pack.contains)
+			if(ispath(item, /obj/item/raw_anomaly_core))
+				TEST_FAIL("[pack.type] sells [item] over cargo")
+
+/// Boffin's core and chart rotations: every type, the right price band and stock,
+/// no discounts, and sold slots turn over instead of refilling.
+/datum/unit_test/voidcrew_anomaly_boffin_shelves/Run()
+	var/list/core_prices = list(
+		/obj/item/raw_anomaly_core/flux = 8000,
+		/obj/item/raw_anomaly_core/grav = 8000,
+		/obj/item/raw_anomaly_core/hallucination = 8000,
+		/obj/item/raw_anomaly_core/pyro = 8000,
+		/obj/item/raw_anomaly_core/bioscrambler = 10000,
+		/obj/item/raw_anomaly_core/ectoplasm = 10000,
+		/obj/item/raw_anomaly_core/dimensional = 10000,
+		/obj/item/raw_anomaly_core/bluespace = 12000,
+		/obj/item/raw_anomaly_core/vortex = 12000,
+	)
+	var/list/chart_prices = list(
+		/obj/effect/anomaly/flux = 4000,
+		/obj/effect/anomaly/grav = 4000,
+		/obj/effect/anomaly/hallucination = 4000,
+		/obj/effect/anomaly/pyro = 4000,
+		/obj/effect/anomaly/bioscrambler = 5000,
+		/obj/effect/anomaly/ectoplasm = 5000,
+		/obj/effect/anomaly/dimensional = 5000,
+		/obj/effect/anomaly/bluespace = 6000,
+		/obj/effect/anomaly/bhole = 6000,
+	)
+
+	var/datum/outpost_shop/shop = allocate(/datum/outpost_shop/vendor/skunkworks, null)
+	var/datum/shop_rotation/cores
+	var/datum/shop_rotation/charts
+	for(var/datum/shop_rotation/rotation as anything in shop.live_rotations)
+		if(istype(rotation, /datum/shop_rotation/skunk_cores))
+			cores = rotation
+		else if(istype(rotation, /datum/shop_rotation/skunk_anomaly_charts))
+			charts = rotation
+	TEST_ASSERT_NOTNULL(cores, "Boffin has no raw core rotation")
+	TEST_ASSERT_NOTNULL(charts, "Boffin has no anomaly chart rotation")
+
+	TEST_ASSERT_EQUAL(cores.slots, 2, "Boffin must keep two core slots")
+	TEST_ASSERT_EQUAL(charts.slots, 4, "Boffin must stock four chart slots")
+
+	var/list/cores_seen = list()
+	for(var/datum/shop_sku/sku_type as anything in cores.pool)
+		var/item = initial(sku_type.item_path)
+		TEST_ASSERT(item in core_prices, "[sku_type] sells [item], which is not a raw anomaly core")
+		TEST_ASSERT_EQUAL(initial(sku_type.price_credits), core_prices[item], "[sku_type] is in the wrong price band")
+		TEST_ASSERT(!initial(sku_type.fixed_price), "[sku_type] ignores favor and specials")
+		TEST_ASSERT(!initial(sku_type.contract_reward), "[sku_type] can be paid out by contracts")
+		TEST_ASSERT_EQUAL(initial(sku_type.stock_min), 1, "[sku_type] does not always stock one core")
+		TEST_ASSERT_EQUAL(initial(sku_type.stock_max), 1, "[sku_type] stocks more than one unit")
+		cores_seen[item] = cores.pool[sku_type]
+	TEST_ASSERT_EQUAL(length(cores_seen), 9, "Boffin's core rotation does not cover all nine types")
+	TEST_ASSERT(cores_seen[/obj/item/raw_anomaly_core/flux] > cores_seen[/obj/item/raw_anomaly_core/bioscrambler], "Uncommon cores are not rarer than common ones")
+	TEST_ASSERT(cores_seen[/obj/item/raw_anomaly_core/bioscrambler] > cores_seen[/obj/item/raw_anomaly_core/vortex], "Rare cores are not rarer than uncommon ones")
+
+	var/list/charts_seen = list()
+	for(var/datum/shop_sku/anomaly_chart/sku_type as anything in charts.pool)
+		var/anomaly = initial(sku_type.anomaly_type)
+		var/base_type
+		for(var/candidate in chart_prices)
+			if(ispath(anomaly, candidate))
+				base_type = candidate
+				break
+		TEST_ASSERT_NOTNULL(base_type, "[sku_type] points at [anomaly], which is not one of the nine anomaly types")
+		TEST_ASSERT_EQUAL(initial(sku_type.price_credits), chart_prices[base_type], "[sku_type] is in the wrong price band")
+		TEST_ASSERT(!initial(sku_type.fixed_price), "[sku_type] ignores favor and specials")
+		TEST_ASSERT_EQUAL(initial(sku_type.stock_min), 2, "[sku_type] must always stock two charts")
+		TEST_ASSERT_EQUAL(initial(sku_type.stock_max), 2, "[sku_type] must stock at most two charts")
+		TEST_ASSERT(!initial(sku_type.contract_reward), "[sku_type] can be paid out by contracts")
+		var/obj/effect/anomaly/anomaly_path = anomaly
+		TEST_ASSERT(initial(anomaly_path.immortal) && initial(anomaly_path.site_bound), "[sku_type] surfaces an anomaly that times out or can leave its site")
+		charts_seen[base_type] = TRUE
+	TEST_ASSERT_EQUAL(length(charts_seen), 9, "Boffin's chart rotation does not cover all nine types")
+
+	for(var/datum/shop_rotation/rotation as anything in list(cores, charts))
+		var/list/on_shelf = list()
+		for(var/datum/shop_sku/sku as anything in shop.skus)
+			if(sku.rotation == rotation)
+				on_shelf += sku
+		TEST_ASSERT_EQUAL(length(on_shelf), rotation.slots, "[rotation.type] put [length(on_shelf)] SKUs on the shelf")
+		var/datum/shop_sku/sold = on_shelf[1]
+		var/expected_stock = rotation == charts ? 2 : 1
+		for(var/datum/shop_sku/sku as anything in on_shelf)
+			TEST_ASSERT_EQUAL(sku.stock, expected_stock, "[sku.type] stocked the wrong number of units")
+		sold.discount_pct = 30
+		TEST_ASSERT_EQUAL(sold.get_credit_price(), round(sold.price_credits * 0.7, 5), "A special did not discount [sold.type]")
+		var/sold_type = sold.type
+		sold.stock = 0
+		shop.convoy_restock()
+		TEST_ASSERT(!(sold in shop.skus), "The convoy refilled a sold [sold_type] in place")
+		var/list/after = list()
+		for(var/datum/shop_sku/sku as anything in shop.skus)
+			if(sku.rotation == rotation)
+				after += sku.type
+				TEST_ASSERT_EQUAL(sku.stock, expected_stock, "The convoy changed [sku.type] stock")
+		TEST_ASSERT_EQUAL(length(after), length(on_shelf), "The convoy did not replace the sold slot")
+		TEST_ASSERT(!(sold_type in after), "The sold slot came back as the same [sold_type]")
+		TEST_ASSERT_EQUAL(length(unique_list(after)), length(after), "The rotation shelved the same SKU twice")
+
+/// Raw cores take the normal favor discount, and the better of favor or special wins.
+/datum/unit_test/voidcrew_anomaly_core_favor/Run()
+	var/datum/outpost_shop/shop = allocate(/datum/outpost_shop)
+	shop.add_sku(/datum/shop_sku/skunk/anomaly_core/vortex, "rotating")
+	var/datum/shop_sku/skunk/anomaly_core/sku = shop.skus[1]
+	var/obj/structure/overmap/ship/ship = allocate(/obj/structure/overmap/ship)
+	var/mob/living/carbon/human/buyer = allocate(/mob/living/carbon/human/consistent)
+	buyer.mind_initialize()
+	allocated += buyer.mind
+	var/datum/team/voidcrew/team = allocate(/datum/team/voidcrew)
+	team.ship = ship
+	ship.ship_team = team
+	team.join_member(buyer.mind)
+	sku.discount_pct = 0
+	TEST_ASSERT_EQUAL(sku.get_credit_price(buyer), 12000, "A stranger got a discount")
+	shop.grant_favor(ship, 6) // FAVOR_TIER_TRUSTED, 15% off
+	TEST_ASSERT_EQUAL(sku.get_credit_price(buyer), 10200, "A Trusted crew did not get the normal favor discount")
+	sku.discount_pct = 30
+	TEST_ASSERT_EQUAL(sku.get_credit_price(buyer), 8400, "The better special did not win over favor")
+	sku.discount_pct = 10
+	TEST_ASSERT_EQUAL(sku.get_credit_price(buyer), 10200, "Favor and special stacked, or the better one lost")
+	buyer.mind.ship_teams = null
+	team.ship = null
+
+/// Buying a chart takes the money and puts a sealed anomaly rumor on the ship.
+/datum/unit_test/voidcrew_anomaly_chart_purchase/Run()
+	var/datum/outpost_shop/shop = allocate(/datum/outpost_shop)
+	var/datum/shop_rotation/rotation = new /datum/shop_rotation/skunk_anomaly_charts
+	shop.live_rotations += rotation
+	shop.add_rotation_sku(rotation, /datum/shop_sku/anomaly_chart/grav)
+	var/datum/shop_sku/anomaly_chart/sku = shop.skus[1]
+	var/obj/structure/overmap/ship/ship = allocate(/obj/structure/overmap/ship)
+	var/mob/living/carbon/human/buyer = allocate(/mob/living/carbon/human/consistent)
+	buyer.mind_initialize()
+	allocated += buyer.mind
+	var/datum/team/voidcrew/team = allocate(/datum/team/voidcrew)
+	team.ship = ship
+	ship.ship_team = team
+	team.join_member(buyer.mind)
+	var/datum/bank_account/account = allocate(/datum/bank_account, "Anomaly chart test", null, 1, FALSE)
+	account.account_balance = 40000
+	ship.ship_account = account
+	var/obj/item/card/id/advanced/id_card = allocate(/obj/item/card/id/advanced)
+	qdel(id_card.registered_account)
+	id_card.registered_account = account
+	TEST_ASSERT(buyer.put_in_hands(id_card), "Buyer could not carry their paying ID")
+
+	TEST_ASSERT(sku.try_purchase(buyer, null), "Chart purchase failed")
+	TEST_ASSERT_EQUAL(account.account_balance, 36000, "The chart charged the wrong amount")
+	TEST_ASSERT_EQUAL(length(ship.pending_rumors), 1, "Purchase did not upload a sealed chart")
+	var/datum/rumor_chart/anomaly/chart = ship.pending_rumors[1]
+	TEST_ASSERT(istype(chart), "The sealed chart is not an anomaly chart")
+	TEST_ASSERT_EQUAL(chart.anomaly_type, /obj/effect/anomaly/grav/planetary, "The chart names the wrong anomaly")
+	TEST_ASSERT(!chart.revealed && !chart.surfaced, "A fresh chart is already revealed")
+	TEST_ASSERT_EQUAL(sku.stock, 1, "The first purchase did not leave one chart")
+	shop.convoy_restock()
+	TEST_ASSERT(sku in shop.skus, "The convoy replaced a partially sold chart slot")
+	TEST_ASSERT_EQUAL(sku.stock, 1, "The convoy refilled a partially sold chart slot")
+	sku.discount_pct = 0 // The convoy rerolls the special independently of stock.
+	TEST_ASSERT(sku.try_purchase(buyer, null), "The second chart purchase failed")
+	TEST_ASSERT_EQUAL(sku.stock, 0, "The second purchase did not exhaust the slot")
+	TEST_ASSERT_EQUAL(account.account_balance, 32000, "The second chart charged the wrong amount")
+	TEST_ASSERT_EQUAL(length(ship.pending_rumors), 2, "Two purchases did not upload two charts")
+	var/datum/rumor_chart/anomaly/second_chart = ship.pending_rumors[2]
+	TEST_ASSERT(second_chart != chart, "Two purchases shared a chart datum")
+	TEST_ASSERT(!sku.try_purchase(buyer, null), "An exhausted chart slot sold a third unit")
+	TEST_ASSERT_EQUAL(account.account_balance, 32000, "A refused purchase took money")
+	TEST_ASSERT_EQUAL(length(ship.pending_rumors), 2, "A refused purchase uploaded a chart")
+	shop.convoy_restock()
+	TEST_ASSERT(!(sku in shop.skus), "The convoy did not replace the exhausted chart slot")
+	TEST_ASSERT_EQUAL(length(shop.skus), 1, "The convoy lost the exhausted chart slot")
+	var/datum/shop_sku/replacement = shop.skus[1]
+	TEST_ASSERT(replacement.type != /datum/shop_sku/anomaly_chart/grav, "The exhausted chart refilled in place")
+	TEST_ASSERT_EQUAL(replacement.stock, 2, "The replacement chart slot did not stock two units")
+
+	qdel(ship)
+	TEST_ASSERT(QDELETED(chart) && QDELETED(second_chart), "Hull loss left a sealed chart alive")
+	buyer.mind.ship_teams = null
+	team.ship = null
+
+/// Test chart that skips site generation and spawn-point search
+/datum/rumor_chart/anomaly/unit_test
+	var/obj/structure/overmap/test_site
+	var/turf/test_turf
+
+/datum/rumor_chart/anomaly/unit_test/pick_site(obj/structure/overmap/ship/ship)
+	return test_site
+
+/datum/rumor_chart/anomaly/unit_test/find_spawn_turf(obj/structure/overmap/site)
+	return test_turf
+
+/// Nothing on reveal, nothing for other ships or other sites, one anomaly when the
+/// buyer docks at the charted site, and a lost site re-seals the chart.
+/datum/unit_test/voidcrew_anomaly_chart_arrival
+	var/list/obj/effect/anomaly/spawned = list()
+
+/datum/unit_test/voidcrew_anomaly_chart_arrival/Destroy()
+	QDEL_LIST(spawned)
+	return ..()
+
+/datum/unit_test/voidcrew_anomaly_chart_arrival/Run()
+	var/obj/structure/overmap/ship/buyer = allocate(/obj/structure/overmap/ship)
+	var/obj/structure/overmap/ship/stranger = allocate(/obj/structure/overmap/ship)
+	var/obj/structure/overmap/space_ruin/site = allocate(/obj/structure/overmap/space_ruin)
+	var/obj/structure/overmap/space_ruin/elsewhere = allocate(/obj/structure/overmap/space_ruin)
+	var/turf/spot = run_loc_floor_top_right
+
+	var/datum/rumor_chart/anomaly/unit_test/chart = new
+	chart.anomaly_type = /obj/effect/anomaly/flux/planetary
+	chart.test_site = site
+	chart.test_turf = spot
+	buyer.add_pending_rumor(chart)
+
+	TEST_ASSERT_EQUAL(buyer.reveal_pending_rumor(chart), site, "Reveal did not chart the site")
+	TEST_ASSERT(!QDELETED(chart) && (chart in buyer.active_anomaly_charts), "Revealing consumed the chart before arrival")
+	TEST_ASSERT(!(chart in buyer.pending_rumors), "The revealed chart is still sealed on the helm")
+	TEST_ASSERT_NULL(locate(/obj/effect/anomaly) in spot, "Revealing the chart spawned the anomaly")
+
+	stranger.docked = site
+	SEND_SIGNAL(stranger, "voidcrew_ship_docked")
+	TEST_ASSERT_NULL(locate(/obj/effect/anomaly) in spot, "Another crew's arrival surfaced the buyer's anomaly")
+
+	buyer.docked = elsewhere
+	SEND_SIGNAL(buyer, "voidcrew_ship_docked")
+	TEST_ASSERT_NULL(locate(/obj/effect/anomaly) in spot, "Docking at a different site surfaced the anomaly")
+
+	buyer.docked = site
+	SEND_SIGNAL(buyer, "voidcrew_ship_docked")
+	var/obj/effect/anomaly/anomaly = locate(/obj/effect/anomaly) in spot
+	if(anomaly)
+		spawned += anomaly
+	TEST_ASSERT_NOTNULL(anomaly, "The buyer docked at the site and no anomaly formed")
+	TEST_ASSERT(istype(anomaly, /obj/effect/anomaly/flux/planetary), "The wrong anomaly formed")
+	TEST_ASSERT(QDELETED(chart), "The chart outlived its anomaly")
+
+	SEND_SIGNAL(buyer, "voidcrew_ship_docked")
+	var/count = 0
+	for(var/obj/effect/anomaly/extra in spot)
+		count++
+		spawned |= extra
+	TEST_ASSERT_EQUAL(count, 1, "A second arrival surfaced another anomaly")
+
+	// A site that disappears before arrival hands the chart back sealed
+	buyer.docked = null
+	stranger.docked = null
+	var/datum/rumor_chart/anomaly/unit_test/second = new
+	second.anomaly_type = /obj/effect/anomaly/flux/planetary
+	second.test_site = elsewhere
+	second.test_turf = spot
+	buyer.add_pending_rumor(second)
+	TEST_ASSERT_EQUAL(buyer.reveal_pending_rumor(second), elsewhere, "Second reveal did not chart its site")
+	qdel(elsewhere)
+	TEST_ASSERT(!QDELETED(second), "Losing the site deleted the paid chart")
+	TEST_ASSERT((second in buyer.pending_rumors) && !(second in buyer.active_anomaly_charts), "Losing the site did not re-seal the chart")
+	TEST_ASSERT(!second.revealed, "The re-sealed chart still counts as revealed")
+
+/// Every anomaly type can seed on planets, as immortal site-bound subtypes, rarer
+/// for the dangerous ones.
+/datum/unit_test/voidcrew_planet_anomaly_table/Run()
+	var/list/base_types = list(
+		/obj/effect/anomaly/flux,
+		/obj/effect/anomaly/grav,
+		/obj/effect/anomaly/hallucination,
+		/obj/effect/anomaly/pyro,
+		/obj/effect/anomaly/bioscrambler,
+		/obj/effect/anomaly/ectoplasm,
+		/obj/effect/anomaly/dimensional,
+		/obj/effect/anomaly/bluespace,
+		/obj/effect/anomaly/bhole,
+	)
+	var/list/weights = list()
+	for(var/base_type in base_types)
+		for(var/obj/effect/anomaly/entry as anything in GLOB.voidcrew_planet_anomalies)
+			if(!ispath(entry, base_type))
+				continue
+			TEST_ASSERT(initial(entry.immortal), "[entry] times out on a planet")
+			TEST_ASSERT(initial(entry.site_bound), "[entry] can wander off its planet")
+			weights[base_type] = GLOB.voidcrew_planet_anomalies[entry]
+		TEST_ASSERT(weights[base_type], "[base_type] never seeds on planets")
+	TEST_ASSERT(weights[/obj/effect/anomaly/pyro] > weights[/obj/effect/anomaly/dimensional], "Uncommon planet anomalies are not rarer than common ones")
+	TEST_ASSERT(weights[/obj/effect/anomaly/dimensional] > weights[/obj/effect/anomaly/bhole], "Rare planet anomalies are not rarer than uncommon ones")
+
+/// The planetary pyroclastic anomaly burns whoever is next to it and never touches the air.
+/datum/unit_test/voidcrew_planet_pyro_jets/Run()
+	var/obj/effect/anomaly/pyro/planetary/pyro = allocate(/obj/effect/anomaly/pyro/planetary)
+	var/turf/open/origin = get_turf(pyro)
+	var/turf/next_door = get_step(origin, NORTH)
+	var/mob/living/carbon/human/victim = allocate(/mob/living/carbon/human/consistent, next_door)
+	var/datum/gas_mixture/air = origin.return_air()
+	var/moles_before = air.total_moles()
+	pyro.anomalyEffect(pyro.burst_delay)
+	TEST_ASSERT(victim.fire_stacks > 0, "Someone standing next to the burst was not set alight")
+	TEST_ASSERT(victim.getFireLoss() > 0, "Someone standing next to the burst took no burns")
+	air = origin.return_air()
+	TEST_ASSERT_EQUAL(air.total_moles(), moles_before, "The planetary pyroclastic anomaly released gas")
+	victim.extinguish_mob()
diff --git a/voidcrew/modules/unit_tests/voidcrew_bank_deposits.dm b/voidcrew/modules/unit_tests/voidcrew_bank_deposits.dm
index 19102b38db6..7a277114cdf 100644
--- a/voidcrew/modules/unit_tests/voidcrew_bank_deposits.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_bank_deposits.dm
@@ -70,7 +70,8 @@
 	TEST_ASSERT_EQUAL(card.registered_account, first_account, "A visitor linked their ID to another ship's account.")
 	TEST_ASSERT(!(card in second_account.bank_cards), "A refused ID was registered on the destination account.")
 
-	// The membership granted by claiming or joining another crew permits a manual switch.
+	// Commissioning another hull for the same crew permits a manual account switch.
+	second_ship.bind_reputation_crew(user.mind)
 	second_ship.enlist_crewmember(user)
 	second_bank.machine_stat |= NOPOWER
 	second_bank.attackby(card, user)
@@ -82,7 +83,7 @@
 	user.stat = CONSCIOUS
 
 	second_bank.attackby(card, user)
-	TEST_ASSERT_EQUAL(card.registered_account, second_account, "A member of both crews could not select the second ship's account.")
+	TEST_ASSERT_EQUAL(card.registered_account, second_account, "A member of the shared crew could not select the second ship's account.")
 	TEST_ASSERT(!(card in first_account.bank_cards), "The old account retained the switched card.")
 	TEST_ASSERT(card in second_account.bank_cards, "The new account did not register the switched card.")
 	TEST_ASSERT_EQUAL(other_card.registered_account, first_account, "Switching one card redirected another crew member's card.")
@@ -99,7 +100,7 @@
 	TEST_ASSERT_EQUAL(second_account.account_balance, 2000, "Switching accounts changed the second ship's balance.")
 	TEST_ASSERT(!QDELETED(first_account) && !QDELETED(second_account), "Switching deleted a ship account.")
 
-	second_ship.ship_team.remove_member(user.mind)
+	user.mind.leave_reputation_crew()
 	second_bank.attackby(card, user)
 	TEST_ASSERT_EQUAL(card.registered_account, first_account, "A former crew member could link an ID after leaving the roster.")
 	second_ship.enlist_crewmember(user)
diff --git a/voidcrew/modules/unit_tests/voidcrew_blueprint_guns.dm b/voidcrew/modules/unit_tests/voidcrew_blueprint_guns.dm
index 6531a1669e4..ce47bd34b97 100644
--- a/voidcrew/modules/unit_tests/voidcrew_blueprint_guns.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_blueprint_guns.dm
@@ -1,65 +1,110 @@
-/// Exercise the actual crafting pipeline: schematics must not supply free ammunition.
+/// The six Voidcrew guns have no schematic, receiver, crafting result or fabrication design.
 /datum/unit_test/voidcrew_blueprint_guns/Run()
-	var/mob/living/carbon/human/crafter = allocate(__IMPLIED_TYPE__)
-	var/datum/component/personal_crafting/unit_test/crafting = crafter.AddComponent(__IMPLIED_TYPE__)
-	allocate(/obj/item/screwdriver, crafter.loc)
-	allocate(/obj/item/wrench, crafter.loc)
-	var/recipes_checked = 0
-	for(var/datum/crafting_recipe/blueprint/gun/recipe in GLOB.crafting_recipes)
-		if(!ispath(recipe.result, /obj/item/gun))
-			continue
-		recipes_checked++
-		check_recipe(crafter, crafting, recipe)
-	TEST_ASSERT(recipes_checked > 0, "No blueprint gun recipes were tested.")
+	var/list/guns = list(
+		/obj/item/gun/ballistic/automatic/c20r,
+		/obj/item/gun/ballistic/automatic/wt550,
+		/obj/item/gun/energy/laser/carbine,
+		/obj/item/gun/ballistic/automatic/l6_saw,
+		/obj/item/gun/ballistic/rifle/sniper_rifle,
+		/obj/item/gun/ballistic/shotgun/bulldog,
+	)
+	for(var/datum/crafting_recipe/recipe as anything in GLOB.crafting_recipes)
+		var/list/results = islist(recipe.result) ? recipe.result : list(recipe.result)
+		for(var/result in results)
+			for(var/gun_type in guns)
+				TEST_ASSERT(!ispath(result, gun_type), "[recipe.type] still crafts [result].")
+	for(var/design_id in SSresearch.techweb_designs)
+		var/datum/design/design = SSresearch.techweb_designs[design_id]
+		for(var/gun_type in guns)
+			TEST_ASSERT(!ispath(design.build_path, gun_type), "[design.type] still fabricates [design.build_path].")
 
-/datum/unit_test/voidcrew_blueprint_guns/proc/check_recipe(mob/living/carbon/human/crafter, datum/component/personal_crafting/unit_test/crafting, datum/crafting_recipe/recipe)
-	for(var/requirement in recipe.reqs)
-		if(ispath(requirement, /obj/item/stack))
-			allocate(requirement, crafter.loc, recipe.reqs[requirement], FALSE)
-		else
-			for(var/index in 1 to recipe.reqs[requirement])
-				allocate(requirement, crafter.loc)
-	var/obj/item/gun/gun = crafting.construct_item(crafter, recipe)
-	TEST_ASSERT(istype(gun), "[recipe.type] failed to craft: [gun]")
-	allocated += gun
-	TEST_ASSERT(gun.pin?.type == /obj/item/firing_pin, "[recipe.type] did not install a usable standard firing pin.")
-	if(istype(gun, /obj/item/gun/energy))
-		var/obj/item/gun/energy/energy_gun = gun
-		TEST_ASSERT(energy_gun.cell?.charge > 0, "[recipe.type] lost its rechargeable power supply.")
-		qdel(gun)
-		return
-	var/obj/item/gun/ballistic/ballistic = gun
-	TEST_ASSERT_EQUAL(ballistic.get_ammo(), 0, "[recipe.type] provided free ammunition.")
-	TEST_ASSERT_NULL(ballistic.chambered, "[recipe.type] left a chambered round.")
-	TEST_ASSERT_NULL(ballistic.magazine, "[recipe.type] provided a free detachable magazine.")
-	// Deleting the default magazine must not eject it onto the ground instead.
-	for(var/obj/item/ammo_box/magazine/leaked in crafter.loc)
-		TEST_FAIL("[recipe.type] left a free magazine on the ground: [leaked.type].")
-	for(var/obj/item/ammo_casing/leaked in crafter.loc)
-		TEST_FAIL("[recipe.type] left a free round on the ground: [leaked.type].")
+	// Text paths avoid recreating the removed parents or requiring deleted defines.
+	for(var/removed_parent in list("/obj/item/blueprint", "/datum/crafting_recipe/blueprint", "/obj/item/gun_part"))
+		TEST_ASSERT_NULL(text2path(removed_parent), "[removed_parent] still exists.")
+	var/list/node_suffixes = list("c20r", "wt550", "carbine", "l6_saw", "sniper", "bulldog")
+	for(var/removed_node in node_suffixes)
+		TEST_ASSERT_NULL(SSresearch.techweb_nodes["weapon_part_[removed_node]"], "Receiver node [removed_node] still exists.")
+	for(var/removed_family in list("c20r", "wt550", "laser_carbine", "l6_saw", "sniper_rifle", "bulldog"))
+		TEST_ASSERT_NULL(text2path("/obj/item/blueprint/gun/[removed_family]"), "[removed_family] still has a gun schematic.")
+		TEST_ASSERT_NULL(text2path("/obj/item/gun_part/[removed_family]"), "[removed_family] still has a receiver item.")
+		TEST_ASSERT_NULL(text2path("/datum/design/gun_part_[removed_family]"), "[removed_family] still has a receiver design type.")
+		TEST_ASSERT_NULL(text2path("/datum/techweb_node/weapon_part_[removed_family]"), "[removed_family] still has a receiver node type.")
+		TEST_ASSERT_NULL(SSresearch.techweb_designs["vc_gun_part_[removed_family]"], "[removed_family] still has a receiver design.")
+	for(var/node_id in SSresearch.techweb_nodes)
+		var/datum/techweb_node/node = SSresearch.techweb_nodes[node_id]
+		for(var/removed_node in node_suffixes)
+			TEST_ASSERT(!("weapon_part_[removed_node]" in node.prereq_ids), "[node_id] still requires a removed receiver node.")
+	var/datum/design/receiver/modular_receiver = SSresearch.techweb_designs["receiver"]
+	TEST_ASSERT_NOTNULL(modular_receiver, "The unrelated TG modular receiver design disappeared.")
+	TEST_ASSERT_EQUAL(modular_receiver.build_path, /obj/item/weaponcrafting/receiver, "The modular receiver design has the wrong output.")
+	TEST_ASSERT_EQUAL(modular_receiver.build_type, AUTOLATHE, "The TG modular receiver lost autolathe fabrication.")
+	TEST_ASSERT(RND_CATEGORY_HACKED in modular_receiver.category, "The TG modular receiver lost its hacked-autolathe gate.")
 
-	// A separately supplied magazine must restore a working weapon, including open bolts.
-	var/obj/item/ammo_box/magazine/reload = allocate(ballistic.spawn_magazine_type)
-	TEST_ASSERT(crafter.put_in_hands(reload), "Could not hold the reload for [recipe.type].")
-	TEST_ASSERT(ballistic.insert_magazine(crafter, reload, FALSE), "[recipe.type] rejected its normal magazine.")
-	ballistic.drop_bolt()
-	TEST_ASSERT(ballistic.chambered?.loaded_projectile, "[recipe.type] could not chamber separately supplied ammunition.")
-	qdel(gun)
+/// Ammunition remains connected to the research tree, including specialist loads.
+/datum/unit_test/voidcrew_gun_ammo_research/Run()
+	var/list/reachable = list()
+	var/previous_count = -1
+	while(length(reachable) != previous_count)
+		previous_count = length(reachable)
+		for(var/node_id in SSresearch.techweb_nodes)
+			var/datum/techweb_node/node = SSresearch.techweb_nodes[node_id]
+			if(!(node_id in reachable) && !length(node.prereq_ids - reachable))
+				reachable += node_id
+	var/list/ammo_prereqs = list(
+		"weapon_ammo_c20r" = list(TECHWEB_NODE_RIOT_SUPRESSION),
+		"weapon_ammo_wt550" = list(TECHWEB_NODE_RIOT_SUPRESSION),
+		"weapon_ammo_sniper" = list(TECHWEB_NODE_EXOTIC_AMMO),
+		"weapon_ammo_bulldog" = list(TECHWEB_NODE_EXOTIC_AMMO),
+		"weapon_ammo_l6_saw" = list(TECHWEB_NODE_EXOTIC_AMMO, "automatic_ammo"),
+	)
+	var/list/ammo_designs = list(
+		"weapon_ammo_c20r" = list("vc_ammo_smgm45"),
+		"weapon_ammo_wt550" = list("vc_ammo_wt550"),
+		"weapon_ammo_sniper" = list("vc_ammo_sniper_rounds"),
+		"weapon_ammo_bulldog" = list("vc_ammo_m12g", "vc_ammo_m12g_slug"),
+		"weapon_ammo_l6_saw" = list("vc_ammo_m7mm"),
+	)
+	for(var/node_id in ammo_prereqs)
+		TEST_ASSERT(node_id in reachable, "Ammunition node [node_id] is unreachable.")
+		var/datum/techweb_node/node = SSresearch.techweb_nodes[node_id]
+		TEST_ASSERT_NOTNULL(node, "Missing ammunition node [node_id].")
+		var/list/expected_prereqs = ammo_prereqs[node_id]
+		TEST_ASSERT_EQUAL(length(node.prereq_ids), length(expected_prereqs), "[node_id] has unexpected prerequisites.")
+		TEST_ASSERT_EQUAL(length(expected_prereqs - node.prereq_ids), 0, "[node_id] lost an intended prerequisite.")
+		for(var/design_id in ammo_designs[node_id])
+			TEST_ASSERT(design_id in node.design_ids, "[node_id] lost ammunition design [design_id].")
+			var/datum/design/design = SSresearch.techweb_designs[design_id]
+			TEST_ASSERT_NOTNULL(design, "Missing ammunition design [design_id].")
+			TEST_ASSERT_EQUAL(design.build_type, PROTOLATHE | AWAY_LATHE, "[design_id] lost its lathe channels.")
+	for(var/node_id in list("bulldog_special_ammo", "l6_special_ammo", "sniper_special_ammo"))
+		TEST_ASSERT(node_id in reachable, "Specialist ammunition node [node_id] is unreachable.")
 
-/// Preserve internal tubes and cylinder slots when a future schematic uses them.
-/datum/unit_test/voidcrew_blueprint_internal_magazines/Run()
-	var/datum/crafting_recipe/blueprint/gun/recipe = allocate(__IMPLIED_TYPE__)
-	for(var/gun_type in list(/obj/item/gun/ballistic/shotgun, /obj/item/gun/ballistic/revolver))
-		var/obj/item/gun/ballistic/gun = allocate(gun_type)
-		var/obj/item/ammo_box/magazine/original_magazine = gun.magazine
-		gun.on_craft_completion(list(), recipe, null)
-		TEST_ASSERT_EQUAL(gun.magazine, original_magazine, "[gun_type] lost its internal magazine.")
-		TEST_ASSERT_EQUAL(gun.get_ammo(), 0, "[gun_type] retained free ammunition.")
-		TEST_ASSERT_NULL(gun.chambered, "[gun_type] retained a chambered round.")
-		var/obj/item/ammo_casing/reload = allocate(gun.magazine.ammo_type)
-		TEST_ASSERT(gun.magazine.give_round(reload), "[gun_type] could not reload its emptied internal magazine.")
-		TEST_ASSERT_EQUAL(gun.get_ammo(), 1, "[gun_type] did not retain its separately supplied round.")
-		qdel(gun)
+	var/datum/design/pin_testing/pin = SSresearch.techweb_designs["pin_testing"]
+	TEST_ASSERT_NOTNULL(pin, "The upstream test-range pin design must remain defined.")
+	TEST_ASSERT_EQUAL(pin.build_type, PROTOLATHE | AWAY_LATHE, "Test-range pins lost their lathe channels.")
+	var/datum/techweb_node/riot_supression/riot = SSresearch.techweb_nodes[TECHWEB_NODE_RIOT_SUPRESSION]
+	TEST_ASSERT_NOTNULL(riot, "Riot Suppression must remain available.")
+	TEST_ASSERT("pin_testing" in riot.design_ids, "Riot Suppression must unlock test-range pins.")
+	TEST_ASSERT("clown_firing_pin" in riot.design_ids, "Riot Suppression lost another firing pin design.")
+
+/// No Quarter's heavy cartridges are ordinary crafting recipes with the original cost.
+/datum/unit_test/voidcrew_no_quarter_cartridge/Run()
+	var/mob/living/carbon/human/consistent/crafter = allocate(__IMPLIED_TYPE__)
+	var/datum/component/personal_crafting/crafting = crafter.AddComponent(__IMPLIED_TYPE__)
+	crafting.ignored_flags = CRAFT_IGNORE_DO_AFTER
+	var/datum/crafting_recipe/no_quarter_cartridge/recipe = locate(/datum/crafting_recipe/no_quarter_cartridge) in GLOB.crafting_recipes
+	TEST_ASSERT_NOTNULL(recipe, "The No Quarter cartridge recipe disappeared.")
+	TEST_ASSERT(!recipe.non_craftable, "The heavy cartridge is absent from the crafting menu.")
+	TEST_ASSERT(crafting.is_recipe_available(recipe, crafter), "The heavy cartridge must be available without a schematic or imprint.")
+	TEST_ASSERT_EQUAL(recipe.time, 3 SECONDS, "The heavy cartridge crafting time changed.")
+	TEST_ASSERT(recipe.mass_craftable, "The heavy cartridge lost batch crafting.")
+	TEST_ASSERT_EQUAL(crafting.construct_item(crafter, recipe), ", missing component.", "The heavy cartridge bypassed its ingredient cost.")
+	var/obj/item/stack/sheet/iron/iron = allocate(__IMPLIED_TYPE__, crafter.loc, 2, FALSE)
+	var/obj/item/paper/paper = allocate(__IMPLIED_TYPE__, crafter.loc)
+	var/atom/result = crafting.construct_item(crafter, recipe)
+	TEST_ASSERT(istype(result, /obj/item/ammo_casing/shotgun/no_quarter), "The heavy cartridge failed to craft without a schematic: [result].")
+	TEST_ASSERT(QDELETED(iron) && QDELETED(paper), "Crafting a heavy cartridge did not consume two iron sheets and one paper.")
+	qdel(result)
 
 /// Map/loot guns and unrelated crafting recipes retain their ordinary loaded state.
 /datum/unit_test/voidcrew_blueprint_ammo_scope/Run()
diff --git a/voidcrew/modules/unit_tests/voidcrew_bounty_admin.dm b/voidcrew/modules/unit_tests/voidcrew_bounty_admin.dm
index 12d0cfd1f36..7188777d9db 100644
--- a/voidcrew/modules/unit_tests/voidcrew_bounty_admin.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_bounty_admin.dm
@@ -480,7 +480,8 @@
 	give_mind = player.mind
 	give_team = new
 	give_team.ship = ship
-	give_mind.ship_teams = list(give_team)
+	ship.ship_team = give_team
+	give_team.join_member(give_mind)
 	run_checks(panel, operator, ship, player)
 	give_mind.ship_teams = null
 	give_team.ship = null
diff --git a/voidcrew/modules/unit_tests/voidcrew_bounty_kingpin.dm b/voidcrew/modules/unit_tests/voidcrew_bounty_kingpin.dm
index 67e87d2f23c..e63ae614128 100644
--- a/voidcrew/modules/unit_tests/voidcrew_bounty_kingpin.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_bounty_kingpin.dm
@@ -37,12 +37,16 @@
 	for(var/datum/criminal_bounty/posting as anything in GLOB.criminal_bounties.Copy())
 		posting.close("admin") // BOUNTY_CLOSE_ADMIN
 	// A crew roster holds its ship and its members' minds hold the crew: undone here, or none of them is ever collected
+	var/list/records = list()
 	for(var/datum/team/voidcrew/team as anything in kingpin_test_teams)
+		if(team.crew_record)
+			records |= team.crew_record
 		for(var/datum/mind/member as anything in team.members.Copy())
 			team.remove_member(member)
 		team.ship?.ship_team = null
 		team.ship = null
 	kingpin_test_teams.Cut()
+	QDEL_LIST(records)
 	bounty_pool_clear("kingpin test")
 	SSbounty_kingpin.kingpin_reset()
 	SSbounty_kingpin.kingpin_next_at = kingpin_test_old_next
@@ -82,11 +86,12 @@
 	return ship
 
 /// A person with a mind at `spot`, on `ship`'s crew if given
-/datum/unit_test/voidcrew_bounty_kingpin/proc/kingpin_test_person(turf/spot, obj/structure/overmap/ship/ship)
+/datum/unit_test/voidcrew_bounty_kingpin/proc/kingpin_test_person(turf/spot, obj/structure/overmap/ship/ship, player_key)
 	var/mob/living/carbon/human/consistent/person = allocate(/mob/living/carbon/human/consistent, spot)
 	person.mind_initialize()
+	person.mind.key = player_key
 	if(ship)
-		ship.ship_team.add_member(person.mind)
+		ship.ship_team.join_member(person.mind)
 	return person
 
 /**
@@ -1092,13 +1097,14 @@
 
 	// L4: bound by player as well as by character
 	var/obj/structure/overmap/ship/working_ship = kingpin_test_ship()
-	var/mob/living/carbon/human/worker = kingpin_test_person(kingpin_test_spot(1, 2), working_ship)
-	worker.mind.key = "p9kingpintestworker"
+	var/mob/living/carbon/human/worker = kingpin_test_person(kingpin_test_spot(1, 2), working_ship, "p9kingpintestworker")
+	TEST_ASSERT_EQUAL(get_crew_ship(worker), working_ship, "The keyed worker must be rostered before asking for work")
 	kingpin.kingpin_talk(worker, "Got any work?")
 	TEST_ASSERT_NOTNULL(kingpin.kingpin_take_job(worker), "The worker couldn't take his job")
 	var/obj/structure/overmap/ship/new_ship = kingpin_test_ship()
-	var/mob/living/carbon/human/new_character = kingpin_test_person(kingpin_test_spot(1, 3), new_ship)
-	new_character.mind.key = "p9kingpintestworker"
+	var/mob/living/carbon/human/new_character = kingpin_test_person(kingpin_test_spot(1, 3), new_ship, "p9kingpintestworker")
+	TEST_ASSERT_EQUAL(get_crew_ship(new_character), new_ship, "The replacement character must join its new crew")
+	TEST_ASSERT(!(worker.mind in working_ship.ship_team.members), "The replacement character left its old life rostered")
 	TEST_ASSERT(SSbounty_kingpin.kingpin_mind_bound(new_character.mind), "The worker's new character isn't bound")
 	TEST_ASSERT(istext(SSbounty_kingpin.kingpin_bound_refusal(new_ship, new_character)), "The worker's new character could turn him in")
 	TEST_ASSERT(istext(posting.hunt_refusal(new_ship)), "A ship with the worker's new character aboard could hunt him")
diff --git a/voidcrew/modules/unit_tests/voidcrew_bounty_lair_mafia.dm b/voidcrew/modules/unit_tests/voidcrew_bounty_lair_mafia.dm
index eb6f6ae32f7..e65a8e136fb 100644
--- a/voidcrew/modules/unit_tests/voidcrew_bounty_lair_mafia.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_bounty_lair_mafia.dm
@@ -63,6 +63,7 @@
 
 /datum/unit_test/voidcrew_bounty_lair_mafia/rockets/Run()
 	var/mob/living/basic/bounty_lair_boss/mafia_mech/mech = allocate(/mob/living/basic/bounty_lair_boss/mafia_mech, spot(0, 2))
+	mech.finalize_npc_zone(allocate(/datum/npc_spawn_context, src, 3, "boss"))
 	var/mob/living/carbon/human/consistent/hunter = hunter_at(spot(4, 2))
 	TEST_ASSERT(!ispath(mech.mech_rocket_type, /obj/projectile/bullet/rocket), "The mech fires tg's rocket, which calls explosion()")
 	TEST_ASSERT(ispath(mech.mech_rocket_type, /obj/projectile/bullet/bounty_mafia_rocket), "The mech doesn't fire the club's rocket")
@@ -86,13 +87,13 @@
 	TEST_ASSERT(!istype(rocket, /obj/projectile/bullet/rocket), "The launch fired tg's rocket")
 	TEST_ASSERT_EQUAL(rocket.rocket_target, get_turf(hunter), "The rocket isn't aimed at the marker")
 
-	// It lands on the marker: 70 brute and a knockdown (BOUNTY_MECH_ROCKET_DAMAGE), once a volley
+	// The projectile and its scripted detonation share one red boss factor.
 	var/turf/marker_turf = get_turf(hunter)
 	var/list/volley = rocket.rocket_volley
 	var/list/hit = rocket.rocket_detonate(marker_turf)
 	TEST_ASSERT(hunter in hit, "The rocket missed the hunter standing on the marker")
 	var/first = hunter.getBruteLoss()
-	TEST_ASSERT_EQUAL(first, 70, "The rocket didn't do 70 brute to an unarmoured hunter") // BOUNTY_MECH_ROCKET_DAMAGE
+	TEST_ASSERT_EQUAL(first, 84, "The rocket lost or doubled its red boss damage factor") // BOUNTY_MECH_ROCKET_DAMAGE * 1.2
 	TEST_ASSERT(hunter.IsKnockdown(), "The rocket didn't knock the hunter down")
 	TEST_ASSERT(QDELETED(rocket), "The rocket outlived its burst")
 	var/obj/projectile/bullet/bounty_mafia_rocket/second = new(spot(1, 2))
@@ -285,8 +286,11 @@
 
 /datum/unit_test/voidcrew_bounty_lair_mafia/posse/Run()
 	var/mob/living/basic/bounty_lair_boss/mafia_mech/mech = allocate(/mob/living/basic/bounty_lair_boss/mafia_mech, spot(2, 2))
+	mech.finalize_npc_zone(allocate(/datum/npc_spawn_context, src, 3, "boss"))
 	TEST_ASSERT(!ispath(mech.type, /mob/living/basic/boss), "The mech is a megafauna boss")
-	TEST_ASSERT_EQUAL(mech.maxHealth, 350, "The mech doesn't start at its one-hunter health") // BOUNTY_MECH_HEALTH_1
+	TEST_ASSERT_EQUAL(mech.npc_zone_role, "boss", "The mech must use the boss zone profile")
+	TEST_ASSERT(abs(mech.npc_zone_health_factor - 1.3) < 0.001, "The mech must retain the red boss health factor")
+	TEST_ASSERT(abs(mech.maxHealth - 455) < 0.001, "The mech doesn't start at its one-hunter health") // BOUNTY_MECH_HEALTH_1 * 1.3
 	TEST_ASSERT_EQUAL(mech.damage_coeff[BRUTE], 0.6, "The mech's brute armour is wrong") // BOUNTY_MECH_BRUTE_MOD
 	TEST_ASSERT_EQUAL(mech.damage_coeff[BURN], 0.8, "The mech's burn armour is wrong") // BOUNTY_MECH_BURN_MOD
 	TEST_ASSERT_EQUAL(mech.damage_coeff[STAMINA], 0, "The mech takes stamina damage")
@@ -296,19 +300,19 @@
 	for(var/i in 1 to 5)
 		hunters += hunter_at(spot(i - 1, 0))
 	TEST_ASSERT(mech.mech_engage(hunters[1]), "The first hunter didn't join the posse")
-	TEST_ASSERT_EQUAL(mech.maxHealth, 350, "One hunter changed the mech's health")
+	TEST_ASSERT(abs(mech.maxHealth - 455) < 0.001, "One hunter changed the mech's health")
 	mech.adjust_health(100)
-	TEST_ASSERT_EQUAL(mech.health, 250, "The mech didn't take the damage")
+	TEST_ASSERT(abs(mech.health - 355) < 0.001, "The mech didn't take the damage")
 	TEST_ASSERT(mech.mech_engage(hunters[2]), "The second hunter didn't join the posse")
-	TEST_ASSERT_EQUAL(mech.maxHealth, 700, "Two hunters didn't raise the mech to 700") // BOUNTY_MECH_HEALTH_2
-	TEST_ASSERT_EQUAL(mech.health, 600, "The mech's damage didn't carry over when its health rose")
+	TEST_ASSERT(abs(mech.maxHealth - 910) < 0.001, "Two hunters lost the selected zone factor") // BOUNTY_MECH_HEALTH_2 * 1.3
+	TEST_ASSERT(abs(mech.health - 810) < 0.001, "The mech's damage didn't carry over when its health rose")
 	TEST_ASSERT(!mech.mech_engage(hunters[2]), "The same hunter joined twice")
 	mech.mech_engage(hunters[3])
-	TEST_ASSERT_EQUAL(mech.maxHealth, 1050, "Three hunters didn't raise the mech to 1050") // BOUNTY_MECH_HEALTH_3
+	TEST_ASSERT(abs(mech.maxHealth - 1365) < 0.001, "Three hunters lost the selected zone factor") // BOUNTY_MECH_HEALTH_3 * 1.3
 	mech.mech_engage(hunters[4])
-	TEST_ASSERT_EQUAL(mech.maxHealth, 1400, "Four hunters didn't raise the mech to 1400") // BOUNTY_MECH_HEALTH_4
+	TEST_ASSERT(abs(mech.maxHealth - 1820) < 0.001, "Four hunters lost the selected zone factor") // BOUNTY_MECH_HEALTH_4 * 1.3
 	mech.mech_engage(hunters[5])
-	TEST_ASSERT_EQUAL(mech.maxHealth, 1400, "A fifth hunter raised the mech past its 4+ health")
+	TEST_ASSERT(abs(mech.maxHealth - 1820) < 0.001, "A fifth hunter raised the mech past its 4+ health")
 
 // ===== THE EMP STALL =====
 
@@ -419,6 +423,7 @@
 	posting.record = new /datum/bounty_record
 	posting.record.name = "Viktor Sokolov"
 	var/mob/living/basic/bounty_lair_boss/mafia_mech/mech = allocate(/mob/living/basic/bounty_lair_boss/mafia_mech, spot(2, 2))
+	mech.finalize_npc_zone(allocate(/datum/npc_spawn_context, src, 3, "boss"))
 	mech.posting_ref = WEAKREF(posting)
 	var/mob/living/carbon/human/consistent/hunter = hunter_at(spot(0, 2))
 	var/turf/where = get_turf(mech)
@@ -437,7 +442,7 @@
 	TEST_ASSERT(don in ejected, "The mech didn't announce the don")
 	TEST_ASSERT_EQUAL(don.posting_ref?.resolve(), posting, "The don didn't keep the mech's posting")
 	TEST_ASSERT_EQUAL(don.name, "Viktor Sokolov", "The don isn't named for his posting")
-	TEST_ASSERT_EQUAL(don.maxHealth, 250, "The don's health is wrong") // BOUNTY_DON_HEALTH
+	TEST_ASSERT_EQUAL(don.maxHealth, 325, "The don lost the mech's selected boss profile") // BOUNTY_DON_HEALTH
 	TEST_ASSERT_EQUAL(don.don_busy, "stagger", "The don isn't dazed as he climbs out")
 	TEST_ASSERT_EQUAL(don.don_wreck_ref?.resolve(), wreck, "The don doesn't know his wreck")
 
@@ -503,7 +508,7 @@
 			TEST_ASSERT(!ispath(entry, /mob/living/basic/trooper/russian/mafia/lieutenant), "[entry] is a lieutenant, which only the gate has")
 			TEST_ASSERT(!ispath(entry, /mob/living/basic/boss), "[entry] is a megafauna")
 	for(var/list/count_range in list(probe.count_green, probe.count_yellow, probe.count_red))
-		TEST_ASSERT(count_range[1] >= 3 && count_range[2] <= 5, "A mafia marker spawns outside 3-5 goons")
+		TEST_ASSERT(count_range[1] == 1 && count_range[2] == 2, "A mafia marker spawns outside 1-2 goons")
 
 	// P11's rooms get their own crews
 	var/list/casino = bounty_mafia_room_crew("/area/ruin/space/has_grav/powered/mafia_club/casino")
@@ -516,7 +521,7 @@
 	TEST_ASSERT_NULL(bounty_mafia_room_crew("/area/ruin/space/has_grav/powered/mafia_club/garage"), "The arena gets goons")
 	TEST_ASSERT_NULL(bounty_mafia_room_crew(/area/misc/testroom), "A room outside the club gets a club crew")
 
-	// Anywhere else, the zone table: 3-5 goons, all on its own floor
+	// Anywhere else, the zone table: 1-2 goons, all on its own floor
 	probe.forceMove(spot(2, 2))
 	probe.do_spawn(2) // ZONE_YELLOW
 	var/count = 0
@@ -526,7 +531,7 @@
 		count++
 		TEST_ASSERT(!istype(goon, /mob/living/basic/trooper/russian/mafia/lieutenant), "The marker spawned a lieutenant")
 		TEST_ASSERT_EQUAL(get_area(goon), room, "A goon spawned outside the marker's room")
-	TEST_ASSERT(count >= 3 && count <= 5, "The marker spawned [count] goons, not 3-5")
+	TEST_ASSERT(count >= 1 && count <= 2, "The marker spawned [count] goons, not 1-2")
 	qdel(probe)
 
 // ===== GOONS: THE SHOUT, THE DOORWAY, THE DOWNED, NO GUNS =====
@@ -674,6 +679,7 @@
 	posting.board_gps_tag = "WANTED-[posting.record.id]"
 	GLOB.criminal_bounties += posting
 	fake_lair = allocate(/obj/structure/overmap/space_ruin/bounty_lair)
+	fake_lair.npc_spawn_context = allocate(/datum/npc_spawn_context, src, 2, "boss")
 	fake_lair.lair_bind_posting(posting)
 	var/datum/map_footprint/footprint = allocate(/datum/map_footprint)
 	footprint.z_value = origin.z
@@ -682,6 +688,8 @@
 	fake_lair.loaded = TRUE
 	boss_mark = new(locate(origin.x + 2, origin.y + 2, origin.z))
 	boss_mark.boss_type = /mob/living/basic/bounty_lair_boss/mafia_mech
+	var/obj/effect/landmark/bounty_lair_gatekeeper/keeper_mark = allocate(/obj/effect/landmark/bounty_lair_gatekeeper, origin)
+	keeper_mark.gatekeeper_type = /mob/living/basic/npc_zone_test
 
 	// The lair spawns the mech and takes it on
 	SEND_SIGNAL(fake_lair, "voidcrew_planet_loaded", TRUE) // COMSIG_VOIDCREW_PLANET_LOADED
@@ -692,6 +700,13 @@
 	var/datum/weakref/mech_ref = fake_lair.lair_bosses[1]
 	var/mob/living/basic/bounty_lair_boss/mafia_mech/mech = mech_ref.resolve()
 	TEST_ASSERT(istype(mech), "The lair's boss isn't the don's mech")
+	TEST_ASSERT(abs(mech.maxHealth - 350 * 1.15) < 0.001, "The lair route did not finalize its boss")
+	TEST_ASSERT_EQUAL(length(fake_lair.lair_gatekeepers), 1, "Lair gatekeeper fixture did not spawn")
+	var/datum/weakref/keeper_ref = fake_lair.lair_gatekeepers[1]
+	var/mob/living/keeper = keeper_ref.resolve()
+	allocated += keeper
+	TEST_ASSERT_EQUAL(keeper.npc_zone_role, "boss", "Lair gatekeeper lost its explicit boss role")
+	TEST_ASSERT(abs(keeper.maxHealth - 115) < 0.001, "Lair gatekeeper used the ordinary profile")
 	TEST_ASSERT_EQUAL(mech.posting_ref?.resolve(), posting, "The mech isn't wanted on the lair's bounty")
 
 	// The mech breaks: the lair takes the don on as he climbs out, and the fight goes on past its grace
diff --git a/voidcrew/modules/unit_tests/voidcrew_bounty_outpost.dm b/voidcrew/modules/unit_tests/voidcrew_bounty_outpost.dm
index 7ba4cbae4bf..a3b49531514 100644
--- a/voidcrew/modules/unit_tests/voidcrew_bounty_outpost.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_bounty_outpost.dm
@@ -78,10 +78,12 @@
 	var/mob/living/carbon/human/hunter = allocate(/mob/living/carbon/human/consistent)
 	hunter.mind_initialize()
 	if(ship)
-		var/datum/team/voidcrew/team = new
+		if(!ship.ship_team)
+			ship.ship_team = new
+		var/datum/team/voidcrew/team = ship.ship_team
 		team.ship = ship
-		hunter.mind.ship_teams = list(team)
-		outpost_test_teams += team
+		team.join_member(hunter.mind)
+		outpost_test_teams |= team
 		outpost_test_minds += hunter.mind
 	return hunter
 
diff --git a/voidcrew/modules/unit_tests/voidcrew_cargo_cart.dm b/voidcrew/modules/unit_tests/voidcrew_cargo_cart.dm
index bcc5cf23df7..3359a72d004 100644
--- a/voidcrew/modules/unit_tests/voidcrew_cargo_cart.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_cargo_cart.dm
@@ -5,6 +5,124 @@
 /obj/structure/overmap/dynamic/player_outpost/cargo_cart_test/contains_service_turf(turf/location)
 	return location == service_turf
 
+/// Substitute only the ship lookup; both consoles use the ship's real shared controller.
+/obj/machinery/computer/voidcrew_cargo/cargo_loan_test
+	var/obj/structure/overmap/ship/loan_ship
+
+/obj/machinery/computer/voidcrew_cargo/cargo_loan_test/get_cargo_shuttle()
+	if(QDELETED(loan_ship))
+		return null
+	return loan_ship.get_cargo_shuttle()
+
+/obj/machinery/computer/voidcrew_cargo/cargo_loan_test/Destroy()
+	. = ..()
+	loan_ship = null
+
+/// Exercise failed deposits without changing normal account bookkeeping.
+/datum/bank_account/cargo_loan_test
+	var/refuse_payment = FALSE
+
+/datum/bank_account/cargo_loan_test/adjust_money(amount, reason)
+	if(refuse_payment)
+		return FALSE
+	return ..()
+
+/datum/unit_test/voidcrew_cargo_loan_once/Run()
+	var/obj/structure/overmap/ship/ship = allocate(__IMPLIED_TYPE__)
+	var/datum/voidcrew_cargo_shuttle/ferry = ship.get_cargo_shuttle()
+	var/obj/machinery/computer/voidcrew_cargo/cargo_loan_test/console = allocate(__IMPLIED_TYPE__)
+	var/obj/machinery/computer/voidcrew_cargo/cargo_loan_test/other_console = allocate(__IMPLIED_TYPE__)
+	console.loan_ship = ship
+	other_console.loan_ship = ship
+	TEST_ASSERT_EQUAL(console.get_cargo_shuttle(), ferry, "The first console must resolve the ship's shared loan offer.")
+	TEST_ASSERT_EQUAL(other_console.get_cargo_shuttle(), ferry, "The second console must resolve the same loan offer.")
+	var/obj/machinery/computer/bank_machine/bank = allocate(__IMPLIED_TYPE__)
+	var/datum/bank_account/account = allocate(/datum/bank_account, "Cargo loan test", null, 1, FALSE)
+	account.account_balance = 1000
+	bank.synced_bank_account = account
+	console.link_ship_bank(bank)
+	other_console.link_ship_bank(bank)
+	ferry.linked_console = console
+	var/mob/living/carbon/human/consistent/user = allocate(__IMPLIED_TYPE__)
+	var/datum/tgui/ui = allocate(/datum/tgui, user, console, "Cargo")
+	var/datum/tgui/other_ui = allocate(/datum/tgui, user, other_console, "Cargo")
+	var/datum/callback/accept = CALLBACK(console, TYPE_PROC_REF(/datum, ui_act), "accept_loan", list(), ui)
+	var/datum/callback/other_accept = CALLBACK(other_console, TYPE_PROC_REF(/datum, ui_act), "accept_loan", list(), other_ui)
+	TEST_ASSERT(ferry.receive_loan_offer(/datum/voidcrew_shuttle_loan), "The idle shuttle must receive a loan offer.")
+	var/datum/voidcrew_shuttle_loan/first_offer = ferry.pending_loan
+	first_offer.bonus_credits = 100
+
+	for(var/repeat in 1 to 3)
+		world.push_usr(user, accept)
+		world.push_usr(user, other_accept)
+	TEST_ASSERT(ferry.loan_accepted, "A loan accepted through the console must latch on the shared controller.")
+	TEST_ASSERT(!ferry.accept_loan(), "A repeated direct acceptance must also be rejected.")
+	TEST_ASSERT_EQUAL(account.account_balance, 1100, "Repeated acceptance through two consoles must pay only once.")
+	TEST_ASSERT_EQUAL(length(ferry.transaction_history), 1, "Repeated acceptance must create one transaction.")
+	var/list/entry = ferry.transaction_history[1]
+	TEST_ASSERT_EQUAL(entry["type"], "loan", "The single transaction must be the loan bonus.")
+	TEST_ASSERT_EQUAL(entry["value"], 100, "The loan transaction must record exactly the paid bonus.")
+
+	// A failed arrival runs the real cleanup path and permits delivery to be retried.
+	for(var/retry in 1 to 2)
+		ferry.state = 1 // CARGO_SHUTTLE_ARRIVING; Voidcrew defines load after unit tests.
+		TEST_ASSERT(!ferry.complete_arrival(), "An arrival without a destination must fail.")
+		TEST_ASSERT_EQUAL(ferry.state, initial(ferry.state), "Failed delivery must return the shuttle to AWAY.")
+		TEST_ASSERT(ferry.loan_accepted, "Failed delivery must retain the acceptance latch.")
+		TEST_ASSERT_EQUAL(ferry.pending_loan, first_offer, "Failed delivery must retain the accepted offer.")
+		world.push_usr(user, other_accept)
+	TEST_ASSERT_EQUAL(account.account_balance, 1100, "Retrying delivery and acceptance must not pay again.")
+	TEST_ASSERT_EQUAL(length(ferry.transaction_history), 1, "Delivery retries must not duplicate bonus history.")
+
+	ferry.decline_loan()
+	TEST_ASSERT_NULL(ferry.pending_loan, "Clearing an offer must remove it.")
+	TEST_ASSERT(!ferry.loan_accepted, "Clearing an offer must release its acceptance latch.")
+	TEST_ASSERT(ferry.receive_loan_offer(/datum/voidcrew_shuttle_loan), "A fresh offer must be available after the previous offer is cleared.")
+	ferry.pending_loan.bonus_credits = 100
+	world.push_usr(user, other_accept)
+	world.push_usr(user, accept)
+	TEST_ASSERT(ferry.loan_accepted, "The fresh offer must accept normally.")
+	TEST_ASSERT_EQUAL(account.account_balance, 1200, "A fresh offer must pay one new bonus.")
+	TEST_ASSERT_EQUAL(length(ferry.transaction_history), 2, "Each distinct paid offer must have one history entry.")
+
+/datum/unit_test/voidcrew_cargo_loan_payment/Run()
+	var/datum/voidcrew_cargo_shuttle/ferry = allocate(__IMPLIED_TYPE__)
+	var/obj/machinery/computer/voidcrew_cargo/console = allocate(__IMPLIED_TYPE__)
+	var/obj/machinery/computer/bank_machine/bank = allocate(__IMPLIED_TYPE__)
+	console.link_ship_bank(bank)
+	ferry.linked_console = console
+	TEST_ASSERT(ferry.receive_loan_offer(/datum/voidcrew_shuttle_loan), "The idle shuttle must receive a loan offer.")
+	var/datum/voidcrew_shuttle_loan/offer = ferry.pending_loan
+	offer.bonus_credits = 100
+	TEST_ASSERT(!ferry.accept_loan(), "A positive bonus must require a receiving account.")
+	TEST_ASSERT(!ferry.loan_accepted, "A missing account must leave the offer unaccepted.")
+	TEST_ASSERT_EQUAL(ferry.pending_loan, offer, "A missing account must leave the offer available.")
+	TEST_ASSERT_EQUAL(length(ferry.transaction_history), 0, "A missing account must not record a bonus.")
+
+	var/datum/bank_account/cargo_loan_test/account = allocate(/datum/bank_account/cargo_loan_test, "Cargo loan test", null, 1, FALSE)
+	account.account_balance = 1000
+	account.refuse_payment = TRUE
+	bank.synced_bank_account = account
+	TEST_ASSERT(!ferry.accept_loan(), "Failed bonus payment must reject acceptance.")
+	TEST_ASSERT(!ferry.loan_accepted, "Failed payment must release the acceptance latch.")
+	TEST_ASSERT_EQUAL(ferry.pending_loan, offer, "Failed payment must leave the same offer available.")
+	TEST_ASSERT_EQUAL(account.account_balance, 1000, "Failed payment must leave the balance unchanged.")
+	TEST_ASSERT_EQUAL(length(ferry.transaction_history), 0, "Failed payment must not record a transaction.")
+	account.refuse_payment = FALSE
+	TEST_ASSERT(ferry.accept_loan(), "Restoring payment must allow the same offer to be accepted.")
+	TEST_ASSERT_EQUAL(account.account_balance, 1100, "The retried payment must pay exactly one bonus.")
+	TEST_ASSERT_EQUAL(length(ferry.transaction_history), 1, "Only the successful payment must enter history.")
+
+	ferry.decline_loan()
+	TEST_ASSERT(ferry.receive_loan_offer(/datum/voidcrew_shuttle_loan), "A zero-bonus offer must be available normally.")
+	ferry.pending_loan.bonus_credits = 0
+	bank.synced_bank_account = null
+	TEST_ASSERT(ferry.accept_loan(), "A zero-bonus offer must accept without a receiving account.")
+	TEST_ASSERT(ferry.loan_accepted, "A zero-bonus acceptance must still latch.")
+	TEST_ASSERT(!ferry.accept_loan(), "A zero-bonus offer must also reject repeated acceptance.")
+	TEST_ASSERT_EQUAL(account.account_balance, 1100, "A zero-bonus offer must leave the balance unchanged.")
+	TEST_ASSERT_EQUAL(length(ferry.transaction_history), 1, "A zero-bonus offer must not record a payment.")
+
 /datum/unit_test/voidcrew_cargo_clear_cart/Run()
 	var/obj/structure/overmap/dynamic/player_outpost/cargo_cart_test/home = allocate(__IMPLIED_TYPE__)
 	home.service_turf = run_loc_floor_bottom_left
@@ -51,3 +169,115 @@
 	world.push_usr(user, CALLBACK(console, TYPE_PROC_REF(/datum, ui_act), "remove", list("order_name" = individual_pack.name), ui))
 	TEST_ASSERT(!(individual in home.cargo_cart), "Per-item Remove must accept the numeric order ID supplied by ui_act.")
 	TEST_ASSERT(protected in home.cargo_cart, "Removing another item must retain the protected order.")
+
+// Observe dispatch without loading a shuttle; cart actions and buy() remain real.
+/obj/machinery/computer/voidcrew_cargo/launch_cargo_test/restricted_dispatch_test/get_shuttle_error_message()
+	return null
+
+/datum/voidcrew_cargo_shuttle/launch_cargo_test/restricted_dispatch_test
+	var/dispatch_attempted = FALSE
+
+/datum/voidcrew_cargo_shuttle/launch_cargo_test/restricted_dispatch_test/call_shuttle(obj/structure/overmap/ship/ship)
+	dispatch_attempted = TRUE
+	return "Dispatch fixture"
+
+/// Exercise forged actions, dispatch validation and real settlement.
+/datum/unit_test/voidcrew_launch_cargo_fixture/denied_packs/Run()
+	save_economy()
+	SSshuttle.supply_packs = list()
+	var/turf/bay = get_step(run_loc_floor_bottom_left, EAST)
+	var/list/original_contents = bay.contents.Copy()
+	var/obj/machinery/computer/voidcrew_cargo/launch_cargo_test/restricted_dispatch_test/console = allocate(__IMPLIED_TYPE__)
+	var/datum/voidcrew_cargo_shuttle/launch_cargo_test/restricted_dispatch_test/ferry = allocate(__IMPLIED_TYPE__)
+	ferry.test_turfs = list(bay)
+	console.test_ferry = ferry
+	var/obj/machinery/computer/bank_machine/bank = allocate(__IMPLIED_TYPE__)
+	var/datum/bank_account/account = allocate(/datum/bank_account, "Cargo restriction test", null, 1, FALSE)
+	bank.synced_bank_account = account
+	console.link_ship_bank(bank)
+	account.account_balance = 1000000
+	var/mob/living/carbon/human/consistent/user = allocate(__IMPLIED_TYPE__)
+	var/datum/tgui/ui = allocate(/datum/tgui, user, console, "Cargo")
+	var/list/banned_types = typesof(/datum/supply_pack/security) + list(
+		/datum/supply_pack/goody/mars_single,
+		/datum/supply_pack/goody/ballistic_single,
+		/datum/supply_pack/goody/disabler_single,
+		/datum/supply_pack/goody/energy_single,
+		/datum/supply_pack/goody/laser_single,
+		/datum/supply_pack/goody/thermal_single,
+		/datum/supply_pack/goody/double_barrel,
+		/datum/supply_pack/goody/hell_single,
+		/datum/supply_pack/imports/mafia,
+		/datum/supply_pack/imports/abandoned,
+		/datum/supply_pack/imports/wt550,
+		/datum/supply_pack/imports/moistnuggets,
+		/datum/supply_pack/imports/giant_wrench_parts,
+		/datum/supply_pack/imports/specialops,
+		/datum/supply_pack/imports/russian,
+	)
+	var/list/banned_packs = list()
+	for(var/pack_type in banned_types)
+		var/datum/supply_pack/pack = allocate(pack_type)
+		pack.special_enabled = TRUE
+		pack.drop_pod_only = FALSE
+		SSshuttle.supply_packs[pack_type] = pack
+		banned_packs += pack
+		for(var/unlocked in list(FALSE, TRUE))
+			if(unlocked)
+				console.obj_flags |= EMAGGED
+			else
+				console.obj_flags &= ~EMAGGED
+			console.contraband = unlocked
+			pack.hidden = unlocked
+			pack.contraband = unlocked
+			TEST_ASSERT(!console.can_order_pack(pack), "[pack_type] is orderable with emag/contraband [unlocked].")
+			TEST_ASSERT(!console.add_item(list("id" = "[pack_type]"), user), "A forged [pack_type] ID entered the cart.")
+			world.push_usr(user, CALLBACK(console, TYPE_PROC_REF(/datum, ui_act), "add", list("id" = "[pack_type]"), ui))
+			world.push_usr(user, CALLBACK(console, TYPE_PROC_REF(/datum, ui_act), "add_by_name", list("order_name" = pack.name), ui))
+			world.push_usr(user, CALLBACK(console, TYPE_PROC_REF(/datum, ui_act), "modify", list("order_name" = pack.name, "amount" = 1), ui))
+			TEST_ASSERT_EQUAL(length(console.checkout_list), 0, "A forged cart action added [pack_type].")
+		TEST_ASSERT_EQUAL(length(console.get_packs_data(pack.group)), 0, "Forbidden pack group [pack.group] has catalog entries.")
+	var/list/catalog = console.ui_static_data(user)
+	TEST_ASSERT_EQUAL(length(catalog["supplies"]), 0, "Empty cargo groups remain visible.")
+
+	// A cart loaded before the restriction must be rechecked before payment or spawning.
+	for(var/datum/supply_pack/pack as anything in banned_packs)
+		var/datum/supply_order/order = allocate(/datum/supply_order, pack)
+		order.applied_coupon = allocate(/obj/item/coupon)
+		console.checkout_list += order
+	world.push_usr(user, CALLBACK(console, TYPE_PROC_REF(/datum, ui_act), "send", list(), ui))
+	TEST_ASSERT(!ferry.dispatch_attempted, "A forbidden cart reached dispatch, where outpost freight would reserve payment.")
+	TEST_ASSERT(console.buy(), "The stale-cart fixture did not reach the shipment loop.")
+	TEST_ASSERT_EQUAL(account.account_balance, 1000000, "A forbidden stale order was charged.")
+	TEST_ASSERT_EQUAL(length(console.checkout_list), length(banned_packs), "Rejected stale orders must remain cancellable in the cart.")
+	TEST_ASSERT_EQUAL(length(bay.contents - original_contents), 0, "A forbidden stale order generated cargo.")
+	for(var/datum/supply_order/order as anything in console.checkout_list)
+		TEST_ASSERT_NULL(order.ship_paid_cost, "[order.pack.type] was settled despite the restriction.")
+		TEST_ASSERT_NOTNULL(order.applied_coupon, "Rejecting [order.pack.type] consumed its coupon.")
+
+	// Unrelated cargo must still settle in a cart that also holds forbidden orders.
+	var/datum/supply_pack/ordinary_pack = allocate(/datum/supply_pack)
+	ordinary_pack.group = "Cargo control"
+	ordinary_pack.contains = list(/obj/item/screwdriver)
+	SSshuttle.supply_packs[ordinary_pack.type] = ordinary_pack
+	catalog = console.ui_static_data(user)
+	TEST_ASSERT_EQUAL(length(catalog["supplies"]), 1, "The catalog must show only its nonempty group.")
+	TEST_ASSERT_NOTNULL(catalog["supplies"][ordinary_pack.group], "An ordinary cargo group disappeared.")
+	var/datum/supply_order/ordinary_order = allocate(/datum/supply_order, ordinary_pack)
+	ordinary_order.manifest_can_fail = FALSE
+	console.checkout_list += ordinary_order
+	var/ordinary_cost = ordinary_order.get_final_cost()
+	TEST_ASSERT(console.can_order_pack(ordinary_pack), "The restriction blocked an ordinary pack.")
+	console.buy()
+	TEST_ASSERT_EQUAL(account.account_balance, 1000000 - ordinary_cost, "A mixed cart must bill only its ordinary cargo.")
+	TEST_ASSERT(!(ordinary_order in console.checkout_list), "Ordinary cargo did not leave the cart after settlement.")
+	TEST_ASSERT_EQUAL(length(console.checkout_list), length(banned_packs), "Settling ordinary cargo changed forbidden orders.")
+	var/obj/structure/closet/crate/delivery = locate() in bay
+	TEST_ASSERT_NOTNULL(delivery, "Ordinary cargo did not arrive.")
+	TEST_ASSERT(locate(/obj/item/screwdriver) in delivery, "Ordinary cargo lost its contents.")
+	qdel(delivery)
+
+	console.checkout_list.Cut()
+	console.checkout_list += allocate(/datum/supply_order, ordinary_pack)
+	world.push_usr(user, CALLBACK(console, TYPE_PROC_REF(/datum, ui_act), "send", list(), ui))
+	TEST_ASSERT(ferry.dispatch_attempted, "An ordinary cart must still reach dispatch.")
diff --git a/voidcrew/modules/unit_tests/voidcrew_checkpoints.dm b/voidcrew/modules/unit_tests/voidcrew_checkpoints.dm
index 28af34ce87c..fb0876c0216 100644
--- a/voidcrew/modules/unit_tests/voidcrew_checkpoints.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_checkpoints.dm
@@ -35,6 +35,227 @@
 	var/obj/machinery/computer/ship_checkpoint/terminal
 	var/turf/terminal_turf
 
+/// Only clear_stock is under test; no bay, checkpoint or reconstruction job is needed.
+/datum/checkpoint_construction/stock_test/New()
+	state = "complete" // CHECKPOINT_BUILD_COMPLETE, defined after the test includes.
+
+/obj/docking_port/mobile/voidcrew/stock_test/return_turfs()
+	return list(get_turf(src))
+
+/datum/unit_test/voidcrew_checkpoint_lazy_stock
+	var/obj/docking_port/mobile/voidcrew/stock_test/source_port
+
+/datum/unit_test/voidcrew_checkpoint_lazy_stock/Destroy()
+	if(source_port)
+		qdel(source_port, force = TRUE)
+	source_port = null
+	return ..()
+
+/datum/unit_test/voidcrew_checkpoint_lazy_stock/Run()
+	source_port = new(run_loc_floor_bottom_left)
+	source_port.shuttle_areas = list()
+	source_port.shuttle_areas[get_area(run_loc_floor_bottom_left)] = TRUE
+	var/datum/checkpoint_construction/stock_test/job = allocate(/datum/checkpoint_construction/stock_test)
+	var/obj/structure/closet/crate/zone_loot/research/cache = allocate(/obj/structure/closet/crate/zone_loot/research)
+	var/obj/structure/closet/crate/secure/loot/freight = allocate(/obj/structure/closet/crate/secure/loot)
+	var/obj/machinery/suit_storage_unit/ruin_zone/unit = allocate(/obj/machinery/suit_storage_unit/ruin_zone)
+	TEST_ASSERT(!unit.stock_consumed && !unit.mod, "Test unit did not start with a deferred resolver")
+	var/obj/machinery/suit_storage_unit/base_tier/base = allocate(/obj/machinery/suit_storage_unit/base_tier)
+	TEST_ASSERT_NOTNULL(base.mod, "Base fixture has no initial stock to scrub")
+	for(var/obj/machinery/suit_storage_unit/machine as anything in list(base, unit))
+		machine.anchored = FALSE
+		TEST_ASSERT_EQUAL(machine.checkpoint_type(), /obj/machinery/suit_storage_unit, "Unbolted suit reward retained its stocked rebuild type")
+		var/rebuilt_type = machine.checkpoint_type()
+		var/obj/machinery/suit_storage_unit/rebuilt = allocate(rebuilt_type, run_loc_floor_top_right)
+		TEST_ASSERT_NULL(rebuilt.mod, "Rebuilt suit unit stocked a reward")
+	job.clear_stock(source_port)
+	TEST_ASSERT(cache.contents_initialized && freight.contents_initialized && freight.spawned_loot, "Scrubbed containers retain a lazy stock path")
+	TEST_ASSERT_NULL(freight.spawn_turf, "Scrubbed freight retained its deferred origin")
+	freight.on_freight_zone_resolved(3)
+	freight.spawn_loot()
+	TEST_ASSERT_EQUAL(length(freight.contents), 0, "A solved rebuilt freight lock regenerated stock")
+	TEST_ASSERT(unit.stock_consumed && isnull(unit.stock_spawn_turf), "Scrubbed unit retained its deferred stock claim")
+	// Reopening takes the real closet path; a solved freight lock also checks spawned_loot.
+	for(var/obj/structure/closet/container as anything in list(cache, freight))
+		container.open(force = TRUE, special_effects = FALSE)
+		container.dump_contents()
+	TEST_ASSERT_NULL(locate(/obj/item/mod/control) in base.contents, "Scrubbing retained the base suit")
+	TEST_ASSERT_NULL(base.mod, "Scrubbing retained a reference to the deleted suit")
+	var/turf/red = SSovermap.get_unused_overmap_square_in_zone_band(3) // ZONE_RED
+	TEST_ASSERT_NOTNULL(red, "No red square for the deferred stock test")
+	unit.forceMove(red)
+	// ZONE_RESOLVE_ATTEMPTS * ZONE_RESOLVE_RETRY_DELAY, plus a tick of margin.
+	sleep(61 SECONDS)
+	TEST_ASSERT_NULL(unit.mod, "Deferred resolver replenished the rebuilt machine")
+	unit.stock_for_zone(3)
+	TEST_ASSERT_NULL(unit.mod, "A repeated resolver callback replenished the rebuilt machine")
+	freight.on_freight_zone_resolved(3)
+	freight.spawn_loot()
+	TEST_ASSERT_EQUAL(length(freight.contents), 0, "A late freight resolver replenished checkpoint stock")
+	for(var/obj/structure/closet/container as anything in list(cache, freight))
+		container.dump_contents()
+	for(var/obj/item/item in run_loc_floor_bottom_left.get_all_contents())
+		if(ismachinery(item.loc))
+			var/obj/machinery/machine = item.loc
+			if((item in machine.component_parts) || item == machine.circuit)
+				continue
+		TEST_FAIL("Reopened checkpoint fixture returned stock: [item.type]")
+
+/// Delay only zone resolution so movement can happen before the first callback.
+/obj/structure/closet/crate/secure/loot/freight_zone_test/LateInitialize()
+	// Deliberately skip the resolver; these runtime fixtures have no mapped contents.
+	return
+
+/datum/unit_test/voidcrew_freight_profiles/Run()
+	var/list/expected_pools = list(
+		list(/obj/item/gun/ballistic/rifle/boltaction/surplus, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver/c38/detective, /obj/item/gun/ballistic/shotgun/doublebarrel),
+		list(/obj/item/gun/ballistic/shotgun/riot, /obj/item/gun/ballistic/automatic/tommygun, /obj/item/gun/ballistic/automatic/mini_uzi),
+		list(/obj/item/knife/combat/survival, /obj/item/spear, /obj/item/hatchet, /obj/item/melee/baseball_bat),
+		list(/obj/item/knife/combat, /obj/item/claymore/shortsword, /obj/item/melee/baseball_bat/ablative, /obj/item/fireaxe, /obj/item/melee/cleric_mace, /obj/item/melee/sabre),
+		list(/obj/item/claymore, /obj/item/claymore/cutlass, /obj/item/katana, /obj/item/mjollnir, /obj/item/melee/energy/sword/saber, /obj/item/melee/energy/sword/pirate),
+	)
+	var/list/pools = list(GLOB.abandoned_crate_guns_green, GLOB.abandoned_crate_guns_yellow, GLOB.abandoned_crate_melee_green, GLOB.abandoned_crate_melee_yellow, GLOB.abandoned_crate_melee_red)
+	for(var/index in 1 to length(pools))
+		var/list/pool = pools[index]
+		var/list/expected = expected_pools[index]
+		TEST_ASSERT_EQUAL(length(pool), length(expected), "Freight weapon class [index] changed size")
+		for(var/weapon in expected)
+			TEST_ASSERT(weapon in pool, "Freight class [index] lost [weapon]")
+			TEST_ASSERT_NULL(pool[weapon], "Freight class selection must be uniform")
+			if(ispath(weapon, /obj/item/gun/ballistic))
+				TEST_ASSERT(ispath(GLOB.loot_gun_spare_ammo[weapon], /obj/item), "Freight gun [weapon] has no spare reload")
+	for(var/list/pool as anything in list(GLOB.abandoned_crate_common, GLOB.abandoned_crate_uncommon, GLOB.abandoned_crate_prime))
+		for(var/entry in pool)
+			TEST_ASSERT(!(entry in pools[1]) && !(entry in pools[2]) && !(entry in pools[3]) && !(entry in pools[4]) && !(entry in pools[5]), "Freight has a second weapon draw: [entry]")
+			TEST_ASSERT(!ispath(entry, /obj/item/gun), "Freight nonweapon pool contains a gun: [entry]")
+			TEST_ASSERT(!ispath(entry, /obj/item/storage/case/cyberware) && !ispath(entry, /obj/item/cyberware_pair_case), "Freight contains weapon chrome: [entry]")
+
+	// ZONE_GREEN/YELLOW/RED are defined after test includes. Each row lists
+	// zone, gun chance, gun-green weight, then the three melee class weights.
+	for(var/list/profile as anything in list(list(1, 8, 940, 900, 99, 1), list(2, 19, 450, 350, 640, 10), list(3, 33, 150, 100, 450, 450)))
+		var/list/counts = list(0, 0, 0, 0, 0)
+		for(var/gun_roll in 1 to 100)
+			CHECK_TICK
+			for(var/class_roll in 1 to 1000)
+				var/list/pool = freight_weapon_pool(profile[1], gun_roll, class_roll)
+				var/index = pools.Find(pool)
+				TEST_ASSERT(index, "Freight selected an unknown class")
+				counts[index]++
+		TEST_ASSERT_EQUAL(counts[1] + counts[2], profile[2] * 1000, "Freight zone [profile[1]] gun chance is not exact")
+		TEST_ASSERT_EQUAL(counts[1], profile[2] * profile[3], "Freight zone [profile[1]] green gun weight changed")
+		for(var/index in 3 to 5)
+			TEST_ASSERT_EQUAL(counts[index], (100 - profile[2]) * profile[index + 1], "Freight zone [profile[1]] melee class [index] weight changed")
+	TEST_ASSERT_EQUAL(freight_weapon_pool(null, 8, 940), GLOB.abandoned_crate_guns_green, "Unresolved freight did not use the green profile")
+	TEST_ASSERT_EQUAL(freight_weapon_pool(null, 9, 1000), GLOB.abandoned_crate_melee_red, "Green freight cannot reach red melee")
+
+/datum/unit_test/voidcrew_freight_lifecycle
+	var/reentries = 0
+	var/explosions = 0
+
+/// Item initialization can call back into the same crate before new() returns.
+/datum/unit_test/voidcrew_freight_lifecycle/proc/on_loot_created(obj/structure/closet/crate/secure/loot/source)
+	SIGNAL_HANDLER
+	reentries++
+	source.spawn_loot()
+
+/// Exercise the real anti-tamper path without damaging the shared test room.
+/datum/unit_test/voidcrew_freight_lifecycle/proc/on_explosion(datum/source, list/arguments)
+	SIGNAL_HANDLER
+	explosions++
+	return COMSIG_CANCEL_EXPLOSION
+
+/datum/unit_test/voidcrew_freight_lifecycle/Run()
+	var/list/weapon_paths = GLOB.abandoned_crate_guns_green + GLOB.abandoned_crate_guns_yellow + GLOB.abandoned_crate_melee_green + GLOB.abandoned_crate_melee_yellow + GLOB.abandoned_crate_melee_red
+	var/list/manifests = list(GLOB.abandoned_crate_common, GLOB.abandoned_crate_uncommon, GLOB.abandoned_crate_prime)
+	var/list/original_manifests = list()
+	for(var/list/manifest as anything in manifests)
+		original_manifests += list(manifest.Copy())
+	var/turf/red = SSovermap.get_unused_overmap_square_in_zone_band(3)
+	TEST_ASSERT_NOTNULL(red, "No red square for freight movement")
+	for(var/zone in list(1, 2, 3))
+		var/turf/origin = SSovermap.get_unused_overmap_square_in_zone_band(zone)
+		TEST_ASSERT_NOTNULL(origin, "No test square for freight zone [zone]")
+		var/obj/structure/closet/crate/secure/loot/freight_zone_test/freight = allocate(/obj/structure/closet/crate/secure/loot/freight_zone_test, origin)
+		TEST_ASSERT_EQUAL(freight.spawn_turf, origin, "Freight did not pin its origin in Initialize")
+		TEST_ASSERT(freight.locked && freight.attempts == 10 && length(freight.code) == 4, "Freight lost its code lock")
+		TEST_ASSERT(!freight.open(special_effects = FALSE), "Unsolved freight opened without force")
+		TEST_ASSERT(!freight.spawned_loot && !length(freight.contents), "An ordinary locked open consumed or paid freight")
+		freight.forceMove(red)
+		new /datum/zone_resolver(freight.spawn_turf, CALLBACK(freight, TYPE_PROC_REF(/obj/structure/closet/crate/secure/loot, on_freight_zone_resolved)))
+		TEST_ASSERT_EQUAL(freight.loot_zone, zone, "Moving unresolved freight changed its profile")
+		TEST_ASSERT_NULL(freight.spawn_turf, "Resolved freight retained its origin reference")
+		freight.on_freight_zone_resolved(3)
+		TEST_ASSERT_EQUAL(freight.loot_zone, zone, "Repeated freight callback changed its profile")
+		freight.forceMove(run_loc_floor_bottom_left)
+		RegisterSignal(freight, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON, PROC_REF(on_loot_created))
+		freight.spawn_loot()
+		UnregisterSignal(freight, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON)
+		TEST_ASSERT(freight.spawned_loot, "Freight did not claim its payout")
+		var/list/first_payout = freight.contents.Copy()
+		var/weapons = 0
+		var/guns = 0
+		for(var/obj/item/item in first_payout)
+			if(item.type in weapon_paths)
+				weapons++
+			if(isgun(item))
+				guns++
+				TEST_ASSERT((item.type in GLOB.abandoned_crate_guns_green) || (item.type in GLOB.abandoned_crate_guns_yellow), "Freight paid an advanced or unlisted gun")
+				TEST_ASSERT(locate(GLOB.loot_gun_spare_ammo[item.type]) in first_payout, "Freight gun arrived without its spare reload")
+		TEST_ASSERT_EQUAL(weapons, 1, "Freight did not replace exactly one draw with a weapon")
+		TEST_ASSERT(length(first_payout) >= 5 + guns && length(first_payout) <= 7 + guns, "Freight changed its 5-7 draw budget")
+		freight.spawn_loot()
+		TEST_ASSERT_EQUAL(length(freight.contents), length(first_payout), "A second opener received another payout")
+		for(var/obj/item/item in first_payout)
+			TEST_ASSERT(item in freight.contents, "A repeated payout replaced the original loot")
+		freight.open(force = TRUE, special_effects = FALSE)
+		freight.on_freight_zone_resolved(3)
+		freight.spawn_loot()
+		TEST_ASSERT_EQUAL(length(freight.contents), 0, "Reopening emptied freight regenerated its loot")
+		for(var/obj/item/item in first_payout)
+			qdel(item)
+		qdel(freight)
+	TEST_ASSERT(reentries > 0, "No item constructor exercised a reentrant freight claim")
+	for(var/index in 1 to length(manifests))
+		var/list/manifest = manifests[index]
+		var/list/original = original_manifests[index]
+		TEST_ASSERT_EQUAL(length(manifest), length(original), "Freight consumed a shared manifest")
+		for(var/entry in original)
+			TEST_ASSERT_EQUAL(manifest[entry], original[entry], "Freight changed a shared manifest weight")
+
+	// The last synchronous attempt must also use the pinned source, then green.
+	var/obj/structure/closet/crate/secure/loot/freight_zone_test/fallback = allocate(/obj/structure/closet/crate/secure/loot/freight_zone_test)
+	fallback.forceMove(red)
+	fallback.spawn_loot()
+	TEST_ASSERT_EQUAL(fallback.loot_zone, 1, "Unresolved freight retiered at its destination")
+	qdel(fallback)
+
+	for(var/method in list("force", "break", "dump", "cut", "emag", "damage"))
+		var/obj/structure/closet/crate/secure/loot/freight = allocate(/obj/structure/closet/crate/secure/loot)
+		RegisterSignal(freight, COMSIG_ATOM_EXPLODE, PROC_REF(on_explosion))
+		var/before_explosions = explosions
+		switch(method)
+			if("force")
+				TEST_ASSERT(freight.open(force = TRUE, special_effects = FALSE), "Forced-open freight test did not open")
+			if("break")
+				freight.atom_break(MELEE)
+			if("dump")
+				freight.dump_contents()
+			if("cut")
+				freight.deconstruct(TRUE)
+			if("emag")
+				freight.emag_act(null, null)
+			if("damage")
+				freight.tamperproof = 100
+				freight.take_damage(50)
+				TEST_ASSERT_EQUAL(explosions, before_explosions + 1, "Damaging locked freight skipped anti-tamper")
+		TEST_ASSERT(freight.spawned_loot && !length(freight.contents), "Freight [method] bypass left an unclaimed or paid manifest")
+		if(!QDELETED(freight))
+			UnregisterSignal(freight, COMSIG_ATOM_EXPLODE)
+			freight.on_freight_zone_resolved(3)
+			freight.spawn_loot()
+			TEST_ASSERT_EQUAL(length(freight.contents), 0, "A later correct code paid after freight [method]")
+			qdel(freight)
+
 /// Recovery must also work after the hull and the captain's original body are gone.
 /datum/unit_test/voidcrew_checkpoints/lost
 	destroy_original = TRUE
@@ -211,6 +432,7 @@
 			break
 	var/obj/machinery/autolathe/lathe = new(fixture_turf)
 	lathe.name = "checkpoint upgrade fixture"
+	new /obj/structure/closet/crate/secure/loot(fixture_turf)
 	for(var/datum/stock_part/matter_bin/part in lathe.component_parts.Copy())
 		lathe.component_parts -= part
 		lathe.component_parts += GLOB.stock_part_datums[/datum/stock_part/matter_bin/tier4]
@@ -222,7 +444,12 @@
 		var/obj/item/disk = new disk_type(builder)
 		builder.item_interaction(captain, disk)
 	var/expected_construction_upgrades = builder.console_upgrades
-	new /obj/machinery/power/shuttle_engine/ship/liquid/oil(fixture_turf)
+	var/obj/machinery/power/shuttle_engine/ship/liquid/oil/oil_engine = new(fixture_turf)
+	// Runtime engines start unbolted. Install this fitting so the co-located freight
+	// crate cannot swallow it during the rebuilt map's LateInitialize().
+	oil_engine.set_anchored(TRUE)
+	oil_engine.engine_state = 2 // ENGINE_WELDED
+	oil_engine.connect_to_shuttle(FALSE, original.shuttle)
 	new /obj/machinery/vending/cola(fixture_turf)
 	var/obj/machinery/ore_silo/ship_silo = new(fixture_turf)
 	ship_silo.materials.insert_amount_mat(5000, /datum/material/iron)
@@ -250,6 +477,7 @@
 	TEST_ASSERT(panel.prepare_save(captain, bay), "Could not prepare a real hull: [panel.error]")
 	TEST_ASSERT(!findtext(panel.quote.tgm, "/obj/item"), "The snapshot includes items")
 	TEST_ASSERT(findtext(panel.quote.tgm, "/obj/machinery/computer/helm"), "Checkpoint omitted the helm")
+	TEST_ASSERT(findtext(panel.quote.tgm, "spawned_loot = 1"), "Checkpoint did not serialize an empty freight shell")
 	TEST_ASSERT(!findtext(panel.quote.tgm, "initial_gas_mix"), "The snapshot preserved room gases")
 	var/datum/parsed_map/parsed = new(panel.quote.tgm)
 	TEST_ASSERT_EQUAL(parsed.bounds[4], panel.quote.width, "Exported width does not parse correctly")
@@ -287,27 +515,28 @@
 	original.ship_account.account_balance = before_money
 	var/datum/ship_checkpoint_ui/registry_test/other_panel = allocate(__IMPLIED_TYPE__, home, terminal, captain)
 	TEST_ASSERT(other_panel.prepare_save(captain, bay), "Could not prepare a concurrent save")
-	TEST_ASSERT_EQUAL(panel.quoted_fee, 10000, "First checkpoint did not cost 10,000 credits")
+	TEST_ASSERT_EQUAL(panel.quoted_fee, 5000, "First checkpoint did not cost 5,000 credits")
 	TEST_ASSERT(panel.save_quote(captain), "Could not save a checkpoint without silo access: [panel.error]")
-	TEST_ASSERT_EQUAL(before_money - original.ship_account.account_balance, 10000, "Save charged the wrong amount")
+	TEST_ASSERT_EQUAL(before_money - original.ship_account.account_balance, 5000, "Save charged the wrong amount")
 	TEST_ASSERT_EQUAL(home.treasury.account_balance, before_treasury, "Checkpoint fee was refunded through the outpost treasury")
 	TEST_ASSERT(!other_panel.save_quote(captain), "A stale save overwrote the paid checkpoint")
 	var/datum/ship_checkpoint/snapshot = home.checkpoints[1]
+	TEST_ASSERT(findtext(snapshot.tgm, "/obj/machinery/power/shuttle_engine/ship/liquid/oil"), "The checkpoint omitted its installed oil engine")
 	TEST_ASSERT(!panel.save_quote(captain), "A repeated save reused the paid snapshot")
-	// Updating must capture the newest design, charge 5k and preserve the old one on failure.
+	// Updating must capture the newest design, charge 2k and preserve the old one on failure.
 	lathe.name = "updated checkpoint fixture"
 	TEST_ASSERT(panel.prepare_save(captain, bay), "Could not prepare an update")
-	TEST_ASSERT_EQUAL(panel.quoted_fee, 5000, "Updating did not cost 5,000 credits")
+	TEST_ASSERT_EQUAL(panel.quoted_fee, 2000, "Updating did not cost 2,000 credits")
 	panel.accept_save = FALSE
 	TEST_ASSERT(!panel.save_quote(captain) && home.checkpoints[1] == snapshot, "Cancelled update lost the old checkpoint")
 	panel.accept_save = TRUE
-	original.ship_account.account_balance = 4999
+	original.ship_account.account_balance = 1999
 	TEST_ASSERT(!panel.save_quote(captain) && home.checkpoints[1] == snapshot, "Unaffordable update lost the old checkpoint")
-	original.ship_account.account_balance = before_money - 10000
+	original.ship_account.account_balance = before_money - 5000
 	TEST_ASSERT(panel.save_quote(captain), "Could not update a checkpoint")
 	TEST_ASSERT(QDELETED(snapshot), "Update retained the old snapshot")
 	TEST_ASSERT_EQUAL(length(home.checkpoints), 1, "Updating created a second checkpoint")
-	TEST_ASSERT_EQUAL(before_money - original.ship_account.account_balance, 15000, "Save and update charged the wrong total")
+	TEST_ASSERT_EQUAL(before_money - original.ship_account.account_balance, 7000, "Save and update charged the wrong total")
 	TEST_ASSERT_EQUAL(home.treasury.account_balance, before_treasury, "Update fee was refunded through the outpost treasury")
 	TEST_ASSERT_EQUAL(silo.materials.get_material_amount(/datum/material/iron), before_iron, "Checkpoint consumed silo materials")
 	snapshot = home.checkpoints[1]
@@ -444,6 +673,10 @@
 		if(!(get_area(tile) in rebuilt.shuttle.shuttle_areas))
 			continue
 		for(var/obj/structure/closet/storage in tile)
+			if(istype(storage, /obj/structure/closet/crate/secure/loot))
+				var/obj/structure/closet/crate/secure/loot/freight = storage
+				TEST_ASSERT(freight.spawned_loot && isnull(freight.spawn_turf), "Rebuilt freight retained a stock claim")
+				freight.spawn_loot()
 			storage.dump_contents() // First use must not spawn fresh default stock.
 		for(var/obj/item/item in tile.get_all_contents())
 			if(ismachinery(item.loc))
diff --git a/voidcrew/modules/unit_tests/voidcrew_combat_metrics.dm b/voidcrew/modules/unit_tests/voidcrew_combat_metrics.dm
index ae7c4778432..10d639f0518 100644
--- a/voidcrew/modules/unit_tests/voidcrew_combat_metrics.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_combat_metrics.dm
@@ -1,10 +1,17 @@
 /// Combat metrics pick real hits out of log_combat() lines, name how a hit landed and why a player
-/// died, find what called revive(), and credit NPC kills to the player with the last hit.
+/// died, attribute scoped revivals, and credit NPC kills to the player with the last hit.
 /// No database: rows stay in SSmetrics' memory.
 /datum/unit_test/voidcrew_combat_metrics
 	var/was_accepting
 	var/list/old_pending
 	var/list/old_tallies
+	var/list/old_deaths
+	var/list/old_last_deaths
+	var/old_flush_scheduled
+	var/patient_number = 0
+	var/shocks = 0
+	var/nested_restored = FALSE
+	var/obj/item/organ/cyberimp/cyberware/governor_delete/defib_governor
 
 /datum/unit_test/voidcrew_combat_metrics/Run()
 	for(var/hit in list("attacked", "shot", "threw and hit", "punched", "kicked"))
@@ -31,19 +38,18 @@
 	TEST_ASSERT_EQUAL(metric_death_cause(FALSE, FALSE, null, null, 190, 10, 0, 0), "brute", "mostly brute damage")
 	TEST_ASSERT_EQUAL(metric_death_cause(FALSE, FALSE, null, null), "unknown", "no damage at all")
 
-	var/list/site = revive()
-	TEST_ASSERT_NOTNULL(site, "the call stack walk finds the proc that called revive()")
-	TEST_ASSERT_EQUAL(site[1], src, "the caller's src is read off the stack")
-	TEST_ASSERT_EQUAL(site[2], "Run", "the caller's proc name is read off the stack")
-	TEST_ASSERT_EQUAL(metric_revive_method(null, "do_strange_reagent_revival"), "strange_reagent", "strange reagent is named by its proc")
-	TEST_ASSERT_EQUAL(metric_revive_method(src, "Run"), "other", "unknown callers are other")
-
 	was_accepting = SSmetrics.accepting
 	old_pending = SSmetrics.pending
 	old_tallies = SSmetrics.tallies
 	SSmetrics.accepting = TRUE
 	SSmetrics.pending = list()
 	SSmetrics.tallies = list()
+	old_deaths = GLOB.combat_metrics.pending_deaths
+	old_last_deaths = GLOB.combat_metrics.last_death_by_ckey
+	old_flush_scheduled = GLOB.combat_metrics.flush_scheduled
+	GLOB.combat_metrics.pending_deaths = list()
+	GLOB.combat_metrics.last_death_by_ckey = list()
+	GLOB.combat_metrics.flush_scheduled = FALSE
 
 	var/mob/living/carbon/human/player = allocate(/mob/living/carbon/human/consistent)
 	player.mind_initialize()
@@ -80,8 +86,462 @@
 	TEST_ASSERT_EQUAL(kills["ckey"], "combattester", "the killer is the ckey")
 	TEST_ASSERT_EQUAL(kills["quantity"], 2, "both kills count, including the killing blow logged after the death")
 
-/datum/unit_test/voidcrew_combat_metrics/proc/revive()
-	return metric_revive_site()
+	check_attribution()
+	check_implant_clock()
+	check_implant_callbacks()
+	check_nanite_defib()
+
+/// Real humans and real revival code; only the implant clock is simulated.
+/datum/unit_test/voidcrew_combat_metrics/proc/patient()
+	var/mob/living/carbon/human/consistent/voidcrew_revival_test/body = allocate(/mob/living/carbon/human/consistent/voidcrew_revival_test)
+	body.mind_initialize()
+	body.mind.key = "revivaltester[++patient_number]"
+	return body
+
+/datum/unit_test/voidcrew_combat_metrics/proc/revival_count(mob/living/body, method)
+	var/count = 0
+	for(var/list/row as anything in SSmetrics.pending)
+		if(row["ckey"] == metric_ckey(body) && row["event"] == "revived" && (!method || row["subject"] == method))
+			count += row["quantity"]
+	for(var/key in SSmetrics.tallies)
+		var/list/row = SSmetrics.tallies[key]
+		if(row["ckey"] == metric_ckey(body) && row["event"] == "revived_repeat" && (!method || row["subject"] == method))
+			count += row["quantity"]
+	return count
+
+/datum/unit_test/voidcrew_combat_metrics/proc/check_attribution()
+	for(var/method in list("reviver_implant", "nanites", "defibrillator", "strange_reagent", "legion_core", "surgery", "reagent", "admin", "phylactery", "meridian_heart", "lazarus_line", "temporal_rewind"))
+		var/mob/living/body = patient()
+		body.death()
+		TEST_ASSERT(body.revive_from(method), "[method] did not revive a healthy corpse")
+		TEST_ASSERT_EQUAL(revival_count(body, method), 1, "[method] was not explicitly attributed")
+		TEST_ASSERT_NULL(body.metric_revival_method, "[method] leaked its attribution")
+		TEST_ASSERT(!body.metric_revive_was_dead, "[method] leaked its death context")
+		body.revive_from("admin", ADMIN_HEAL_ALL)
+		body.heal_and_revive_from("phylactery", 30)
+		TEST_ASSERT_EQUAL(revival_count(body), 1, "Healing a living body recorded a revival")
+
+	var/mob/living/carbon/human/consistent/voidcrew_revival_test/body = patient()
+	body.setOxyLoss(250)
+	body.death()
+	TEST_ASSERT(!body.revive_from("nanites"), "An unhealed lethal corpse revived")
+	TEST_ASSERT_NULL(body.metric_revival_method, "A failed revival leaked attribution")
+	TEST_ASSERT_EQUAL(revival_count(body), 0, "A failed revival was recorded")
+	TEST_ASSERT(body.heal_and_revive_from("phylactery", 30), "The scoped healing route did not revive")
+	TEST_ASSERT_EQUAL(revival_count(body, "phylactery"), 1, "The healing route lost its method")
+	TEST_ASSERT_NULL(body.metric_revival_method, "The healing route leaked attribution")
+
+	var/mob/living/unknown = patient()
+	unknown.death()
+	TEST_ASSERT(unknown.revive(), "An unclassified route failed")
+	TEST_ASSERT_EQUAL(revival_count(unknown, "other"), 1, "Unclassified routes must remain other")
+	var/mob/living/clone = patient()
+	metric_clone_revival(clone, unknown)
+	TEST_ASSERT_EQUAL(revival_count(clone, "cloning_vat"), 1, "Cloning vat attribution changed")
+
+	// A nested heal during the outer revival signal must restore both contexts.
+	var/mob/living/nested = patient()
+	RegisterSignal(nested, COMSIG_LIVING_REVIVE, PROC_REF(nested_heal))
+	nested.death()
+	TEST_ASSERT(nested.revive_from("surgery"), "The outer revival failed")
+	TEST_ASSERT(nested_restored, "A nested living heal did not restore the enclosing method")
+	TEST_ASSERT_EQUAL(revival_count(nested, "surgery"), 1, "The nested heal replaced the outer method")
+	TEST_ASSERT_EQUAL(revival_count(nested), 1, "The nested living heal was counted")
+	TEST_ASSERT_NULL(nested.metric_revival_method, "The nested revival leaked context")
+
+	body.metric_revival_method = "enclosing"
+	body.throw_on_revive = TRUE
+	var/caught = FALSE
+	try
+		body.revive_from("admin")
+	catch(var/exception/error)
+		caught = !isnull(error)
+	TEST_ASSERT(caught, "The exception fixture did not throw")
+	TEST_ASSERT_EQUAL(body.metric_revival_method, "enclosing", "An exception lost the enclosing method")
+	body.throw_on_revive = FALSE
+	body.throw_on_heal = TRUE
+	caught = FALSE
+	try
+		body.heal_and_revive_from("phylactery", 30)
+	catch(var/exception/healing_error)
+		caught = !isnull(healing_error)
+	TEST_ASSERT(caught, "The healing exception fixture did not throw")
+	TEST_ASSERT_EQUAL(body.metric_revival_method, "enclosing", "A healing exception lost the enclosing method")
+	body.metric_revival_method = null
+	body.throw_on_heal = FALSE
+
+/datum/unit_test/voidcrew_combat_metrics/proc/nested_heal(mob/living/source, full_heal_flags)
+	SIGNAL_HANDLER
+	UnregisterSignal(source, COMSIG_LIVING_REVIVE)
+	var/outer_method = source.metric_revival_method
+	source.revive_from("admin")
+	nested_restored = source.metric_revival_method == outer_method && source.metric_revive_was_dead
+
+/// Reproduce eleven death/revival requests across nine simulated minutes without sleeping.
+/datum/unit_test/voidcrew_combat_metrics/proc/check_implant_clock()
+	var/mob/living/carbon/human/consistent/voidcrew_revival_test/body = patient()
+	var/obj/item/organ/cyberimp/chest/reviver/voidcrew_clock_test/implant = allocate(/obj/item/organ/cyberimp/chest/reviver/voidcrew_clock_test)
+	implant.Insert(body)
+	// Stay within adjustOxyLoss's cap; its first heal otherwise clamps 250 straight to 200.
+	body.setOxyLoss(200)
+	var/healing_pulses = round((body.getOxyLoss() - (body.maxHealth - body.hardcrit_threshold)) / 5) + 1
+	body.death()
+	var/start_time = 1 HOURS
+	var/list/attempt_times = list(0, 45 SECONDS, 90 SECONDS, 135 SECONDS, 180 SECONDS, 225 SECONDS, 270 SECONDS, 315 SECONDS, 360 SECONDS, 405 SECONDS, 450 SECONDS)
+	var/attempts = 0
+	var/succeeded_at
+	var/cooldown_at_success
+	var/healing_at_success
+	var/reached_hardcrit = FALSE
+	for(var/elapsed in 0 to (9 MINUTES) step (1 SECONDS))
+		implant.clock = start_time + elapsed
+		if(elapsed in attempt_times)
+			attempts++
+			if(body.stat != DEAD)
+				body.setOxyLoss(250)
+			body.death()
+			implant.revive_dead()
+		implant.on_death(1, elapsed / 10)
+		implant.try_heal()
+		var/timer_before = implant.heal_timer
+		implant.try_heal()
+		TEST_ASSERT_EQUAL(implant.heal_timer, timer_before, "Overlapping processing queued a second healing timer")
+		if(implant.heal_timer && implant.clock >= implant.heal_due)
+			implant.heal(WEAKREF(body), implant.activation_generation, implant.heal_generation)
+			if(body.health == body.hardcrit_threshold)
+				reached_hardcrit = TRUE
+				TEST_ASSERT_EQUAL(body.stat, DEAD, "The implant revived at the hard-crit boundary")
+		if(body.revive_calls && isnull(succeeded_at))
+			succeeded_at = implant.clock
+			cooldown_at_success = implant.reviver_cooldown
+			healing_at_success = implant.revive_cost - 10 MINUTES
+			TEST_ASSERT(body.stat != DEAD, "The implant's first attempt did not succeed")
+			TEST_ASSERT(!implant.reviving && !implant.heal_timer, "Successful revival did not end the activation")
+			TEST_ASSERT_EQUAL(cooldown_at_success, succeeded_at + 10 MINUTES + healing_at_success, "Cooldown did not begin at success")
+		if(!isnull(succeeded_at))
+			if(elapsed == 60 SECONDS)
+				body.set_stat(CONSCIOUS)
+			if(elapsed == 61 SECONDS)
+				body.set_stat(HARD_CRIT)
+			implant.try_heal()
+			TEST_ASSERT_EQUAL(implant.reviver_cooldown, cooldown_at_success, "Consciousness or another death restarted the cooldown")
+	TEST_ASSERT_EQUAL(attempts, 11, "The scenario did not exercise all eleven observed requests")
+	TEST_ASSERT(reached_hardcrit, "The scenario never reached the exact hard-crit boundary")
+	TEST_ASSERT_NOTNULL(succeeded_at, "The implant never revived after healing past hard crit")
+	TEST_ASSERT_EQUAL(succeeded_at, start_time + 3 SECONDS + (healing_pulses - 1) * SSmobs.wait, "Single-callback scheduling changed the existing healing rate")
+	TEST_ASSERT_EQUAL(body.hardcrit_revive_calls, 0, "revive() was attempted at hard-crit health")
+	TEST_ASSERT_EQUAL(body.revive_calls, 1, "The implant attempted a second revival during cooldown")
+	TEST_ASSERT_EQUAL(revival_count(body, "reviver_implant"), 1, "The scenario did not produce exactly one attributed success")
+	TEST_ASSERT(healing_at_success > 0, "Accumulated healing was omitted from cooldown")
+	TEST_ASSERT(implant.clock < implant.reviver_cooldown, "The nine-minute scenario outlasted the success cooldown")
+	implant.Remove(body)
+	implant.Insert(body)
+	implant.try_heal()
+	TEST_ASSERT_EQUAL(implant.reviver_cooldown, cooldown_at_success, "Reinsertion reset the successful revival cooldown")
+	TEST_ASSERT(!implant.reviving && !implant.heal_timer, "Reinsertion bypassed the successful revival cooldown")
+
+/datum/unit_test/voidcrew_combat_metrics/proc/check_implant_callbacks()
+	var/mob/living/carbon/human/first = patient()
+	var/mob/living/carbon/human/second = patient()
+	first.setOxyLoss(200)
+	second.setOxyLoss(200)
+	first.death()
+	second.death()
+	var/obj/item/organ/cyberimp/chest/reviver/voidcrew_clock_test/implant = allocate(/obj/item/organ/cyberimp/chest/reviver/voidcrew_clock_test)
+	implant.clock = 1 HOURS
+	implant.Insert(first)
+	implant.try_heal()
+	implant.try_heal()
+	var/generation = implant.activation_generation
+	var/implantation = implant.implantation_generation
+	var/callback_generation = implant.heal_generation
+	var/old_timer = implant.heal_timer
+	for(var/index in 1 to 11)
+		implant.try_heal()
+		TEST_ASSERT_EQUAL(implant.heal_timer, old_timer, "Processing queued overlapping callbacks")
+	implant.Remove(first)
+	TEST_ASSERT(!implant.heal_timer && !implant.reviving, "Removal did not cancel the pending activation")
+	implant.Insert(second)
+	implant.try_heal()
+	implant.try_heal()
+	var/new_timer = implant.heal_timer
+	implant.heal(WEAKREF(first), generation, callback_generation)
+	TEST_ASSERT_EQUAL(first.getOxyLoss(), 200, "A removed implant healed its former owner")
+	TEST_ASSERT_EQUAL(second.getOxyLoss(), 200, "A stale callback healed the new owner")
+	TEST_ASSERT_EQUAL(implant.heal_timer, new_timer, "A stale callback consumed the new owner's timer")
+	second.set_heartattack(TRUE)
+	implant.undo_heart_attack(WEAKREF(first), implantation)
+	TEST_ASSERT(second.undergoing_cardiac_arrest(), "A stale EMP callback healed the new owner")
+	callback_generation = implant.heal_generation
+	implant.heal(WEAKREF(second), implant.activation_generation, implant.heal_generation)
+	TEST_ASSERT_EQUAL(second.getOxyLoss(), 195, "One callback did not preserve the oxygen healing rate")
+	TEST_ASSERT_EQUAL(implant.heal_due, implant.clock + SSmobs.wait, "A healing callback changed the existing pulse interval")
+	implant.try_heal()
+	implant.heal(WEAKREF(second), implant.activation_generation, callback_generation)
+	TEST_ASSERT_EQUAL(second.getOxyLoss(), 195, "Replaying an earlier callback healed twice")
+	generation = implant.activation_generation
+	callback_generation = implant.heal_generation
+	implantation = implant.implantation_generation
+	implant.Remove(second)
+	implant.Insert(second)
+	implant.try_heal()
+	implant.try_heal()
+	TEST_ASSERT_EQUAL(implant.revive_cost, 5, "Reinsertion discarded accumulated healing cost")
+	implant.heal(WEAKREF(second), generation, callback_generation)
+	TEST_ASSERT_EQUAL(second.getOxyLoss(), 195, "Reinsertion into the same body accepted a stale generation")
+	implant.undo_heart_attack(WEAKREF(second), implantation)
+	TEST_ASSERT(second.undergoing_cardiac_arrest(), "Reinsertion accepted a stale EMP recovery")
+	generation = implant.activation_generation
+	callback_generation = implant.heal_generation
+	qdel(implant)
+	implant.heal(WEAKREF(second), generation, callback_generation)
+	TEST_ASSERT_EQUAL(second.getOxyLoss(), 195, "A deleted implant healed its owner")
+
+	var/mob/living/carbon/human/consistent/voidcrew_revival_test/failed = patient()
+	failed.setBruteLoss(10)
+	failed.setFireLoss(10)
+	failed.setToxLoss(10, TRUE, FALSE, ALL)
+	failed.setOxyLoss(100)
+	failed.death()
+	failed.deny_revival = TRUE
+	var/obj/item/organ/cyberimp/chest/reviver/voidcrew_clock_test/failing_implant = allocate(/obj/item/organ/cyberimp/chest/reviver/voidcrew_clock_test)
+	failing_implant.clock = 1 HOURS
+	failing_implant.Insert(failed)
+	failing_implant.try_heal()
+	failing_implant.try_heal()
+	failing_implant.clock += 8 SECONDS
+	RegisterSignal(failed, COMSIG_LIVING_MINOR_SHOCK, PROC_REF(note_shock))
+	failing_implant.heal(WEAKREF(failed), failing_implant.activation_generation, failing_implant.heal_generation)
+	TEST_ASSERT_EQUAL(failed.getBruteLoss(), 8, "Implant brute healing changed")
+	TEST_ASSERT_EQUAL(failed.getFireLoss(), 8, "Implant burn healing changed")
+	TEST_ASSERT_EQUAL(failed.getToxLoss(), 9, "Implant toxin healing changed")
+	TEST_ASSERT_EQUAL(failed.getOxyLoss(), 95, "Implant oxygen healing changed")
+	TEST_ASSERT_EQUAL(failed.revive_calls, 1, "The failed implant revival was not attempted after healing")
+	TEST_ASSERT_EQUAL(failing_implant.revive_cost, 125, "A failed revival added the success surcharge")
+	TEST_ASSERT_EQUAL(failing_implant.reviver_cooldown, 0, "A failed revival began the success cooldown")
+	TEST_ASSERT(failing_implant.reviving, "A failed revival ended its activation")
+	TEST_ASSERT_EQUAL(revival_count(failed), 0, "A failed implant revival was recorded as success")
+	TEST_ASSERT_EQUAL(shocks, 0, "A failed implant revival emitted a success shock")
+
+/datum/unit_test/voidcrew_combat_metrics/proc/note_shock(mob/living/source)
+	SIGNAL_HANDLER
+	shocks++
+
+/datum/unit_test/voidcrew_combat_metrics/proc/check_nanite_defib()
+	var/list/failures = list("suicide" = DEFIB_FAIL_SUICIDE, "husk" = DEFIB_FAIL_HUSK, "no heart" = DEFIB_FAIL_NO_HEART, "bad heart" = DEFIB_FAIL_FAILING_HEART, "no brain" = DEFIB_FAIL_NO_BRAIN, "bad brain" = DEFIB_FAIL_FAILING_BRAIN, "brute" = DEFIB_FAIL_TISSUE_DAMAGE, "burn" = DEFIB_FAIL_TISSUE_DAMAGE, "blacklist" = DEFIB_FAIL_BLACKLISTED, "no intelligence" = DEFIB_FAIL_NO_INTELLIGENCE)
+	var/datum/nanite_program/defib/program = allocate(/datum/nanite_program/defib)
+	for(var/failure in failures)
+		var/mob/living/carbon/body = patient()
+		body.setOxyLoss(250)
+		body.death()
+		var/obj/item/organ/heart/heart = body.get_organ_slot(ORGAN_SLOT_HEART)
+		var/obj/item/organ/brain/brain = body.get_organ_slot(ORGAN_SLOT_BRAIN)
+		switch(failure)
+			if("suicide")
+				ADD_TRAIT(body, TRAIT_SUICIDED, INNATE_TRAIT)
+			if("husk")
+				ADD_TRAIT(body, TRAIT_HUSK, INNATE_TRAIT)
+			if("no heart")
+				heart.Remove(body, special = TRUE)
+			if("bad heart")
+				heart.set_organ_damage(heart.maxHealth)
+			if("no brain")
+				brain.Remove(body, special = TRUE)
+			if("bad brain")
+				brain.set_organ_damage(brain.maxHealth)
+			if("brute")
+				body.setBruteLoss(MAX_REVIVE_BRUTE_DAMAGE)
+			if("burn")
+				body.setFireLoss(MAX_REVIVE_FIRE_DAMAGE)
+			if("blacklist")
+				ADD_TRAIT(body, TRAIT_DEFIB_BLACKLISTED, INNATE_TRAIT)
+			if("no intelligence")
+				brain.suicided = TRUE
+		program.host_mob = body
+		RegisterSignal(body, COMSIG_LIVING_MINOR_SHOCK, PROC_REF(note_shock))
+		var/health_before = body.health
+		TEST_ASSERT_EQUAL(body.can_defib(), failures[failure], "The [failure] fixture did not reach its intended rejection")
+		TEST_ASSERT(!program.check_revivable(), "Nanites accepted [failure] as eligible")
+		TEST_ASSERT(!program.defibrillate(), "Nanites revived despite [failure]")
+		TEST_ASSERT_EQUAL(body.health, health_before, "Nanites healed a body rejected for [failure]")
+		TEST_ASSERT_EQUAL(body.stat, DEAD, "Nanites revived a body rejected for [failure]")
+		TEST_ASSERT_EQUAL(revival_count(body), 0, "A nanite failure was logged as success: [failure]")
+	TEST_ASSERT_EQUAL(shocks, 0, "A rejected nanite attempt emitted a success shock")
+
+	// Eligibility can pass and revive() can still fail. No success effects may escape.
+	var/mob/living/carbon/human/consistent/voidcrew_revival_test/failed = patient()
+	failed.setOxyLoss(250)
+	failed.death()
+	failed.deny_revival = TRUE
+	program.host_mob = failed
+	RegisterSignal(failed, COMSIG_LIVING_MINOR_SHOCK, PROC_REF(note_shock))
+	TEST_ASSERT(program.check_revivable(), "The failed-revive fixture was ineligible")
+	TEST_ASSERT(!program.defibrillate(), "A failing revive() reported nanite success")
+	TEST_ASSERT_EQUAL(failed.stat, DEAD, "A failing revive() brought the body back")
+	TEST_ASSERT_EQUAL(shocks, 0, "A failing revive() emitted success effects")
+	TEST_ASSERT(!failed.has_status_effect(/datum/status_effect/jitter), "A failing revive() applied success jitter")
+	TEST_ASSERT_EQUAL(revival_count(failed), 0, "A failing revive() emitted a success row")
+	TEST_ASSERT_NULL(failed.metric_revival_method, "A failed nanite revival leaked attribution")
+
+	// Both sides exercise their production revival path on identical mixed injuries.
+	var/mob/living/carbon/nanite_body = patient()
+	var/mob/living/carbon/paddle_body = patient()
+	var/obj/item/shockpaddles/cyborg/paddles = allocate(/obj/item/shockpaddles/cyborg)
+	for(var/mob/living/carbon/body in list(nanite_body, paddle_body))
+		body.death()
+		var/obj/item/organ/liver = body.get_organ_slot(ORGAN_SLOT_LIVER)
+		liver.Remove(body, special = TRUE)
+		var/obj/item/bodypart/arm = body.get_bodypart(BODY_ZONE_L_ARM)
+		arm.drop_limb()
+		// Identical limb placement matters: legs weight damage differently from the torso.
+		body.get_bodypart(BODY_ZONE_CHEST).set_initial_damage(50, 30)
+		body.get_bodypart(BODY_ZONE_R_LEG).set_initial_damage(30, 10)
+		body.setToxLoss(30, TRUE, FALSE, ALL)
+		body.setOxyLoss(110)
+		body.get_organ_slot(ORGAN_SLOT_HEART).set_organ_damage(20)
+		body.get_organ_slot(ORGAN_SLOT_BRAIN).set_organ_damage(20)
+		ADD_TRAIT(body, TRAIT_DEAF, INNATE_TRAIT)
+	program.host_mob = nanite_body
+	RegisterSignal(nanite_body, COMSIG_LIVING_MINOR_SHOCK, PROC_REF(note_shock))
+	TEST_ASSERT(program.defibrillate(), "Eligible nanites did not revive")
+	TEST_ASSERT(paddles.revive_patient(paddle_body, paddle_body.can_defib()), "Eligible paddles did not revive")
+	TEST_ASSERT_EQUAL(shocks, 1, "Successful nanites did not emit exactly one success shock")
+	TEST_ASSERT(abs(nanite_body.health + 50) <= 4 * DAMAGE_PRECISION, "Nanites did not target -50 health within damage rounding")
+	TEST_ASSERT_EQUAL(nanite_body.getBruteLoss(), paddle_body.getBruteLoss(), "Nanite brute redistribution differs from paddles")
+	TEST_ASSERT_EQUAL(nanite_body.getFireLoss(), paddle_body.getFireLoss(), "Nanite burn redistribution differs from paddles")
+	TEST_ASSERT_EQUAL(nanite_body.getToxLoss(), paddle_body.getToxLoss(), "Nanite toxin redistribution differs from paddles")
+	TEST_ASSERT_EQUAL(nanite_body.getOxyLoss(), paddle_body.getOxyLoss(), "Nanite oxygen redistribution differs from paddles")
+	for(var/mob/living/carbon/body in list(nanite_body, paddle_body))
+		TEST_ASSERT(abs(body.health + 50) <= 4 * DAMAGE_PRECISION, "Defib missed its health target with weighted limb injuries")
+		TEST_ASSERT_EQUAL(body.get_bodypart(BODY_ZONE_CHEST).brute_dam, 30, "Defib redistributed a torso injury onto another limb")
+		TEST_ASSERT_EQUAL(body.get_bodypart(BODY_ZONE_R_LEG).brute_dam, 18, "Defib did not preserve a leg injury's proportion")
+		TEST_ASSERT_NULL(body.get_organ_slot(ORGAN_SLOT_LIVER), "Defib restored an unrelated missing organ")
+		TEST_ASSERT_NULL(body.get_bodypart(BODY_ZONE_L_ARM), "Defib restored a missing limb")
+		TEST_ASSERT_EQUAL(body.get_organ_loss(ORGAN_SLOT_HEART), 20, "Defib cured unrelated heart damage")
+		TEST_ASSERT_EQUAL(body.get_organ_loss(ORGAN_SLOT_BRAIN), 20, "Defib cured unrelated brain damage")
+		TEST_ASSERT(HAS_TRAIT(body, TRAIT_DEAF), "Defib cured unrelated deafness")
+	TEST_ASSERT_EQUAL(revival_count(nanite_body, "nanites"), 1, "Successful nanites lost their attribution")
+	TEST_ASSERT_EQUAL(revival_count(paddle_body, "defibrillator"), 1, "Successful paddles lost their attribution")
+
+	// A healthy corpse gets the same oxygen penalty in both paths.
+	var/mob/living/carbon/healthy = patient()
+	healthy.death()
+	program.host_mob = healthy
+	TEST_ASSERT(program.defibrillate(), "Nanites failed on a repaired corpse")
+	TEST_ASSERT_EQUAL(healthy.health, -50, "A repaired corpse was not brought to -50 health")
+	TEST_ASSERT(!program.check_revivable(), "Nanites accepted a living host")
+
+	// The admin-ghost special case remains eligible without forcing its ghost home.
+	var/mob/living/carbon/human/consistent/voidcrew_revival_test/aghost = patient()
+	aghost.defib_override = DEFIB_NOGRAB_AGHOST
+	aghost.death()
+	program.host_mob = aghost
+	TEST_ASSERT(program.check_revivable(), "The admin-ghost special case was rejected")
+	TEST_ASSERT(program.defibrillate(), "The admin-ghost special case could not revive")
+
+	// Change eligibility while the real zap() is in its charge windup.
+	var/mob/living/carbon/windup = patient()
+	windup.death()
+	program.host_mob = windup
+	shocks = 0
+	RegisterSignal(windup, COMSIG_LIVING_MINOR_SHOCK, PROC_REF(note_shock))
+	addtimer(CALLBACK(src, PROC_REF(blacklist_during_windup), windup), 1)
+	program.zap(WEAKREF(windup))
+	TEST_ASSERT_EQUAL(windup.stat, DEAD, "Nanites ignored a blacklist added during windup")
+	TEST_ASSERT_EQUAL(windup.health, 100, "Nanites healed after failing their windup recheck")
+	TEST_ASSERT_EQUAL(shocks, 0, "A windup failure emitted success effects")
+	TEST_ASSERT_EQUAL(revival_count(windup), 0, "A windup failure was logged as success")
+	program.host_mob = null
+	check_nanite_capacity_windup()
+
+/datum/unit_test/voidcrew_combat_metrics/proc/check_nanite_capacity_windup()
+	var/mob/living/carbon/human/consistent/voidcrew_revival_test/body = patient()
+	defib_governor = allocate(/obj/item/organ/cyberimp/cyberware/governor_delete)
+	var/obj/item/organ/cyberimp/cyberware/test_heavy/heavy = allocate(/obj/item/organ/cyberimp/cyberware/test_heavy)
+	TEST_ASSERT(defib_governor.Insert(body, TRUE), "Could not install the defib capacity governor")
+	TEST_ASSERT(heavy.Insert(body, TRUE), "Could not install the defib capacity load")
+	var/datum/component/nanites/swarm = body.AddComponent(/datum/component/nanites)
+	STOP_PROCESSING(SSnanites, swarm)
+	swarm.regen_rate = 0
+	var/datum/nanite_program/defib/program = allocate(/datum/nanite_program/defib)
+	TEST_ASSERT_EQUAL(swarm.add_program(null, program), 1, "Could not install the capacity defib fixture") // COMPONENT_PROGRAM_INSTALLED
+	body.setOxyLoss(250)
+	body.death()
+	TEST_ASSERT(program.check_revivable() && !program.capacity_blocked(), "The capacity defib fixture cannot start")
+	shocks = 0
+	RegisterSignal(body, COMSIG_LIVING_MINOR_SHOCK, PROC_REF(note_shock))
+	var/health_before = body.health
+	addtimer(CALLBACK(defib_governor, TYPE_PROC_REF(/obj/item/organ, Remove), body, TRUE), 1)
+	program.zap(WEAKREF(body))
+	TEST_ASSERT(program.capacity_blocked(), "Removing Governor Delete did not overload the defib host")
+	TEST_ASSERT_EQUAL(body.health, health_before, "Nanites healed after losing capacity during windup")
+	TEST_ASSERT(!program.defibrillate(), "Direct defibrillation ignored the capacity gate")
+	TEST_ASSERT_EQUAL(body.health, health_before, "Direct defibrillation healed an overloaded host")
+	TEST_ASSERT_EQUAL(body.revive_calls, 0, "An overloaded nanite program attempted revival")
+	TEST_ASSERT_EQUAL(body.stat, DEAD, "Nanites revived after losing capacity during windup")
+	TEST_ASSERT_EQUAL(shocks, 0, "A capacity windup failure emitted success effects")
+	TEST_ASSERT_EQUAL(revival_count(body), 0, "A capacity windup failure was logged as success")
+
+	// Healing can notify other systems; capacity must still hold when revival is attempted.
+	TEST_ASSERT(defib_governor.Insert(body, TRUE), "Could not restore capacity before healing")
+	RegisterSignal(body, COMSIG_LIVING_HEALTH_UPDATE, PROC_REF(remove_defib_governor_on_heal))
+	TEST_ASSERT(!program.defibrillate(), "Nanites revived after losing capacity during healing")
+	TEST_ASSERT(program.capacity_blocked(), "The healing callback did not remove capacity")
+	TEST_ASSERT(body.health > health_before, "The capacity callback did not run during healing")
+	TEST_ASSERT_EQUAL(body.revive_calls, 0, "Nanites attempted revival after healing removed capacity")
+	TEST_ASSERT_EQUAL(body.stat, DEAD, "Healing capacity loss revived the host")
+	TEST_ASSERT_EQUAL(shocks, 0, "Healing capacity loss emitted success effects")
+	TEST_ASSERT_EQUAL(revival_count(body), 0, "Healing capacity loss was logged as success")
+	TEST_ASSERT(defib_governor.Insert(body, TRUE), "Could not restore capacity after healing")
+	TEST_ASSERT(program.defibrillate(), "Nanite defibrillation did not recover with capacity")
+	TEST_ASSERT_EQUAL(revival_count(body, "nanites"), 1, "Recovered defibrillation lost its attribution")
+	defib_governor = null
+
+/datum/unit_test/voidcrew_combat_metrics/proc/remove_defib_governor_on_heal(mob/living/carbon/body)
+	SIGNAL_HANDLER
+	UnregisterSignal(body, COMSIG_LIVING_HEALTH_UPDATE)
+	defib_governor.Remove(body, TRUE)
+
+/datum/unit_test/voidcrew_combat_metrics/proc/blacklist_during_windup(mob/living/body)
+	ADD_TRAIT(body, TRAIT_DEFIB_BLACKLISTED, INNATE_TRAIT)
+
+/// Simulate time without modifying world.time or replacing the implant's healing/revival code.
+/obj/item/organ/cyberimp/chest/reviver/voidcrew_clock_test
+	// This clock fixture does not exercise the upstream implant overlay destructor.
+	aug_overlay = null
+	var/clock = 0
+
+/obj/item/organ/cyberimp/chest/reviver/voidcrew_clock_test/reviver_time()
+	return clock
+
+/mob/living/carbon/human/consistent/voidcrew_revival_test
+	var/deny_revival = FALSE
+	var/throw_on_revive = FALSE
+	var/throw_on_heal = FALSE
+	var/defib_override
+	var/revive_calls = 0
+	var/hardcrit_revive_calls = 0
+
+/mob/living/carbon/human/consistent/voidcrew_revival_test/can_be_revived()
+	return !deny_revival && ..()
+
+/mob/living/carbon/human/consistent/voidcrew_revival_test/can_defib()
+	if(!isnull(defib_override))
+		return defib_override
+	return ..()
+
+/mob/living/carbon/human/consistent/voidcrew_revival_test/revive(full_heal_flags = NONE, excess_healing = 0, force_grab_ghost = FALSE)
+	if(throw_on_revive)
+		throw EXCEPTION("Revival scope cleanup fixture")
+	revive_calls++
+	if(health <= hardcrit_threshold)
+		hardcrit_revive_calls++
+	return ..()
+
+/mob/living/carbon/human/consistent/voidcrew_revival_test/heal_and_revive(heal_to = 75, revive_message)
+	if(throw_on_heal)
+		throw EXCEPTION("Healing scope cleanup fixture")
+	return ..()
 
 /datum/unit_test/voidcrew_combat_metrics/proc/find_tally(event)
 	for(var/key in SSmetrics.tallies)
@@ -92,6 +552,9 @@
 
 /datum/unit_test/voidcrew_combat_metrics/Destroy()
 	if(old_pending)
+		GLOB.combat_metrics.pending_deaths = old_deaths
+		GLOB.combat_metrics.last_death_by_ckey = old_last_deaths
+		GLOB.combat_metrics.flush_scheduled = old_flush_scheduled
 		SSmetrics.accepting = was_accepting
 		SSmetrics.pending = old_pending
 		SSmetrics.tallies = old_tallies
diff --git a/voidcrew/modules/unit_tests/voidcrew_cyberware.dm b/voidcrew/modules/unit_tests/voidcrew_cyberware.dm
index 62fb62ba357..5fe0e7bb450 100644
--- a/voidcrew/modules/unit_tests/voidcrew_cyberware.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_cyberware.dm
@@ -46,6 +46,12 @@
 	slot = "voidcrew_test_chrome_ladder"
 	chrome_load = 20 // fits ONLY because the mk1 nets out
 
+// A later insertion gate refusing after the Cradle's projected check passed.
+/obj/item/organ/cyberimp/cyberware/test_ladder_high/refused/Insert(mob/living/carbon/receiver, special = FALSE, movement_flags)
+	if(!special)
+		return FALSE
+	return ..()
+
 /obj/item/organ/cyberimp/cyberware/test_heavy
 	name = "test heavy chrome"
 	zone = BODY_ZONE_CHEST
@@ -330,6 +336,98 @@
 		TEST_ASSERT(paired["vouchers"] > 0, "[half] indexed with no voucher price")
 		TEST_ASSERT(paired["paired"], "[half] came out of a pair case without the paired flag")
 
+/// Recheck the complete final installation after the delay, before touching incumbents.
+/datum/unit_test/voidcrew_cradle_installed_capacity
+
+/datum/unit_test/voidcrew_cradle_installed_capacity/Run()
+	var/obj/machinery/chrome_cradle/rig = allocate(/obj/machinery/chrome_cradle)
+	var/mob/living/carbon/human/patient = allocate(/mob/living/carbon/human/consistent)
+	rig.buckle_mob(patient, force = TRUE)
+	var/obj/item/organ/cyberimp/cyberware/test_ladder_low/incumbent = allocate(/obj/item/organ/cyberimp/cyberware/test_ladder_low)
+	var/obj/item/organ/cyberimp/cyberware/test_small/extra = allocate(/obj/item/organ/cyberimp/cyberware/test_small)
+	var/obj/item/organ/cyberimp/cyberware/test_ladder_high/upgrade = allocate(/obj/item/organ/cyberimp/cyberware/test_ladder_high)
+	TEST_ASSERT(incumbent.Insert(patient, TRUE), "Cradle incumbent fixture failed")
+	TEST_ASSERT(extra.Insert(patient, TRUE), "Cradle extra-load fixture failed")
+	patient.put_in_hands(upgrade)
+	rig.begin_install(upgrade)
+	TEST_ASSERT(!rig.busy, "Cradle began an over-budget sequence")
+	TEST_ASSERT_EQUAL(upgrade.loc, patient, "Initial refusal moved the incoming ware")
+	TEST_ASSERT_EQUAL(incumbent.owner, patient, "Initial refusal evicted the incumbent")
+	extra.Remove(patient, TRUE)
+	rig.begin_install(upgrade)
+	TEST_ASSERT(rig.busy && rig.busy_ware == upgrade, "Fitting upgrade didn't begin its sequence")
+	TEST_ASSERT_EQUAL(incumbent.owner, patient, "Beginning the sequence evicted the incumbent")
+	// An implanter can add load while the patient is sedated.
+	var/obj/item/implant/voidcrew_capacity_test/implant = allocate(/obj/item/implant/voidcrew_capacity_test)
+	TEST_ASSERT(implant.implant(patient), "Mid-sequence implantation fixture failed")
+	rig.finish_install()
+	TEST_ASSERT_EQUAL(incumbent.owner, patient, "Post-delay capacity refusal evicted the incumbent")
+	TEST_ASSERT(!QDELETED(incumbent) && !QDELETED(upgrade), "Post-delay refusal consumed an organ")
+	TEST_ASSERT(!upgrade.owner && upgrade.loc == rig && (upgrade in rig.tray), "Rejected incoming ware wasn't preserved in the tray")
+	TEST_ASSERT_EQUAL(get_chrome_load(patient), 19, "Rejected sequence changed installed load")
+	TEST_ASSERT(!rig.busy && !patient.IsUnconscious(), "Rejected sequence didn't clear the cycle and sedation")
+	implant.removed(patient)
+	// Even a refusal by a later Insert() gate must restore the old piece.
+	var/obj/item/organ/cyberimp/cyberware/test_ladder_high/refused/late_refusal = allocate(/obj/item/organ/cyberimp/cyberware/test_ladder_high/refused)
+	late_refusal.forceMove(rig)
+	rig.begin_install(late_refusal)
+	TEST_ASSERT(rig.busy, "Late-refusal fixture failed its projected check")
+	rig.finish_install()
+	TEST_ASSERT_EQUAL(incumbent.owner, patient, "Insertion refusal didn't restore the incumbent")
+	TEST_ASSERT(!(incumbent in rig.tray), "Restored incumbent remained in the parts tray")
+	TEST_ASSERT(!late_refusal.owner && late_refusal.loc == rig && (late_refusal in rig.tray), "Insertion refusal lost the incoming ware")
+	TEST_ASSERT_EQUAL(get_chrome_load(patient), 18, "Rollback changed the original installed load")
+	// Retry after shedding load: net the old piece out rather than summing both.
+	rig.begin_install(upgrade)
+	rig.finish_install()
+	TEST_ASSERT_EQUAL(upgrade.owner, patient, "Fitting Cradle replacement was refused")
+	TEST_ASSERT(!incumbent.owner && incumbent.loc == rig && (incumbent in rig.tray), "Successful replacement didn't rack its incumbent")
+	TEST_ASSERT_EQUAL(get_chrome_load(patient), 20, "Cradle replacement didn't net the incumbent")
+	upgrade.Remove(patient, TRUE)
+	TEST_ASSERT(incumbent.Insert(patient, TRUE), "Governor-loss incumbent fixture failed")
+	var/obj/item/organ/cyberimp/cyberware/governor_delete/governor = allocate(/obj/item/organ/cyberimp/cyberware/governor_delete)
+	governor.Insert(patient, TRUE)
+	implant.implant(patient)
+	upgrade.forceMove(rig)
+	rig.begin_install(upgrade)
+	TEST_ASSERT(rig.busy, "Governor-backed replacement didn't begin")
+	governor.Remove(patient, TRUE)
+	rig.finish_install()
+	TEST_ASSERT_EQUAL(incumbent.owner, patient, "Losing a Governor during the delay evicted the incumbent")
+	TEST_ASSERT_EQUAL(get_chrome_capacity(patient), 20, "Cradle retained the removed Governor's bonus")
+	TEST_ASSERT(!upgrade.owner && (upgrade in rig.tray), "Governor-loss refusal lost the incoming ware")
+	// A Governor-for-Governor swap must fit the exact 35 boundary.
+	implant.removed(patient)
+	incumbent.Remove(patient, TRUE)
+	governor.Insert(patient, TRUE)
+	upgrade.Insert(patient, TRUE)
+	var/obj/item/organ/cyberimp/cyberware/test_heavy/heavy = allocate(/obj/item/organ/cyberimp/cyberware/test_heavy)
+	heavy.Insert(patient, TRUE)
+	var/obj/item/organ/cyberimp/cyberware/governor_delete/new_governor = allocate(/obj/item/organ/cyberimp/cyberware/governor_delete)
+	new_governor.forceMove(rig)
+	rig.begin_install(new_governor)
+	TEST_ASSERT(rig.busy, "Governor replacement at 35 failed its projected check")
+	rig.finish_install()
+	TEST_ASSERT_EQUAL(new_governor.owner, patient, "Cradle rejected a netted Governor replacement at 35")
+	TEST_ASSERT(!governor.owner && (governor in rig.tray), "Successful Governor replacement didn't rack the old Governor")
+	TEST_ASSERT_EQUAL(get_chrome_capacity(patient), 35, "Governor replacement changed capacity")
+	TEST_ASSERT_EQUAL(get_chrome_load(patient), 35, "Governor replacement changed installed load")
+
+/datum/unit_test/voidcrew_cradle_generic_projection
+
+/datum/unit_test/voidcrew_cradle_generic_projection/Run()
+	var/obj/machinery/chrome_cradle/rig = allocate(/obj/machinery/chrome_cradle)
+	var/mob/living/carbon/human/patient = allocate(/mob/living/carbon/human/consistent)
+	var/obj/item/organ/cyberimp/cyberware/test_nineteen/bulk = allocate(/obj/item/organ/cyberimp/cyberware/test_nineteen)
+	var/obj/item/organ/eyes/robotic/incumbent = allocate(/obj/item/organ/eyes/robotic)
+	var/obj/item/organ/eyes/robotic/cyberware/nightshade/optics = allocate(/obj/item/organ/eyes/robotic/cyberware/nightshade)
+	bulk.Insert(patient, TRUE)
+	incumbent.Insert(patient, TRUE)
+	rig.selected_ware = optics
+	var/list/projection = rig.build_projection(patient, "carried")
+	TEST_ASSERT_EQUAL(projection["load"], 20, "Cradle projection didn't net out generic robotic eyes")
+	TEST_ASSERT_EQUAL(get_chrome_load(patient), 20, "Building a Cradle projection changed the body")
+
 /// (i) Gecko Grips: the clamp is a refusal of the involuntary drop itself, so
 /// what it does and does not refuse is the whole ware. Everything below is a
 /// real drop attempt rather than a state check, because the failure this
@@ -621,20 +719,408 @@
 	TEST_ASSERT(!(mesh.organ_flags & ORGAN_FAILING), "A tune-up didn't bring the EMP'd ware back online")
 	TEST_ASSERT_EQUAL(lab_rat.physiology.armor.get_rating(MELEE), plated, "Repaired chrome didn't hand its plating back")
 
-	// One pulse, then the capacitors have to vent. Both pulses below land in
-	// the same tick, so the shortened recharge can't finish between them; it
-	// is shortened only so the recharge timer doesn't outlive the test.
+	// Protection and notification must have distinct signals. The first pulse
+	// is absorbed; the next one arrives before the one-minute recharge.
+	TEST_ASSERT(COMSIG_ATOM_PRE_EMP_ACT != COMSIG_ATOM_EMP_ACT, "EMP protection collides with EMP notification")
 	var/obj/item/organ/heart/cybernetic/anomalock/prebuilt/shield = allocate(/obj/item/organ/heart/cybernetic/anomalock/prebuilt)
-	shield.emp_absorb_cooldown_time = 1
+	TEST_ASSERT_EQUAL(shield.emp_absorb_cooldown_time, 1 MINUTES, "Voltaic recharge changed")
 	TEST_ASSERT(shield.Insert(lab_rat, special = TRUE), "Test fixture: Voltaic cyberheart staging insert was refused")
 
 	lab_rat.emp_act(EMP_HEAVY)
 	TEST_ASSERT(!(mesh.organ_flags & ORGAN_FAILING), "The Voltaic cyberheart didn't absorb the first pulse")
+	TEST_ASSERT_EQUAL(COOLDOWN_TIMELEFT(shield, emp_absorb_cooldown), 1 MINUTES, "Absorption didn't start the one-minute recharge")
 
 	lab_rat.emp_act(EMP_HEAVY)
 	TEST_ASSERT(mesh.organ_flags & ORGAN_FAILING, "The Voltaic cyberheart ate a second pulse on drained capacitors. It must only ever cover one")
+	chrome.tune_up()
+	// Advance only the charge clock, without sleeping through a minute of world processing.
+	shield.emp_absorb_cooldown = world.time
+	lab_rat.emp_act(EMP_HEAVY)
+	TEST_ASSERT(chrome.is_running(), "A recharged Voltaic heart failed to absorb another pulse")
 
 	// Pulling the core first: a cored heart tesla-zaps the room on removal,
 	// and teardown removes it.
 	QDEL_NULL(shield.core)
 
+/// Non-chrome fixtures use production installation hooks and costs.
+/obj/item/organ/cyberimp/cyberware/test_nineteen
+	zone = BODY_ZONE_CHEST
+	slot = "voidcrew_test_chrome_bulk"
+	chrome_load = 19
+
+/obj/item/implant/voidcrew_capacity_test
+	allow_multiple = TRUE
+
+/datum/unit_test/voidcrew_installed_capacity_mixed
+
+/datum/unit_test/voidcrew_installed_capacity_mixed/Run()
+	var/mob/living/carbon/human/patient = allocate(/mob/living/carbon/human/consistent)
+	TEST_ASSERT_EQUAL(get_chrome_load(patient), 0, "Organic anatomy costs capacity")
+	var/obj/item/organ/cyberimp/cyberware/test_heavy/chrome = allocate(/obj/item/organ/cyberimp/cyberware/test_heavy)
+	var/obj/item/organ/cyberimp/brain/anti_drop/implant_organ = allocate(/obj/item/organ/cyberimp/brain/anti_drop)
+	var/obj/item/organ/heart/cybernetic/heart = allocate(/obj/item/organ/heart/cybernetic)
+	var/obj/item/implant/voidcrew_capacity_test/implant = allocate(/obj/item/implant/voidcrew_capacity_test)
+	TEST_ASSERT(chrome.Insert(patient, TRUE), "Chrome fixture failed")
+	TEST_ASSERT(implant_organ.Insert(patient), "TG cyber implant failed")
+	TEST_ASSERT(heart.Insert(patient), "Robotic heart failed")
+	TEST_ASSERT(implant.implant(patient), "Implant fixture failed")
+	var/datum/status_effect/bioware/nerves/grounded/bioware = patient.apply_status_effect(/datum/status_effect/bioware/nerves/grounded)
+	TEST_ASSERT(bioware, "Bioware fixture failed")
+	var/datum/component/nanites/nanites = patient.AddComponent(/datum/component/nanites)
+	var/datum/nanite_program/protocol/kickstart/protocol = allocate(/datum/nanite_program/protocol/kickstart)
+	protocol.activated = FALSE
+	TEST_ASSERT_EQUAL(nanites.add_program(null, protocol), 1, "Protocol fixture failed") // COMPONENT_PROGRAM_INSTALLED
+	TEST_ASSERT_EQUAL(get_chrome_load(patient), 20, "Mixed installed sources weren't counted exactly once")
+	TEST_ASSERT(!(chrome.organ_flags & ORGAN_FAILING), "The exact 20 boundary browned out")
+	var/obj/item/bodypart/arm/left/robot/arm = allocate(/obj/item/bodypart/arm/left/robot)
+	TEST_ASSERT(arm.replace_limb(patient, TRUE), "Free prosthetic failed at capacity")
+	TEST_ASSERT_EQUAL(get_chrome_load(patient), 20, "Prosthetic limb costs capacity")
+	// Generic replacements net the incumbent before upstream can delete it.
+	var/obj/item/organ/heart/cybernetic/replacement = allocate(/obj/item/organ/heart/cybernetic)
+	TEST_ASSERT(replacement.Insert(patient, FALSE, DELETE_IF_REPLACED), "Netted robotic-organ replacement failed at 20")
+	TEST_ASSERT(QDELETED(heart), "Successful replacement didn't follow DELETE_IF_REPLACED")
+	TEST_ASSERT_EQUAL(get_chrome_load(patient), 20, "Robotic-organ replacement double-counted")
+	var/obj/item/implant/voidcrew_capacity_test/refused = allocate(/obj/item/implant/voidcrew_capacity_test)
+	var/atom/old_location = refused.loc
+	TEST_ASSERT(!refused.implant(patient), "Over-budget implant was accepted")
+	TEST_ASSERT(!QDELETED(refused) && !refused.imp_in && refused.loc == old_location, "Rejected implantation consumed or moved the item")
+	var/stun_mod = patient.physiology.stun_mod
+	TEST_ASSERT(!patient.apply_status_effect(/datum/status_effect/bioware/ligaments/reinforced), "Over-budget bioware was accepted")
+	TEST_ASSERT_EQUAL(patient.physiology.stun_mod, stun_mod, "Rejected bioware changed physiology")
+	qdel(protocol)
+	TEST_ASSERT_EQUAL(get_chrome_load(patient), 19, "Program deletion didn't release capacity")
+	TEST_ASSERT(refused.implant(patient), "Released capacity didn't allow implantation")
+	implant.removed(patient)
+	TEST_ASSERT_EQUAL(get_chrome_load(patient), 19, "Implant removal didn't release capacity")
+
+/datum/unit_test/voidcrew_installed_capacity_rejections
+
+/datum/unit_test/voidcrew_installed_capacity_rejections/Run()
+	var/mob/living/carbon/human/patient = allocate(/mob/living/carbon/human/consistent)
+	var/obj/item/organ/cyberimp/cyberware/test_full_body/bulk = allocate(/obj/item/organ/cyberimp/cyberware/test_full_body)
+	bulk.Insert(patient, TRUE)
+	var/obj/item/organ/heart/incumbent = patient.get_organ_slot(ORGAN_SLOT_HEART)
+	var/obj/item/organ/heart/cybernetic/refused = allocate(/obj/item/organ/heart/cybernetic)
+	var/atom/old_location = refused.loc
+	TEST_ASSERT(!refused.Insert(patient, FALSE, DELETE_IF_REPLACED), "Robotic heart was installed over capacity")
+	TEST_ASSERT_EQUAL(patient.get_organ_slot(ORGAN_SLOT_HEART), incumbent, "Rejected replacement removed the incumbent")
+	TEST_ASSERT(!QDELETED(incumbent) && !QDELETED(refused), "Rejected replacement deleted an organ")
+	TEST_ASSERT_EQUAL(refused.loc, old_location, "Rejected replacement moved the new organ")
+	TEST_ASSERT(!patient.apply_status_effect(/datum/status_effect/bioware/nerves/spliced), "Bioware was applied over capacity")
+	TEST_ASSERT_EQUAL(patient.physiology.stun_mod, 1, "Refused bioware ran its removal effect without applying")
+	// An attached limb can carry installed organs, even though the limb itself is free.
+	var/obj/item/bodypart/arm/left/robot/arm = allocate(/obj/item/bodypart/arm/left/robot)
+	var/obj/item/organ/cyberimp/cyberware/test_arm/packed = allocate(/obj/item/organ/cyberimp/cyberware/test_arm)
+	packed.bodypart_insert(arm)
+	var/obj/item/bodypart/original_arm = patient.get_bodypart(BODY_ZONE_L_ARM)
+	TEST_ASSERT(!arm.replace_limb(patient, TRUE), "A loaded prosthetic bypassed capacity")
+	TEST_ASSERT_EQUAL(patient.get_bodypart(BODY_ZONE_L_ARM), original_arm, "Rejected prosthetic replacement detached the original limb")
+	TEST_ASSERT_EQUAL(packed.loc, arm, "Rejected prosthetic lost its organ")
+	TEST_ASSERT(!QDELETED(arm) && !QDELETED(packed), "Rejected prosthetic replacement consumed items")
+	// Net a generic robotic eye out when replacing it with chrome optics.
+	bulk.Remove(patient, TRUE)
+	var/obj/item/organ/cyberimp/cyberware/test_nineteen/nineteen = allocate(/obj/item/organ/cyberimp/cyberware/test_nineteen)
+	nineteen.Insert(patient, TRUE)
+	var/obj/item/organ/eyes/robotic/robotic_eyes = allocate(/obj/item/organ/eyes/robotic)
+	TEST_ASSERT(robotic_eyes.Insert(patient), "Generic eye fixture failed")
+	var/obj/item/organ/eyes/robotic/cyberware/nightshade/optics = allocate(/obj/item/organ/eyes/robotic/cyberware/nightshade)
+	var/datum/component/cyberware/optics_chrome = optics.GetComponent(/datum/component/cyberware)
+	optics_chrome.grant_install_context(patient)
+	TEST_ASSERT(optics.Insert(patient), "Chrome replacement didn't net out generic robotic eyes")
+	TEST_ASSERT_EQUAL(get_chrome_load(patient), 20, "Chrome optics counted as both chrome and robotic anatomy")
+
+/// Capacity can change between surgery's preop check and its insertion step.
+/datum/unit_test/voidcrew_surgery_capacity_recheck
+
+/datum/unit_test/voidcrew_surgery_capacity_recheck/Run()
+	var/mob/living/carbon/human/patient = allocate(/mob/living/carbon/human/consistent)
+	var/mob/living/carbon/human/surgeon = allocate(/mob/living/carbon/human/consistent)
+	var/obj/item/organ/cyberimp/cyberware/test_nineteen/bulk = allocate(/obj/item/organ/cyberimp/cyberware/test_nineteen)
+	var/obj/item/organ/cyberimp/cyberware/test_small/extra = allocate(/obj/item/organ/cyberimp/cyberware/test_small)
+	bulk.Insert(patient, TRUE)
+	var/obj/item/organ/cyberimp/brain/anti_drop/implant = allocate(/obj/item/organ/cyberimp/brain/anti_drop)
+	surgeon.put_in_hands(implant)
+	TEST_ASSERT(implant.pre_surgical_insertion(surgeon, patient, BODY_ZONE_HEAD), "Surgical capacity fixture didn't initially fit")
+	extra.Insert(patient, TRUE)
+	var/datum/surgery_step/manipulate_organs/step = allocate(/datum/surgery_step/manipulate_organs)
+	step.current_type = "insert"
+	step.target_organ = implant
+	TEST_ASSERT_EQUAL(step.success(surgeon, patient, BODY_ZONE_HEAD, implant, null), SURGERY_STEP_FAIL, "Surgery didn't recheck capacity after its delay")
+	TEST_ASSERT(surgeon.is_holding(implant), "Late surgical refusal unequipped the new organ")
+	TEST_ASSERT(!QDELETED(implant) && !implant.owner, "Late surgical refusal consumed or installed the organ")
+
+/datum/unit_test/voidcrew_governor_capacity
+
+/datum/unit_test/voidcrew_governor_capacity/Run()
+	var/mob/living/carbon/human/patient = allocate(/mob/living/carbon/human/consistent)
+	var/obj/item/organ/cyberimp/cyberware/governor_delete/governor = allocate(/obj/item/organ/cyberimp/cyberware/governor_delete)
+	TEST_ASSERT_EQUAL(governor.zone, BODY_ZONE_CHEST, "Governor isn't chest hardware")
+	for(var/os_type in list(/obj/item/organ/cyberimp/cyberware/cascade, /obj/item/organ/cyberimp/cyberware/redline))
+		var/obj/item/organ/os = os_type
+		TEST_ASSERT_EQUAL(governor.slot, initial(os.slot), "Governor doesn't share the OS slot with [os_type]")
+	TEST_ASSERT(governor.Insert(patient, TRUE), "Governor fixture failed")
+	TEST_ASSERT_EQUAL(get_chrome_capacity(patient), 35, "Governor must yield 35 capacity")
+	var/obj/item/organ/cyberimp/cyberware/test_full_body/bulk = allocate(/obj/item/organ/cyberimp/cyberware/test_full_body)
+	var/obj/item/organ/cyberimp/cyberware/test_heavy/heavy = allocate(/obj/item/organ/cyberimp/cyberware/test_heavy)
+	bulk.Insert(patient, TRUE)
+	heavy.Insert(patient, TRUE)
+	TEST_ASSERT_EQUAL(get_chrome_load(patient), 35, "35 boundary fixture is wrong")
+	var/datum/component/cyberware/heavy_chrome = heavy.GetComponent(/datum/component/cyberware)
+	TEST_ASSERT(heavy_chrome.is_running(), "35/35 browned out")
+	var/obj/item/organ/cyberimp/cyberware/test_small/extra = allocate(/obj/item/organ/cyberimp/cyberware/test_small)
+	TEST_ASSERT(!cyberware_insert_check(extra, patient, TRUE), "36/35 passed the capacity gate")
+	var/obj/item/organ/cyberimp/cyberware/governor_delete/replacement = allocate(/obj/item/organ/cyberimp/cyberware/governor_delete)
+	var/datum/component/cyberware/replacement_chrome = replacement.GetComponent(/datum/component/cyberware)
+	replacement_chrome.grant_install_context(patient)
+	TEST_ASSERT(replacement.Insert(patient), "Governor replacement double-counted its bonus")
+	var/obj/item/organ/cyberimp/cyberware/cascade/cascade = allocate(/obj/item/organ/cyberimp/cyberware/cascade)
+	TEST_ASSERT(!cyberware_insert_check(cascade, patient, TRUE), "OS replacement kept the evicted Governor's capacity")
+	TEST_ASSERT_EQUAL(replacement.owner, patient, "Rejected OS replacement evicted the Governor")
+	replacement.Remove(patient, TRUE)
+	TEST_ASSERT_EQUAL(get_chrome_capacity(patient), 20, "Governor removal retained its bonus")
+	TEST_ASSERT(!heavy_chrome.is_running(), "Capacity loss didn't brown out chrome")
+	heavy.Remove(patient, TRUE)
+	var/datum/component/cyberware/bulk_chrome = bulk.GetComponent(/datum/component/cyberware)
+	TEST_ASSERT(bulk_chrome.is_running(), "Removal didn't recover chrome at 20")
+	bulk.Remove(patient, TRUE)
+	TEST_ASSERT(cascade.Insert(patient, TRUE), "OS fixture failed")
+	TEST_ASSERT(governor.Insert(patient, TRUE), "Governor couldn't replace an OS")
+	TEST_ASSERT(!cascade.owner && governor.owner == patient, "Chest OS hardware stacked")
+
+/// Every approved exception is checked independently of the table under test.
+/datum/unit_test/voidcrew_nanite_capacity_costs
+
+/datum/unit_test/voidcrew_nanite_capacity_costs/Run()
+	var/list/cost_groups = list(
+		list(/datum/nanite_program/regenerative_advanced, /datum/nanite_program/defib),
+		list(/datum/nanite_program/regenerative, /datum/nanite_program/repairing, /datum/nanite_program/hardening, /datum/nanite_program/refractive, /datum/nanite_program/nervous, /datum/nanite_program/adrenaline),
+		list(/datum/nanite_program/purging, /datum/nanite_program/purging_advanced, /datum/nanite_program/brain_heal_advanced, /datum/nanite_program/coagulating, /datum/nanite_program/access, /datum/nanite_program/viral, /datum/nanite_program/emp, /datum/nanite_program/spreading),
+		list(/datum/nanite_program/brain_heal, /datum/nanite_program/blood_restoring, /datum/nanite_program/temperature, /datum/nanite_program/conductive, /datum/nanite_program/mindshield, /datum/nanite_program/self_scan, /datum/nanite_program/stealth, /datum/nanite_program/metabolic_synthesis, /datum/nanite_program/mitosis, /datum/nanite_program/nanite_sting),
+		list(/datum/nanite_program/relay, /datum/nanite_program/dermal_button, /datum/nanite_program/sensor/repeat, /datum/nanite_program/sensor/relay_repeat, /datum/nanite_program/reduced_diagnostics, /datum/nanite_program/monitoring, /datum/nanite_program/poison, /datum/nanite_program/glitch, /datum/nanite_program/paralyzing),
+	)
+	var/list/costs = list(6, 3, 2, 1, 0)
+	for(var/index in 1 to length(cost_groups))
+		for(var/program_type in cost_groups[index])
+			var/datum/nanite_program/program = allocate(program_type)
+			TEST_ASSERT_EQUAL(program.capacity_cost(), costs[index], "Wrong capacity for [program_type]")
+			program.activated = FALSE
+			program.force_disabled = TRUE
+			TEST_ASSERT_EQUAL(program.capacity_cost(), costs[index], "Disabling [program_type] made it free")
+	var/mob/living/carbon/human/patient = allocate(/mob/living/carbon/human/consistent)
+	var/datum/component/nanites/nanites = patient.AddComponent(/datum/component/nanites)
+	for(var/program_type in subtypesof(/datum/nanite_program/protocol))
+		var/datum/nanite_program/protocol/program = allocate(program_type)
+		program.activated = FALSE
+		program.force_disabled = TRUE
+		TEST_ASSERT_EQUAL(nanites.add_program(null, program), 1, "Protocol installation failed")
+	TEST_ASSERT_EQUAL(get_chrome_load(patient), length(subtypesof(/datum/nanite_program/protocol)), "Inactive/exclusive protocols were free")
+	var/datum/nanite_program/defib/old_program = allocate(/datum/nanite_program/defib)
+	old_program.activated = FALSE
+	TEST_ASSERT_EQUAL(nanites.add_program(null, old_program), 1, "Disabled program installation failed")
+	var/old_load = get_chrome_load(patient)
+	var/datum/nanite_program/defib/new_program = allocate(/datum/nanite_program/defib)
+	TEST_ASSERT_EQUAL(nanites.add_program(null, new_program), 1, "Netted nanite replacement failed")
+	TEST_ASSERT(QDELETED(old_program), "Replaced program survived")
+	TEST_ASSERT_EQUAL(get_chrome_load(patient), old_load, "Nanite replacement doubled its cost")
+	var/obj/item/organ/cyberimp/cyberware/test_full_body/bulk = allocate(/obj/item/organ/cyberimp/cyberware/test_full_body)
+	bulk.Insert(patient, TRUE)
+	var/datum/nanite_program/defib/refused = allocate(/datum/nanite_program/defib)
+	refused.activation_code = 42
+	TEST_ASSERT_EQUAL(nanites.add_program(null, refused), 2, "Over-budget replacement was accepted")
+	TEST_ASSERT(!QDELETED(new_program) && new_program in nanites.programs, "Rejected replacement deleted its incumbent")
+	TEST_ASSERT(!QDELETED(refused) && !refused.nanites, "Rejected replacement consumed the new program")
+	// A different paid program cannot consume an over-budget body's remaining programming.
+	var/datum/nanite_program/hardening/rejected = allocate(/datum/nanite_program/hardening)
+	TEST_ASSERT_EQUAL(nanites.add_program(null, rejected), 2, "Over-budget nanite installation succeeded") // COMPONENT_PROGRAM_NOT_INSTALLED
+	TEST_ASSERT(!QDELETED(rejected) && !rejected.nanites, "Rejected nanite program was consumed")
+	TEST_ASSERT(new_program in nanites.programs, "Rejected nanite install removed existing programming")
+
+/datum/unit_test/voidcrew_nanite_capacity_sync
+
+/datum/unit_test/voidcrew_nanite_capacity_sync/Run()
+	var/mob/living/carbon/human/patient = allocate(/mob/living/carbon/human/consistent)
+	var/obj/item/organ/cyberimp/cyberware/test_heavy/heavy = allocate(/obj/item/organ/cyberimp/cyberware/test_heavy)
+	heavy.Insert(patient, TRUE)
+	var/datum/component/nanites/nanites = patient.AddComponent(/datum/component/nanites)
+	var/datum/nanite_program/hardening/incumbent = allocate(/datum/nanite_program/hardening)
+	var/datum/nanite_program/brain_heal/shared = allocate(/datum/nanite_program/brain_heal)
+	nanites.add_program(null, incumbent)
+	nanites.add_program(null, shared)
+	shared.activation_code = 12
+	shared.activated = FALSE
+	var/obj/machinery/computer/nanite_cloud_controller/controller = allocate(/obj/machinery/computer/nanite_cloud_controller)
+	var/datum/nanite_cloud_backup/backup = allocate(/datum/nanite_cloud_backup, controller)
+	var/datum/component/nanites/cloud = backup.AddComponent(/datum/component/nanites)
+	backup.nanites = cloud
+	var/datum/nanite_program/brain_heal/cloud_shared = allocate(/datum/nanite_program/brain_heal)
+	cloud_shared.activation_code = 34
+	var/datum/nanite_program/nervous/cloud_new = allocate(/datum/nanite_program/nervous)
+	cloud.add_program(null, cloud_new)
+	cloud.add_program(null, cloud_shared)
+	var/list/excess = list()
+	for(var/program_type in list(/datum/nanite_program/defib, /datum/nanite_program/regenerative_advanced, /datum/nanite_program/repairing, /datum/nanite_program/hardening))
+		var/datum/nanite_program/program = allocate(program_type)
+		TEST_ASSERT_EQUAL(cloud.add_program(null, program), 1, "Hostless backup was capacity-limited")
+		excess += program
+	TEST_ASSERT(cloud.programs_fit_capacity(cloud.programs), "Hostless cloud has a body capacity")
+	TEST_ASSERT_EQUAL(nanites.sync_programming(cloud, TRUE, TRUE), 4, "Over-budget cloud sync did not report refusal") // NANITE_SYNC_REFUSED
+	TEST_ASSERT(incumbent in nanites.programs, "Rejected cloud sync deleted an incumbent")
+	TEST_ASSERT_EQUAL(shared.activation_code, 12, "Rejected cloud sync copied settings")
+	TEST_ASSERT(!shared.activated, "Rejected cloud sync copied activation")
+	TEST_ASSERT_EQUAL(length(nanites.programs), 2, "Rejected cloud sync partially installed programs")
+	for(var/datum/nanite_program/program in excess)
+		qdel(program)
+	TEST_ASSERT(nanites.sync_programming(cloud), "Fitting cloud sync didn't commit")
+	TEST_ASSERT(QDELETED(incumbent), "Committed cloud sync didn't remove old programming")
+	TEST_ASSERT_EQUAL(shared.activation_code, 34, "Committed cloud sync didn't copy settings")
+	TEST_ASSERT_EQUAL(get_chrome_load(patient), 19, "Cloud sync didn't net its complete replacement set")
+	var/datum/component/cyberware/chrome = heavy.GetComponent(/datum/component/cyberware)
+	chrome.set_browned_out(TRUE)
+	// Identical programming still has to settle capacity; reordering the cloud is immaterial.
+	cloud.programs.Swap(1, 2)
+	TEST_ASSERT_EQUAL(nanites.sync_programming(cloud), 0, "Identical resync reported a programming change")
+	TEST_ASSERT(chrome.is_running(), "Unchanged resync didn't recalculate brownout")
+	// A partial sync must count the programs it retains, too.
+	var/datum/nanite_program/hardening/additional = allocate(/datum/nanite_program/hardening)
+	cloud.add_program(null, additional)
+	TEST_ASSERT_EQUAL(nanites.sync_programming(cloud, FALSE), 4, "Partial cloud sync ignored retained program load") // NANITE_SYNC_REFUSED
+	TEST_ASSERT_EQUAL(length(nanites.programs), 2, "Rejected partial sync changed programming")
+
+/datum/unit_test/voidcrew_nanite_capacity_recovery
+
+/datum/unit_test/voidcrew_nanite_capacity_recovery/Run()
+	var/mob/living/carbon/human/patient = allocate(/mob/living/carbon/human/consistent)
+	var/obj/item/organ/cyberimp/cyberware/governor_delete/governor = allocate(/obj/item/organ/cyberimp/cyberware/governor_delete)
+	var/obj/item/organ/cyberimp/cyberware/test_heavy/heavy = allocate(/obj/item/organ/cyberimp/cyberware/test_heavy)
+	var/obj/item/organ/heart/cybernetic/heart = allocate(/obj/item/organ/heart/cybernetic)
+	governor.Insert(patient, TRUE)
+	heavy.Insert(patient, TRUE)
+	heart.Insert(patient)
+	var/datum/component/nanites/nanites = patient.AddComponent(/datum/component/nanites)
+	var/datum/nanite_program/hardening/armor = allocate(/datum/nanite_program/hardening)
+	var/datum/nanite_program/adrenaline/burst = allocate(/datum/nanite_program/adrenaline)
+	nanites.add_program(null, armor)
+	nanites.add_program(null, burst)
+	var/bare_armor = patient.physiology.armor.get_rating(MELEE)
+	armor.on_process()
+	TEST_ASSERT(armor.passive_enabled, "Beneficial passive didn't start")
+	governor.Remove(patient, TRUE)
+	TEST_ASSERT(!armor.passive_enabled, "Capacity loss retained beneficial nanite armor")
+	TEST_ASSERT_EQUAL(patient.physiology.armor.get_rating(MELEE), bare_armor, "Paused nanites retained armor")
+	TEST_ASSERT(!(heart.organ_flags & ORGAN_FAILING), "Capacity loss shut down a vital TG organ")
+	var/volume = nanites.nanite_volume
+	armor.on_process()
+	burst.trigger()
+	TEST_ASSERT_EQUAL(nanites.nanite_volume, volume, "Over-budget beneficial nanites consumed fuel")
+	TEST_ASSERT_EQUAL(burst.next_trigger, 0, "A paused beneficial trigger spent its cooldown")
+	TEST_ASSERT(!patient.reagents.has_reagent(/datum/reagent/medicine/stimulants), "Paused Adrenaline Burst fired")
+	for(var/program_type in list(/datum/nanite_program/glitch, /datum/nanite_program/poison, /datum/nanite_program/paralyzing, /datum/nanite_program/sensor/repeat, /datum/nanite_program/monitoring))
+		var/datum/nanite_program/hostile = allocate(program_type)
+		var/load = get_chrome_load(patient)
+		TEST_ASSERT_EQUAL(nanites.add_program(null, hostile), 1, "Zero-cost payload was refused over capacity")
+		TEST_ASSERT_EQUAL(get_chrome_load(patient), load, "Zero-cost payload sabotaged capacity")
+		TEST_ASSERT(!hostile.capacity_blocked(), "Capacity paused a hostile/free program")
+	qdel(burst)
+	TEST_ASSERT_EQUAL(get_chrome_load(patient), 19, "Deletion didn't release beneficial program load")
+	var/datum/component/cyberware/chrome = heavy.GetComponent(/datum/component/cyberware)
+	TEST_ASSERT(chrome.is_running(), "Deleting a program didn't recover chrome")
+	armor.on_process()
+	TEST_ASSERT(armor.passive_enabled, "Beneficial nanites didn't resume after recovery")
+	qdel(nanites)
+	TEST_ASSERT_EQUAL(get_chrome_load(patient), 16, "Deleting nanites retained installed program costs")
+	TEST_ASSERT_EQUAL(patient.physiology.armor.get_rating(MELEE), bare_armor, "Deleting recovered nanites retained their armor")
+
+/datum/unit_test/voidcrew_cyberware_running_gates
+
+/datum/unit_test/voidcrew_cyberware_running_gates/Run()
+	var/mob/living/carbon/human/patient = allocate(/mob/living/carbon/human/consistent)
+	var/obj/item/organ/eyes/robotic/cyberware/nightshade/eyes = allocate(/obj/item/organ/eyes/robotic/cyberware/nightshade)
+	eyes.Insert(patient, TRUE)
+	var/datum/component/cyberware/eye_chrome = eyes.GetComponent(/datum/component/cyberware)
+	var/datum/action/cooldown/cyberware/chrome_read/read = locate() in eyes.actions
+	TEST_ASSERT(read, "Chrome read action fixture missing")
+	TEST_ASSERT(read.IsAvailable(), "Installed healthy optics action unavailable")
+	eyes.set_organ_damage(eyes.maxHealth)
+	eye_chrome.start_emp_reboot()
+	eyes.set_organ_damage(0)
+	TEST_ASSERT(eye_chrome.emp_down, "Organ repair cleared EMP downtime")
+	TEST_ASSERT(!eye_chrome.is_running() && !read.IsAvailable(), "Healing eyes reopened buttons before reboot")
+	// The running predicate must remain authoritative even if another caller clears the shared bit.
+	eyes.organ_flags &= ~ORGAN_FAILING
+	TEST_ASSERT(!read.IsAvailable(), "Clearing the shared failing flag bypassed EMP downtime")
+	eye_chrome.tune_up()
+	TEST_ASSERT(read.IsAvailable(), "Finished reboot didn't restore the action")
+	read.StartCooldown(1 MINUTES)
+	var/ready_at = read.next_use_time
+	eyes.Remove(patient, TRUE)
+	TEST_ASSERT(!eye_chrome.is_running() && !read.IsAvailable(), "Removed optics still running")
+	eyes.Insert(patient, TRUE)
+	TEST_ASSERT_EQUAL(read.next_use_time, ready_at, "Removing/reinstalling reset an ability cooldown")
+	var/obj/item/organ/cyberimp/arm/toolkit/cyberware/mantis/arm = allocate(/obj/item/organ/cyberimp/arm/toolkit/cyberware/mantis)
+	arm.Insert(patient, TRUE)
+	var/datum/component/cyberware/arm_chrome = arm.GetComponent(/datum/component/cyberware)
+	var/obj/item/blade = arm.contents[1]
+	arm.Extend(blade)
+	TEST_ASSERT(arm.active_item == blade && blade.loc == patient, "Arm deployment fixture failed")
+	arm_chrome.start_emp_reboot()
+	TEST_ASSERT(!arm.active_item && blade.loc == arm, "EMP left chrome arm hardware deployed")
+	arm.organ_flags &= ~ORGAN_FAILING
+	arm.Extend(blade)
+	TEST_ASSERT(blade.loc == arm, "Arm deployed during EMP reboot after shared flag was cleared")
+	arm_chrome.tune_up()
+	arm.Extend(blade)
+	arm.set_organ_damage(arm.maxHealth)
+	TEST_ASSERT(!arm.active_item && blade.loc == arm, "Damage failure left chrome arm hardware deployed")
+	arm_chrome.tune_up()
+	arm.Extend(blade)
+	var/obj/item/organ/cyberimp/cyberware/test_full_body/bulk = allocate(/obj/item/organ/cyberimp/cyberware/test_full_body)
+	bulk.Insert(patient, TRUE)
+	TEST_ASSERT(!arm.active_item && blade.loc == arm, "Brownout left chrome arm hardware deployed")
+	bulk.Remove(patient, TRUE)
+	arm.Extend(blade)
+	TEST_ASSERT_EQUAL(arm.active_item, blade, "Capacity recovery didn't restore arm deployment")
+	arm.Remove(patient, TRUE)
+	TEST_ASSERT(!arm.active_item && blade.loc == arm, "Removal left arm hardware deployed")
+
+/datum/unit_test/voidcrew_cyberware_lazarus_windup
+
+/datum/unit_test/voidcrew_cyberware_lazarus_windup/Run()
+	var/mob/living/carbon/human/patient = allocate(/mob/living/carbon/human/consistent)
+	var/obj/item/organ/cyberimp/cyberware/lazarus/node = allocate(/obj/item/organ/cyberimp/cyberware/lazarus)
+	node.Insert(patient, TRUE)
+	var/datum/component/cyberware/chrome = node.GetComponent(/datum/component/cyberware)
+	patient.stat = SOFT_CRIT
+	node.on_stat_change(patient, SOFT_CRIT, CONSCIOUS)
+	var/first_generation = node.jolt_generation
+	TEST_ASSERT(node.jolting, "Lazarus didn't wind up")
+	TEST_ASSERT(COOLDOWN_FINISHED(node, jolt_cooldown), "Windup consumed Lazarus charge")
+	chrome.start_emp_reboot()
+	TEST_ASSERT(!node.jolting, "EMP didn't cancel Lazarus windup")
+	chrome.tune_up()
+	node.jolt(first_generation, WEAKREF(patient))
+	TEST_ASSERT(COOLDOWN_FINISHED(node, jolt_cooldown), "Cancelled EMP windup consumed charge")
+	node.on_stat_change(patient, SOFT_CRIT, CONSCIOUS)
+	var/removed_generation = node.jolt_generation
+	node.Remove(patient, TRUE)
+	node.Insert(patient, TRUE)
+	node.on_stat_change(patient, SOFT_CRIT, CONSCIOUS)
+	var/current_generation = node.jolt_generation
+	node.jolt(removed_generation, WEAKREF(patient))
+	TEST_ASSERT(node.jolting, "A stale Lazarus callback cancelled the new windup")
+	TEST_ASSERT(COOLDOWN_FINISHED(node, jolt_cooldown), "Removal/reinstall allowed a stale callback to discharge")
+	patient.stat = DEAD
+	node.jolt(current_generation, WEAKREF(patient))
+	TEST_ASSERT(COOLDOWN_FINISHED(node, jolt_cooldown), "Dead patient consumed Lazarus charge")
+	patient.stat = SOFT_CRIT
+	node.on_stat_change(patient, SOFT_CRIT, CONSCIOUS)
+	patient.stat = CONSCIOUS
+	node.jolt(node.jolt_generation, WEAKREF(patient))
+	TEST_ASSERT(COOLDOWN_FINISHED(node, jolt_cooldown), "Recovered patient consumed Lazarus charge")
+	patient.stat = SOFT_CRIT
+	node.on_stat_change(patient, SOFT_CRIT, CONSCIOUS)
+	node.jolt(node.jolt_generation, WEAKREF(patient))
+	TEST_ASSERT_EQUAL(COOLDOWN_TIMELEFT(node, jolt_cooldown), 6 MINUTES, "Successful discharge didn't start the six-minute cooldown")
+	var/ready_at = node.jolt_cooldown
+	node.Remove(patient, TRUE)
+	node.Insert(patient, TRUE)
+	TEST_ASSERT_EQUAL(node.jolt_cooldown, ready_at, "Removal/reinstall reset Lazarus cooldown")
diff --git a/voidcrew/modules/unit_tests/voidcrew_derelict_layout.dm b/voidcrew/modules/unit_tests/voidcrew_derelict_layout.dm
index daefc48d266..aa49e8e1668 100644
--- a/voidcrew/modules/unit_tests/voidcrew_derelict_layout.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_derelict_layout.dm
@@ -122,3 +122,35 @@
 		TEST_ASSERT(fixture.on, "A light stayed off in a relit berth (status [fixture.status])")
 
 	qdel(berth)
+
+/// Shared mob types must use the designated boss role after theme-specific setup.
+/datum/derelict_theme/npc_zone_test
+	id = "npc_zone_test"
+
+/datum/derelict_theme/npc_zone_test/prepare_hostile(mob/living/hostile)
+	hostile.setMaxHealth(200)
+	hostile.setBruteLoss(50)
+	hostile.melee_damage_lower = 30
+	hostile.melee_damage_upper = 40
+
+/datum/unit_test/voidcrew_derelict_zone_profiles/Run()
+	var/obj/structure/overmap/dynamic/player_outpost/derelict/site = allocate(/obj/structure/overmap/dynamic/player_outpost/derelict)
+	var/datum/derelict_scene/scene = allocate(/datum/derelict_scene, site)
+	var/datum/derelict_theme/theme = allocate(/datum/derelict_theme/npc_zone_test)
+	for(var/band in 1 to 3)
+		site.derelict_band = band
+		for(var/role in list("ordinary", "boss"))
+			var/list/mob/living/spawned = list()
+			var/mob/living/body = scene.add_hostile(theme, /mob/living/basic/npc_zone_test/replacement, run_loc_floor_bottom_left, role, spawned)
+			TEST_ASSERT_NOTNULL(body, "Derelict route lost its replacement")
+			TEST_ASSERT_EQUAL(length(spawned), 1, "Derelict registered a discarded precursor")
+			TEST_ASSERT_EQUAL(body.npc_spawn_context.source_id, REF(site), "Derelict hostile lost site identity")
+			TEST_ASSERT_EQUAL(body.npc_zone_role, role, "Designated derelict boss was treated as its ordinary shared type")
+			var/health_factor = band == 1 ? 1 : (role == "boss" ? (band == 2 ? 1.15 : 1.3) : (band == 2 ? 1.35 : 1.8))
+			var/damage_factor = band == 1 ? 1 : (role == "boss" ? (band == 2 ? 1.1 : 1.2) : (band == 2 ? 1.15 : 1.35))
+			TEST_ASSERT(abs(body.maxHealth - 200 * health_factor) < 0.001, "Derelict finalized before theme health setup")
+			TEST_ASSERT(abs(body.health / body.maxHealth - 0.75) < 0.001, "Derelict profile healed theme damage")
+			TEST_ASSERT(abs(body.melee_damage_upper - 40 * damage_factor) < 0.001, "Derelict theme melee missed the selected factor")
+			body.npc_spawn_context.finalize()
+			TEST_ASSERT(abs(body.maxHealth - 200 * health_factor) < 0.001, "Derelict retained a stacking multiplier")
+			qdel(body)
diff --git a/voidcrew/modules/unit_tests/voidcrew_derelict_themes.dm b/voidcrew/modules/unit_tests/voidcrew_derelict_themes.dm
index 6e5ee77512b..32be804e6ee 100644
--- a/voidcrew/modules/unit_tests/voidcrew_derelict_themes.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_derelict_themes.dm
@@ -96,9 +96,10 @@
 		if(generator)
 			// DERELICT_GENERATOR_CLEAR_RADIUS
 			TEST_ASSERT(get_dist(hostile, generator) > 4, "[theme_id]: [hostile] starts within 4 of the generator")
-		// DERELICT_BOSS_HEALTH_MULT_* 1.5 / 2, DERELICT_HEALTH_MULT_* 1.5 / 1.8
-		var/multiplier = i == 1 ? (red ? 2 : 1.5) : (red ? 1.8 : 1.5)
-		TEST_ASSERT_EQUAL(hostile.maxHealth, round(initial(hostile.maxHealth) * multiplier), "[theme_id]: [hostile]'s health was not scaled by [multiplier]")
+		// Named boss types retain their boss role even in the regular roster.
+		var/is_boss = i == 1 || npc_zone_boss_type(hostile.type)
+		var/multiplier = is_boss ? (red ? 1.3 : 1.15) : (red ? 1.8 : 1.35)
+		TEST_ASSERT(abs(hostile.maxHealth - hostile.npc_zone_original_max_health * multiplier) < 0.001, "[theme_id]: [hostile]'s health was not scaled by [multiplier]")
 
 /// Dressing stays under DERELICT_MAX_DRESSING (160); lights break at the theme's rate, give or take one fixture
 /datum/unit_test/voidcrew_derelict_theme/proc/check_dressing(obj/structure/overmap/dynamic/player_outpost/derelict/site, placed, dressing_before, list/lights_before)
diff --git a/voidcrew/modules/unit_tests/voidcrew_destructive_analyzer.dm b/voidcrew/modules/unit_tests/voidcrew_destructive_analyzer.dm
new file mode 100644
index 00000000000..5ae48ec268c
--- /dev/null
+++ b/voidcrew/modules/unit_tests/voidcrew_destructive_analyzer.dm
@@ -0,0 +1,72 @@
+/// An analyzer with no research web still returns its window data with a sample loaded.
+/datum/unit_test/voidcrew_analyzer_without_web
+
+/datum/unit_test/voidcrew_analyzer_without_web/Run()
+	var/mob/living/carbon/human/user = allocate(/mob/living/carbon/human/consistent)
+	var/obj/machinery/rnd/destructive_analyzer/analyzer = allocate(/obj/machinery/rnd/destructive_analyzer)
+	analyzer.connect_techweb(null)
+	TEST_ASSERT_NULL(analyzer.stored_research, "The analyzer fixture kept a research web")
+	var/obj/item/crowbar/sample = allocate(/obj/item/crowbar, analyzer)
+	analyzer.loaded_item = sample
+
+	var/list/data = analyzer.ui_data(user)
+	TEST_ASSERT(islist(data), "An unlinked analyzer with a sample returned no window data")
+	TEST_ASSERT(!data["server_connected"], "An unlinked analyzer reported a research server")
+	var/list/static_data = analyzer.ui_static_data(user)
+	TEST_ASSERT_NOTNULL(static_data["research_point_id"], "An unlinked analyzer returned no static window data")
+
+	TEST_ASSERT(!analyzer.user_try_decon_id("research_points"), "An unlinked analyzer accepted a breakdown")
+	TEST_ASSERT(!analyzer.destroy_item(TRUE), "An unlinked analyzer destroyed its sample")
+	TEST_ASSERT_EQUAL(analyzer.loaded_item, sample, "An unlinked analyzer lost its sample")
+	TEST_ASSERT(!QDELETED(sample), "An unlinked analyzer deleted its sample")
+
+	// A web deleted out from under the analyzer counts as no web.
+	var/datum/techweb/doomed = allocate(/datum/techweb)
+	analyzer.stored_research = doomed
+	qdel(doomed)
+	data = analyzer.ui_data(user)
+	TEST_ASSERT(!data["server_connected"], "An analyzer reported a deleted research web as a server")
+	analyzer.stored_research = null
+	analyzer.unload_item()
+
+/**
+ * A built analyzer aboard a ship links to that ship's server with a plain left-click of the
+ * server's multitool, and loses the link again when the source disk comes out.
+ * Uses the one-tile ship from voidcrew_research_lifecycle.dm.
+ */
+/datum/unit_test/voidcrew_experiment_reward_fixture/analyzer_ship_link/Run()
+	var/obj/structure/overmap/ship/ship = make_reward_ship(run_loc_floor_bottom_left)
+	var/mob/living/carbon/human/user = allocate(/mob/living/carbon/human/consistent)
+	user.set_combat_mode(FALSE)
+	var/obj/machinery/rnd/server/ship/server = allocate(/obj/machinery/rnd/server/ship)
+	var/datum/techweb/web = install_reward_disk(server, user)
+	var/obj/machinery/rnd/destructive_analyzer/analyzer = allocate(/obj/machinery/rnd/destructive_analyzer)
+	TEST_ASSERT_EQUAL(get_research_service_site(analyzer), ship, "The analyzer fixture is not aboard the ship")
+
+	var/obj/item/multitool/tool = allocate(/obj/item/multitool)
+	user.put_in_active_hand(tool)
+	server.multitool_act(user, tool)
+	TEST_ASSERT_EQUAL(tool.buffer, web, "The ship server did not copy its web to the multitool")
+
+	// Powered, idle and closed, so the analyzer would accept a sample.
+	analyzer.set_is_operational(TRUE)
+	analyzer.machine_stat = NONE
+	click_wrapper(user, analyzer)
+	TEST_ASSERT_EQUAL(analyzer.stored_research, web, "A left-click with the server's multitool did not link the analyzer")
+	TEST_ASSERT_NULL(analyzer.loaded_item, "A left-click with the server's multitool loaded it as a sample")
+	TEST_ASSERT_EQUAL(tool.loc, user, "Linking took the multitool out of the user's hand")
+
+	// Once linked to that web, the same multitool is just a sample again.
+	click_wrapper(user, analyzer)
+	TEST_ASSERT_EQUAL(analyzer.loaded_item, tool, "A multitool for the already linked web was not loaded as a sample")
+	TEST_ASSERT_EQUAL(analyzer.stored_research, web, "Loading a sample changed the analyzer's link")
+	var/list/data = analyzer.ui_data(user)
+	TEST_ASSERT(data["server_connected"], "A linked analyzer reported no research server")
+
+	server.source_code_hdd.forceMove(run_loc_floor_bottom_left)
+	TEST_ASSERT_NULL(analyzer.stored_research, "Removing the source disk left the analyzer linked")
+	data = analyzer.ui_data(user)
+	TEST_ASSERT(!data["server_connected"], "An analyzer whose disk was removed reported a research server")
+	TEST_ASSERT_EQUAL(analyzer.loaded_item, tool, "Removing the source disk lost the analyzer's sample")
+	analyzer.busy = FALSE
+	analyzer.unload_item()
diff --git a/voidcrew/modules/unit_tests/voidcrew_economy_metrics.dm b/voidcrew/modules/unit_tests/voidcrew_economy_metrics.dm
index d9ba0c1492a..fc2426df0ce 100644
--- a/voidcrew/modules/unit_tests/voidcrew_economy_metrics.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_economy_metrics.dm
@@ -99,3 +99,101 @@
 	SSmetrics.pending = old_pending
 	SSmetrics.tallies = old_tallies
 	return ..()
+
+/// Printable disks have no special export reward, regardless of their saved programs.
+/datum/unit_test/voidcrew_nanite_disk_exports/Run()
+	if(!length(GLOB.exports_list))
+		setupExports()
+	var/datum/export/nanite_disk/disk_export = locate(/datum/export/nanite_disk) in GLOB.exports_list
+	TEST_ASSERT_NOTNULL(disk_export, "The nanite disk export should exist")
+	TEST_ASSERT_EQUAL(disk_export.cost, 0, "Nanite disks should have no special export reward")
+	TEST_ASSERT_EQUAL(disk_export.init_cost, 0, "Non-elastic nanite disk valuation should also be zero")
+
+	var/datum/design/nanite_disk/design = allocate(/datum/design/nanite_disk)
+	var/obj/item/disk/nanite_program/source_disk = allocate(design.build_path)
+	var/datum/nanite_program/source_program = new /datum/nanite_program/regenerative
+	source_program.trigger_code = 321
+	source_disk.backup += source_program
+
+	for(var/apply_elastic in list(FALSE, TRUE))
+		var/datum/export_report/sale_report = allocate(/datum/export_report)
+		for(var/batch in 1 to 3)
+			for(var/disk_state in list("blank", "programmed", "copied"))
+				var/obj/item/disk/nanite_program/disk = allocate(design.build_path)
+				// Fabricated items retain the materials spent on their design.
+				disk.set_custom_materials(design.materials)
+				switch(disk_state)
+					if("programmed")
+						disk.backup += new /datum/nanite_program/regenerative
+					if("copied")
+						// The cloud controller saves backups through program.copy().
+						var/datum/nanite_program/copied_program = source_program.copy()
+						disk.backup += copied_program
+						TEST_ASSERT(copied_program != source_program, "A copied disk should contain an independent program")
+						TEST_ASSERT_EQUAL(copied_program.trigger_code, 321, "The copied disk should retain its saved programming")
+
+				var/context = "[disk_state] disk, batch [batch], elasticity [apply_elastic]"
+				TEST_ASSERT_EQUAL(disk_export.get_cost(disk, apply_elastic), 0, "[context] should have no special export value")
+				var/backup_count = length(disk.backup)
+				var/datum/export_report/quote = export_item_and_contents(disk, apply_elastic = apply_elastic, dry_run = TRUE)
+				TEST_ASSERT_NULL(quote.total_value[disk_export], "Dry-run valuation should not reward [context]")
+				TEST_ASSERT_NULL(quote.total_amount[disk_export], "Dry-run valuation should not count [context] as a special export")
+				TEST_ASSERT(!QDELETED(disk), "Dry-run valuation should preserve [context]")
+				TEST_ASSERT_EQUAL(length(disk.backup), backup_count, "Dry-run valuation should preserve the programs on [context]")
+				qdel(quote)
+
+				var/list/recyclable = disk.get_material_composition()
+				TEST_ASSERT_EQUAL(recyclable[GET_MATERIAL_REF(/datum/material/iron)], 300, "[context] should retain its recyclable iron")
+				TEST_ASSERT_EQUAL(recyclable[GET_MATERIAL_REF(/datum/material/glass)], 100, "[context] should retain its recyclable glass")
+				export_item_and_contents(disk, apply_elastic = apply_elastic, dry_run = FALSE, external_report = sale_report)
+				TEST_ASSERT(QDELETED(disk), "An actual cargo export should consume [context]")
+				TEST_ASSERT_NULL(sale_report.total_value[disk_export], "Repeated manufacture/export should not reward [context]")
+				TEST_ASSERT_NULL(sale_report.total_amount[disk_export], "Repeated manufacture/export should not count [context] as a special export")
+
+	disk_export.process()
+	TEST_ASSERT_EQUAL(disk_export.cost, 0, "Export price recovery should not restore a nanite disk reward")
+
+/// Cargo quotes and sales pay only for the shell, even with large exotic gas mixtures.
+/datum/unit_test/voidcrew_gas_canister_exports
+	var/datum/export/large/gas_canister/canister_export
+	var/saved_cost
+
+/datum/unit_test/voidcrew_gas_canister_exports/Run()
+	if(!length(GLOB.exports_list))
+		setupExports()
+	canister_export = locate(/datum/export/large/gas_canister) in GLOB.exports_list
+	TEST_ASSERT_NOTNULL(canister_export, "The gas canister export should exist")
+	saved_cost = canister_export.cost
+	var/list/fillings = list(
+		"empty" = list(),
+		"tritium" = list(/datum/gas/tritium = 1000000),
+		"mixed" = list(/datum/gas/antinoblium = 1000000, /datum/gas/nitrium = 1000000),
+	)
+	for(var/apply_elastic in list(FALSE, TRUE))
+		for(var/dry_run in list(TRUE, FALSE))
+			var/empty_value
+			for(var/filling in fillings)
+				var/obj/machinery/portable_atmospherics/canister/canister = allocate(/obj/machinery/portable_atmospherics/canister)
+				var/datum/gas_mixture/mixture = canister.return_air()
+				var/list/gases = fillings[filling]
+				for(var/gas_type in gases)
+					mixture.assert_gas(gas_type)
+					mixture.gases[gas_type][MOLES] = gases[gas_type]
+				// Compare each filling at the same shell price before sale elasticity.
+				canister_export.cost = canister_export.init_cost
+				var/datum/export_report/report = allocate(/datum/export_report)
+				export_item_and_contents(canister, apply_elastic = apply_elastic, dry_run = dry_run, external_report = report)
+				var/value = counterlist_sum(report.total_value)
+				var/context = "[filling] canister, elasticity [apply_elastic], dry run [dry_run]"
+				TEST_ASSERT_EQUAL(report.total_amount[canister_export], 1, "Cargo should count one shell for [context]")
+				TEST_ASSERT_EQUAL(value, canister_export.init_cost, "Cargo should pay only the shell value for [context]")
+				if(filling == "empty")
+					empty_value = value
+				else
+					TEST_ASSERT_EQUAL(value, empty_value, "Gas contents should not increase the empty canister payout for [context]")
+				TEST_ASSERT_EQUAL(!!QDELETED(canister), !dry_run, "Only an actual cargo sale should consume [context]")
+
+/datum/unit_test/voidcrew_gas_canister_exports/Destroy()
+	if(canister_export)
+		canister_export.cost = saved_cost
+	return ..()
diff --git a/voidcrew/modules/unit_tests/voidcrew_event_horizon.dm b/voidcrew/modules/unit_tests/voidcrew_event_horizon.dm
new file mode 100644
index 00000000000..e1388b0dbe5
--- /dev/null
+++ b/voidcrew/modules/unit_tests/voidcrew_event_horizon.dm
@@ -0,0 +1,86 @@
+/// The sole difference from master's rifle is the missing scope.
+/datum/unit_test/voidcrew_event_horizon_defaults/Run()
+	var/obj/item/gun/energy/event_horizon/rifle = allocate(/obj/item/gun/energy/event_horizon)
+	TEST_ASSERT_NULL(rifle.GetComponent(/datum/component/scope), "A new Event Horizon must have no scope.")
+	TEST_ASSERT(rifle.selfcharge, "The Event Horizon must recharge itself.")
+	TEST_ASSERT(rifle.can_charge, "The Event Horizon must accept external charging.")
+	TEST_ASSERT_EQUAL(rifle.get_cell(null, null), rifle.cell, "The Event Horizon must expose its cell to chargers.")
+	TEST_ASSERT_EQUAL(rifle.self_charge_amount, STANDARD_ENERGY_GUN_SELF_CHARGE_RATE * 10, "The Event Horizon's recharge rate must match master.")
+	TEST_ASSERT(!(rifle.gun_flags & TURRET_INCOMPATIBLE), "The Event Horizon must fit emitters and turrets.")
+	var/obj/item/ammo_casing/energy/event_horizon/shot = rifle.ammo_type[rifle.select]
+	TEST_ASSERT_EQUAL(shot.e_cost, LASER_SHOTS(1, STANDARD_CELL_CHARGE), "The Event Horizon must expend a full standard cell per shot.")
+	TEST_ASSERT_EQUAL(rifle.fire_delay, shot.delay, "The Event Horizon must use its upstream firing delay.")
+	var/obj/projectile/beam/event_horizon/projectile = shot.loaded_projectile
+	TEST_ASSERT(istype(projectile), "The Event Horizon must fire its upstream beam.")
+	TEST_ASSERT_EQUAL(projectile.damage, 100, "The Event Horizon beam must deal master's damage.")
+	TEST_ASSERT_EQUAL(projectile.damage_type, BURN, "The Event Horizon beam must deal burn damage.")
+	TEST_ASSERT_EQUAL(projectile.range, 150, "The Event Horizon beam must keep master's range.")
+
+/// Exercise real firing and recharging without releasing a destructive projectile in the test room.
+/datum/unit_test/voidcrew_event_horizon_firing/Run()
+	var/obj/item/gun/energy/event_horizon/rifle = allocate(/obj/item/gun/energy/event_horizon)
+	var/mob/living/carbon/human/consistent/user = allocate(/mob/living/carbon/human/consistent)
+	TEST_ASSERT(!HAS_TRAIT(user, TRAIT_USER_SCOPED), "The shooter must start unscoped.")
+	var/obj/item/ammo_casing/energy/original_shot = rifle.ammo_type[rifle.select]
+	var/obj/item/ammo_casing/energy/event_horizon/unit_test/shot = allocate(/obj/item/ammo_casing/energy/event_horizon/unit_test, rifle)
+	rifle.ammo_type[rifle.select] = shot
+	rifle.chambered = shot
+	qdel(original_shot)
+	TEST_ASSERT(rifle.process_fire(run_loc_floor_top_right, user, FALSE, null, "", 0), "The Event Horizon must fire without scoping.")
+	TEST_ASSERT_EQUAL(rifle.cell.charge, 0, "One shot must empty the Event Horizon's cell.")
+	TEST_ASSERT(!rifle.can_shoot(), "An empty Event Horizon must not fire.")
+	rifle.process(rifle.charge_delay)
+	TEST_ASSERT_EQUAL(rifle.cell.charge, rifle.cell.maxcharge, "The Event Horizon must regain a full shot at master's recharge rate.")
+	// Recharge and clear only the ordinary gun cooldown; the old 20-second rifle cooldown would still block this.
+	rifle.reset_fire_cd()
+	TEST_ASSERT(rifle.process_fire(run_loc_floor_top_right, user, FALSE, null, "", 0), "A recharged Event Horizon must fire again without the old rifle cooldown.")
+	TEST_ASSERT_EQUAL(rifle.cell.charge, 0, "The recharged shot must spend the cell again.")
+	TEST_ASSERT(!HAS_TRAIT(user, TRAIT_USER_SCOPED), "Firing the Event Horizon must not scope the shooter.")
+
+/obj/item/ammo_casing/energy/event_horizon/unit_test/fire_casing(atom/target, mob/living/user, params, distro, quiet, zone_override, spread, atom/fired_from)
+	// Only substitute projectile launch; the rifle still chambers, consumes charge and recharges normally.
+	QDEL_NULL(loaded_projectile)
+	return TRUE
+
+/// A beam hit spawns master's temporary tear, which consumes people as well as the room.
+/datum/unit_test/voidcrew_event_horizon_tear/Run()
+	var/mob/living/carbon/human/consistent/victim = allocate(/mob/living/carbon/human/consistent)
+	var/obj/item/pen/fixture = allocate(/obj/item/pen)
+	var/obj/projectile/beam/event_horizon/projectile = allocate(/obj/projectile/beam/event_horizon)
+	projectile.on_hit(victim, 0, FALSE)
+	var/obj/reality_tear/temporary/tear = locate(/obj/reality_tear/temporary) in run_loc_floor_bottom_left
+	TEST_ASSERT_NOTNULL(tear, "An Event Horizon hit must create a temporary reality tear.")
+	var/datum/component/singularity/singularity = tear.GetComponent(/datum/component/singularity)
+	TEST_ASSERT_NOTNULL(singularity, "The Event Horizon tear must start its singularity.")
+	// Consume only the chosen targets, without damaging test-room turfs or other tests.
+	STOP_PROCESSING(SSsinguloprocess, singularity)
+	TEST_ASSERT_EQUAL(victim.getFireLoss(), 0, "The hit callback must not add the nerf's extra 200 burn damage.")
+	TEST_ASSERT_EQUAL(singularity.consume_range, 2, "The Event Horizon tear must keep master's consumption radius.")
+	TEST_ASSERT_EQUAL(singularity.grav_pull, 3, "The Event Horizon tear must keep master's pull radius.")
+	TEST_ASSERT_EQUAL(singularity.singularity_size, STAGE_SIX, "The Event Horizon tear must keep master's singularity strength.")
+	TEST_ASSERT(!singularity.roaming, "The Event Horizon tear must remain stationary.")
+	TEST_ASSERT_EQUAL(tear.collapse_spawn_time, 2 SECONDS, "The Event Horizon tear must keep master's lifetime.")
+	singularity.consume(tear, fixture)
+	TEST_ASSERT(QDELETED(fixture), "The Event Horizon tear must consume nearby objects.")
+	singularity.consume(tear, victim)
+	TEST_ASSERT(QDELETED(victim), "The Event Horizon tear must gib and consume people.")
+	tear.reality_collapse()
+	TEST_ASSERT(QDELETED(tear), "The temporary tear must disappear when it collapses.")
+	TEST_ASSERT_NULL(locate(/obj/singularity) in run_loc_floor_bottom_left, "The temporary tear must not leave a wandering singularity.")
+
+/// Both machine installation paths must accept the rifle and retain its beam.
+/datum/unit_test/voidcrew_event_horizon_mounting/Run()
+	var/mob/living/carbon/human/consistent/user = allocate(/mob/living/carbon/human/consistent)
+	var/obj/item/gun/energy/event_horizon/emitter_rifle = allocate(/obj/item/gun/energy/event_horizon)
+	var/obj/machinery/power/emitter/emitter = allocate(/obj/machinery/power/emitter)
+	TEST_ASSERT(user.put_in_hands(emitter_rifle), "The shooter must hold the rifle for emitter installation.")
+	TEST_ASSERT(emitter.integrate(emitter_rifle, user), "An emitter must accept the Event Horizon.")
+	TEST_ASSERT_EQUAL(emitter.gun, emitter_rifle, "The emitter must retain its installed Event Horizon.")
+	TEST_ASSERT_EQUAL(emitter.gun_properties["lethal_projectile"], /obj/projectile/beam/event_horizon, "The emitter must retain the Event Horizon's beam.")
+	var/obj/item/gun/energy/event_horizon/turret_rifle = allocate(/obj/item/gun/energy/event_horizon)
+	var/obj/machinery/porta_turret_construct/frame = allocate(/obj/machinery/porta_turret_construct)
+	frame.build_step = 3 // PTURRET_INTERNAL_ARMOUR_ON (local to portable_turret_construct.dm).
+	TEST_ASSERT(user.put_in_hands(turret_rifle), "The shooter must hold the rifle for turret installation.")
+	frame.attackby(turret_rifle, user, list(), list())
+	TEST_ASSERT_EQUAL(frame.installed_gun, turret_rifle, "A turret frame must accept the Event Horizon.")
+	TEST_ASSERT_EQUAL(frame.build_step, 4, "Installing the Event Horizon must advance turret construction.") // PTURRET_GUN_EQUIPPED
diff --git a/voidcrew/modules/unit_tests/voidcrew_fresh_cores.dm b/voidcrew/modules/unit_tests/voidcrew_fresh_cores.dm
new file mode 100644
index 00000000000..abf8b537379
--- /dev/null
+++ b/voidcrew/modules/unit_tests/voidcrew_fresh_cores.dm
@@ -0,0 +1,126 @@
+// Vex wants legion cores fresh or stabilized, on contracts and at the voucher window,
+// and Sawbones wants every monster gland the same way.
+// Fork defines compile after tests; mission item results are literals here.
+
+/// Supply contracts refuse a rotted core, checked on the core at hand-over.
+/datum/unit_test/voidcrew_fresh_cores_contract/Run()
+	var/obj/structure/overmap/ship/receiving_ship = allocate(/obj/structure/overmap/ship)
+	receiving_ship.ship_account = allocate(/datum/bank_account)
+	var/datum/mission/mission = allocate(/datum/mission)
+	mission.requires_item = TRUE
+	mission.servant = receiving_ship
+	mission.active = TRUE
+	var/datum/mission_objective/deliver/procurement/ask = new
+	ask.required_type = /obj/item/organ/monster_core/regenerative_core/legion
+	ask.required_amount = 2
+	mission.add_objective(ask)
+
+	var/obj/item/organ/monster_core/regenerative_core/legion/dead = allocate(/obj/item/organ/monster_core/regenerative_core/legion)
+	TEST_ASSERT(dead.go_inert(), "The fixture core would not rot")
+	TEST_ASSERT(ask.matches_ask(dead), "A rotted core must still read as the asked goods, so the refusal can name it")
+	TEST_ASSERT(!mission.can_turn_in(dead), "A rotted core satisfied the contract")
+	TEST_ASSERT_EQUAL(mission.get_failure_reason(dead), "That core's gone dead.", "A rotted core had the wrong refusal")
+	TEST_ASSERT(!mission.turn_in(run_loc_floor_bottom_left, dead), "A rotted core was accepted")
+	TEST_ASSERT_EQUAL(ask.accept_item(dead, run_loc_floor_bottom_left), 0, "Direct acceptance took a rotted core") // MISSION_ITEM_REFUSED
+	TEST_ASSERT(!QDELETED(dead), "A refused core was consumed")
+	TEST_ASSERT_EQUAL(ask.delivered_count, 0, "A rotted core counted toward the contract")
+
+	var/obj/item/organ/monster_core/regenerative_core/legion/fresh = allocate(/obj/item/organ/monster_core/regenerative_core/legion)
+	TEST_ASSERT_EQUAL(mission.pick_turn_in_item(list(dead, fresh)), fresh, "The pad offered a rotted core ahead of a fresh one")
+	TEST_ASSERT_EQUAL(mission.pick_turn_in_item(list(dead)), dead, "A lone rotted core must stay available for its refusal")
+
+	// A core that rots while it waits on the pad is judged as it is at hand-over
+	var/obj/item/organ/monster_core/regenerative_core/legion/rotting = allocate(/obj/item/organ/monster_core/regenerative_core/legion)
+	TEST_ASSERT(mission.can_turn_in(rotting), "A fresh core was refused before it rotted")
+	TEST_ASSERT(rotting.go_inert(), "The waiting core would not rot")
+	TEST_ASSERT(!mission.turn_in(run_loc_floor_bottom_left, rotting), "A core that rotted on the pad was accepted")
+	TEST_ASSERT(!QDELETED(rotting), "A core that rotted on the pad was consumed")
+
+	TEST_ASSERT(mission.turn_in(run_loc_floor_bottom_left, fresh), "A fresh core was refused")
+	TEST_ASSERT(QDELETED(fresh), "The fresh core was not consumed")
+	TEST_ASSERT_EQUAL(ask.delivered_count, 1, "The fresh core did not count")
+	TEST_ASSERT(!mission.turn_in(run_loc_floor_bottom_left, fresh), "A consumed core was counted twice")
+
+	var/obj/item/organ/monster_core/regenerative_core/legion/stabilized = allocate(/obj/item/organ/monster_core/regenerative_core/legion)
+	TEST_ASSERT(stabilized.preserve(), "The fixture core would not stabilize")
+	TEST_ASSERT(mission.turn_in(run_loc_floor_bottom_left, stabilized), "A stabilized core was refused")
+	TEST_ASSERT(QDELETED(stabilized), "The stabilized core was not consumed")
+	TEST_ASSERT(QDELETED(mission), "Two good cores did not finish the contract")
+	TEST_ASSERT(!QDELETED(dead), "Finishing the contract consumed the rotted core")
+
+/// Vex's voucher window refuses a rotted core and pays for a fresh or stabilized one.
+/datum/unit_test/voidcrew_fresh_cores_vouchers/Run()
+	var/mob/living/carbon/human/seller = allocate(/mob/living/carbon/human/consistent, run_loc_floor_bottom_left)
+	var/datum/shop_buyback/black_market/legion_core/ledger = allocate(/datum/shop_buyback/black_market/legion_core)
+	ledger.demand = 5
+
+	var/obj/item/organ/monster_core/regenerative_core/legion/dead = allocate(/obj/item/organ/monster_core/regenerative_core/legion)
+	TEST_ASSERT(dead.go_inert(), "The fixture core would not rot")
+	TEST_ASSERT(seller.put_in_hands(dead), "The seller could not hold the rotted core")
+	TEST_ASSERT(!ledger.matches(dead), "Vex's window matched a rotted core")
+	TEST_ASSERT_EQUAL(ledger.count_carried_units(seller), 0, "A rotted core counted as goods to sell")
+	TEST_ASSERT_EQUAL(ledger.get_denial_reason(seller), "That core's gone dead.", "A rotted core had the wrong refusal")
+	TEST_ASSERT(!ledger.try_sell(seller, null), "Vex bought a rotted core")
+	TEST_ASSERT_EQUAL(ledger.try_sell_bulk(seller, null), 0, "A bulk sale took a rotted core")
+	TEST_ASSERT(!QDELETED(dead), "A refused core was consumed")
+	TEST_ASSERT_EQUAL(ledger.demand, 5, "A refused core used up demand")
+	var/obj/item/stack/trade_voucher/unearned = locate() in seller.get_all_contents()
+	TEST_ASSERT_NULL(unearned, "A rotted core paid a voucher")
+
+	var/obj/item/organ/monster_core/regenerative_core/legion/fresh = allocate(/obj/item/organ/monster_core/regenerative_core/legion)
+	TEST_ASSERT(seller.put_in_hands(fresh), "The seller could not hold the fresh core")
+	TEST_ASSERT_NULL(ledger.get_denial_reason(seller), "A fresh core was refused")
+	TEST_ASSERT(ledger.try_sell(seller, null), "Vex refused a fresh core")
+	TEST_ASSERT(QDELETED(fresh), "The fresh core was not consumed")
+	TEST_ASSERT(!QDELETED(dead), "The sale took the rotted core instead of the fresh one")
+	TEST_ASSERT_EQUAL(ledger.demand, 4, "The fresh sale did not use one demand")
+	var/obj/item/stack/trade_voucher/payout = locate() in seller.get_all_contents()
+	TEST_ASSERT_NOTNULL(payout, "The fresh core paid no voucher")
+	TEST_ASSERT_EQUAL(payout.amount, 1, "The fresh core paid the wrong number of vouchers")
+	qdel(payout)
+
+	var/obj/item/organ/monster_core/regenerative_core/legion/stabilized = allocate(/obj/item/organ/monster_core/regenerative_core/legion)
+	TEST_ASSERT(stabilized.preserve(), "The fixture core would not stabilize")
+	TEST_ASSERT(seller.put_in_hands(stabilized), "The seller could not hold the stabilized core")
+	TEST_ASSERT(ledger.try_sell(seller, null), "Vex refused a stabilized core")
+	TEST_ASSERT(QDELETED(stabilized), "The stabilized core was not consumed")
+	TEST_ASSERT_EQUAL(ledger.demand, 3, "The stabilized sale did not use one demand")
+	TEST_ASSERT(!QDELETED(dead), "Selling the stabilized core took the rotted one")
+
+/// Sawbones' gland intake refuses any rotted monster gland and pays for a fresh or stabilized one.
+/datum/unit_test/voidcrew_fresh_cores_clinic/Run()
+	var/mob/living/carbon/human/seller = allocate(/mob/living/carbon/human/consistent, run_loc_floor_bottom_left)
+	var/obj/item/card/id/id = allocate(/obj/item/card/id)
+	var/datum/bank_account/account = allocate(/datum/bank_account, "Gland test", null, 1, FALSE)
+	id.registered_account = account
+	TEST_ASSERT(seller.put_in_hands(id), "The seller could not hold their ID")
+	var/datum/shop_buyback/clinic/monster_gland/ledger = allocate(/datum/shop_buyback/clinic/monster_gland)
+	ledger.demand = 5
+	var/balance = account.account_balance
+
+	var/obj/item/organ/monster_core/rush_gland/dead = allocate(/obj/item/organ/monster_core/rush_gland, seller)
+	TEST_ASSERT(dead.go_inert(), "The fixture gland would not rot")
+	TEST_ASSERT(!ledger.matches(dead), "Sawbones matched a rotted gland")
+	TEST_ASSERT_EQUAL(ledger.count_carried_units(seller), 0, "A rotted gland counted as goods to sell")
+	TEST_ASSERT_EQUAL(ledger.get_denial_reason(seller), "That core's gone dead.", "A rotted gland had the wrong refusal")
+	TEST_ASSERT(!ledger.try_sell(seller, null), "Sawbones bought a rotted gland")
+	TEST_ASSERT_EQUAL(ledger.try_sell_bulk(seller, null), 0, "A bulk sale took a rotted gland")
+	TEST_ASSERT(!QDELETED(dead), "A refused gland was consumed")
+	TEST_ASSERT_EQUAL(ledger.demand, 5, "A refused gland used up demand")
+	TEST_ASSERT_EQUAL(account.account_balance, balance, "A rotted gland was paid for")
+
+	var/obj/item/organ/monster_core/regenerative_core/legion/fresh = allocate(/obj/item/organ/monster_core/regenerative_core/legion, seller)
+	TEST_ASSERT_NULL(ledger.get_denial_reason(seller), "A fresh core was refused")
+	TEST_ASSERT(ledger.try_sell(seller, null), "Sawbones refused a fresh core")
+	TEST_ASSERT(QDELETED(fresh), "The fresh core was not consumed")
+	TEST_ASSERT(!QDELETED(dead), "The sale took the rotted gland instead of the fresh core")
+	TEST_ASSERT_EQUAL(ledger.demand, 4, "The fresh sale did not use one demand")
+	TEST_ASSERT_EQUAL(account.account_balance, balance + 250, "The fresh core paid the wrong amount")
+
+	var/obj/item/organ/monster_core/rush_gland/stabilized = allocate(/obj/item/organ/monster_core/rush_gland, seller)
+	TEST_ASSERT(stabilized.preserve(), "The fixture gland would not stabilize")
+	TEST_ASSERT(ledger.try_sell(seller, null), "Sawbones refused a stabilized gland")
+	TEST_ASSERT(QDELETED(stabilized), "The stabilized gland was not consumed")
+	TEST_ASSERT(!QDELETED(dead), "Selling the stabilized gland took the rotted one")
+	TEST_ASSERT_EQUAL(ledger.demand, 3, "The stabilized sale did not use one demand")
+	TEST_ASSERT_EQUAL(account.account_balance, balance + 500, "The stabilized gland paid the wrong amount")
diff --git a/voidcrew/modules/unit_tests/voidcrew_helm_access.dm b/voidcrew/modules/unit_tests/voidcrew_helm_access.dm
index 061d0ed35b3..d1cd51ca4ee 100644
--- a/voidcrew/modules/unit_tests/voidcrew_helm_access.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_helm_access.dm
@@ -90,9 +90,26 @@
 		TEST_ASSERT(helm.test_item_interaction(user, tool, ranged = TRUE) & ITEM_INTERACT_BLOCKING, "An enemy's ranged [item_type] must also stop.")
 		TEST_ASSERT(!QDELETED(tool), "Rejected items must not be consumed.")
 
-	// Membership in another team is fine if this hull has also enlisted the user.
+	// Low-level HUD enrollment cannot put one player in two different crews.
 	ship.ship_team.add_member(user.mind)
-	TEST_ASSERT(helm.is_crew_member(user), "A member of both crews must have access.")
+	TEST_ASSERT(!helm.is_crew_member(user), "HUD enrollment must not bypass the user's current crew.")
+	TEST_ASSERT(user.mind in enemy_ship.ship_team.members, "Rejected HUD enrollment removed the user's current crew.")
+	TEST_ASSERT(ship.enlist_crewmember(user), "An explicit enlistment must switch the user's crew.")
+	TEST_ASSERT(!(user.mind in enemy_ship.ship_team.members), "Joining another crew must revoke the old hull's membership.")
+	TEST_ASSERT_EQUAL(user.mind.get_reputation_crew(), ship.get_crew_record(), "Enlistment must bind the new crew.")
+	TEST_ASSERT(helm.is_crew_member(user), "The enlisted crewmember must have access.")
+	// One continuing crew may enroll the same member on several hulls.
+	var/obj/structure/overmap/ship/allied_ship = allocate(/obj/structure/overmap/ship)
+	allied_ship.ship_team = new /datum/team/voidcrew()
+	allied_ship.ship_team.ship = allied_ship
+	TEST_ASSERT(allied_ship.bind_reputation_crew(user.mind), "A second hull could not continue the crew.")
+	TEST_ASSERT(allied_ship.enlist_crewmember(user), "The same crew could not enroll its member on a second hull.")
+	var/obj/machinery/computer/helm/allied_helm = allocate(/obj/machinery/computer/helm)
+	allied_helm.set_current_ship(allied_ship)
+	TEST_ASSERT(helm.is_crew_member(user) && allied_helm.is_crew_member(user), "One crew's member must retain access on both enrolled hulls.")
+	var/obj/machinery/computer/helm/enemy_helm = allocate(/obj/machinery/computer/helm)
+	enemy_helm.set_current_ship(enemy_ship)
+	TEST_ASSERT(!enemy_helm.is_crew_member(user), "Switching crews must lock the former crew's helm.")
 	TEST_ASSERT(helm.can_interact(user), "Crew must retain normal helm interaction.")
 	TEST_ASSERT_EQUAL(helm.ui_status(user, GLOB.default_state), UI_INTERACTIVE, "Crew must retain an interactive UI.")
 	ui_data = helm.ui_data(user)
@@ -102,6 +119,7 @@
 	helm.test_mouse_drop(user)
 	TEST_ASSERT_NOTNULL(helm.GetComponent(/datum/component/leanable/helm), "Crew must be able to make the helm leanable.")
 	ship.ship_team.remove_member(user.mind)
+	TEST_ASSERT(allied_helm.is_crew_member(user), "Leaving one hull must retain access on the same crew's other hull.")
 	TEST_ASSERT_EQUAL(helm.ui_status(user, GLOB.default_state), UI_INTERACTIVE, "Removing a crewmember must leave the locked UI visible.")
 	ui_data = helm.ui_data(user)
 	TEST_ASSERT(ui_data["isNotCrew"], "Removing a crewmember must lock an already open UI on its next update.")
@@ -144,6 +162,7 @@
 	TEST_ASSERT(QDELETED(helm), "A crewmember must still be able to dismantle the console.")
 	TEST_ASSERT_NOTNULL(locate(/obj/structure/frame/computer) in user.loc, "Crew deconstruction must leave a computer frame.")
 	ship.ship_team.remove_member(user.mind)
+	allied_ship.ship_team.remove_member(user.mind)
 	enemy_ship.ship_team.remove_member(user.mind)
 
 /// NPC authorization keys may establish ownership, but may not steal a crewed hull.
@@ -160,6 +179,9 @@
 	key.set_ship(ship)
 	TEST_ASSERT(!helm.is_crew_member(claimer), "An unclaimed NPC hull must still reject ordinary helm use.")
 	key.melee_attack_chain(claimer, helm, list())
+	TEST_ASSERT(!QDELETED(key) && !ship.player_controlled, "A key outside the claimer's hands must not claim the ship.")
+	TEST_ASSERT(claimer.put_in_hands(key), "The claimer could not hold the key.")
+	key.melee_attack_chain(claimer, helm, list())
 	TEST_ASSERT(QDELETED(key), "A valid NPC claim must consume the key.")
 	TEST_ASSERT(ship.player_controlled && helm.is_crew_member(claimer), "Claiming must grant the new crew access.")
 
@@ -167,11 +189,14 @@
 	boarder.mind_initialize()
 	var/obj/item/ship_key/spare_key = allocate(/obj/item/ship_key)
 	spare_key.set_ship(ship)
+	TEST_ASSERT(boarder.put_in_hands(spare_key), "The boarder could not hold the spare key.")
 	spare_key.melee_attack_chain(boarder, helm, list())
 	TEST_ASSERT(!QDELETED(spare_key), "A rejected spare key must not be consumed.")
 	TEST_ASSERT(!helm.is_crew_member(boarder), "An old key must not steal a disabled player-owned ship.")
 	TEST_ASSERT_EQUAL(ship.claimed_captain, claimer.mind, "An old key must not replace the captain.")
 
+	// Real abandonment clears the hull roster before it becomes claimable.
+	ship.ship_team.remove_member(claimer.mind)
 	ship.abandoned = TRUE
 	spare_key.melee_attack_chain(boarder, helm, list())
 	TEST_ASSERT(QDELETED(spare_key), "An abandoned hull must remain claimable by key.")
diff --git a/voidcrew/modules/unit_tests/voidcrew_launch_access.dm b/voidcrew/modules/unit_tests/voidcrew_launch_access.dm
index 5529f68467c..6fe01fba523 100644
--- a/voidcrew/modules/unit_tests/voidcrew_launch_access.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_launch_access.dm
@@ -54,6 +54,13 @@
 	GLOB.overmap_blocked_turfs -= target_tile
 
 	var/obj/structure/overmap/ship/ship = allocate(/obj/structure/overmap/ship)
+	ship.ship_team = allocate(/datum/team/voidcrew)
+	ship.ship_team.ship = ship
+	allocated += ship.get_crew_record()
+	var/mob/living/carbon/human/member = allocate(/mob/living/carbon/human/consistent)
+	member.mind_initialize()
+	allocated += member.mind
+	ship.enlist_crewmember(member)
 	for(var/index in 1 to 5)
 		ship.available_missions += allocate(/datum/mission)
 	SSmissions.refresh_ship_missions(ship)
@@ -61,11 +68,14 @@
 	var/datum/mission/exploration/safe_offer = locate() in ship.available_missions
 	TEST_ASSERT_NOTNULL(safe_offer, "Full unsafe board did not reserve an exploration slot")
 	TEST_ASSERT_EQUAL(safe_offer.target.get_zone_type(), 1, "Reserved job is outside green space")
-	TEST_ASSERT(safe_offer.value >= 400 && safe_offer.value <= 700, "Reserved job changed the existing green payout")
+	TEST_ASSERT(safe_offer.value >= 150 && safe_offer.value <= 250, "Reserved job left the green payout band")
 	SSmissions.refresh_ship_missions(ship)
 	TEST_ASSERT(safe_offer in ship.available_missions, "Refresh replaced an existing valid safe offer")
+	TEST_ASSERT(!SSmissions.force_refresh_ship_missions(ship), "Manual refresh bypassed the fixed offer timer")
+	TEST_ASSERT(safe_offer in ship.available_missions, "Early refresh replaced the green offer")
+	ship.next_mission_refresh = world.time
 	SSmissions.force_refresh_ship_missions(ship)
-	TEST_ASSERT(QDELETED(safe_offer), "Reroll retained the old offer")
+	TEST_ASSERT(QDELETED(safe_offer), "Scheduled refresh retained the old offer")
 	safe_offer = locate() in ship.available_missions
 	TEST_ASSERT_NOTNULL(safe_offer, "Reroll omitted the reserved exploration offer")
 	TEST_ASSERT_EQUAL(safe_offer.target.get_zone_type(), 1, "Reroll's first exploration job is not green")
diff --git a/voidcrew/modules/unit_tests/voidcrew_launch_cargo.dm b/voidcrew/modules/unit_tests/voidcrew_launch_cargo.dm
index a0bce9de9b6..4cbc6e85111 100644
--- a/voidcrew/modules/unit_tests/voidcrew_launch_cargo.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_launch_cargo.dm
@@ -91,6 +91,24 @@
 	TEST_ASSERT(!valid_material_order_contents(list(/obj/item/stack/sheet/iron = MAX_STACK_SIZE * 10, /obj/item/stack/sheet/glass = 1)), "Mixed materials bypassed ten-stack cap")
 	TEST_ASSERT(valid_material_order_contents(list(/obj/item/stack/sheet/iron = MAX_STACK_SIZE * 9, /obj/item/stack/sheet/glass = MAX_STACK_SIZE)), "Ten valid mixed stacks were rejected")
 
+	// Market-generated packs are hidden catalog entries, but must still ship normally.
+	console.obj_flags &= ~EMAGGED
+	console.contraband = FALSE
+	var/datum/supply_pack/custom/minerals/materials = allocate(/datum/supply_pack/custom/minerals, "Market guard", 5, list(/obj/item/stack/sheet/iron = 1))
+	TEST_ASSERT(materials.hidden, "Material fixture must exercise the hidden-pack exception")
+	TEST_ASSERT(console.can_order_pack(materials), "An ordinary console rejected a valid market order")
+	materials.contraband = TRUE
+	TEST_ASSERT(!console.can_order_pack(materials), "A market order bypassed the contraband restriction")
+	materials.contraband = FALSE
+	materials.special = TRUE
+	TEST_ASSERT(!console.can_order_pack(materials), "A market order bypassed the special-pack restriction")
+	materials.special = FALSE
+	materials.drop_pod_only = TRUE
+	TEST_ASSERT(!console.can_order_pack(materials), "A market order bypassed the pod-only restriction")
+	materials.drop_pod_only = FALSE
+	materials.contains = list(/obj/item/stack/sheet/iron = 0)
+	TEST_ASSERT(!console.can_order_pack(materials), "An invalid material order bypassed the hidden-pack restriction")
+
 /// Run real buy(), bank debits, material preflight, crate construction and manifests.
 /datum/unit_test/voidcrew_launch_cargo_fixture/settlement/Run()
 	save_economy()
@@ -109,6 +127,7 @@
 	bank.synced_bank_account = account
 	console.link_ship_bank(bank)
 	var/datum/supply_pack/custom/minerals/pack = allocate(/datum/supply_pack/custom/minerals, "Cargo test", 360, list(/obj/item/stack/sheet/iron = 12, /obj/item/stack/sheet/mineral/plasma = 15))
+	TEST_ASSERT(!(console.obj_flags & EMAGGED) && console.can_order_pack(pack), "Market settlement must work through an ordinary cargo console")
 	var/datum/supply_order/disposable/materials/order = allocate(/datum/supply_order/disposable/materials, pack)
 	order.manifest_can_fail = FALSE
 	order.applied_coupon = allocate(/obj/item/coupon)
@@ -158,7 +177,9 @@
 	qdel(delivery)
 
 	// An ordinary discounted shipment must record the final paid bill as well.
-	var/datum/supply_pack/plating_pack = allocate(/datum/supply_pack/security/modsuit_plating)
+	var/datum/supply_pack/plating_pack = allocate(/datum/supply_pack)
+	plating_pack.cost = CARGO_CRATE_VALUE
+	plating_pack.contains = list(/obj/item/mod/construction/plating/civilian)
 	var/datum/supply_order/plating_order = allocate(/datum/supply_order, plating_pack)
 	plating_order.manifest_can_fail = FALSE
 	plating_order.applied_coupon = allocate(/obj/item/coupon)
@@ -243,6 +264,14 @@
 	delivery = locate() in bay
 	TEST_ASSERT_NOTNULL(delivery, "Paid spacewear was not delivered")
 	var/mob/living/carbon/human/seller = allocate(/mob/living/carbon/human/consistent)
+	seller.mind_initialize()
+	allocated += seller.mind
+	var/obj/structure/overmap/ship/selling_ship = allocate(/obj/structure/overmap/ship)
+	selling_ship.ship_team = allocate(/datum/team/voidcrew)
+	selling_ship.ship_team.ship = selling_ship
+	allocated += selling_ship.get_crew_record()
+	selling_ship.enlist_crewmember(seller)
+	selling_ship.ship_account = account
 	var/obj/item/card/id/advanced/seller_id = allocate(/obj/item/card/id/advanced)
 	seller_id.registered_account = account
 	TEST_ASSERT(seller.put_in_hands(seller_id), "Seller could not carry their paying ID")
@@ -324,3 +353,132 @@
 	var/datum/export_report/steel_report = export_item_and_contents(plasteel, apply_elastic = FALSE, dry_run = TRUE)
 	TEST_ASSERT_EQUAL(counterlist_sum(steel_report.total_value), 400, "Plasteel direct resale retained its former inflated material price")
 	TEST_ASSERT(counterlist_sum(steel_report.total_value) < 630, "Repair-stock resale exceeds Barnaby's strongest special")
+
+/// Market tests isolate event state as well as the shared export fixture's prices.
+/datum/unit_test/voidcrew_launch_cargo_fixture/material_market
+	abstract_type = /datum/unit_test/voidcrew_launch_cargo_fixture/material_market
+	var/list/base_prices = list(
+		/datum/material/diamond = 120,
+		/datum/material/bluespace = 80,
+		/datum/material/gold = 40,
+		/datum/material/titanium = 40,
+		/datum/material/uranium = 30,
+		/datum/material/silver = 15,
+		/datum/material/iron = 2,
+		/datum/material/glass = 2,
+	)
+	var/list/saved_trends
+	var/list/saved_trend_life
+	var/list/saved_events
+	var/saved_news
+	var/list/saved_crash_sources
+
+/datum/unit_test/voidcrew_launch_cargo_fixture/material_market/proc/save_market()
+	save_economy()
+	saved_trends = SSstock_market.materials_trends.Copy()
+	saved_trend_life = SSstock_market.materials_trend_life.Copy()
+	saved_events = SSstock_market.active_events
+	SSstock_market.active_events = list()
+	saved_news = SSstock_market.news_string
+	var/list/crash_sources = GET_TRAIT_SOURCES(SSeconomy, TRAIT_MARKET_CRASHING)
+	saved_crash_sources = crash_sources.Copy()
+	REMOVE_TRAIT(SSeconomy, TRAIT_MARKET_CRASHING, saved_crash_sources)
+
+/datum/unit_test/voidcrew_launch_cargo_fixture/material_market/Destroy()
+	if(saved_trends)
+		QDEL_LIST(SSstock_market.active_events)
+		SSstock_market.active_events = saved_events
+		SSstock_market.materials_trends = saved_trends
+		SSstock_market.materials_trend_life = saved_trend_life
+		SSstock_market.news_string = saved_news
+		REMOVE_TRAIT(SSeconomy, TRAIT_MARKET_CRASHING, TRAIT_SOURCE_UNIT_TESTS)
+		for(var/source in saved_crash_sources)
+			ADD_TRAIT(SSeconomy, TRAIT_MARKET_CRASHING, source)
+	return ..()
+
+/// Trading, ordinary trends and economy-wide crashes retain their price bounds.
+/datum/unit_test/voidcrew_launch_cargo_fixture/material_market/adjustments/Run()
+	save_market()
+	for(var/datum/material/material as anything in base_prices)
+		var/base = base_prices[material]
+		TEST_ASSERT_EQUAL(material.value_per_unit, base / SHEET_MATERIAL_AMOUNT, "[material] has the wrong base value per material unit")
+		if(material == /datum/material/iron || material == /datum/material/glass)
+			TEST_ASSERT_EQUAL(material.minimum_value_override * SHEET_MATERIAL_AMOUNT, 1, "[material] lost its one-credit floor")
+		else
+			TEST_ASSERT_NULL(material.minimum_value_override, "[material] must retain its half-base floor")
+		var/minimum = round(base * 0.5)
+		var/maximum = round(base * 1.5)
+		SSstock_market.materials_prices[material] = base
+		SSstock_market.adjust_material_price(material, base * 100)
+		TEST_ASSERT_EQUAL(SSstock_market.materials_prices[material], maximum, "[material] purchase adjustment exceeded the ceiling")
+		SSstock_market.adjust_material_price(material, -base * 100)
+		TEST_ASSERT_EQUAL(SSstock_market.materials_prices[material], minimum, "[material] sale adjustment crossed the floor")
+		SSstock_market.adjust_material_price(material, base - minimum)
+		TEST_ASSERT_EQUAL(SSstock_market.materials_prices[material], base, "[material] could not return to its base price")
+
+		for(var/trend in list(MARKET_TREND_DOWNWARD, MARKET_TREND_STABLE, MARKET_TREND_UPWARD))
+			for(var/starting_price in list(minimum, base, maximum))
+				SSstock_market.materials_prices[material] = starting_price
+				SSstock_market.materials_trends[material] = trend
+				SSstock_market.materials_trend_life[material] = 1
+				SSstock_market.handle_trends_and_price(material)
+				var/price = SSstock_market.materials_prices[material]
+				TEST_ASSERT(price >= minimum && price <= maximum, "[material] ordinary trend left the price bounds: [price]")
+
+	ADD_TRAIT(SSeconomy, TRAIT_MARKET_CRASHING, TRAIT_SOURCE_UNIT_TESTS)
+	for(var/datum/material/material as anything in base_prices)
+		SSstock_market.materials_prices[material] = base_prices[material] * 1.5
+		SSstock_market.handle_trends_and_price(material)
+		TEST_ASSERT_EQUAL(SSstock_market.materials_prices[material], round(base_prices[material] * 0.5), "[material] crash crossed its price floor")
+
+/// Events use their own clamp, and both reset paths restore the new base prices.
+/datum/unit_test/voidcrew_launch_cargo_fixture/material_market/events/Run()
+	save_market()
+	for(var/datum/material/material as anything in base_prices)
+		var/base = base_prices[material]
+		for(var/event_type in list(/datum/stock_market_event/large_boost, /datum/stock_market_event/large_drop, /datum/stock_market_event/hotcakes, /datum/stock_market_event/market_reset))
+			for(var/starting_price in list(base * 0.5, base, base * 1.5))
+				SSstock_market.materials_prices[material] = starting_price
+				var/datum/stock_market_event/event = allocate(event_type)
+				TEST_ASSERT(event.start_event(material), "[event_type] failed to start for [material]")
+				var/price = SSstock_market.materials_prices[material]
+				TEST_ASSERT(price >= base * 0.5 && price <= base * 1.5, "[event_type] left [material] outside its bounds: [price]")
+				if(event_type == /datum/stock_market_event/hotcakes)
+					TEST_ASSERT_EQUAL(price, round(base * 1.5), "Hotcakes used the wrong ceiling for [material]")
+				if(event_type == /datum/stock_market_event/market_reset)
+					// Per-unit values round through BYOND floats when converted back to sheets.
+					TEST_ASSERT(isnum(price) && abs(price - base) < 0.0001, "Market reset restored [price] instead of [base] for [material]")
+				qdel(event)
+
+		var/datum/stock_market_event/lockdown/lockdown = allocate(/datum/stock_market_event/lockdown)
+		TEST_ASSERT(lockdown.start_event(material), "Lockdown failed to start for [material]")
+		SSstock_market.active_events += lockdown
+		SSstock_market.materials_prices[material] = base * 1.5
+		lockdown.handle()
+		TEST_ASSERT_EQUAL(SSstock_market.materials_quantity[material], 0, "Lockdown failed to suspend [material] stock")
+		lockdown.handle()
+		var/reset_price = SSstock_market.materials_prices[material]
+		TEST_ASSERT(isnum(reset_price) && abs(reset_price - base) < 0.0001, "Lockdown restored [reset_price] instead of [base] for [material]")
+		TEST_ASSERT(!(lockdown in SSstock_market.active_events), "Ended lockdown remained active")
+
+/// Quote the entire stack before depressing the market or its export demand.
+/datum/unit_test/voidcrew_launch_cargo_fixture/material_market/diamond_stack/Run()
+	save_market()
+	SSstock_market.materials_prices[/datum/material/diamond] = 120
+	SSstock_market.materials_quantity[/datum/material/diamond] = 50
+	var/datum/export/material/market/diamond/exporter = locate(/datum/export/material/market/diamond) in GLOB.exports_list
+	TEST_ASSERT_NOTNULL(exporter, "Diamond market exporter is missing")
+	var/obj/item/stack/sheet/mineral/diamond/diamonds = allocate(/obj/item/stack/sheet/mineral/diamond, run_loc_floor_bottom_left, 50)
+	var/datum/export_report/quote = export_item_and_contents(diamonds, apply_elastic = TRUE, dry_run = TRUE)
+	TEST_ASSERT_EQUAL(counterlist_sum(quote.total_value), 6000, "Fifty diamonds did not quote at the full base price")
+	TEST_ASSERT_EQUAL(SSstock_market.materials_prices[/datum/material/diamond], 120, "Dry quote changed the market price")
+	TEST_ASSERT_EQUAL(SSstock_market.materials_quantity[/datum/material/diamond], 50, "Dry quote changed available stock")
+	TEST_ASSERT_EQUAL(exporter.cost, exporter.init_cost, "Dry quote depressed export demand")
+	var/datum/export_report/sale = export_item_and_contents(diamonds, apply_elastic = TRUE, dry_run = FALSE)
+	TEST_ASSERT_EQUAL(counterlist_sum(sale.total_value), 6000, "Market or elasticity changed before the whole-stack sale was quoted")
+	TEST_ASSERT_EQUAL(SSstock_market.materials_prices[/datum/material/diamond], 60, "Completed sale failed to depress the subsequent market price")
+	TEST_ASSERT_EQUAL(SSstock_market.materials_quantity[/datum/material/diamond], 100, "Completed sale failed to add the whole stack to stock")
+	TEST_ASSERT(exporter.cost < exporter.init_cost, "Completed sale failed to consume export demand")
+	var/depressed_cost = exporter.cost
+	exporter.process()
+	TEST_ASSERT(exporter.cost > depressed_cost && exporter.cost <= exporter.init_cost, "Export demand no longer recovers within its base limit")
diff --git a/voidcrew/modules/unit_tests/voidcrew_launch_progression.dm b/voidcrew/modules/unit_tests/voidcrew_launch_progression.dm
index e8663e763fe..6974c902f45 100644
--- a/voidcrew/modules/unit_tests/voidcrew_launch_progression.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_launch_progression.dm
@@ -9,18 +9,19 @@
 	console.data = new
 	console.test_candidates = list(star)
 	console.survey_research_tiers = list("basic")
+	var/list/quote = console.get_survey_value(star)
+	TEST_ASSERT_EQUAL(quote["cash"], 0, "Survey reward results must contain zero cash for metrics")
 	console.survey_celestial_object(user, ref(star))
 	TEST_ASSERT(console.survey_in_progress, "A fresh in-range star must be surveyable")
 	// Advance only this timer, not the world's economy or restock clocks.
 	deltimer(console.survey_timer)
 	console.complete_survey(star)
-	var/first_cash = console.banked_cash
 	var/first_points = console.banked_points
-	TEST_ASSERT(first_cash > 0 && first_points > 0, "The first survey must pay cash and research")
+	TEST_ASSERT_EQUAL(first_points, 250, "The first survey must pay only the base research, without a first-surveyor bonus")
+	TEST_ASSERT_EQUAL(first_points, quote["points"], "The research quote must match the award")
 	TEST_ASSERT(console.is_object_surveyed(star), "Completion must record the target")
-	TEST_ASSERT(star.surveyed, "The first-surveyor premium must be consumed globally")
+	TEST_ASSERT(star.surveyed, "Completion must preserve the global surveyed marker")
 	console.complete_survey(star)
-	TEST_ASSERT_EQUAL(console.banked_cash, first_cash, "A repeated completion must not pay cash again")
 	TEST_ASSERT_EQUAL(console.banked_points, first_points, "A repeated completion must not pay research again")
 	console.survey_celestial_object(user, ref(star))
 	TEST_ASSERT(!console.survey_in_progress, "A forged survey action must not restart a completed target")
@@ -31,16 +32,17 @@
 	second.survey_celestial_object(user, ref(star))
 	deltimer(second.survey_timer)
 	second.complete_survey(star)
-	TEST_ASSERT_EQUAL(second.banked_cash, star.survey_value, "Another crew's first scan earns the ordinary reward")
+	TEST_ASSERT_EQUAL(second.banked_points, first_points, "First and subsequent crews must earn equal research")
 	var/obj/structure/overmap/star/other_star = allocate(/obj/structure/overmap/star)
 	second.test_candidates = list(other_star)
 	second.survey_celestial_object(user, ref(other_star))
 	second.complete_survey(star)
 	TEST_ASSERT(second.survey_in_progress, "An old callback must not cancel a newer scan")
+	TEST_ASSERT_EQUAL(second.banked_points, first_points, "An old callback must not award research")
 	deltimer(second.survey_timer)
 	second.test_candidates.Cut()
 	second.complete_survey(other_star)
-	TEST_ASSERT_EQUAL(second.banked_cash, star.survey_value, "An out-of-range completion must not pay")
+	TEST_ASSERT_EQUAL(second.banked_points, first_points, "An out-of-range completion must not pay")
 	TEST_ASSERT(!second.is_object_surveyed(other_star), "An out-of-range completion must not unlock research")
 	second.test_candidates = list(other_star)
 	second.update_survey_data()
@@ -50,11 +52,20 @@
 	console.data.update_survey_data(other_star)
 	console.transfer_survey_data(console.data, second.data)
 	second.complete_survey(other_star)
-	TEST_ASSERT_EQUAL(second.banked_cash, star.survey_value, "Importing a target during its scan must prevent duplicate payment")
+	TEST_ASSERT_EQUAL(second.banked_points, first_points, "Importing a target during its scan must prevent duplicate payment")
 	second.survey_celestial_object(user, ref(other_star))
 	TEST_ASSERT(!second.survey_in_progress, "An imported record must not start another paid scan")
 	console.transfer_survey_data(second.data, console.data)
 	QDEL_NULL(second.data)
+	var/turf/output = get_turf(console)
+	var/list/currency_before = list()
+	for(var/obj/item/stack/spacecash/currency in output)
+		currency_before += currency
+	var/datum/tgui/ui = allocate(/datum/tgui, user, console, "SurveyComputer")
+	TEST_ASSERT(!console.ui_act("cashOut", list(), ui), "A stale cash-out action must be explicitly rejected")
+	TEST_ASSERT_EQUAL(console.banked_points, first_points, "A cash-out action must not consume research")
+	for(var/obj/item/stack/spacecash/currency in output)
+		TEST_ASSERT(currency in currency_before, "A forged cash-out action spawned currency")
 	// Clean up the timer even on the unfixed baseline.
 	if(console.survey_timer)
 		deltimer(console.survey_timer)
@@ -174,16 +185,16 @@
 	TEST_ASSERT_EQUAL(length(first.deal_chart_picks()), 1, "First shop could not deal its chart")
 	TEST_ASSERT_EQUAL(length(second.deal_chart_picks()), 1, "First shop reserved the second shop's chart")
 
-/// A sparse reward pool must meet the actual ask premium within600cr tolerance.
+/// A sparse reward pool must settle its fixed quote exactly.
 /datum/unit_test/voidcrew_launch_thin_contract/Run()
 	var/datum/outpost_shop/shop = allocate(/datum/outpost_shop)
 	shop.add_sku(/datum/shop_sku/general/beans, "core")
-	var/datum/mission/mission = allocate(/datum/mission)
+	var/datum/mission/outpost_supply/mission = allocate(/datum/mission/outpost_supply)
 	mission.difficulty = 1
 	TEST_ASSERT(shop.roll_contract_reward(mission, 12000), "A thin priced catalog must still fund its contract")
 	var/datum/shop_sku/sku = shop.skus[1]
-	var/value = shop.get_sku_value(sku) + mission.voucher_count * 1200
-	TEST_ASSERT(value >= 12000 * 1.6 - 600, "Sparse rewards fell below the actual ask premium after voucher rounding")
+	var/value = shop.get_sku_value(sku) + mission.voucher_count * 1200 + mission.value
+	TEST_ASSERT_EQUAL(value, 13800, "Sparse rewards must settle the 1.15 ask premium exactly")
 	TEST_ASSERT_EQUAL(length(mission.mission_rewards), 1, "Thin reward generation duplicated the same item")
 
 /// Repeated purchases use real payment, stock and crew lookup, even with a sealed copy.
@@ -197,9 +208,11 @@
 	allocated += buyer.mind
 	var/datum/team/voidcrew/team = allocate(/datum/team/voidcrew)
 	team.ship = ship
-	buyer.mind.ship_teams = list(team)
+	ship.ship_team = team
+	team.join_member(buyer.mind)
 	var/datum/bank_account/account = allocate(/datum/bank_account, "Chart purchase test", null, 1, FALSE)
 	account.account_balance = 20000
+	ship.ship_account = account
 	var/obj/item/card/id/advanced/id_card = allocate(/obj/item/card/id/advanced)
 	qdel(id_card.registered_account)
 	id_card.registered_account = account
@@ -239,7 +252,8 @@
 					TEST_FAIL("[shop_type] cannot fund a [difficulty] contract")
 					qdel(mission)
 					continue
-				var/value = mission.voucher_count * 1200
+				var/value = mission.voucher_count * 1200 + mission.value
+				TEST_ASSERT_EQUAL(length(mission.mission_rewards), 0, "Depleted shelves must pay currency")
 				for(var/item_type in mission.mission_rewards)
 					if(item_type in mission.rare_reward_types)
 						value += 3600
@@ -251,12 +265,13 @@
 						if(sku.dispense_amount > 1 && mission.reward_amounts?[item_type] != sku.dispense_amount)
 							TEST_FAIL("[shop_type] awards the wrong quantity of [item_type]")
 						break
-				var/minimum = 1400
+				var/minimum = 600
 				if(difficulty == 2)
-					minimum = 2600
+					minimum = 1300
 				else if(difficulty == 3)
-					minimum = 5500
-				if(value < minimum - 600)
-					TEST_FAIL("[shop_type] pays [value] against minimum [minimum] with tolerance [600]")
+					minimum = 2400
+				if(value < minimum)
+					TEST_FAIL("[shop_type] pays [value] against minimum [minimum]")
+				TEST_ASSERT_EQUAL(value, mission.contract_quote, "Currency must exactly meet the quote")
 				qdel(mission)
 		qdel(shop)
diff --git a/voidcrew/modules/unit_tests/voidcrew_loot.dm b/voidcrew/modules/unit_tests/voidcrew_loot.dm
index d1d055355b6..41d5cb3642f 100644
--- a/voidcrew/modules/unit_tests/voidcrew_loot.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_loot.dm
@@ -44,6 +44,7 @@
 				TEST_FAIL("[theme_path] has an empty [table_name] table")
 				continue
 			for(var/entry in table)
+				TEST_ASSERT(findtext("[entry]/", "/obj/item/blueprint/") != 1, "[theme_path].[table_name] still drops a schematic: [entry]")
 				if(!ispath(entry, /atom/movable))
 					TEST_FAIL("[theme_path].[table_name] entry [entry] is not an /atom/movable path")
 				var/weight = table[entry]
@@ -60,6 +61,25 @@
 		for(var/sku in theme.theme_skus)
 			if(!ispath(sku, /datum/shop_sku))
 				TEST_FAIL("[theme_path].theme_skus entry [sku] is not a shop SKU")
+			else
+				var/datum/shop_sku/sku_path = sku
+				TEST_ASSERT(findtext("[initial(sku_path.item_path)]/", "/obj/item/blueprint/") != 1, "[theme_path] still references a schematic SKU: [sku]")
+
+	for(var/list/table as anything in list(GLOB.abandoned_crate_common, GLOB.abandoned_crate_uncommon, GLOB.abandoned_crate_prime))
+		for(var/entry in table)
+			TEST_ASSERT(findtext("[entry]/", "/obj/item/blueprint/") != 1, "Freight still drops a schematic: [entry]")
+	var/datum/loot_theme/syndicate/syndicate = GLOB.loot_themes[/datum/loot_theme/syndicate]
+	var/datum/loot_theme/plunder/plunder = GLOB.loot_themes[/datum/loot_theme/plunder]
+	var/datum/loot_theme/research/research = GLOB.loot_themes[/datum/loot_theme/research]
+	var/list/weapons = syndicate.get_weapon_pool(TRUE, "2") // LOOT_WEAPON_YELLOW
+	TEST_ASSERT(weapons[/obj/item/gun/ballistic/automatic/c20r/unrestricted], "Schematic removal also removed the finished C-20r")
+	weapons = syndicate.get_weapon_pool(TRUE, "3") // LOOT_WEAPON_RED
+	TEST_ASSERT(weapons[/obj/item/gun/ballistic/automatic/l6_saw/unrestricted], "Schematic removal also removed the finished L6")
+	TEST_ASSERT(weapons[/obj/item/gun/ballistic/rifle/sniper_rifle], "Schematic removal also removed the finished sniper rifle")
+	weapons = plunder.get_weapon_pool(TRUE, "3")
+	TEST_ASSERT(weapons[/obj/item/gun/ballistic/shotgun/bulldog/unrestricted], "Schematic removal also removed the finished Bulldog")
+	weapons = research.get_weapon_pool(TRUE, "3")
+	TEST_ASSERT(weapons[/obj/item/gun/energy/laser/carbine], "Schematic removal also removed the finished laser carbine")
 
 	// every crate subtype must point at a registered theme
 	for(var/obj/structure/closet/crate/zone_loot/crate_path as anything in subtypesof(/obj/structure/closet/crate/zone_loot))
@@ -74,6 +94,10 @@
 	// callback after we delete it.
 	for(var/marker_path in subtypesof(/obj/effect/zone_mobs))
 		var/obj/effect/zone_mobs/marker = new marker_path()
+		for(var/list/count_range in list(marker.count_green, marker.count_yellow, marker.count_red))
+			TEST_ASSERT_EQUAL(length(count_range), 2, "[marker_path] has no minimum/maximum guard count")
+			TEST_ASSERT_EQUAL(count_range[1], 1, "[marker_path] minimum guard count must be one in every band")
+			TEST_ASSERT_EQUAL(count_range[2], 2, "[marker_path] maximum guard count must be two in every band")
 		for(var/table in list(marker.mobs_green, marker.mobs_yellow, marker.mobs_red))
 			for(var/entry in table)
 				if(!ispath(entry, /mob/living))
@@ -222,6 +246,214 @@
 
 #undef VOIDCREW_RUIN_MAP_ROOT
 
+/// Enumerate the Bernoulli and conditional class rolls; no statistical tolerance.
+/datum/unit_test/voidcrew_cache_weapon_odds/Run()
+	// Zone and weapon-class literals compile before Voidcrew's defines.
+	var/list/chances = list(
+		/datum/loot_theme/armory = list(12, 32, 55),
+		/datum/loot_theme/syndicate = list(6, 18, 36),
+		/datum/loot_theme/plunder = list(6, 18, 36),
+		/datum/loot_theme/expedition = list(4, 12, 24),
+		/datum/loot_theme/industrial = list(2, 6, 12),
+		/datum/loot_theme/medical = list(1, 4, 8),
+		/datum/loot_theme/research = list(2, 8, 18),
+		/datum/loot_theme/occult = list(2, 6, 12),
+		/datum/loot_theme/wardrobe = list(2, 6, 12),
+	)
+	var/list/freight_chances = list(8, 19, 33)
+	for(var/theme_path in chances)
+		var/datum/loot_theme/theme = GLOB.loot_themes[theme_path]
+		var/list/expected = chances[theme_path]
+		for(var/zone in list(1, 2, 3))
+			TEST_ASSERT_EQUAL(get_cache_gun_chance(zone, theme), expected[zone], "[theme_path] gun chance changed in zone [zone]")
+			TEST_ASSERT_EQUAL(get_cache_gun_chance(zone, theme, TRUE), freight_chances[zone], "Purchased cache did not use freight odds")
+			for(var/freight in list(FALSE, TRUE))
+				var/guns = 0
+				for(var/roll in 1 to 100)
+					var/weapon = select_cache_weapon(zone, theme, freight, roll, 1)
+					TEST_ASSERT_NOTNULL(weapon, "Weapon roll paid nothing")
+					if(ispath(weapon, /obj/item/gun))
+						guns++
+				TEST_ASSERT_EQUAL(guns, freight ? freight_chances[zone] : expected[zone], "[theme_path] has the wrong per-cache gun probability")
+		TEST_ASSERT_EQUAL(get_cache_gun_chance(null, theme), expected[1], "Unresolved cache did not fall back to green")
+
+	var/list/gun_classes = list(list(940, 59, 1), list(450, 540, 10), list(150, 350, 500))
+	var/list/melee_classes = list(list(900, 99, 1), list(350, 640, 10), list(100, 450, 450))
+	for(var/gun in list(FALSE, TRUE))
+		for(var/zone in list(1, 2, 3))
+			var/list/counts = list("1" = 0, "2" = 0, "3" = 0)
+			for(var/roll in 1 to 1000)
+				counts[get_cache_weapon_class(zone, gun, roll)]++
+			var/list/expected = gun ? gun_classes[zone] : melee_classes[zone]
+			for(var/class in list("1", "2", "3"))
+				TEST_ASSERT_EQUAL(counts[class], expected[text2num(class)], "Conditional weapon class [class] changed in zone [zone], gun=[gun]")
+	TEST_ASSERT_EQUAL(get_cache_weapon_class(null, TRUE, 941), "2", "Unresolved class roll did not use green odds")
+
+/// A working copy may be consumed without damaging another crate's singleton tables.
+/datum/unit_test/voidcrew_cache_weapon_pools/Run()
+	var/list/main_counts = list("armory" = list(1, 3, 5), "syndicate" = list(1, 2, 3), "plunder" = list(2, 2, 2), "freight" = list(4, 3))
+	for(var/family in main_counts)
+		var/list/counts = main_counts[family]
+		var/list/classes = GLOB.loot_gun_pools[family]
+		TEST_ASSERT_EQUAL(length(classes), length(counts), "Main gun family gained an unexpected class")
+		for(var/class in classes)
+			var/list/pool = classes[class]
+			TEST_ASSERT_EQUAL(length(pool), counts[text2num(class)], "Main gun class changed size")
+			for(var/entry in pool)
+				TEST_ASSERT_EQUAL(pool[entry], 10, "Main gun class is not uniform")
+	var/list/melee_counts = list(4, 6, 6)
+	for(var/class in GLOB.loot_melee_pools)
+		var/list/pool = GLOB.loot_melee_pools[class]
+		TEST_ASSERT_EQUAL(length(pool), melee_counts[text2num(class)], "Main melee class changed size")
+		for(var/entry in pool)
+			TEST_ASSERT_EQUAL(pool[entry], 10, "Main melee class is not uniform")
+	for(var/theme_path in GLOB.loot_themes)
+		var/datum/loot_theme/theme = GLOB.loot_themes[theme_path]
+		for(var/gun in list(FALSE, TRUE))
+			for(var/class in list("1", "2", "3"))
+				var/list/pool = theme.get_weapon_pool(gun, class)
+				TEST_ASSERT(length(pool), "[theme_path] lost weapon class [class], gun=[gun]")
+				var/list/snapshot = pool.Copy()
+				for(var/entry in pool)
+					TEST_ASSERT(ispath(entry, /obj/item), "Weapon pool contains a non-item: [entry]")
+					TEST_ASSERT(pool[entry] == 10 || pool[entry] == 1, "Weapon [entry] has an unexpected weight")
+				pool.Cut()
+				pool = theme.get_weapon_pool(gun, class)
+				TEST_ASSERT_EQUAL(length(pool), length(snapshot), "Consuming a working pool changed the singleton")
+				for(var/entry in snapshot)
+					TEST_ASSERT_EQUAL(pool[entry], snapshot[entry], "Consuming a working pool changed [entry]'s weight")
+				var/list/freight_pool = theme.get_weapon_pool(gun, class, TRUE)
+				var/list/freight_main = get_cache_weapon_pool(gun, class, "freight")
+				TEST_ASSERT_EQUAL(length(freight_pool), length(freight_main), "Freight inherited weapon extras")
+				for(var/entry in freight_pool)
+					TEST_ASSERT_EQUAL(freight_pool[entry], freight_main[entry], "Freight inherited a themed weapon")
+					TEST_ASSERT(!ispath(entry, /obj/item/organ) && !ispath(entry, /obj/item/cyberware_pair_case), "Freight paid weapon chrome")
+	var/list/yellow = get_cache_weapon_pool(TRUE, "2", "freight")
+	var/list/red = get_cache_weapon_pool(TRUE, "3", "freight")
+	TEST_ASSERT_EQUAL(length(yellow), 3, "Freight ordinary gun pool changed")
+	TEST_ASSERT_EQUAL(length(red), length(yellow), "Freight did not substitute ordinary guns for advanced guns")
+	for(var/entry in yellow)
+		TEST_ASSERT_EQUAL(red[entry], yellow[entry], "Freight advanced-class substitution changed [entry]")
+
+/datum/unit_test/voidcrew_cache_weapon_population
+	var/datum/loot_theme/saved_theme
+
+/datum/unit_test/voidcrew_cache_weapon_population/Destroy()
+	if(saved_theme)
+		GLOB.loot_themes[/datum/loot_theme/armory] = saved_theme
+	return ..()
+
+/datum/unit_test/voidcrew_cache_weapon_population/Run()
+	saved_theme = GLOB.loot_themes[/datum/loot_theme/armory]
+	var/datum/loot_theme/armory/test_theme = allocate(/datum/loot_theme/armory)
+	// Freight's main guns all have one boxed reload. The test controls the
+	// Bernoulli outcome while retaining the real cache population path.
+	test_theme.gun_pool = "freight"
+	test_theme.gun_extras = null
+	test_theme.melee_extras = null
+	GLOB.loot_themes[/datum/loot_theme/armory] = test_theme
+	var/list/minimums = list(2, 3, 4)
+	var/list/maximums = list(3, 4, 5)
+	for(var/gun in list(FALSE, TRUE))
+		test_theme.gun_chance = gun ? list(100, 100, 100) : list(0, 0, 0)
+		for(var/zone in list(1, 2, 3))
+			for(var/bonus in list(0, 2))
+				var/obj/structure/closet/crate/zone_loot/cache = allocate(/obj/structure/closet/crate/zone_loot/armory)
+				cache.theme = /datum/loot_theme/armory
+				cache.bonus_draws = bonus
+				cache.loot_zone = zone
+				cache.PopulateContents()
+				var/weapons = 0
+				var/guns = 0
+				for(var/obj/item/item in cache)
+					if(istype(item, /obj/item/gun) && !istype(item, /obj/item/gun/energy/disabler))
+						weapons++
+						guns++
+					else if((item.type in GLOB.loot_melee_pools["1"]) || (item.type in GLOB.loot_melee_pools["2"]) || (item.type in GLOB.loot_melee_pools["3"]))
+						weapons++
+				TEST_ASSERT_EQUAL(weapons, 1, "Cache did not pay exactly one weapon, bonus=[bonus]")
+				TEST_ASSERT_EQUAL(guns, gun, "Cache ignored the forced gun/melee outcome")
+				var/prizes = length(cache.contents) - (gun ? 1 : 0)
+				TEST_ASSERT(prizes >= minimums[zone] + bonus && prizes <= maximums[zone] + bonus, "Weapon roll changed the cache's draw count")
+				var/list/contents = cache.contents.Copy()
+				cache.PopulateContents()
+				TEST_ASSERT_EQUAL(length(cache.contents), length(contents), "Repeated population paid again")
+				for(var/atom/movable/item as anything in contents)
+					qdel(item)
+				cache.dump_contents()
+				cache.PopulateContents()
+				TEST_ASSERT_EQUAL(length(cache.contents), 0, "Emptying a cache allowed replenishment")
+
+	var/turf/origin = SSovermap.get_unused_overmap_square_in_zone_band(1)
+	var/turf/destination = SSovermap.get_unused_overmap_square_in_zone_band(3)
+	TEST_ASSERT(origin && destination, "Missing overmap test squares")
+	var/obj/structure/closet/crate/zone_loot/armory/moved = allocate(/obj/structure/closet/crate/zone_loot/armory, origin)
+	moved.forceMove(destination)
+	moved.PopulateContents()
+	TEST_ASSERT_EQUAL(moved.loot_zone, 1, "Moving a cache upgraded its spawn band")
+
+/// All three bought caches must be stamped before their first opening.
+/datum/unit_test/voidcrew_purchased_cache_weapons/Run()
+	var/mob/living/carbon/human/buyer = allocate(/mob/living/carbon/human/consistent)
+	for(var/sku_path in list(/datum/shop_sku/general/rotating/freight_crate, /datum/shop_sku/black_market/mystery_cache, /datum/shop_sku/black_market/mystery_cache_rare))
+		var/datum/shop_sku/sku = allocate(sku_path)
+		var/obj/structure/closet/crate/zone_loot/cache = sku.dispense(buyer, null)
+		allocated += cache
+		TEST_ASSERT(cache.freight_weapons, "[sku_path] dispensed guarded weapon odds over the counter")
+		TEST_ASSERT(!cache.loot_consumed && !cache.contents_initialized, "Bought cache populated before freight rules were applied")
+		TEST_ASSERT_EQUAL(cache.theme, /datum/loot_theme/syndicate, "Bought cache lost its themed nonweapon supplies")
+		TEST_ASSERT_EQUAL(cache.bonus_draws, sku_path == /datum/shop_sku/black_market/mystery_cache_rare ? 2 : 0, "Bought cache lost its bonus draws")
+
+/// Every ballistic outcome has a usable reload, including retained specialist guns.
+/datum/unit_test/voidcrew_cache_weapon_ammunition/Run()
+	var/list/weapons = list()
+	for(var/theme_path in GLOB.loot_themes)
+		var/datum/loot_theme/theme = GLOB.loot_themes[theme_path]
+		for(var/class in list("1", "2", "3"))
+			weapons |= theme.get_weapon_pool(TRUE, class)
+	for(var/weapon_path in weapons)
+		if(!ispath(weapon_path, /obj/item/gun/ballistic))
+			continue
+		var/obj/structure/closet/crate/box = allocate(/obj/structure/closet/crate)
+		var/obj/item/gun/ballistic/gun = spawn_loot_prize(box, weapon_path)
+		TEST_ASSERT(!istype(gun.pin, /obj/item/firing_pin/implant), "Loot gun [weapon_path] requires an implant")
+		var/obj/item/ammo_box/magazine/magazine_path = gun.accepted_magazine_type
+		var/has_reload = FALSE
+		var/list/spares = box.get_all_contents() - gun.get_all_contents()
+		for(var/obj/item/ammo_casing/casing in spares)
+			if(casing.caliber == initial(magazine_path.caliber))
+				has_reload = TRUE
+		// Boxes may store rounds as paths until first accessed.
+		for(var/obj/item/ammo_box/ammo in spares)
+			var/obj/item/ammo_casing/casing_path = ammo.ammo_type
+			if(initial(casing_path.caliber) == initial(magazine_path.caliber) && length(ammo.stored_ammo))
+				has_reload = TRUE
+		TEST_ASSERT(has_reload, "Loot gun [weapon_path] has no compatible spare reload")
+
+/// Contraband and low-zone guards cannot bypass the ladder.
+/datum/unit_test/voidcrew_loot_weapon_bypasses/Run()
+	var/list/before = run_loc_floor_top_right.contents.Copy()
+	var/obj/effect/spawner/random/contraband/armory/spawner = new(run_loc_floor_top_right)
+	var/list/green_melee = GLOB.loot_melee_pools["1"]
+	TEST_ASSERT_EQUAL(length(spawner.loot), 4, "Contraband armory is no longer uniform green melee")
+	for(var/entry in spawner.loot)
+		TEST_ASSERT(entry in green_melee, "Contraband bypass pays [entry]")
+		TEST_ASSERT_EQUAL(spawner.loot[entry], 1, "Contraband green melee is not uniform")
+	var/spawned = 0
+	for(var/obj/item/item in run_loc_floor_top_right.contents - before)
+		allocated += item
+		spawned++
+		TEST_ASSERT(item.type in green_melee, "Contraband spawned a weapon outside green melee")
+	TEST_ASSERT_EQUAL(spawned, 1, "Contraband did not pay exactly one green melee weapon")
+	for(var/marker_path in list(/obj/effect/zone_mobs/syndicate, /obj/effect/zone_mobs/syndicate/boss))
+		var/obj/effect/zone_mobs/marker = new marker_path()
+		TEST_ASSERT_EQUAL(length(marker.mobs_green), 1, "Green syndicate pool still includes sword guards")
+		TEST_ASSERT(marker.mobs_green[/mob/living/basic/trooper/syndicate/melee], "Green syndicate guards lost their knives")
+		for(var/entry in marker.mobs_yellow)
+			TEST_ASSERT(!ispath(entry, /mob/living/basic/trooper/syndicate/ranged/smg) && !ispath(entry, /mob/living/basic/trooper/syndicate/ranged/shotgun), "Yellow syndicate guard has an advanced ranged weapon")
+		TEST_ASSERT(marker.mobs_red[/mob/living/basic/trooper/syndicate/ranged/smg] || marker.mobs_red[/mob/living/basic/trooper/syndicate/ranged/smg/space/stormtrooper], "Red syndicate pool lost its SMG guards")
+		qdel(marker)
+
 /**
  * # Outpost megafauna ban
  *
@@ -242,3 +474,345 @@
 	for(var/area/area_path as anything in warded)
 		if(!initial(area_path.repels_megafauna))
 			TEST_FAIL("[area_path] does not set repels_megafauna. A megafauna that reaches it can stay there for the rest of the round")
+
+/// Control when the real resolver starts, including after moving the machine.
+/obj/machinery/suit_storage_unit/ruin_zone/stock_test/LateInitialize()
+	return
+
+/datum/unit_test/voidcrew_ruin_suit_stock/Run()
+	var/list/expected = list(
+		/obj/item/mod/control/pre_equipped/standard,
+		/obj/item/mod/control/pre_equipped/civilian,
+		/obj/item/mod/control/pre_equipped/engineering,
+		/obj/item/mod/control/pre_equipped/atmospheric,
+		/obj/item/mod/control/pre_equipped/mining,
+		/obj/item/mod/control/pre_equipped/medical,
+	)
+	TEST_ASSERT_EQUAL(length(GLOB.base_tier_modsuits), 6, "Base-tier allowlist changed")
+	var/mob/living/carbon/human/user = allocate(/mob/living/carbon/human/consistent)
+	for(var/suit_path in expected)
+		TEST_ASSERT(suit_path in GLOB.base_tier_modsuits, "Base-tier allowlist lost [suit_path]")
+		TEST_ASSERT_NULL(GLOB.base_tier_modsuits[suit_path], "Base-tier selection must be uniform")
+		var/obj/item/mod/control/suit = allocate(suit_path)
+		TEST_ASSERT(suit.allowed(user), "Base reward [suit_path] is access-locked")
+	var/obj/machinery/suit_storage_unit/base_tier/base = allocate(/obj/machinery/suit_storage_unit/base_tier)
+	TEST_ASSERT(base.mod?.type in expected, "Base unit did not select its suit before parent initialization")
+	TEST_ASSERT_EQUAL(base.mod.loc, base, "Base unit did not stock its selected suit")
+
+	var/before_loose = 0
+	for(var/obj/item/mod/control/suit in run_loc_floor_top_right)
+		before_loose++
+	new /obj/effect/spawner/random/modsuit/base_tier(run_loc_floor_top_right)
+	var/after_loose = 0
+	for(var/obj/item/mod/control/suit in run_loc_floor_top_right)
+		after_loose++
+		TEST_ASSERT(suit.type in expected, "Loose spawner selected a suit outside the allowlist")
+	TEST_ASSERT_EQUAL(after_loose, before_loose + 1, "Loose spawner did not pay exactly one suit")
+	TEST_ASSERT_EQUAL(length(GLOB.base_tier_modsuits), 6, "Loose spawner mutated the shared allowlist")
+	for(var/suit_path in expected)
+		TEST_ASSERT_NULL(GLOB.base_tier_modsuits[suit_path], "Loose spawner changed shared weights")
+
+	// Literals 1/2/3 are ZONE_GREEN/YELLOW/RED, defined after unit-test includes.
+	for(var/zone in list(1, 2, 3))
+		var/turf/spawn_turf = SSovermap.get_unused_overmap_square_in_zone_band(zone)
+		TEST_ASSERT_NOTNULL(spawn_turf, "No test square in zone [zone]")
+		var/obj/machinery/suit_storage_unit/ruin_zone/stock_test/unit = allocate(/obj/machinery/suit_storage_unit/ruin_zone/stock_test, spawn_turf)
+		TEST_ASSERT_NULL(unit.mod, "Ruin unit stocked before resolution")
+		unit.state_open = TRUE
+		TEST_ASSERT(!unit.check_interactable(user), "Unresolved unit permits retrieval")
+		TEST_ASSERT_EQUAL(unit.stock_spawn_turf, spawn_turf, "Unit did not pin its spawn turf")
+		unit.forceMove(run_loc_floor_bottom_left)
+		new /datum/zone_resolver(unit.stock_spawn_turf, CALLBACK(unit, TYPE_PROC_REF(/obj/machinery/suit_storage_unit/ruin_zone, stock_for_zone)))
+		TEST_ASSERT(unit.stock_consumed, "Resolver did not complete stock resolution")
+		if(zone == 1)
+			TEST_ASSERT(unit.mod?.type in expected, "Moved green unit did not retain base-tier stock")
+		else
+			var/expected_type = zone == 2 ? /obj/item/mod/control/pre_equipped/security : /obj/item/mod/control/pre_equipped/nuclear/unrestricted
+			TEST_ASSERT_EQUAL(unit.mod?.type, expected_type, "Moved unit changed suit tier")
+		TEST_ASSERT(unit.check_interactable(user) && unit.access_check(user), "Resolved unit blocks retrieval")
+		TEST_ASSERT(unit.mod.allowed(user), "Zone [zone] suit is access-locked")
+		var/obj/item/mod/control/reward = unit.mod
+		unit.stock_for_zone(3)
+		TEST_ASSERT_EQUAL(unit.mod, reward, "Repeated callback created another suit")
+		unit.dump_inventory_contents()
+		unit.stock_for_zone(3)
+		TEST_ASSERT_NULL(unit.mod, "Retrieving the suit allowed replenishment")
+
+	var/obj/machinery/suit_storage_unit/ruin_zone/stock_test/fallback = allocate(/obj/machinery/suit_storage_unit/ruin_zone/stock_test)
+	fallback.stock_for_zone(null)
+	TEST_ASSERT(fallback.mod?.type in expected, "Unresolved zone did not fall back to base-tier stock")
+
+/// Each paid copy creates a fresh site, including after an earlier site is gone.
+/datum/unit_test/voidcrew_named_chart_purchases
+	var/list/spawned_sites = list()
+
+/datum/unit_test/voidcrew_named_chart_purchases/Destroy()
+	for(var/obj/structure/overmap/space_ruin/site in spawned_sites)
+		if(!QDELETED(site))
+			qdel(site)
+	spawned_sites.Cut()
+	return ..()
+
+/datum/unit_test/voidcrew_named_chart_purchases/Run()
+	var/template_path = /datum/map_template/ruin/space/rare/hospice
+	var/obj/structure/overmap/ship/ship = allocate(/obj/structure/overmap/ship)
+	var/mob/living/carbon/human/buyer = allocate(/mob/living/carbon/human/consistent)
+	buyer.mind_initialize()
+	allocated += buyer.mind
+	var/datum/team/voidcrew/team = allocate(/datum/team/voidcrew)
+	team.ship = ship
+	ship.ship_team = team
+	team.join_member(buyer.mind)
+	var/datum/bank_account/account = allocate(/datum/bank_account, "Chart purchase test", null, 1, FALSE)
+	account.account_balance = 20000
+	ship.ship_account = account
+	var/obj/item/card/id/advanced/id = allocate(/obj/item/card/id/advanced)
+	qdel(id.registered_account)
+	id.registered_account = account
+	TEST_ASSERT(buyer.put_in_hands(id), "Buyer cannot hold their ID")
+	var/obj/item/stack/trade_voucher/vouchers = allocate(/obj/item/stack/trade_voucher, buyer, 10)
+	var/datum/outpost_shop/shop = allocate(/datum/outpost_shop)
+	shop.add_sku(/datum/shop_sku/ruin_chart/biolab, "rotating")
+	var/datum/shop_sku/ruin_chart/sku = shop.skus[1]
+	sku.ruin_template_path = template_path
+	sku.spawn_zone = 1 // ZONE_GREEN, defined after the unit-test includes.
+	sku.stock = 3
+	var/price = sku.get_credit_price(buyer)
+	var/voucher_price = sku.price_vouchers
+	TEST_ASSERT(sku.try_purchase(buyer, null), "First named chart purchase failed")
+	TEST_ASSERT_EQUAL(length(ship.pending_rumors), 1, "Purchase did not deliver one sealed chart")
+	var/datum/rumor_chart/first_chart = ship.pending_rumors[1]
+	allocated += first_chart
+	var/obj/structure/overmap/space_ruin/first = ship.reveal_pending_rumor(first_chart)
+	TEST_ASSERT_NOTNULL(first, "First paid chart did not create a site")
+	spawned_sites += first
+	first.mission_exclusive = TRUE
+	TEST_ASSERT(first.rare && !first.loaded && !first.visited, "First purchase did not reveal a fresh rare site")
+	TEST_ASSERT(QDELETED(first_chart) && !length(ship.pending_rumors), "Successful reveal did not consume the first chart")
+
+	TEST_ASSERT(sku.try_purchase(buyer, null), "Another copy of the named chart could not be purchased")
+	var/datum/rumor_chart/second_chart = ship.pending_rumors[1]
+	allocated += second_chart
+	TEST_ASSERT_EQUAL(account.account_balance, 20000 - 2 * price, "Purchase charged the wrong credits")
+	TEST_ASSERT_EQUAL(vouchers.amount, 10 - 2 * voucher_price, "Purchase charged the wrong vouchers")
+	qdel(first)
+	TEST_ASSERT(!QDELETED(second_chart) && !second_chart.revealed && (second_chart in ship.pending_rumors), "Deleting an earlier site consumed another paid chart")
+	TEST_ASSERT_EQUAL(account.account_balance, 20000 - 2 * price, "Deleting an earlier site refunded an independent chart")
+	TEST_ASSERT_EQUAL(count_trade_vouchers(buyer), 10 - 2 * voucher_price, "Deleting an earlier site refunded independent vouchers")
+	TEST_ASSERT_NULL(sku.get_denial_reason(buyer), "Deleting an earlier site blocked another purchase")
+	TEST_ASSERT(sku.try_purchase(buyer, null), "Named chart could not be purchased after its earlier site was deleted")
+	TEST_ASSERT_EQUAL(length(ship.pending_rumors), 2, "Later purchase replaced an existing sealed chart")
+	var/datum/rumor_chart/third_chart = ship.pending_rumors[2]
+	allocated += third_chart
+	TEST_ASSERT_EQUAL(sku.stock, 0, "Three purchases did not consume three units of stock")
+	TEST_ASSERT_EQUAL(account.account_balance, 20000 - 3 * price, "Later purchase charged the wrong credits")
+	TEST_ASSERT_EQUAL(count_trade_vouchers(buyer), 10 - 3 * voucher_price, "Later purchase charged the wrong vouchers")
+
+	var/obj/structure/overmap/space_ruin/second = ship.reveal_pending_rumor(second_chart)
+	TEST_ASSERT_NOTNULL(second, "Pending chart could not reveal after an earlier site was deleted")
+	spawned_sites += second
+	second.mission_exclusive = TRUE
+	TEST_ASSERT(second.rare && !second.loaded && !second.visited, "Pending chart inherited an earlier site's state")
+	second.visited = TRUE
+	var/obj/structure/overmap/space_ruin/third = ship.reveal_pending_rumor(third_chart)
+	TEST_ASSERT_NOTNULL(third, "Later purchase did not reveal another site")
+	spawned_sites += third
+	third.mission_exclusive = TRUE
+	TEST_ASSERT(second != third && get_turf(second) != get_turf(third), "Two purchases reused the same site or coordinates")
+	TEST_ASSERT(third.rare && !third.loaded && !third.visited, "Later purchase inherited the visited site's state")
+	TEST_ASSERT_EQUAL(second.ruin_template.type, template_path, "Pending purchase revealed the wrong template")
+	TEST_ASSERT_EQUAL(third.ruin_template.type, template_path, "Later purchase revealed the wrong template")
+	TEST_ASSERT(QDELETED(second_chart) && QDELETED(third_chart) && !length(ship.pending_rumors), "Successful reveals retained sealed charts")
+	buyer.mind.ship_teams = null
+	team.ship = null
+
+/// Every retained path stays in its catalog class, including themed chrome and uniques.
+/datum/unit_test/voidcrew_cache_weapon_classes/Run()
+	var/list/expected = list(
+		"1" = list(
+			/obj/item/bambostaff,
+			/obj/item/gun/ballistic/automatic/pistol,
+			/obj/item/gun/ballistic/automatic/pistol/m1911,
+			/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag,
+			/obj/item/gun/ballistic/automatic/pistol/no_mag,
+			/obj/item/gun/ballistic/automatic/pistol/toy,
+			/obj/item/gun/ballistic/automatic/toy,
+			/obj/item/gun/ballistic/bow,
+			/obj/item/gun/ballistic/revolver/c38,
+			/obj/item/gun/ballistic/revolver/c38/detective,
+			/obj/item/gun/ballistic/revolver/nagant,
+			/obj/item/gun/ballistic/revolver/russian,
+			/obj/item/gun/ballistic/revolver/russian/soul,
+			/obj/item/gun/ballistic/rifle/boltaction/pipegun,
+			/obj/item/gun/ballistic/rifle/boltaction/pipegun/pistol,
+			/obj/item/gun/ballistic/rifle/boltaction/surplus,
+			/obj/item/gun/ballistic/shotgun/doublebarrel,
+			/obj/item/gun/ballistic/shotgun/doublebarrel/breacherslug,
+			/obj/item/gun/ballistic/shotgun/doublebarrel/slugs,
+			/obj/item/gun/ballistic/shotgun/musket,
+			/obj/item/gun/ballistic/shotgun/toy,
+			/obj/item/gun/ballistic/shotgun/toy/crossbow,
+			/obj/item/hatchet,
+			/obj/item/knife/combat/bone,
+			/obj/item/knife/combat/survival,
+			/obj/item/knife/envy,
+			/obj/item/lead_pipe,
+			/obj/item/melee/baseball_bat,
+			/obj/item/spear,
+			/obj/item/spear/bamboospear,
+			/obj/item/spear/bonespear,
+			/obj/item/spear/military,
+			/obj/item/storage/case/cyberware/scrapper,
+			/obj/item/tailclub,
+		),
+		"2" = list(
+			/obj/item/chainsaw,
+			/obj/item/claymore/cutlass/old,
+			/obj/item/claymore/shortsword,
+			/obj/item/claymore/weak,
+			/obj/item/crowbar/large/twenty_force,
+			/obj/item/fireaxe,
+			/obj/item/fireaxe/boardingaxe,
+			/obj/item/fireaxe/boneaxe,
+			/obj/item/gun/ballistic/automatic/ar,
+			/obj/item/gun/ballistic/automatic/c20r/unrestricted,
+			/obj/item/gun/ballistic/automatic/mini_uzi,
+			/obj/item/gun/ballistic/automatic/pistol/aps,
+			/obj/item/gun/ballistic/automatic/pistol/deagle,
+			/obj/item/gun/ballistic/automatic/pistol/deagle/camo,
+			/obj/item/gun/ballistic/automatic/pistol/deagle/gold,
+			/obj/item/gun/ballistic/automatic/proto/unrestricted,
+			/obj/item/gun/ballistic/automatic/smartgun,
+			/obj/item/gun/ballistic/automatic/tommygun,
+			/obj/item/gun/ballistic/automatic/wt550,
+			/obj/item/gun/ballistic/revolver,
+			/obj/item/gun/ballistic/revolver/c38/housecall,
+			/obj/item/gun/ballistic/revolver/golden,
+			/obj/item/gun/ballistic/revolver/mateba,
+			/obj/item/gun/ballistic/rifle/boltaction,
+			/obj/item/gun/ballistic/rifle/boltaction/donkrifle,
+			/obj/item/gun/ballistic/rifle/boltaction/pipegun/prime,
+			/obj/item/gun/ballistic/rifle/boltaction/prime,
+			/obj/item/gun/ballistic/rifle/rebarxbow/forced,
+			/obj/item/gun/ballistic/shotgun,
+			/obj/item/gun/ballistic/shotgun/lethal,
+			/obj/item/gun/ballistic/shotgun/musket/no_quarter,
+			/obj/item/gun/ballistic/shotgun/riot,
+			/obj/item/gun/energy/e_gun,
+			/obj/item/gun/energy/e_gun/dragnet,
+			/obj/item/gun/energy/e_gun/mini,
+			/obj/item/gun/energy/e_gun/old,
+			/obj/item/gun/energy/ionrifle,
+			/obj/item/gun/energy/ionrifle/carbine,
+			/obj/item/gun/energy/laser,
+			/obj/item/gun/energy/laser/luxurypaywall,
+			/obj/item/gun/energy/laser/retro,
+			/obj/item/gun/energy/laser/retro/old,
+			/obj/item/gun/magic/hook/marlinspike,
+			/obj/item/gun/syringe/rapidsyringe,
+			/obj/item/gun/syringe/syndicate,
+			/obj/item/kinetic_crusher,
+			/obj/item/knife/combat,
+			/obj/item/melee/baseball_bat/ablative,
+			/obj/item/melee/cleric_mace,
+			/obj/item/melee/parsnip_sabre,
+			/obj/item/melee/sabre,
+			/obj/item/nullrod/claymore,
+			/obj/item/nullrod/claymore/chainsaw_sword,
+			/obj/item/nullrod/claymore/darkblade,
+			/obj/item/nullrod/claymore/glowing,
+			/obj/item/nullrod/claymore/katana,
+			/obj/item/nullrod/claymore/multiverse,
+			/obj/item/nullrod/claymore/saber,
+			/obj/item/nullrod/claymore/saber/pirate,
+			/obj/item/nullrod/claymore/saber/red,
+			/obj/item/nullrod/hypertool,
+			/obj/item/nullrod/vibro,
+			/obj/item/nullrod/vibro/spellblade,
+			/obj/item/nullrod/vibro/talking,
+			/obj/item/pen/edagger,
+			/obj/item/shield/buckler,
+			/obj/item/shield/buckler/parmula,
+			/obj/item/shield/kite,
+			/obj/item/shield/riot,
+			/obj/item/shield/riot/phalanx_buckler,
+			/obj/item/shield/riot/tele,
+			/obj/item/shield/roman,
+			/obj/item/shovel/serrated,
+			/obj/item/spear/grey_tide,
+			/obj/item/switchblade,
+		),
+		"3" = list(
+			/obj/item/claymore,
+			/obj/item/claymore/cutlass,
+			/obj/item/claymore/cutlass/parley,
+			/obj/item/clothing/gloves/knock_knock,
+			/obj/item/cursed_katana,
+			/obj/item/cyberware_pair_case/gorilla_arms,
+			/obj/item/cyberware_pair_case/mantis_blades,
+			/obj/item/energy_katana,
+			/obj/item/gun/ballistic/automatic/l6_saw/unrestricted,
+			/obj/item/gun/ballistic/automatic/m90/unrestricted,
+			/obj/item/gun/ballistic/rifle/sniper_rifle,
+			/obj/item/gun/ballistic/shotgun/automatic/combat,
+			/obj/item/gun/ballistic/shotgun/bulldog/unrestricted,
+			/obj/item/gun/energy/e_gun/hos,
+			/obj/item/gun/energy/e_gun/nuclear,
+			/obj/item/gun/energy/event_horizon,
+			/obj/item/gun/energy/laser/carbine,
+			/obj/item/gun/energy/laser/carbine/cybersun/unrestricted,
+			/obj/item/gun/energy/laser/hellgun,
+			/obj/item/gun/energy/laser/scatter,
+			/obj/item/gun/energy/lasercannon/unrestricted,
+			/obj/item/gun/energy/recharge/ebow,
+			/obj/item/gun/energy/temperature/unrestricted,
+			/obj/item/gun/energy/xray,
+			/obj/item/heave_ho,
+			/obj/item/house_edge,
+			/obj/item/katana,
+			/obj/item/knife/bloodletter,
+			/obj/item/knife/understudy,
+			/obj/item/melee/energy/sword/pirate,
+			/obj/item/melee/energy/sword/saber,
+			/obj/item/melee/energy/sword/saber/blue,
+			/obj/item/melee/energy/sword/saber/purple,
+			/obj/item/melee/energy/sword/saber/red,
+			/obj/item/melee/greykingsword,
+			/obj/item/mjollnir,
+			/obj/item/organ/cyberimp/arm/toolkit/cyberware/bunker_buster,
+			/obj/item/organ/cyberimp/arm/toolkit/cyberware/monowire,
+			/obj/item/organ/cyberimp/arm/toolkit/cyberware/ronin,
+			/obj/item/shield/energy,
+			/obj/item/singularityhammer,
+			/obj/item/storage/toolbox/mechanical/old/clean,
+			/obj/item/veilrender,
+			/obj/item/veilrender/honkrender,
+			/obj/item/veilrender/vealrender,
+		),
+	)
+	var/list/all_weapons = list()
+	for(var/class in expected)
+		all_weapons += expected[class]
+	var/list/seen = list()
+	var/list/utility_guns = list(
+		/obj/item/gun/energy/disabler,
+		/obj/item/gun/energy/recharge/kinetic_accelerator,
+		/obj/item/gun/energy/plasmacutter,
+		/obj/item/gun/energy/plasmacutter/adv,
+	)
+	for(var/theme_path in GLOB.loot_themes)
+		var/datum/loot_theme/theme = GLOB.loot_themes[theme_path]
+		for(var/gun in list(FALSE, TRUE))
+			for(var/class in expected)
+				var/list/pool = theme.get_weapon_pool(gun, class)
+				for(var/entry in pool)
+					TEST_ASSERT(entry in expected[class], "[theme_path] weapon [entry] is outside catalog class [class]")
+					seen |= entry
+		for(var/list/pool as anything in list(theme.loot_common, theme.loot_uncommon, theme.loot_prime, theme.loot_uniques))
+			for(var/entry in pool)
+				TEST_ASSERT(!(entry in all_weapons), "[theme_path] can pay an extra weapon from its nonweapon draws: [entry]")
+				if(ispath(entry, /obj/item/gun))
+					TEST_ASSERT(entry in utility_guns, "[theme_path] bypasses its weapon roll with [entry]")
+				TEST_ASSERT(entry != /obj/item/his_grace, "His Grace remains in ordinary cache loot")
+	for(var/entry in all_weapons)
+		TEST_ASSERT(entry in seen, "Retained weapon [entry] lost its guarded cache source")
diff --git a/voidcrew/modules/unit_tests/voidcrew_mining_qol.dm b/voidcrew/modules/unit_tests/voidcrew_mining_qol.dm
index bfe702d7d6e..00a8f159f13 100644
--- a/voidcrew/modules/unit_tests/voidcrew_mining_qol.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_mining_qol.dm
@@ -11,3 +11,73 @@
 /datum/unit_test/voidcrew_mining_console_quotes_its_price/Run()
 	var/obj/machinery/computer/order_console/mining/console_type = /obj/machinery/computer/order_console/mining
 	TEST_ASSERT_EQUAL(initial(console_type.cargo_cost_multiplier), initial(console_type.express_cost_multiplier), "The mining console must quote the price it charges.")
+
+/// Exercise real material intake and its payout signal for every displayed raw ore rate.
+/datum/unit_test/voidcrew_orm_quotes_actual_points
+
+/datum/unit_test/voidcrew_orm_quotes_actual_points/Run()
+	for(var/upgrade in list(1, 1.7))
+		var/obj/machinery/mineral/ore_redemption/orm = allocate(/obj/machinery/mineral/ore_redemption)
+		orm.point_upgrade = upgrade
+		var/list/data = orm.ui_data(null)
+		var/checked_titanium = FALSE
+		for(var/list/entry as anything in data["materials"])
+			if(entry["category"] != "material")
+				continue
+			var/datum/material/material = locate(entry["id"])
+			TEST_ASSERT_NOTNULL(material, "An ORM material row must refer to a material datum.")
+			var/obj/item/stack/ore/ore_type = material.ore_type
+			if(!ispath(ore_type, /obj/item/stack/ore) || !initial(ore_type.refined_type))
+				TEST_ASSERT_EQUAL(entry["value"], 0, "Materials without redeemable ore must quote zero points.")
+				continue
+			var/ore_count = 5
+			var/obj/item/stack/ore/ore = allocate(ore_type, run_loc_floor_bottom_left, ore_count)
+			var/points_before = orm.points
+			TEST_ASSERT(orm.materials.insert_item(ore, orm.ore_multiplier) > 0, "The ORM must consume [ore_type] through its real intake.")
+			var/awarded_points = orm.points - points_before
+			TEST_ASSERT_EQUAL(entry["value"] * ore_count, awarded_points, "The ORM quote must match the [ore_type] payout with point_upgrade [upgrade].")
+			if(material.type != /datum/material/titanium)
+				continue
+			checked_titanium = TRUE
+			var/recovered_sheets = orm.materials.mat_container.retrieve_sheets(ore_count, material)
+			TEST_ASSERT_EQUAL(recovered_sheets, ore_count, "Raw titanium must retain its sheet yield.")
+			TEST_ASSERT_EQUAL(awarded_points, recovered_sheets * 40 * upgrade, "Raw titanium must pay 40 points per recovered sheet before point upgrades.")
+		TEST_ASSERT(checked_titanium, "The ORM must display titanium.")
+
+/datum/unit_test/voidcrew_titanium_boulder_points
+
+/datum/unit_test/voidcrew_titanium_boulder_points/Run()
+	var/datum/material/titanium = GET_MATERIAL_REF(/datum/material/titanium)
+	for(var/sheet_count in list(1, 5))
+		var/obj/machinery/bouldertech/refinery/smelter/smelter = allocate(/obj/machinery/bouldertech/refinery/smelter)
+		STOP_PROCESSING(SSmachines, smelter)
+		var/obj/item/boulder/boulder = allocate(/obj/item/boulder, smelter)
+		boulder.set_custom_materials(list((titanium) = sheet_count * SHEET_MATERIAL_AMOUNT))
+		boulder.durability = 0
+		smelter.process()
+		TEST_ASSERT(QDELETED(boulder), "The smelter must consume the titanium boulder.")
+		var/recovered_sheets = smelter.silo_materials.mat_container.retrieve_sheets(sheet_count, titanium)
+		TEST_ASSERT_EQUAL(recovered_sheets, sheet_count, "Boulder titanium must retain its sheet yield.")
+		TEST_ASSERT_EQUAL(smelter.points_held, recovered_sheets * 40, "Boulder titanium must pay 40 points per recovered sheet after the machine multiplier.")
+		var/points_before = smelter.points_held
+		smelter.process()
+		TEST_ASSERT_EQUAL(smelter.points_held, points_before, "A consumed boulder must not award points twice.")
+
+/datum/unit_test/voidcrew_mining_cash_bill
+
+/datum/unit_test/voidcrew_mining_cash_bill/Run()
+	var/datum/orderable_item/consumables/space_cash/product = allocate(/datum/orderable_item/consumables/space_cash)
+	var/obj/machinery/computer/order_console/mining/console = allocate(/obj/machinery/computer/order_console/mining)
+	var/datum/bank_account/account = allocate(/datum/bank_account, "Mining bill test", null, 1, FALSE)
+	var/obj/item/card/id/card = allocate(/obj/item/card/id)
+	card.registered_account = account
+	console.grocery_list[product] = 1
+	account.mining_points = 1999
+	TEST_ASSERT(!console.purchase_items(card, TRUE), "A bill must not be sold for fewer than 2000 mining points.")
+	TEST_ASSERT_EQUAL(account.mining_points, 1999, "A refused purchase must not spend mining points.")
+	account.mining_points = 2000
+	TEST_ASSERT(console.purchase_items(card, TRUE), "One bill must be purchasable for 2000 mining points.")
+	TEST_ASSERT_EQUAL(account.mining_points, 0, "One bill must spend exactly 2000 mining points.")
+	var/obj/item/stack/spacecash/bill = allocate(product.purchase_path)
+	TEST_ASSERT_EQUAL(bill.amount, 1, "One order must produce one bill.")
+	TEST_ASSERT_EQUAL(bill.get_item_credit_value(), 500, "The ordered bill must be worth 500 credits.")
diff --git a/voidcrew/modules/unit_tests/voidcrew_mission_board_rewards.dm b/voidcrew/modules/unit_tests/voidcrew_mission_board_rewards.dm
new file mode 100644
index 00000000000..c724f9b9e02
--- /dev/null
+++ b/voidcrew/modules/unit_tests/voidcrew_mission_board_rewards.dm
@@ -0,0 +1,323 @@
+#ifndef VOIDCREW_MISSION_BOARD_REWARDS_TESTS
+#define VOIDCREW_MISSION_BOARD_REWARDS_TESTS
+
+/// Board fixtures avoid random overmap sites; reward and lifecycle code stays real.
+/datum/mission/m1_board_test/generate_mission_details()
+
+/datum/mission/recovery/outpost/m1_board_test/generate_mission_details()
+
+/datum/mission/recovery/kill/outpost/m1_board_test/generate_mission_details()
+
+/datum/mission/outpost_courier/m1_board_test/generate_mission_details()
+
+/obj/structure/overmap/trader_outpost/m1_board_test
+	var/turf/counter_turf
+
+/obj/structure/overmap/trader_outpost/m1_board_test/contains_site_turf(turf/location)
+	return location && location == counter_turf
+
+/// Verify conservation, shelf restrictions, stack amounts and all difficulty bands.
+/datum/unit_test/voidcrew_m1_quotes/Run()
+	for(var/shop_type in list(/datum/outpost_shop/general, /datum/outpost_shop/outfitter, /datum/outpost_shop/black_market, /datum/outpost_shop/vendor/suit_fitter))
+		var/datum/outpost_shop/shop = allocate(shop_type)
+		for(var/difficulty in list(1, 2, 3)) // MISSION_DIFFICULTY_* compile later.
+			for(var/attempt in 1 to 15)
+				var/datum/mission/mission = allocate(/datum/mission/m1_board_test, shop)
+				mission.difficulty = difficulty
+				TEST_ASSERT(shop.roll_contract_reward(mission), "A board must fund even an empty package")
+				var/list/bands = list(list(600, 900), list(1300, 1800), list(2400, 3200))
+				TEST_ASSERT(mission.contract_quote >= bands[difficulty][1] && mission.contract_quote <= bands[difficulty][2], "Quote left its difficulty band")
+				var/package_value = 0
+				TEST_ASSERT(length(mission.get_reward_types()) <= 2, "A quote includes too many shelf objects")
+				TEST_ASSERT_EQUAL(length(mission.rare_reward_types), 0, "Hard board work must never draw an exclusive")
+				for(var/item_type in mission.contract_stock)
+					var/datum/shop_sku/sku = mission.contract_stock[item_type]
+					TEST_ASSERT_EQUAL(sku.shelf, "core", "A package leaked a restricted shelf")
+					TEST_ASSERT(sku.contract_reward && sku.price_credits > 0 && !sku.price_vouchers && sku.stock > 0, "A package includes ineligible stock")
+					TEST_ASSERT_EQUAL(mission.reward_amounts[item_type], sku.dispense_amount, "A package changed a stack quantity")
+					package_value += sku.price_credits
+				TEST_ASSERT(package_value <= floor(mission.contract_quote * 0.6), "The package exceeds its shelf share")
+				TEST_ASSERT_EQUAL(package_value + mission.value + mission.voucher_count * 1200, mission.contract_quote, "Settlement lost or created quoted value")
+				TEST_ASSERT(mission.value >= 0 && mission.value < 1200, "Currency residual is not exact")
+				qdel(mission)
+		for(var/datum/shop_sku/sku as anything in shop.skus)
+			sku.stock = 0
+		var/datum/mission/empty = allocate(/datum/mission/m1_board_test, shop)
+		TEST_ASSERT(shop.roll_contract_reward(empty), "Empty shelves must still offer work")
+		TEST_ASSERT_EQUAL(length(empty.get_reward_types()), 0, "Depleted stock was quoted as goods")
+		TEST_ASSERT_EQUAL(empty.value + empty.voucher_count * 1200, empty.contract_quote, "Empty shelves failed to settle in currency")
+		TEST_ASSERT(!findtext(empty.get_contract_pay_summary(), "goods"), "Currency-only text invented a goods reward")
+		qdel(shop)
+	var/datum/outpost_shop/shop = allocate(/datum/outpost_shop)
+	var/list/expensive = list(/obj/item/gps = 601)
+	TEST_ASSERT_NULL(shop.pick_valued_reward(expensive, 600), "The cheapest-item fallback or overshoot remains")
+
+/// Every retained ask and all six fitter rows use the specified supply formula.
+/datum/unit_test/voidcrew_m1_supply_rows/Run()
+	var/obj/structure/overmap/trader_outpost/outpost = allocate(/obj/structure/overmap/trader_outpost/outfitter)
+	var/datum/outpost_shop/vendor/suit_fitter/fitter = outpost.get_shop(/datum/outpost_shop/vendor/suit_fitter)
+	TEST_ASSERT_EQUAL(length(outpost.shop.get_procurement_requests()), 9, "The shared outfitter pool must contain nine equal rows")
+	var/datum/outpost_shop/outfitter/standalone = allocate(/datum/outpost_shop/outfitter)
+	TEST_ASSERT_EQUAL(length(standalone.get_procurement_requests()), 9, "A standalone outfitter lost the fitter requests")
+	var/list/expected_types = list(
+		/obj/item/stack/sheet/animalhide/goliath_hide,
+		/obj/item/stack/sheet/sinew,
+		/obj/item/stack/glacial_core,
+		/obj/item/mod/construction/broken_core,
+		/obj/item/mod/control/pre_equipped,
+		/obj/item/mod/module/springlock,
+		/obj/item/mod/module/visor/rave,
+		/obj/item/mod/module/balloon,
+		/obj/item/mod/module/stamp,
+	)
+	for(var/list/request as anything in outpost.shop.get_procurement_requests())
+		TEST_ASSERT(request["type"] in expected_types, "The shared pool duplicated or substituted an ask")
+		expected_types -= request["type"]
+	TEST_ASSERT_EQUAL(length(expected_types), 0, "The shared pool omitted an ask")
+	TEST_ASSERT_EQUAL(length(fitter.mission_requests), 6, "Wick must supply all six salvage rows")
+	for(var/list/request as anything in fitter.mission_requests)
+		TEST_ASSERT(request in outpost.shop.mission_requests, "Sarge's board did not retain Wick's request")
+	for(var/shop_type in list(/datum/outpost_shop/general, /datum/outpost_shop/outfitter, /datum/outpost_shop/black_market))
+		var/datum/outpost_shop/shop = shop_type == /datum/outpost_shop/outfitter ? outpost.shop : allocate(shop_type)
+		var/list/requests = shop.mission_requests.Copy()
+		for(var/list/request as anything in requests)
+			shop.mission_requests = list(request)
+			var/datum/mission/outpost_supply/mission = allocate(/datum/mission/outpost_supply, shop)
+			TEST_ASSERT(!mission.generation_failed, "[request["type"]] failed generation")
+			TEST_ASSERT_EQUAL(mission.required_amount, request["amount"], "Generation changed an ask quantity")
+			TEST_ASSERT_EQUAL(mission.difficulty, request["difficulty"], "Generation changed ask difficulty")
+			var/datum/outpost_shop/reward_shop = request["reward_shop"] ? fitter : shop
+			TEST_ASSERT_EQUAL(mission.contract_reward_shop, reward_shop, "Fitter reward stock must come from Wick")
+			TEST_ASSERT_EQUAL(mission.shop, shop, "Fitter favor must remain with Sarge")
+			var/counter = reward_shop.get_counter_value(request["type"], request["amount"])
+			if(ispath(request["type"], /obj/item/mod/module))
+				TEST_ASSERT_EQUAL(counter, 0, "Loot-module reference value became a buyback")
+				counter = 250
+			var/list/bands = list(list(600, 900), list(1300, 1800), list(2400, 3200))
+			var/list/band = bands[mission.difficulty]
+			var/list/services = list(200, 350, 500)
+			var/service = services[mission.difficulty]
+			var/minimum = max(CEILING(counter * 1.15, 1), min(request["pay_min"] || band[1], counter + service))
+			var/maximum = max(CEILING(counter * 1.15, 1), min(request["pay_max"] || band[2], counter + service))
+			if(mission.is_routine_contract())
+				minimum = max(CEILING(counter * 1.10, 1), min(floor(band[1] * 0.4), service))
+				maximum = max(CEILING(counter * 1.10, 1), min(floor(band[2] * 0.4), service))
+				TEST_ASSERT_EQUAL(mission.voucher_count, 0, "Routine supplies must not pay vouchers")
+				TEST_ASSERT_EQUAL(mission.get_favor_reward(), 1, "Routine supplies must pay one favor")
+			TEST_ASSERT(mission.contract_quote >= minimum && mission.contract_quote <= maximum, "[request["type"]] left its specified pay range")
+			TEST_ASSERT_EQUAL(mission.value, mission.value_min, "The shell overwrote residual credits")
+			TEST_ASSERT_EQUAL(mission.value, mission.value_max, "Residual credits must not reroll")
+			qdel(mission)
+		shop.mission_requests = requests
+	for(var/mission_type in list(/datum/mission/outpost_supply/cook, /datum/mission/outpost_supply/angler))
+		var/datum/mission/mission = allocate(mission_type, outpost.shop)
+		TEST_ASSERT_EQUAL(mission.voucher_count, 0, "The food and angler exceptions must never pay vouchers")
+		TEST_ASSERT_EQUAL(mission.get_favor_reward(), 1, "The food and angler exceptions must pay routine favor")
+
+/// Target scaling precedes the board quote; only the board multiplier changes fees.
+/datum/unit_test/voidcrew_m1_field_fees/Run()
+	var/datum/outpost_shop/shop = allocate(/datum/outpost_shop)
+	var/list/bands = list(list(600, 900), list(1300, 1800), list(2400, 3200))
+	var/list/zones = list(1, 2, 3) // ZONE_GREEN/YELLOW/RED
+	for(var/index in 1 to 3)
+		var/list/band = bands[index]
+		for(var/mission_type in list(/datum/mission/recovery/outpost/m1_board_test, /datum/mission/recovery/kill/outpost/m1_board_test))
+			var/datum/mission/mission = allocate(mission_type, shop)
+			mission.apply_zone_scaling(zones[index])
+			mission.generate_details()
+			var/multiplier = 1.15
+			if(istype(mission, /datum/mission/recovery/kill))
+				var/list/kill_multipliers = list(1.10, 0.95, 0.55)
+				multiplier = kill_multipliers[index]
+			TEST_ASSERT(mission.contract_quote >= floor(band[1] * multiplier) && mission.contract_quote <= floor(band[2] * multiplier), "Field fee scaled twice or used the old multiplier")
+			TEST_ASSERT_EQUAL(mission.get_favor_reward(), index == 3 ? 3 : index, "Field favor has the wrong difficulty reward")
+	var/obj/structure/overmap/trader_outpost/origin = allocate(/obj/structure/overmap/trader_outpost, run_loc_floor_bottom_left)
+	var/obj/structure/overmap/trader_outpost/destination = allocate(/obj/structure/overmap/trader_outpost, run_loc_floor_top_right)
+	var/datum/mission/outpost_courier/mission = allocate(/datum/mission/outpost_courier/m1_board_test, origin.shop)
+	var/datum/mission_target/outpost/target = new(mission)
+	target.outpost = destination
+	mission.target = target
+	mission.generate_details()
+	TEST_ASSERT_EQUAL(mission.contract_quote, 10 * max(abs(origin.x - destination.x), abs(origin.y - destination.y)), "Courier pay ignored the fixed endpoint distance")
+
+/// Stock races, convoy caps, failure/delete release and exact once-only payout.
+/datum/unit_test/voidcrew_m1_reservations/Run()
+	var/datum/outpost_shop/shop = allocate(/datum/outpost_shop)
+	shop.add_sku(/datum/shop_sku/general/beans, "core")
+	var/datum/shop_sku/sku = shop.skus[1]
+	sku.stock = 1
+	sku.stock_max = 1
+	var/obj/structure/overmap/ship/ship = allocate(/obj/structure/overmap/ship)
+	var/datum/bank_account/account = allocate(/datum/bank_account, "Contract settlement", null, 1, FALSE)
+	ship.ship_account = account
+	var/datum/mission/first = allocate(/datum/mission/m1_board_test, shop)
+	var/datum/mission/second = allocate(/datum/mission/m1_board_test, shop)
+	shop.roll_contract_reward(first)
+	shop.roll_contract_reward(second)
+	var/second_quote = second.contract_quote
+	TEST_ASSERT(shop.roll_contract_reward(second), "A fixed quote could not be read again")
+	TEST_ASSERT_EQUAL(second.contract_quote, second_quote, "Reading the quote rerolled its value")
+	TEST_ASSERT(first.start_mission(ship), "The first crew could not accept its quote")
+	TEST_ASSERT_EQUAL(sku.stock, 0, "Acceptance did not claim shared stock")
+	TEST_ASSERT_EQUAL(sku.reserved_stock, 1, "Acceptance did not record its reservation")
+	TEST_ASSERT(!first.start_mission(ship), "A second acceptance reserved stock again")
+	TEST_ASSERT(second.start_mission(ship), "The second crew must still receive a currency award")
+	TEST_ASSERT_EQUAL(length(second.get_reward_types()), 0, "Two crews reserved the same last shelf object")
+	TEST_ASSERT_EQUAL(second.value + second.voucher_count * 1200, second_quote, "A drained shelf changed total pay")
+	shop.convoy_restock()
+	TEST_ASSERT_EQUAL(sku.stock, 0, "The convoy refilled a unit held by a contract")
+	first.fail("Abandoned.")
+	TEST_ASSERT_EQUAL(sku.stock, 1, "Abandonment did not release its stock")
+	qdel(first)
+	TEST_ASSERT_EQUAL(sku.stock, 1, "Deletion released the same reservation twice")
+	qdel(second)
+	var/datum/mission/paid = allocate(/datum/mission/m1_board_test, shop)
+	shop.roll_contract_reward(paid)
+	TEST_ASSERT(paid.start_mission(ship), "The completion fixture could not start")
+	var/cash = paid.value
+	var/balance = account.account_balance
+	TEST_ASSERT(paid.turn_in(run_loc_floor_bottom_left, null), "A completed contract could not settle")
+	TEST_ASSERT_EQUAL(account.account_balance, balance + cash, "Settlement paid the wrong residual credits")
+	TEST_ASSERT_EQUAL(sku.stock, 0, "Completion returned the paid shelf object to stock")
+	TEST_ASSERT_EQUAL(sku.reserved_stock, 0, "Completion left a reservation behind")
+	TEST_ASSERT(!paid.turn_in(run_loc_floor_bottom_left, null), "A stale hand-in completed twice")
+	paid.finish_mission(run_loc_floor_bottom_left)
+	TEST_ASSERT_EQUAL(account.account_balance, balance + cash, "A repeated completion paid twice")
+
+/// Missing receiving accounts refuse both partial and final consumption.
+/datum/unit_test/voidcrew_m1_accounts/Run()
+	var/datum/outpost_shop/shop = allocate(/datum/outpost_shop)
+	var/obj/structure/overmap/ship/ship = allocate(/obj/structure/overmap/ship)
+	var/datum/bank_account/account = allocate(/datum/bank_account, "Contract handover", null, 1, FALSE)
+	var/datum/mission/mission = allocate(/datum/mission/m1_board_test, shop)
+	shop.roll_contract_reward(mission)
+	ship.ship_account = null
+	TEST_ASSERT(!mission.start_mission(ship), "An accountless crew accepted work")
+	ship.ship_account = account
+	mission.requires_item = TRUE
+	var/datum/mission_objective/deliver/procurement/ask = new
+	ask.required_type = /obj/item/mod/construction/broken_core
+	ask.required_amount = 2
+	mission.add_objective(ask)
+	TEST_ASSERT(mission.start_mission(ship), "A funded crew could not accept work")
+	var/obj/item/first = allocate(/obj/item/mod/construction/broken_core)
+	var/obj/item/second = allocate(/obj/item/mod/construction/broken_core)
+	ship.ship_account = null
+	TEST_ASSERT(!mission.turn_in(run_loc_floor_bottom_left, first), "A partial delivery consumed goods without a receiving account")
+	TEST_ASSERT(!QDELETED(first) && ask.delivered_count == 0, "Refused partial goods were consumed")
+	ship.ship_account = account
+	TEST_ASSERT(mission.turn_in(run_loc_floor_bottom_left, first), "A valid partial delivery failed")
+	TEST_ASSERT_EQUAL(ask.delivered_count, 1, "Partial delivery did not advance")
+	TEST_ASSERT(!mission.turn_in(run_loc_floor_bottom_left, first), "The same partial delivery counted twice")
+	ship.ship_account = null
+	TEST_ASSERT(!mission.turn_in(run_loc_floor_bottom_left, second), "A final delivery consumed goods without an account")
+	TEST_ASSERT(!QDELETED(second), "Refused final goods were consumed")
+	ship.ship_account = account
+	TEST_ASSERT(mission.turn_in(run_loc_floor_bottom_left, second), "Restoring the account did not allow settlement")
+	TEST_ASSERT(!mission.turn_in(run_loc_floor_bottom_left, second), "A final delivery settled twice")
+
+/// Acceptance, reopening, failure and target loss never advance the refill clock.
+/datum/unit_test/voidcrew_m1_board_clock/Run()
+	var/obj/structure/overmap/trader_outpost/outpost = allocate(/obj/structure/overmap/trader_outpost)
+	for(var/datum/mission/posted as anything in outpost.shop_offers.Copy())
+		qdel(posted)
+	outpost.shop_offers.Cut()
+	outpost.shop.mission_requests = list()
+	outpost.shop.extra_offer_mix = list(
+		/datum/mission/outpost_supply = 0,
+		/datum/mission/recovery/kill/outpost = 0,
+		/datum/mission/recovery/outpost = 0,
+		/datum/mission/outpost_courier = 0,
+		/datum/mission/outpost_supply/cook = 1,
+	)
+	outpost.next_contract_refill = world.time
+	outpost.ensure_shop_offers()
+	TEST_ASSERT_EQUAL(length(outpost.shop_offers), 4, "Scheduled refill did not fill the shared slots")
+	var/next_refill = outpost.next_contract_refill
+	var/datum/mission/taken = outpost.shop_offers[1]
+	outpost.shop_offers -= taken
+	qdel(taken)
+	outpost.ensure_shop_offers()
+	TEST_ASSERT_EQUAL(length(outpost.shop_offers), 3, "Reopening replaced a vacant offer early")
+	TEST_ASSERT_EQUAL(outpost.next_contract_refill, next_refill, "Reopening moved the refill clock")
+	var/datum/mission/expired = outpost.shop_offers[1]
+	expired.posted_at = world.time - (22 MINUTES)
+	outpost.next_contract_refill = world.time
+	outpost.ensure_shop_offers()
+	TEST_ASSERT(QDELETED(expired), "An unaccepted offer survived its expiry")
+	TEST_ASSERT_EQUAL(length(outpost.shop_offers), 4, "Scheduled refill did not replace expired offers")
+	outpost.next_contract_refill = world.time - (1 SECONDS)
+	var/delayed_deadline = outpost.next_contract_refill
+	outpost.ensure_shop_offers()
+	TEST_ASSERT_EQUAL(outpost.next_contract_refill, delayed_deadline + (11 MINUTES), "A delayed callback shifted the fixed cadence")
+
+/// A cached window cannot act for visitors, former members or a displaced trader.
+/datum/unit_test/voidcrew_m1_counter_access/Run()
+	var/obj/structure/overmap/trader_outpost/m1_board_test/outpost = allocate(/obj/structure/overmap/trader_outpost/m1_board_test)
+	var/mob/living/basic/outpost_trader/npc = allocate(/mob/living/basic/outpost_trader, run_loc_floor_bottom_left)
+	outpost.counter_turf = get_turf(npc)
+	outpost.trader = npc
+	npc.outpost = outpost
+	npc.shop = outpost.shop
+	var/mob/living/carbon/human/user = allocate(/mob/living/carbon/human/consistent, run_loc_floor_bottom_left)
+	user.mind_initialize()
+	allocated += user.mind
+	TEST_ASSERT(!npc.can_use_contracts(user), "A visitor could act on the board")
+	var/obj/structure/overmap/ship/ship = allocate(/obj/structure/overmap/ship)
+	var/datum/team/voidcrew/team = allocate(/datum/team/voidcrew)
+	team.ship = ship
+	ship.ship_team = team
+	team.join_member(user.mind)
+	TEST_ASSERT(npc.can_use_contracts(user), "A present crew member could not use the board")
+	user.mind.leave_reputation_crew()
+	TEST_ASSERT(!npc.can_use_contracts(user), "A former crew member could send a stale action")
+	team.join_member(user.mind)
+	npc.forceMove(get_step(run_loc_floor_bottom_left, NORTH))
+	TEST_ASSERT(!npc.can_use_contracts(user), "A relocated trader could settle outside its site")
+	user.mind.ship_teams = list()
+	team.ship = null
+
+/// Spawned stack quantities, vouchers and cash match the accepted quote exactly.
+/datum/unit_test/voidcrew_m1_physical_settlement/Run()
+	var/datum/outpost_shop/shop = allocate(/datum/outpost_shop)
+	shop.add_sku(/datum/shop_sku/general/suture, "core")
+	var/datum/shop_sku/sku = shop.skus[1]
+	var/datum/mission/mission = allocate(/datum/mission/m1_board_test, shop)
+	mission.difficulty = 3
+	shop.roll_contract_reward(mission)
+	var/obj/structure/overmap/ship/ship = allocate(/obj/structure/overmap/ship)
+	var/datum/bank_account/account = allocate(/datum/bank_account, "Physical settlement", null, 1, FALSE)
+	ship.ship_account = account
+	ship.ship_team = allocate(/datum/team/voidcrew)
+	ship.ship_team.ship = ship
+	allocated += ship.get_crew_record()
+	TEST_ASSERT(mission.start_mission(ship), "The physical settlement could not start")
+	var/cash = mission.value
+	var/vouchers = mission.voucher_count
+	var/quote = mission.contract_quote
+	var/balance = account.account_balance
+	TEST_ASSERT(mission.turn_in(run_loc_floor_bottom_left, null), "The physical settlement failed")
+	var/obj/item/stack/medical/suture/pack = locate() in run_loc_floor_bottom_left
+	var/obj/item/stack/trade_voucher/scrip = locate() in run_loc_floor_bottom_left
+	TEST_ASSERT_NOTNULL(pack, "The shelf package was not spawned")
+	TEST_ASSERT_NOTNULL(scrip, "The currency vouchers were not spawned")
+	TEST_ASSERT_EQUAL(pack.amount, 10, "The shelf package spawned one unit instead of ten")
+	TEST_ASSERT_EQUAL(scrip.amount, vouchers, "Settlement spawned the wrong voucher count")
+	TEST_ASSERT_EQUAL(account.account_balance - balance + scrip.amount * 1200 + sku.price_credits, quote, "Physical and bank rewards do not equal the quote")
+	TEST_ASSERT_EQUAL(account.account_balance, balance + cash, "The bank did not receive the residual cash")
+	TEST_ASSERT_EQUAL(shop.get_favor(ship), 3, "Hard completion granted the wrong standing")
+
+/// Existing food checks still distinguish player cooking from the diner's own plates.
+/datum/unit_test/voidcrew_m1_cooked_goods/Run()
+	var/datum/mission_objective/deliver/cooked/ask = allocate(/datum/mission_objective/deliver/cooked)
+	var/obj/item/food/dish = allocate(/obj/item/food)
+	dish.crafting_complexity = ask.min_complexity
+	TEST_ASSERT(!ask.can_turn_in(dish), "Factory food satisfied a Kitchen Order")
+	ADD_TRAIT(dish, TRAIT_FOOD_CHEF_MADE, "outpost_kitchen") // TRAIT_SOURCE_OUTPOST_KITCHEN
+	TEST_ASSERT(!ask.can_turn_in(dish), "A counter plate satisfied a Kitchen Order")
+	ADD_TRAIT(dish, TRAIT_FOOD_CHEF_MADE, "player_cook")
+	TEST_ASSERT(ask.can_turn_in(dish), "Player-cooked food failed an otherwise valid order")
+	dish.crafting_complexity = ask.min_complexity - 1
+	TEST_ASSERT(!ask.can_turn_in(dish), "An underspecified meal satisfied a Kitchen Order")
+
+#endif
diff --git a/voidcrew/modules/unit_tests/voidcrew_mission_console_rewards.dm b/voidcrew/modules/unit_tests/voidcrew_mission_console_rewards.dm
new file mode 100644
index 00000000000..82c594e3ab4
--- /dev/null
+++ b/voidcrew/modules/unit_tests/voidcrew_mission_console_rewards.dm
@@ -0,0 +1,499 @@
+#ifndef VOIDCREW_MISSION_CONSOLE_REWARDS_TESTS
+#define VOIDCREW_MISSION_CONSOLE_REWARDS_TESTS
+
+// Included before and after the fork defines; literals below name their corresponding constants.
+/datum/mission/m2_rewards_test/generate_mission_details()
+
+/datum/mission/recovery/kill/m2_rewards_test
+	weight = 0
+
+/datum/mission/recovery/kill/m2_rewards_test/generate_mission_details()
+
+/datum/mission/recovery/kill/outpost/m2_rewards_test/generate_mission_details()
+
+/obj/structure/overmap/ship/m2_rewards_test
+	var/prize_rolls = 0
+	var/prize_category = "suit"
+
+/obj/structure/overmap/ship/m2_rewards_test/roll_mission_prize(zone)
+	prize_rolls++
+	return prize_category
+
+/datum/mission_target/m2_rewards_test
+	var/resolved_zone = 1 // ZONE_GREEN
+	var/can_resolve = TRUE
+
+/datum/mission_target/m2_rewards_test/resolve()
+	return can_resolve
+
+/datum/mission_target/m2_rewards_test/get_zone_type()
+	return resolved_zone
+
+/obj/item/stack/spice_pods/m2_rewards_test
+
+/datum/unit_test/voidcrew_m2_rewards
+	abstract_type = /datum/unit_test/voidcrew_m2_rewards
+	var/old_accepting
+	var/list/old_pending
+	var/list/old_tallies
+	var/list/old_types
+
+/datum/unit_test/voidcrew_m2_rewards/New()
+	. = ..()
+	old_accepting = SSmetrics.accepting
+	old_pending = SSmetrics.pending
+	old_tallies = SSmetrics.tallies
+	old_types = SSmissions.mission_types
+	SSmetrics.accepting = FALSE
+	SSmetrics.pending = list()
+	SSmetrics.tallies = list()
+
+/datum/unit_test/voidcrew_m2_rewards/Destroy()
+	SSmetrics.accepting = old_accepting
+	SSmetrics.pending = old_pending
+	SSmetrics.tallies = old_tallies
+	SSmissions.mission_types = old_types
+	return ..()
+
+/datum/unit_test/voidcrew_m2_rewards/proc/test_ship()
+	var/obj/structure/overmap/ship/m2_rewards_test/ship = allocate(/obj/structure/overmap/ship/m2_rewards_test)
+	ship.ship_team = allocate(/datum/team/voidcrew)
+	ship.ship_team.ship = ship
+	allocated += ship.get_crew_record()
+	ship.ship_account = allocate(/datum/bank_account)
+	return ship
+
+/// All targeted base bands, one scaling pass, and the independent research factors.
+/datum/unit_test/voidcrew_m2_rewards/bands/Run()
+	var/list/bands = list(
+		/datum/mission/exploration = list(150, 250),
+		/datum/mission/recovery = list(450, 650),
+		/datum/mission/recovery/kill = list(500, 700),
+		/datum/mission/recovery/survey = list(550, 750),
+		/datum/mission/recovery/extraction = list(500, 700),
+		/datum/mission/field_expedition = list(500, 700),
+		/datum/mission/rescue = list(650, 850),
+		/datum/mission/prospect_stake = list(1400, 1800),
+		/datum/mission/research/containment = list(350, 550),
+		/datum/mission/research/core_sample = list(300, 450),
+		/datum/mission/big_game_hunt = list(650, 850),
+		/datum/mission/live_capture = list(600, 800),
+		/datum/mission/poacher_bust = list(600, 800),
+	)
+	var/list/multipliers = list(1, 1.5, 2.2)
+	var/list/research_multipliers = list(1, 1.4, 1.8)
+	for(var/datum/mission/mission_type as anything in bands)
+		var/list/band = bands[mission_type]
+		TEST_ASSERT_EQUAL(initial(mission_type.value_min), band[1], "[mission_type] has the wrong base minimum")
+		TEST_ASSERT_EQUAL(initial(mission_type.value_max), band[2], "[mission_type] has the wrong base maximum")
+		for(var/zone in 1 to 3) // ZONE_GREEN/YELLOW/RED
+			var/datum/mission/mission = allocate(/datum/mission/m2_rewards_test)
+			mission.target = allocate(/datum/mission_target/m2_rewards_test, mission)
+			mission.value_min = band[1]
+			mission.value_max = band[2]
+			mission.research_reward = 500
+			mission.apply_zone_scaling(zone)
+			TEST_ASSERT_EQUAL(mission.value_min, round(band[1] * multipliers[zone], 10), "Wrong scaled minimum")
+			TEST_ASSERT_EQUAL(mission.value_max, round(band[2] * multipliers[zone], 10), "Wrong scaled maximum")
+			TEST_ASSERT_EQUAL(mission.research_reward, round(500 * research_multipliers[zone], 10), "Research used the credit factor")
+			var/quoted = mission.value_max
+			mission.apply_zone_scaling(zone)
+			TEST_ASSERT_EQUAL(mission.value_max, quoted, "Scaling applied twice")
+			TEST_ASSERT_EQUAL(mission.voucher_count, 0, "Scaling invented a red voucher")
+	var/datum/mission/suppression/sweep = allocate(/datum/mission/suppression)
+	var/lo = sweep.quote_zone == 3 ? 1100 : 700
+	var/hi = sweep.quote_zone == 3 ? 1500 : 1000
+	TEST_ASSERT(sweep.value >= lo && sweep.value <= hi, "Suppression must remain flat in its quoted band")
+	TEST_ASSERT(sweep.voucher_count in list(0, 1), "Suppression pays at most one ordinary voucher")
+	var/datum/mission/rescue/rescue_type = /datum/mission/rescue
+	TEST_ASSERT_EQUAL(initial(rescue_type.voucher_count), 0, "Rescue still guarantees vouchers")
+
+/// Verify every delivery row and accept stored goods, including account loss before partial delivery.
+/datum/unit_test/voidcrew_m2_rewards/deliveries/Run()
+	var/datum/mission/delivery/catalog = allocate(/datum/mission/delivery)
+	var/list/expected = list(
+		/obj/item/stack/spice_pods = list(3, 1, 320, 400),
+		/obj/item/stack/sheet/sinew = list(2, 1, 260, 340),
+		/obj/item/stack/sheet/animalhide/goliath_hide = list(2, 2, 400, 550),
+		/obj/item/stack/glacial_core = list(3, 2, 550, 700),
+		/obj/item/stack/telecrystal_raw = list(5, 3, 1500, 1700),
+		/obj/item/sea_crystal = list(1, 3, 1000, 1200),
+		/obj/item/documents/syndicate = list(1, 3, 3000, 3300),
+	)
+	TEST_ASSERT_EQUAL(catalog.weight, 10, "Delivery suspension was not lifted")
+	TEST_ASSERT_EQUAL(length(catalog.delivery_asks), length(expected), "Delivery catalog has extra or missing rows")
+	var/obj/structure/overmap/ship/ship = test_ship()
+	for(var/list/row as anything in catalog.delivery_asks)
+		var/list/wanted = expected[row["type"]]
+		TEST_ASSERT_NOTNULL(wanted, "Delivery asks for an unapproved item")
+		TEST_ASSERT_EQUAL(row["amount"], wanted[1], "Delivery quantity changed")
+		TEST_ASSERT_EQUAL(row["difficulty"], wanted[2], "Delivery difficulty changed")
+		TEST_ASSERT_EQUAL(row["value_min"], wanted[3], "Wrong delivery minimum")
+		TEST_ASSERT_EQUAL(row["value_max"], wanted[4], "Wrong delivery maximum")
+		var/datum/mission/mission = allocate(/datum/mission/m2_rewards_test)
+		mission.value_min = row["value_min"]
+		mission.value_max = row["value_max"]
+		var/datum/mission_objective/deliver/console/ask = new
+		ask.required_type = row["type"]
+		ask.required_amount = row["amount"]
+		mission.add_objective(ask)
+		mission.requires_item = TRUE
+		TEST_ASSERT(mission.start_mission(ship), "Stored-goods delivery did not start")
+		var/obj/item/item
+		if(ispath(ask.required_type, /obj/item/stack))
+			item = allocate(ask.required_type, run_loc_floor_bottom_left, ask.required_amount + 2, FALSE)
+		else
+			item = allocate(ask.required_type)
+		TEST_ASSERT(mission.turn_in(run_loc_floor_bottom_left, item), "Stored qualifying goods were refused")
+		if(isstack(item))
+			var/obj/item/stack/left = item
+			TEST_ASSERT_EQUAL(left.amount, 2, "Delivery consumed excess goods")
+		TEST_ASSERT(!mission.turn_in(run_loc_floor_bottom_left, item), "Stale hand-in paid twice")
+	var/datum/mission/delivery/flat = allocate(/datum/mission/delivery, null, null, 3)
+	var/list/flat_row
+	for(var/list/row as anything in flat.delivery_asks)
+		if(row["type"] == flat.required_type)
+			flat_row = row
+	TEST_ASSERT_EQUAL(flat.value_min, flat_row["value_min"], "Red scaled a flat delivery")
+	TEST_ASSERT_EQUAL(flat.difficulty, flat_row["difficulty"], "Red replaced ask difficulty")
+	TEST_ASSERT_EQUAL(flat.voucher_count, 0, "Delivery gained a voucher")
+	var/datum/mission/partial = allocate(/datum/mission/m2_rewards_test)
+	var/datum/mission_objective/deliver/ask = new
+	ask.required_type = /obj/item/sea_crystal
+	ask.required_amount = 2
+	partial.add_objective(ask)
+	partial.requires_item = TRUE
+	partial.start_mission(ship)
+	var/obj/item/first = allocate(/obj/item/sea_crystal)
+	var/obj/item/second = allocate(/obj/item/sea_crystal)
+	var/datum/bank_account/account = ship.ship_account
+	ship.ship_account = null
+	TEST_ASSERT(!partial.turn_in(run_loc_floor_bottom_left, first), "Accountless partial delivery succeeded")
+	TEST_ASSERT(!QDELETED(first) && !ask.delivered_count, "Rejected delivery consumed goods")
+	ship.ship_account = account
+	TEST_ASSERT(partial.turn_in(run_loc_floor_bottom_left, first), "Valid partial delivery failed")
+	TEST_ASSERT(!partial.turn_in(run_loc_floor_bottom_left, first), "Consumed partial item counted twice")
+	ship.ship_account = null
+	TEST_ASSERT(!partial.turn_in(run_loc_floor_bottom_left, second), "Accountless final delivery succeeded")
+	TEST_ASSERT(!QDELETED(second), "Rejected final delivery consumed goods")
+	ship.ship_account = account
+	TEST_ASSERT(partial.turn_in(run_loc_floor_bottom_left, second), "Final delivery failed after account recovery")
+	var/datum/mission_objective/deliver/console/exact = allocate(/datum/mission_objective/deliver/console)
+	exact.required_type = /obj/item/stack/spice_pods
+	var/obj/item/descendant = allocate(/obj/item/stack/spice_pods/m2_rewards_test)
+	TEST_ASSERT(!exact.can_turn_in(descendant), "A descendant bypassed the exact goods path")
+
+/// Original document variants fulfill the ask; forged photocopies never do.
+/datum/unit_test/voidcrew_m2_rewards/documents/Run()
+	var/obj/structure/overmap/ship/ship = test_ship()
+	var/datum/mission/mission = allocate(/datum/mission/m2_rewards_test)
+	var/datum/mission_objective/deliver/console/ask = new
+	ask.required_type = /obj/item/documents/syndicate
+	mission.add_objective(ask)
+	mission.requires_item = TRUE
+	TEST_ASSERT(mission.start_mission(ship), "Document delivery did not start")
+	var/obj/item/documents/syndicate/red/original = allocate(__IMPLIED_TYPE__)
+	var/obj/item/documents/photocopy/copy = allocate(/obj/item/documents/photocopy, null, original)
+	copy.forgedseal = "red"
+	TEST_ASSERT(!ask.matches_ask(copy) && !mission.turn_in(run_loc_floor_bottom_left, copy), "A forged photocopy satisfied the document delivery")
+	TEST_ASSERT(!QDELETED(copy), "Rejected photocopy was consumed")
+	for(var/document_type in list(/obj/item/documents/syndicate/blue, /obj/item/documents/syndicate/mining))
+		var/obj/item/variant = allocate(document_type)
+		TEST_ASSERT(ask.matches_ask(variant) && ask.can_turn_in(variant), "Original [document_type] was refused")
+	TEST_ASSERT(ask.matches_ask(original), "Red Syndicate intelligence did not match its ask")
+	TEST_ASSERT(mission.turn_in(run_loc_floor_bottom_left, original), "Red Syndicate intelligence did not fulfill the delivery")
+	TEST_ASSERT(ask.completed && QDELETED(original), "Successful delivery did not complete and consume its original")
+
+/// Fixed sets survive acceptance, failure, deletion and rebuilding until the scheduled refresh.
+/datum/unit_test/voidcrew_m2_rewards/offers/Run()
+	SSmissions.mission_types = list(/datum/mission/delivery)
+	var/obj/structure/overmap/ship/ship = test_ship()
+	var/mob/living/carbon/human/member = allocate(/mob/living/carbon/human/consistent)
+	member.mind_initialize()
+	allocated += member.mind
+	ship.enlist_crewmember(member)
+	TEST_ASSERT(SSmissions.refresh_ship_missions(ship), "Initial offer set was not posted")
+	TEST_ASSERT_EQUAL(length(ship.available_missions), 5, "Initial board does not contain five offers")
+	TEST_ASSERT_EQUAL(ship.next_mission_refresh, world.time + 20 MINUTES, "Offer timer is not twenty minutes")
+	var/datum/mission/taken = ship.available_missions[1]
+	TEST_ASSERT(taken.start_mission(ship), "Offer could not be accepted")
+	taken.fail("Abandoned.")
+	var/datum/mission/destroyed = ship.available_missions[1]
+	ship.available_missions -= destroyed
+	qdel(destroyed)
+	var/datum/mission/retained = ship.available_missions[1]
+	var/refresh_at = ship.next_mission_refresh
+	var/obj/machinery/computer/mission_board/console = allocate(/obj/machinery/computer/mission_board)
+	qdel(console)
+	console = allocate(/obj/machinery/computer/mission_board)
+	TEST_ASSERT(!SSmissions.force_refresh_ship_missions(ship), "Manual refresh bypassed the schedule")
+	TEST_ASSERT_EQUAL(length(ship.available_missions), 3, "Vacancies refilled before the timer")
+	TEST_ASSERT(retained in ship.available_missions, "Rebuilding or failing an offer rerolled the set")
+	TEST_ASSERT_EQUAL(ship.next_mission_refresh, refresh_at, "A console reset the ship timer")
+	ship.next_mission_refresh = world.time
+	TEST_ASSERT(SSmissions.refresh_ship_missions(ship), "Scheduled refresh did not run")
+	TEST_ASSERT(QDELETED(retained), "Scheduled refresh retained an old offer")
+	TEST_ASSERT_EQUAL(length(ship.available_missions), 5, "Scheduled refresh failed to replace the full set")
+	var/datum/mission/quoted = allocate(/datum/mission/m2_rewards_test)
+	var/datum/mission_target/m2_rewards_test/target = allocate(/datum/mission_target/m2_rewards_test, quoted)
+	quoted.target = target
+	for(var/quoted_band in 1 to 3)
+		quoted.quote_zone = quoted_band
+		for(var/resolved_band in 1 to 3)
+			target.resolved_zone = resolved_band
+			TEST_ASSERT_EQUAL(quoted.resolve_quoted_target(), quoted_band == resolved_band, "Retarget from band [quoted_band] to [resolved_band] ignored the quote")
+			TEST_ASSERT_EQUAL(target.preferred_zone, quoted_band, "Retarget did not request its quoted band")
+	for(var/invalid_band in list(null, 99))
+		quoted.quote_zone = invalid_band
+		target.resolved_zone = invalid_band
+		TEST_ASSERT(!quoted.resolve_quoted_target(), "Retarget accepted an unknown quoted band")
+	quoted.quote_zone = 1
+	target.resolved_zone = 1
+	target.can_resolve = FALSE
+	TEST_ASSERT(!quoted.resolve_quoted_target(), "Retarget accepted a failed resolution in the quoted band")
+
+/// Every scan/gas row and all six utility cells retain ask difficulty independently of zone.
+/datum/unit_test/voidcrew_m2_rewards/asks/Run()
+	var/datum/mission/survey/survey = allocate(/datum/mission/survey)
+	var/list/survey_rows = list(
+		list("any", 3, 100, 160, 1), list("nebulas", 2, 80, 120, 1), list("asteroids", 2, 100, 160, 1),
+		list("planets", 2, 180, 260, 2), list("electric_storms", 2, 160, 240, 2), list("space_ruins", 2, 180, 260, 2),
+		list("stars", 1, 160, 240, 3), list("emp_storms", 2, 240, 360, 3), list("planets", 4, 320, 440, 3),
+	)
+	var/datum/mission/research/telemetry/telemetry = allocate(/datum/mission/research/telemetry)
+	TEST_ASSERT(!telemetry.generation_failed, "Telemetry generation failed")
+	var/list/telemetry_rows = list(
+		list("nebulas", 2, 60, 100, 1), list("asteroids", 2, 60, 100, 1), list("any", 3, 80, 120, 1),
+		list("planets", 2, 100, 160, 2), list("space_ruins", 2, 100, 160, 2), list("electric_storms", 2, 100, 160, 2),
+		list("emp_storms", 2, 160, 240, 3), list("stars", 1, 100, 160, 3),
+	)
+	check_asks(survey.survey_targets, survey_rows)
+	check_asks(telemetry.telemetry_asks, telemetry_rows)
+	var/list/medium = list(
+		list(/obj/item/gps, /obj/item/extraction_pack),
+		list(/obj/item/t_scanner/adv_mining_scanner, /obj/item/analyzer/ranged),
+		list(/obj/item/clothing/glasses/meson/night, /obj/item/inducer/orderable),
+	)
+	var/list/hard = list(
+		list(/obj/item/t_scanner/adv_mining_scanner, /obj/item/survivalcapsule),
+		list(/obj/item/healthanalyzer/advanced, /obj/item/tank/jetpack/oxygen),
+		list(/obj/item/construction/rcd, /obj/item/survivalcapsule),
+	)
+	var/list/multipliers = list(1, 1.5, 2.2)
+	for(var/zone in 1 to 3)
+		for(var/ask_difficulty in 2 to 3)
+			survey.quote_zone = zone
+			survey.difficulty = ask_difficulty
+			var/list/pool = survey.get_utility_pool()
+			var/list/wanted = ask_difficulty == 3 ? hard[zone] : medium[zone]
+			TEST_ASSERT_EQUAL(length(pool), 2, "Utility cell must have exactly two equal choices")
+			TEST_ASSERT_EQUAL(length(pool & wanted), 2, "Wrong utility pool for zone and difficulty")
+		var/datum/mission/survey/posted = allocate(/datum/mission/survey, null, null, zone)
+		var/list/ask = matching_ask(posted.survey_targets, posted.target_type, posted.required_amount)
+		TEST_ASSERT_EQUAL(posted.value_min, round(ask["value_min"] * multipliers[zone], 10), "Survey scaling preceded the ask roll")
+		TEST_ASSERT_EQUAL(posted.difficulty, ask["difficulty"], "Survey lost its ask difficulty")
+		var/prize = posted.mission_reward
+		var/fee = posted.value
+		posted.update_text()
+		posted.apply_zone_scaling(1)
+		TEST_ASSERT_EQUAL(posted.mission_reward, prize, "Reopening changed utility")
+		TEST_ASSERT_EQUAL(posted.value, fee, "Moving changed the posted quote")
+		var/datum/mission/research/telemetry/science = allocate(/datum/mission/research/telemetry, null, null, zone)
+		ask = matching_ask(science.telemetry_asks, science.target_type, science.required_amount)
+		TEST_ASSERT_EQUAL(science.value_max, round(ask["value_max"] * multipliers[zone], 10), "Telemetry credits did not scale after details")
+		var/list/research_mult = list(1, 1.4, 1.8)
+		TEST_ASSERT_EQUAL(science.research_reward, round(ask["research"] * research_mult[zone], 10), "Telemetry research lost its separate factor")
+	var/datum/mission/gas_harvest/gas = allocate(/datum/mission/gas_harvest)
+	TEST_ASSERT(!gas.generation_failed, "Gas fallback generation failed")
+	var/list/gas_rows = list(
+		/datum/gas/plasma = list(600, 900, 250, 350, 1, 0),
+		/datum/gas/nitrogen = list(600, 900, 220, 320, 1, 0),
+		/datum/gas/water_vapor = list(600, 900, 220, 320, 1, 0),
+		/datum/gas/miasma = list(400, 700, 300, 450, 2, 0),
+		/datum/gas/tritium = list(250, 450, 450, 650, 2, 1),
+		/datum/gas/pluoxium = list(200, 350, 650, 850, 3, 1),
+		/datum/gas/nitrium = list(200, 350, 650, 850, 3, 1),
+		/datum/gas/hypernoblium = list(150, 300, 750, 950, 3, 1),
+	)
+	TEST_ASSERT_EQUAL(length(gas.gas_asks), 8, "Gas catalog changed size")
+	for(var/gas_type in gas.gas_asks)
+		var/list/ask = gas.gas_asks[gas_type]
+		var/list/wanted = gas_rows[gas_type]
+		TEST_ASSERT_NOTNULL(wanted, "Unapproved gas row")
+		TEST_ASSERT_EQUAL(ask["moles"][1], wanted[1], "Gas minimum quantity changed")
+		TEST_ASSERT_EQUAL(ask["moles"][2], wanted[2], "Gas maximum quantity changed")
+		TEST_ASSERT_EQUAL(ask["value"][1], wanted[3], "Wrong gas minimum")
+		TEST_ASSERT_EQUAL(ask["value"][2], wanted[4], "Wrong gas maximum")
+		TEST_ASSERT_EQUAL(ask["difficulty"], wanted[5], "Gas ask difficulty changed")
+		TEST_ASSERT_EQUAL(ask["vouchers"], wanted[6], "Gas voucher count changed")
+	for(var/zone in 1 to 3)
+		var/datum/mission/gas_harvest/posted = allocate(/datum/mission/gas_harvest, null, null, zone)
+		var/list/ask = posted.gas_asks[posted.gas_type]
+		TEST_ASSERT_EQUAL(posted.value_max, round(ask["value"][2] * multipliers[zone], 10), "Gas quote did not use the posting zone")
+		TEST_ASSERT_EQUAL(posted.voucher_count, ask["vouchers"], "Gas gained an extra zone voucher")
+
+/datum/unit_test/voidcrew_m2_rewards/asks/proc/matching_ask(list/rows, object_type, amount)
+	for(var/list/row as anything in rows)
+		if(row["type"] == object_type && row["amount"] == amount)
+			return row
+
+/datum/unit_test/voidcrew_m2_rewards/asks/proc/check_asks(list/rows, list/expected)
+	TEST_ASSERT_EQUAL(length(rows), length(expected), "Scan ask catalog changed size")
+	for(var/index in 1 to length(expected))
+		var/list/row = rows[index]
+		var/list/wanted = expected[index]
+		TEST_ASSERT_EQUAL(row["type"], wanted[1], "Wrong scan object")
+		TEST_ASSERT_EQUAL(row["amount"], wanted[2], "Scan quota changed")
+		TEST_ASSERT_EQUAL(row["value_min"], wanted[3], "Wrong scan minimum")
+		TEST_ASSERT_EQUAL(row["value_max"], wanted[4], "Wrong scan maximum")
+		TEST_ASSERT_EQUAL(row["difficulty"], wanted[5], "Scan difficulty changed")
+
+/// Exact disjoint odds, all seven green prizes, shared caps, and one completion roll.
+/datum/unit_test/voidcrew_m2_rewards/prizes/Run()
+	var/list/suits = list(30, 40, 200)
+	var/list/gadgets = list(15, 20, 100)
+	for(var/zone in 1 to 3)
+		var/suit_count = 0
+		var/gadget_count = 0
+		for(var/roll in 1 to 1000)
+			var/outcome = mission_prize_outcome(zone, roll)
+			suit_count += outcome == "suit"
+			gadget_count += outcome == "gadget"
+		TEST_ASSERT_EQUAL(suit_count, suits[zone], "Wrong suit chance")
+		TEST_ASSERT_EQUAL(gadget_count, gadgets[zone], "Wrong gadget chance")
+	var/list/green_prizes = list()
+	for(var/family in list("kill", "hunt", "poacher", "capture", "waves"))
+		green_prizes |= mission_prize_pool(family, "suit")
+		green_prizes |= mission_prize_pool(family, "gadget")
+	TEST_ASSERT_EQUAL(length(green_prizes), 7, "Green work cannot reach all seven named prizes")
+	var/obj/structure/overmap/ship/m2_rewards_test/ship = test_ship()
+	for(var/mission_type in list(/datum/mission/recovery/kill/m2_rewards_test, /datum/mission/recovery/kill/outpost/m2_rewards_test))
+		var/datum/mission/mission = allocate(mission_type)
+		mission.quote_zone = 1
+		mission.value = 600
+		mission.voucher_count = 1
+		mission.start_mission(ship)
+		var/before = ship.ship_account.account_balance
+		TEST_ASSERT(mission.turn_in(run_loc_floor_bottom_left), "Completed guarded work failed")
+		TEST_ASSERT_EQUAL(ship.ship_account.account_balance - before, 600, "Prize replaced ordinary credits")
+		TEST_ASSERT(!mission.turn_in(run_loc_floor_bottom_left), "A stale completion succeeded")
+		mission.finish_mission(run_loc_floor_bottom_left)
+	TEST_ASSERT_EQUAL(ship.prize_rolls, 2, "Each completion must roll once, including outpost kills")
+	TEST_ASSERT(ship.get_crew_record().mission_suit_paid && !ship.get_crew_record().mission_gadget_paid, "Capped suit rerolled into a gadget")
+	TEST_ASSERT_EQUAL(length(run_loc_floor_bottom_left.get_all_contents_type(/obj/item/mod/control/pre_equipped/traitor_elite)), 1, "Suit cap allowed a duplicate")
+	ship.prize_category = "gadget"
+	TEST_ASSERT_EQUAL(ship.award_guarded_prize("kill", 1, run_loc_floor_bottom_left), /obj/item/gun/energy/laser/captain, "Suit cap blocked the separate gadget")
+	TEST_ASSERT_NULL(ship.award_guarded_prize("hunt", 3, run_loc_floor_bottom_left), "A different family bypassed the gadget cap")
+	var/rolls_before = ship.prize_rolls
+	var/datum/mission/failed = allocate(/datum/mission/recovery/kill/m2_rewards_test)
+	failed.start_mission(ship)
+	failed.fail("Abandoned.")
+	TEST_ASSERT_EQUAL(ship.prize_rolls, rolls_before, "Failed work rolled a prize")
+	TEST_ASSERT_NULL(ship.award_guarded_prize("stake", 1, run_loc_floor_bottom_left), "Green stake became eligible")
+	TEST_ASSERT_NULL(mission_prize_pool("suppression", "suit"), "Suppression gained a prize pool")
+	TEST_ASSERT_NULL(mission_prize_pool("expedition", "suit"), "Expedition ambush gained a prize pool")
+	var/list/families = list(
+		/datum/mission/recovery/kill = "kill", /datum/mission/recovery/kill/outpost = "kill",
+		/datum/mission/big_game_hunt = "hunt", /datum/mission/live_capture = "capture", /datum/mission/poacher_bust = "poacher",
+		/datum/mission/recovery/survey = "waves", /datum/mission/recovery/extraction = "waves", /datum/mission/research/core_sample = "waves",
+		/datum/mission/prospect_stake = "stake",
+	)
+	for(var/datum/mission/mission_type as anything in families)
+		TEST_ASSERT_EQUAL(initial(mission_type.guarded_prize_family), families[mission_type], "Mission has the wrong guarded prize family")
+
+/// Lair claims use the same flags after the existing atomic bounty completion.
+/datum/unit_test/voidcrew_m2_rewards/lair/Run()
+	var/obj/structure/overmap/ship/m2_rewards_test/ship = test_ship()
+	var/obj/machinery/mission_pad/pad = allocate(/obj/machinery/mission_pad)
+	var/datum/criminal_bounty/kill_only/lair/posting = allocate(/datum/criminal_bounty/kill_only/lair)
+	posting.record = bounty_kill_record("Test Boss", "testing", MALE, 5000, "test")
+	posting.value = 5000
+	posting.board_vouchers = 3
+	posting.board_zone = 2 // ZONE_YELLOW
+	var/obj/item/bounty_proof/trophy/proof = allocate(/obj/item/bounty_proof/trophy)
+	posting.kill_bind_trophy(proof)
+	var/before = ship.ship_account.account_balance
+	TEST_ASSERT(islist(posting.board_claim(ship, pad, proof, "dead")), "Lair trophy claim failed")
+	TEST_ASSERT_EQUAL(ship.ship_account.account_balance - before, 5000, "Lair pay changed")
+	TEST_ASSERT_EQUAL(ship.prize_rolls, 1, "Successful lair must roll one prize")
+	TEST_ASSERT(ship.get_crew_record().mission_suit_paid, "Lair did not claim the crew's suit flag")
+	TEST_ASSERT(!islist(posting.board_claim(ship, pad, proof, "dead")), "Closed lair paid twice")
+	TEST_ASSERT_EQUAL(ship.prize_rolls, 1, "Closed lair rolled again")
+
+/// Chip amounts on both mission surfaces remain separate from the completion fee.
+/datum/unit_test/voidcrew_m2_rewards/chips/Run()
+	var/datum/mission/recovery/kill/kill_type = allocate(/datum/mission/recovery/kill/m2_rewards_test)
+	TEST_ASSERT_EQUAL(kill_type.guarded_prize_family, "kill", "Kill fixture lost its production prize family")
+	var/easy_cash = 0
+	for(var/mob/living/basic/trooper/pirate/faction/pirate_type as anything in kill_type.easy_targets)
+		easy_cash += initial(pirate_type.plunder_credits)
+	TEST_ASSERT_EQUAL(easy_cash / length(kill_type.easy_targets), 300, "Wrong green kill-chip expectation")
+	var/medium_cash = 0
+	for(var/mob/living/basic/trooper/pirate/faction/pirate_type as anything in kill_type.medium_targets)
+		medium_cash += initial(pirate_type.plunder_credits)
+	TEST_ASSERT_EQUAL(medium_cash / length(kill_type.medium_targets) + 300, 568.75, "Wrong yellow kill-chip expectation")
+	for(var/mob/living/basic/trooper/pirate/faction/pirate_type as anything in kill_type.hard_targets)
+		TEST_ASSERT_EQUAL(initial(pirate_type.plunder_credits) + 2 * 25, 3050, "Wrong red kill-chip expectation")
+	var/mob/living/basic/trooper/pirate/faction/medieval/captain/captain_type = /mob/living/basic/trooper/pirate/faction/medieval/captain
+	TEST_ASSERT_EQUAL(initial(captain_type.plunder_credits), 1000, "Medieval captain kept its melee chip value")
+
+/// Rewinding and reviving a kill still yields one chip, one settlement and one prize roll.
+/datum/unit_test/voidcrew_m2_rewards/rewind/Run()
+	var/obj/structure/overmap/ship/m2_rewards_test/ship = test_ship()
+	var/datum/mission/recovery/kill/m2_rewards_test/mission = allocate(/datum/mission/recovery/kill/m2_rewards_test)
+	mission.objective_name = "Testbeard"
+	mission.quote_zone = 1
+	mission.value = 600
+	mission.requires_item = TRUE
+	var/datum/mission_target/kill_rewind_test/target = allocate(/datum/mission_target/kill_rewind_test, mission)
+	target.spawn_turf = run_loc_floor_top_right
+	mission.target = target
+	var/datum/mission_objective/field/kill_named/hunt = new
+	hunt.target_mob_type = /mob/living/basic/trooper/pirate/faction/boss/mission_rewind_test
+	mission.add_objective(hunt)
+	mission.add_objective(new /datum/mission_objective/deliver/bound/proof)
+	TEST_ASSERT(mission.start_mission(ship), "Rewind hunt did not start")
+	var/datum/mission_work_receipt/receipt = mission.work_receipt
+	var/mob/living/basic/trooper/pirate/faction/boss/mission_rewind_test/boss = hunt.target_mob
+	TEST_ASSERT_NOTNULL(boss, "Rewind fixture did not spawn its boss")
+	boss.death(FALSE)
+	TEST_ASSERT(mission.named_kill_completed && mission.boss_cash_issued, "Initial kill did not preserve S06 flags")
+	TEST_ASSERT(boss.revive(ADMIN_HEAL_ALL), "Test boss could not revive")
+	boss.death(FALSE)
+	for(var/rewind in 1 to 2)
+		var/obj/item/mission_recovery/old_proof = mission.quest_atom
+		target.interior_loaded = FALSE
+		mission.on_target_interior_unloaded()
+		qdel(old_proof)
+		target.interior_loaded = TRUE
+		mission.on_target_interior_loaded()
+		TEST_ASSERT(mission.can_turn_in(mission.quest_atom), "Rewind lost proof recovery")
+		TEST_ASSERT_EQUAL(mission.work_receipt, receipt, "Rewind replaced the progression receipt")
+		TEST_ASSERT_NULL(hunt.target_mob, "Completed kill respawned a boss")
+	TEST_ASSERT_EQUAL(length(run_loc_floor_top_right.get_all_contents_type(/obj/item/holochip)), 1, "Rewind or revival issued another boss chip")
+	var/before = ship.ship_account.account_balance
+	TEST_ASSERT(mission.turn_in(run_loc_floor_bottom_left, mission.quest_atom), "Recovered proof did not settle")
+	TEST_ASSERT(receipt.claimed && receipt.credited == 1, "Recovered proof did not claim exactly one green contribution")
+	TEST_ASSERT_EQUAL(ship.ship_account.account_balance - before, 600, "Recovered proof paid the wrong fee")
+	TEST_ASSERT_EQUAL(ship.prize_rolls, 1, "Recovered proof must make exactly one completion roll")
+	TEST_ASSERT(!mission.turn_in(run_loc_floor_bottom_left, null, TRUE), "Repeated proof settlement succeeded")
+	mission.finish_mission(run_loc_floor_bottom_left)
+	TEST_ASSERT_EQUAL(ship.prize_rolls, 1, "Stale completion rolled another prize")
+	TEST_ASSERT_EQUAL(ship.ship_account.account_balance - before, 600, "Stale completion paid another fee")
+
+/// Named prizes record the receiving hull, quote zone, value and first-suit time.
+/datum/unit_test/voidcrew_m2_rewards/prize_metrics/Run()
+	SSmetrics.accepting = TRUE
+	var/obj/structure/overmap/ship/m2_rewards_test/ship = test_ship()
+	ship.award_guarded_prize("kill", 1, run_loc_floor_bottom_left, /datum/mission/recovery/kill)
+	TEST_ASSERT_EQUAL(length(SSmetrics.pending), 1, "A suit should write one prize row")
+	var/list/row = SSmetrics.pending[1]
+	TEST_ASSERT_EQUAL(row["event"], "guarded_prize_paid", "Wrong prize event")
+	TEST_ASSERT_EQUAL(row["zone"], "green", "Prize metric lost its quote zone")
+	var/list/details = json_decode(row["details"])
+	TEST_ASSERT_EQUAL(details["item_value"], 9000, "Wrong suit value")
+	TEST_ASSERT_EQUAL(details["first_suit_s"], ship.mission_first_suit_seconds, "First suit time was not recorded")
+	ship.award_guarded_prize("kill", 3, run_loc_floor_bottom_left)
+	TEST_ASSERT_EQUAL(length(SSmetrics.pending), 1, "A capped outcome wrote another prize payment")
+
+#endif
diff --git a/voidcrew/modules/unit_tests/voidcrew_mission_gps.dm b/voidcrew/modules/unit_tests/voidcrew_mission_gps.dm
index f34b9c10927..dc767a724f6 100644
--- a/voidcrew/modules/unit_tests/voidcrew_mission_gps.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_mission_gps.dm
@@ -65,9 +65,16 @@
 /datum/mission_target/mission_gps_test/get_spawn_turf()
 	return spawn_turf
 
+/datum/mission_target/mission_gps_test/get_zone_type()
+	return 1 // ZONE_GREEN: the fixture is a known travel destination.
+
 /datum/unit_test/voidcrew_mission_coasting_gps/Run()
 	var/obj/structure/overmap/ship/ship = allocate(__IMPLIED_TYPE__)
+	ship.ship_team = allocate(/datum/team/voidcrew)
+	ship.ship_team.ship = ship
+	allocated += ship.get_crew_record()
 	var/datum/mission/mission = allocate(__IMPLIED_TYPE__)
+	mission.quote_zone = 1 // ZONE_GREEN
 	mission.gps_tag = "Coasting Objective"
 	mission.objective_name = "coasting test objective"
 	var/datum/mission_target/mission_gps_test/target = allocate(__IMPLIED_TYPE__, mission)
diff --git a/voidcrew/modules/unit_tests/voidcrew_mission_metrics.dm b/voidcrew/modules/unit_tests/voidcrew_mission_metrics.dm
index ae26c632c43..7b691abfaf5 100644
--- a/voidcrew/modules/unit_tests/voidcrew_mission_metrics.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_mission_metrics.dm
@@ -80,7 +80,8 @@
 	tally_mission_offer(posted, null, "contract_offered")
 	TEST_ASSERT_EQUAL(length(SSmetrics.tallies), 1, "Offers of one type on one board share a tally")
 	SSmetrics.fold_tallies()
-	row = SSmetrics.pending[1]
+	TEST_ASSERT_EQUAL(length(SSmetrics.pending), 3, "Two quote records and one folded offer tally must be present")
+	row = SSmetrics.pending[3]
 	TEST_ASSERT_EQUAL(row["quantity"], 2, "The tally counts every offer")
 
 /datum/unit_test/voidcrew_mission_metrics/Destroy()
diff --git a/voidcrew/modules/unit_tests/voidcrew_missions.dm b/voidcrew/modules/unit_tests/voidcrew_missions.dm
index 59b49bc4b11..038d3250cae 100644
--- a/voidcrew/modules/unit_tests/voidcrew_missions.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_missions.dm
@@ -42,10 +42,12 @@
 	TEST_ASSERT(mission_type_within_limit(/datum/mission/unit_test_capped, first), "a limit-1 contract was refused with nothing of its type running")
 
 	SSmissions.all_active_missions += first
+	first.active = TRUE
 	TEST_ASSERT(!mission_type_within_limit(/datum/mission/unit_test_capped, second), "a limit-1 contract was still 'within limit' with one already running, so a second ship can accept the same capped job. Boards hold more copies than the cap allows, so the cap has to hold at accept time (see /obj/structure/overmap/ship/proc/accept_mission).")
 	TEST_ASSERT(mission_type_within_limit(/datum/mission/unit_test_capped, first), "the running mission counted against its own cap, accept_mission passes the mission being accepted as `excluding` for exactly this reason")
 
 	SSmissions.all_active_missions -= first
+	first.active = FALSE
 	TEST_ASSERT(mission_type_within_limit(/datum/mission/unit_test_capped, second), "the cap did not free up after the running mission ended")
 
 	// mission_limit 0 means uncapped, not "capped at zero"
@@ -58,6 +60,116 @@
 
 /datum/unit_test/voidcrew_mission_wiring
 
+/// Pirate quotes retain their variance, loot tier and tracking deduction after the cash cut.
+/datum/unit_test/voidcrew_pirate_bounty_pay
+	var/turf/open/overmap/overmap_tile
+	var/original_turf_type
+	var/metrics_were_accepting
+
+/datum/unit_test/voidcrew_pirate_bounty_pay/New()
+	. = ..()
+	metrics_were_accepting = SSmetrics.accepting
+	SSmetrics.accepting = FALSE
+
+/datum/unit_test/voidcrew_pirate_bounty_pay/Destroy()
+	if(overmap_tile)
+		overmap_tile.current_zone = null
+		overmap_tile.ChangeTurf(original_turf_type)
+	SSmetrics.accepting = metrics_were_accepting
+	return ..()
+
+/datum/unit_test/voidcrew_pirate_bounty_pay/Run()
+	original_turf_type = run_loc_floor_bottom_left.type
+	overmap_tile = run_loc_floor_bottom_left.ChangeTurf(/turf/open/overmap)
+	var/obj/structure/overmap/ship/winner = allocate(/obj/structure/overmap/ship)
+	winner.ship_account = allocate(/datum/bank_account)
+	// Zone (ZONE_YELLOW/RED), low/base/high quote, tracking fee, tracked payout.
+	var/list/cases = list(list(2, 3200, 4000, 4800, 1000, 3000), list(3, 9600, 12000, 14400, 3000, 9000))
+	var/list/reward_rolls = list(80, 100, 120)
+	for(var/list/pay_case as anything in cases)
+		overmap_tile.current_zone = allocate(/datum/overmap_zone, pay_case[1])
+		var/obj/structure/overmap/ship/npc/pirate = allocate(/obj/structure/overmap/ship/npc, overmap_tile)
+		// Teardown must not refill the live pirate pool.
+		pirate.spawner_resolved = TRUE
+		var/obj/item/ship_key/key = allocate(/obj/item/ship_key, run_loc_floor_top_right, pirate)
+		key.spawner_notified = TRUE
+		for(var/tracking in list(FALSE, TRUE))
+			var/datum/pirate_bounty/bounty = allocate(/datum/pirate_bounty, pirate, key)
+			TEST_ASSERT(bounty.reward >= pay_case[2] && bounty.reward <= pay_case[4], "Generated pirate quote is outside the reduced band")
+			TEST_ASSERT_EQUAL(bounty.is_heavy_bounty, pay_case[1] == 3, "The cash cut changed the pirate loot tier")
+			for(var/index in 1 to length(reward_rolls))
+				TEST_ASSERT_EQUAL(bounty.calculate_reward(pirate, reward_rolls[index]), pay_case[index + 1], "Wrong pirate bounty quote at [reward_rolls[index]]%")
+			bounty.reward = bounty.calculate_reward(pirate, 100)
+			TEST_ASSERT_EQUAL(bounty.get_tracking_cost(), pay_case[5], "Tracking cost did not follow the reduced quote")
+			TEST_ASSERT(bounty.add_claimant(winner), "Could not accept the pirate bounty")
+			TEST_ASSERT(bounty.can_turn_in(key, winner), "The matching pirate key was refused")
+			if(tracking)
+				TEST_ASSERT(bounty.enable_tracking(winner), "Could not enable pirate tracking")
+			var/expected_pay = tracking ? pay_case[6] : pay_case[3]
+			var/balance_before = winner.ship_account.account_balance
+			TEST_ASSERT_EQUAL(bounty.complete(winner, null), expected_pay, "Pirate completion returned the wrong payment")
+			TEST_ASSERT_EQUAL(winner.ship_account.account_balance - balance_before, expected_pay, "Pirate completion credited the wrong payment")
+			TEST_ASSERT(!bounty.can_turn_in(key, winner), "A completed pirate bounty accepted its key again")
+			TEST_ASSERT_EQUAL(bounty.complete(winner, null), 0, "A completed pirate bounty paid twice")
+			TEST_ASSERT_EQUAL(winner.ship_account.account_balance - balance_before, expected_pay, "Duplicate completion changed the ship balance")
+
+/// Steal-objective guns exist at spawn; opening any gun cache yields one gun total.
+/datum/unit_test/voidcrew_pirate_reward_guns/Run()
+	var/list/cache_guns = list(
+		/obj/structure/closet/crate/secure/weapon/pirate_loot/lasers = /obj/item/gun/energy/laser,
+		/obj/structure/closet/crate/secure/weapon/pirate_loot/disablers = /obj/item/gun/energy/disabler,
+		/obj/structure/closet/crate/secure/weapon/pirate_loot/heavy/energy_guns = /obj/item/gun/energy/e_gun,
+		/obj/structure/closet/crate/secure/weapon/pirate_loot/heavy/combat_shotguns = /obj/item/gun/energy/laser,
+		/obj/structure/closet/crate/secure/weapon/pirate_loot/heavy/laser_carbines = /obj/item/gun/energy/e_gun,
+	)
+	var/list/immediate_caches = list(
+		/obj/structure/closet/crate/secure/weapon/pirate_loot/lasers,
+		/obj/structure/closet/crate/secure/weapon/pirate_loot/disablers,
+		/obj/structure/closet/crate/secure/weapon/pirate_loot/heavy/energy_guns,
+		/obj/structure/closet/crate/secure/weapon/pirate_loot/heavy/combat_shotguns,
+		/obj/structure/closet/crate/secure/weapon/pirate_loot/heavy/laser_carbines,
+	)
+	var/turf/cache_turf = run_loc_floor_bottom_left
+	for(var/cache_type in cache_guns)
+		var/obj/structure/closet/crate/secure/weapon/pirate_loot/cache = allocate(cache_type, cache_turf)
+		var/expected_before = (cache_type in immediate_caches) ? 1 : 0
+		TEST_ASSERT_EQUAL(length(cache.get_all_contents_type(/obj/item/gun)), expected_before, "[cache_type] has the wrong gun count before opening")
+		TEST_ASSERT_EQUAL(length(cache.get_all_contents_type(cache_guns[cache_type])), expected_before, "[cache_type] has the wrong gun type before opening")
+		TEST_ASSERT(!cache.contents_initialized, "[cache_type] must retain lazy population of other contents")
+		TEST_ASSERT(cache.open(null, TRUE, FALSE), "[cache_type] could not open")
+		TEST_ASSERT_EQUAL(length(cache_turf.get_all_contents_type(/obj/item/gun)), 1, "[cache_type] must contain exactly one gun after opening")
+		TEST_ASSERT_EQUAL(length(cache_turf.get_all_contents_type(cache_guns[cache_type])), 1, "[cache_type] must retain its gun type")
+		if(cache_type == /obj/structure/closet/crate/secure/weapon/pirate_loot/heavy/combat_shotguns)
+			TEST_ASSERT_EQUAL(length(cache_turf.get_all_contents_type(/obj/item/storage/belt/bandolier)), 0, "The replacement laser cache must not retain shotgun bandoliers")
+		TEST_ASSERT(cache.close(), "[cache_type] could not close")
+		TEST_ASSERT(cache.open(null, TRUE, FALSE), "[cache_type] could not reopen")
+		TEST_ASSERT_EQUAL(length(cache_turf.get_all_contents_type(/obj/item/gun)), 1, "Reopening [cache_type] duplicated its gun")
+		for(var/atom/movable/drop in cache_turf.contents - cache)
+			if(!istype(drop, /obj/effect/landmark))
+				qdel(drop)
+		qdel(cache)
+
+/// Initial, rebuilt and refilled SolGov inventories cannot recreate the removed sword.
+/datum/unit_test/voidcrew_solgov_vendor_stock/Run()
+	var/obj/machinery/vending/security/marine/solgov/vendor = allocate(/obj/machinery/vending/security/marine/solgov)
+	assert_no_sword(vendor)
+	TEST_ASSERT(!outpost_checkpoint_saves(vendor), "Ship checkpoints must exclude SolGov vendors")
+	vendor.update_canister()
+	vendor.RefreshParts()
+	assert_no_sword(vendor)
+	var/obj/item/vending_refill/security/refill = allocate(/obj/item/vending_refill/security)
+	// Old stock in a canister must not add a product absent from the new inventory.
+	refill.products = list(/obj/item/melee/energy/sword/saber/blue = 1, /obj/item/restraints/handcuffs = 10)
+	for(var/datum/data/vending_product/product in vendor.product_records)
+		product.amount = 0
+	TEST_ASSERT(vendor.restock(refill) > 0, "The refill must still replenish supported products")
+	assert_no_sword(vendor)
+
+/datum/unit_test/voidcrew_solgov_vendor_stock/proc/assert_no_sword(obj/machinery/vending/security/marine/solgov/vendor)
+	TEST_ASSERT(!(/obj/item/melee/energy/sword/saber/blue in vendor.products), "SolGov's products still include the blue sword")
+	for(var/datum/data/vending_product/product in vendor.product_records + vendor.hidden_records + vendor.coin_records)
+		TEST_ASSERT(!ispath(product.product_path, /obj/item/melee/energy/sword/saber/blue), "SolGov's live inventory still includes the blue sword")
+
 /datum/unit_test/voidcrew_mission_wiring/Run()
 	var/checked = 0
 	for(var/datum/mission/mission_type as anything in subtypesof(/datum/mission))
@@ -115,6 +227,9 @@
 	for(var/core_type in core_types)
 		var/datum/mission/mission = allocate(/datum/mission)
 		mission.value = 0
+		mission.servant = allocate(/obj/structure/overmap/ship)
+		mission.servant.ship_account = allocate(/datum/bank_account)
+		mission.active = TRUE
 		mission.requires_item = TRUE
 		var/datum/mission_objective/deliver/delivery = new
 		delivery.required_type = core_type
@@ -133,6 +248,9 @@
 /datum/unit_test/voidcrew_mission_pad_requirements/Run()
 	var/datum/mission/mission = allocate(/datum/mission)
 	mission.value = 0
+	mission.servant = allocate(/obj/structure/overmap/ship)
+	mission.servant.ship_account = allocate(/datum/bank_account)
+	mission.active = TRUE
 	mission.requires_item = TRUE
 	var/datum/mission_objective/deliver/delivery = new
 	delivery.required_type = /obj/item/stack/ore/iron
@@ -263,6 +381,65 @@
 		ruin.loaded = saved_loaded[ruin]
 		ruin.mission_claims = saved_claims[ruin]
 
+/// Rescue bonuses affect credits alone, once, and never return after revival.
+/datum/unit_test/voidcrew_mission_rescue_reward/Run()
+	var/turf/pad_turf = run_loc_floor_bottom_left
+	var/obj/machinery/mission_pad/pad = allocate(/obj/machinery/mission_pad, pad_turf)
+	var/obj/structure/overmap/ship/ship = allocate(/obj/structure/overmap/ship)
+	ship.ship_account = allocate(/datum/bank_account/ship, "Rescue Test", null, 1, FALSE)
+	ship.linked_mission_pads = list(pad)
+	var/datum/mission/rescue/rescue_type = /datum/mission/rescue
+	var/expected_vouchers = 0
+	var/list/delivery_cases = list(
+		list("healthy", 0, FALSE, 1250),
+		list("80% health", 12, FALSE, 1250),
+		list("injured", 13, FALSE, 1000),
+		list("revived and healed", 13, TRUE, 1000),
+	)
+	for(var/list/delivery_case as anything in delivery_cases)
+		var/datum/mission/mission = allocate(/datum/mission)
+		mission.value = 1000
+		mission.voucher_count = initial(rescue_type.voucher_count)
+		mission.servant = ship
+		mission.active = TRUE
+		var/datum/mission_objective/field/escort/escort = new
+		mission.add_objective(escort)
+		escort.spawn_field_objects(pad_turf)
+		var/mob/living/survivor = escort.survivor
+		survivor.adjustBruteLoss(delivery_case[2])
+		if(delivery_case[3])
+			survivor.death()
+			TEST_ASSERT(escort.grace_timer, "The survivor's death must start the revival window")
+			survivor.revive(ADMIN_HEAL_ALL)
+			TEST_ASSERT(survivor.stat != DEAD, "The survivor must actually revive")
+			TEST_ASSERT_EQUAL(survivor.health, survivor.maxHealth, "The revived survivor must be fully healed")
+			TEST_ASSERT(escort.was_revived, "Healing must preserve the survivor's revival history")
+			TEST_ASSERT_NULL(escort.grace_timer, "Revival must clear the recovery timer")
+		var/balance_before = ship.ship_account.account_balance
+		expected_vouchers += mission.voucher_count
+		TEST_ASSERT(mission.turn_in(pad), "The [delivery_case[1]] survivor must be accepted")
+		TEST_ASSERT_EQUAL(ship.ship_account.account_balance - balance_before, delivery_case[4], "The [delivery_case[1]] survivor paid the wrong credits")
+		TEST_ASSERT(QDELETED(survivor), "The delivered survivor must be removed")
+		TEST_ASSERT(QDELETED(mission), "Delivering the survivor must complete the mission")
+		var/vouchers_paid = 0
+		for(var/obj/item/stack/trade_voucher/vouchers in pad_turf)
+			vouchers_paid += vouchers.amount
+		TEST_ASSERT_EQUAL(vouchers_paid, expected_vouchers, "The [delivery_case[1]] survivor must leave the voucher payout unchanged")
+
+	// Exercise the finalizer twice while the mission and objective still exist.
+	var/datum/mission/repeated = allocate(/datum/mission)
+	repeated.value = 1000
+	repeated.voucher_count = initial(rescue_type.voucher_count)
+	var/datum/mission_objective/field/escort/repeated_escort = new
+	repeated.add_objective(repeated_escort)
+	repeated_escort.survivor = allocate(/mob/living/basic/mission_survivor, pad_turf)
+	repeated_escort.on_turn_in_finalized(pad)
+	TEST_ASSERT_EQUAL(repeated.value, 1250, "A healthy survivor must add 25% to credits")
+	TEST_ASSERT_NULL(repeated_escort.survivor, "Finalization must clear the survivor reference")
+	repeated_escort.on_turn_in_finalized(pad)
+	TEST_ASSERT_EQUAL(repeated.value, 1250, "Repeated finalization must not stack the bonus")
+	TEST_ASSERT_EQUAL(repeated.voucher_count, initial(rescue_type.voucher_count), "Repeated finalization must not change vouchers")
+
 /**
  * A contract that marks itself exclusive_site must get a wreck to itself.
  *
@@ -345,3 +522,246 @@
 	for(var/obj/structure/overmap/space_ruin/ruin as anything in live_ruins)
 		ruin.loaded = saved_loaded[ruin]
 		ruin.mission_claims = saved_claims[ruin]
+
+/// Isolate mission lifecycle tests from overmap generation and bank accounts.
+/datum/mission/kill_rewind_test
+	var/reward_calls = 0
+
+/datum/mission/kill_rewind_test/generate_mission_details()
+	return
+
+/datum/mission/kill_rewind_test/distribute_rewards(atom/reward_anchor)
+	reward_calls++
+
+/// The far corner is the site; the near corner represents the crew's ship.
+/datum/mission_target/kill_rewind_test
+	var/turf/spawn_turf
+	var/interior_loaded = TRUE
+
+/datum/mission_target/kill_rewind_test/resolve()
+	return TRUE
+
+/datum/mission_target/kill_rewind_test/get_zone_type()
+	return 1 // ZONE_GREEN: lifecycle fixtures still need an identified work band.
+
+/datum/mission_target/kill_rewind_test/is_interior_loaded()
+	return interior_loaded
+
+/datum/mission_target/kill_rewind_test/get_spawn_turf()
+	return spawn_turf
+
+/datum/mission_target/kill_rewind_test/contains_turf(turf/where)
+	return where == spawn_turf
+
+/datum/mission_target/kill_rewind_test/get_interior_bounds()
+	return list(spawn_turf.x, spawn_turf.y, spawn_turf.x, spawn_turf.y, spawn_turf.z)
+
+/// Retain the original body so real revival can exercise the cash handler.
+/mob/living/basic/trooper/pirate/faction/boss/mission_rewind_test
+	ai_controller = null
+	basic_mob_flags = NONE
+	use_dynamic_appearance = FALSE
+	corpse = null
+	loot = null
+	loot_pool = null
+	plunder_credits = 3000
+	unsuitable_cold_damage = 0
+	unsuitable_heat_damage = 0
+
+/datum/unit_test/voidcrew_mission_kill_rewind
+	abstract_type = /datum/unit_test/voidcrew_mission_kill_rewind
+
+/datum/unit_test/voidcrew_mission_kill_rewind/proc/make_hunt(big_game = FALSE)
+	var/datum/mission/kill_rewind_test/mission = allocate(__IMPLIED_TYPE__)
+	mission.servant = allocate(/obj/structure/overmap/ship)
+	mission.servant.ship_account = allocate(/datum/bank_account)
+	mission.active = TRUE
+	mission.quote_zone = 1 // ZONE_GREEN
+	mission.requires_item = TRUE
+	mission.objective_name = "Old Testbeard"
+	var/datum/mission_target/kill_rewind_test/target = allocate(__IMPLIED_TYPE__, mission)
+	mission.target = target
+	target.spawn_turf = run_loc_floor_top_right
+	var/datum/mission_objective/field/kill_named/hunt
+	var/datum/mission_objective/set_lure/lure
+	if(big_game)
+		lure = allocate(__IMPLIED_TYPE__)
+		mission.add_objective(lure)
+		var/datum/mission_objective/field/kill_named/big_game/trophy_hunt = allocate(__IMPLIED_TYPE__)
+		trophy_hunt.trophy_part = "scarred jawbone"
+		trophy_hunt.health_override = 450
+		hunt = trophy_hunt
+		lure.hunt_objective = trophy_hunt
+	else
+		hunt = allocate(__IMPLIED_TYPE__)
+	hunt.target_mob_type = /mob/living/basic/trooper/pirate/faction/boss/mission_rewind_test
+	hunt.guard_types = list(/mob/living/basic/trooper/pirate/faction/boss/mission_rewind_test)
+	mission.add_objective(hunt)
+	mission.add_objective(allocate(big_game ? /datum/mission_objective/deliver/bound/trophy : /datum/mission_objective/deliver/bound/proof))
+	if(lure)
+		lure.kit = allocate(/obj/item/hunting_lure, target.spawn_turf)
+		mission.register_quest_atom(lure.kit)
+	mission.activate_current_objective()
+	if(lure)
+		lure.on_planted(null, target.spawn_turf)
+		// The single-turf fixture stands in for the whole hunting ground.
+		hunt.target_mob.forceMove(target.spawn_turf)
+	return mission
+
+/datum/unit_test/voidcrew_mission_kill_rewind/proc/test_mobs()
+	var/list/mobs = list()
+	for(var/mob/living/basic/trooper/pirate/faction/boss/mission_rewind_test/boss in GLOB.mob_list)
+		if(!QDELETED(boss))
+			mobs += boss
+	return mobs
+
+/datum/unit_test/voidcrew_mission_kill_rewind/proc/floor_items(item_type)
+	var/list/items = list()
+	for(var/turf/tile in block(run_loc_floor_bottom_left, run_loc_floor_top_right))
+		for(var/obj/item/item in tile.contents)
+			if(istype(item, item_type) && !QDELETED(item))
+				items += item
+	return items
+
+/// Kill, strand the proof and rebuild the interior more than once.
+/datum/unit_test/voidcrew_mission_kill_rewind/repeated/Run()
+	check_repeated_rewinds(FALSE)
+
+/// The same lifecycle must restore trophies without another lure or beast.
+/datum/unit_test/voidcrew_mission_kill_rewind/trophy/Run()
+	check_repeated_rewinds(TRUE)
+
+/datum/unit_test/voidcrew_mission_kill_rewind/proc/check_repeated_rewinds(big_game)
+	var/datum/mission/kill_rewind_test/mission = make_hunt(big_game)
+	var/datum/mission_target/kill_rewind_test/target = mission.target
+	var/datum/mission_objective/field/kill_named/hunt = mission.current_objective()
+	var/mob/living/basic/trooper/pirate/faction/boss/mission_rewind_test/boss = hunt.target_mob
+	TEST_ASSERT_EQUAL(length(test_mobs()), 2, "The initial hunt must spawn a target and guard")
+	boss.death(FALSE)
+	TEST_ASSERT(mission.named_kill_completed, "The mission must retain the completed kill")
+	TEST_ASSERT(mission.boss_cash_issued, "The first death must claim the mission's cash entitlement")
+	var/obj/item/mission_recovery/proof = mission.quest_atom
+	TEST_ASSERT(istype(proof, big_game ? /obj/item/mission_recovery/trophy : /obj/item/mission_recovery/proof), "The initial proof must have the right subtype")
+	TEST_ASSERT(mission.can_turn_in(proof), "The original proof must be deliverable")
+
+	SEND_SIGNAL(boss, COMSIG_LIVING_DEATH, FALSE)
+	hunt.on_target_death(boss, FALSE)
+	TEST_ASSERT(boss.revive(ADMIN_HEAL_ALL), "The retained original boss must be revivable")
+	boss.death(FALSE)
+	TEST_ASSERT_EQUAL(mission.quest_atom, proof, "Duplicate death signals and revival must not replace the proof")
+	TEST_ASSERT_EQUAL(length(floor_items(/obj/item/mission_recovery)), 1, "A revived boss must not create another proof")
+	var/list/cash = floor_items(/obj/item/holochip)
+	TEST_ASSERT_EQUAL(length(cash), 1, "Duplicate deaths and revival must issue one holochip")
+	var/obj/item/holochip/payment = cash[1]
+	TEST_ASSERT_EQUAL(payment.credits, boss.plunder_credits, "The boss cash amount must stay unchanged")
+	payment.forceMove(run_loc_floor_bottom_left)
+	var/retargets_before = mission.retargets_left
+
+	for(var/rewind in 1 to 3)
+		var/obj/item/mission_recovery/old_proof = mission.quest_atom
+		var/old_serial = mission.binding_serial
+		target.interior_loaded = FALSE
+		mission.on_target_interior_unloaded()
+		TEST_ASSERT_NULL(mission.quest_atom, "Unload must forget stranded proof before the wipe")
+		TEST_ASSERT_EQUAL(mission.current_objective(), hunt, "A completed kill must wait at proof recovery")
+		TEST_ASSERT(mission.named_kill_completed && mission.boss_cash_issued, "Rewind must retain both lifetime flags")
+		TEST_ASSERT(mission.binding_serial > old_serial, "Replacement proof must get a fresh binding")
+		for(var/mob/living/left_behind in test_mobs())
+			qdel(left_behind)
+		// Keep one obsolete proof through reload to check stale-binding rejection.
+		if(rewind != 1)
+			qdel(old_proof)
+		TEST_ASSERT(!mission.failed && !QDELETED(mission), "Deleting forgotten quest atoms must not trigger quest loss")
+		target.interior_loaded = TRUE
+		mission.on_target_interior_loaded()
+		var/obj/item/mission_recovery/replacement = mission.quest_atom
+		TEST_ASSERT_NOTNULL(replacement, "Reload must place replacement proof")
+		TEST_ASSERT(replacement != old_proof, "Reload must bind a newly created proof")
+		TEST_ASSERT_EQUAL(replacement.type, big_game ? /obj/item/mission_recovery/trophy : /obj/item/mission_recovery/proof, "Reload must preserve the proof subtype")
+		TEST_ASSERT_EQUAL(replacement.name, big_game ? "Old Testbeard's scarred jawbone" : "Old Testbeard's identification tag", "Reload must preserve the proof's identity")
+		TEST_ASSERT(mission.can_turn_in(replacement), "Reload must resume the delivery step")
+		if(rewind == 1)
+			TEST_ASSERT(!mission.can_turn_in(old_proof), "Stranded proof must not match the new binding")
+			qdel(old_proof)
+		mission.on_target_interior_loaded()
+		hunt.do_field_spawn()
+		TEST_ASSERT_EQUAL(length(test_mobs()), 0, "Completed hunts must never respawn a boss or guards")
+		TEST_ASSERT_EQUAL(length(floor_items(/obj/item/mission_recovery)), 1, "Repeated load callbacks must leave exactly one proof")
+		TEST_ASSERT_EQUAL(length(floor_items(/obj/item/holochip)), 1, "Rewinds must not issue more boss cash")
+		TEST_ASSERT_EQUAL(mission.retargets_left, retargets_before, "Interior rewinds must not consume retargets")
+		if(big_game)
+			var/datum/mission_objective/set_lure/lure = mission.objectives[1]
+			TEST_ASSERT(lure.completed, "A completed trophy hunt must never ask for another lure")
+
+	TEST_ASSERT(mission.turn_in(run_loc_floor_bottom_left, mission.quest_atom), "Replacement proof must finish the mission")
+	TEST_ASSERT(!mission.failed && mission.completed, "Proof consumption must finish rather than void the mission")
+	TEST_ASSERT(!mission.turn_in(run_loc_floor_bottom_left, null, TRUE), "Repeated forced turn-in must still honor mission completion")
+	TEST_ASSERT_EQUAL(mission.reward_calls, 1, "Repeated turn-in must not distribute rewards twice")
+
+/// Carried proof stays valid while the crew revisits an emptied site.
+/datum/unit_test/voidcrew_mission_kill_rewind/carried/Run()
+	for(var/big_game in list(FALSE, TRUE))
+		var/datum/mission/kill_rewind_test/mission = make_hunt(big_game)
+		var/datum/mission_target/kill_rewind_test/target = mission.target
+		var/datum/mission_objective/field/kill_named/hunt = mission.current_objective()
+		var/mob/living/basic/trooper/pirate/faction/boss/mission_rewind_test/boss = hunt.target_mob
+		boss.death(FALSE)
+		var/obj/item/mission_recovery/proof = mission.quest_atom
+		var/mob/living/carbon/human/carrier = allocate(__IMPLIED_TYPE__)
+		TEST_ASSERT(carrier.put_in_hands(proof), "The crew must be able to carry out the proof")
+		var/serial_before = mission.binding_serial
+		var/datum/mission_objective/delivery = mission.current_objective()
+		for(var/rewind in 1 to 3)
+			target.interior_loaded = FALSE
+			mission.on_target_interior_unloaded()
+			target.interior_loaded = TRUE
+			mission.on_target_interior_loaded()
+			TEST_ASSERT_EQUAL(mission.quest_atom, proof, "Extracted proof must stay tracked")
+			TEST_ASSERT_EQUAL(mission.binding_serial, serial_before, "Extracted proof must keep its binding")
+			TEST_ASSERT_EQUAL(mission.current_objective(), delivery, "Extracted proof must stay on delivery")
+			TEST_ASSERT(mission.can_turn_in(proof), "Carried proof must remain valid")
+		TEST_ASSERT(mission.turn_in(run_loc_floor_bottom_left, proof), "Carried proof must still finish the contract")
+		TEST_ASSERT(!mission.turn_in(run_loc_floor_bottom_left, proof), "The same proof cannot pay twice")
+		TEST_ASSERT_EQUAL(mission.reward_calls, 1, "Carried proof must pay once")
+		var/cash_count = length(floor_items(/obj/item/holochip))
+		boss.on_death_drop_credits(boss)
+		TEST_ASSERT_EQUAL(length(floor_items(/obj/item/holochip)), cash_count, "An expired mission reference must never become an unbound cash drop")
+
+/// An abandoned live target and its replacement share the same cash entitlement.
+/datum/unit_test/voidcrew_mission_kill_rewind/replacement/Run()
+	var/datum/mission/kill_rewind_test/mission = make_hunt()
+	var/datum/mission_target/kill_rewind_test/target = mission.target
+	var/datum/mission_objective/field/kill_named/hunt = mission.current_objective()
+	var/mob/living/basic/trooper/pirate/faction/boss/mission_rewind_test/original = hunt.target_mob
+	target.interior_loaded = FALSE
+	mission.on_target_interior_unloaded()
+	TEST_ASSERT(!mission.named_kill_completed && !mission.boss_cash_issued, "A live target's rewind must not invent completion or spend cash")
+	TEST_ASSERT_NULL(hunt.target_mob, "Reset must release the original target")
+	target.interior_loaded = TRUE
+	mission.on_target_interior_loaded()
+	var/mob/living/basic/trooper/pirate/faction/boss/mission_rewind_test/replacement = hunt.target_mob
+	TEST_ASSERT(replacement && replacement != original, "An unfinished hunt must spawn a replacement target")
+	original.death(FALSE)
+	TEST_ASSERT(!mission.named_kill_completed, "The original target's old death handler must be unregistered")
+	TEST_ASSERT_EQUAL(mission.quest_atom, replacement, "An obsolete target must not replace the live quest atom")
+	TEST_ASSERT_EQUAL(length(floor_items(/obj/item/mission_recovery)), 0, "An obsolete target must not drop proof")
+	replacement.death(FALSE)
+	TEST_ASSERT(mission.named_kill_completed, "The current target must complete the kill")
+	TEST_ASSERT_EQUAL(length(floor_items(/obj/item/holochip)), 1, "Original and replacement targets must share one cash payment")
+	var/obj/item/mission_recovery/old_proof = mission.quest_atom
+	var/mob_count = length(test_mobs())
+	var/retargets_before = mission.retargets_left
+	mission.retarget()
+	TEST_ASSERT(!mission.failed && mission.active, "A same-band retarget must keep the contract active")
+	TEST_ASSERT_EQUAL(mission.retargets_left, retargets_before - 1, "A real retarget must consume one retarget")
+	TEST_ASSERT(mission.named_kill_completed && mission.boss_cash_issued, "Retargeting must preserve both lifetime flags")
+	TEST_ASSERT_EQUAL(length(test_mobs()), mob_count, "Retargeting a completed kill must restore proof without more mobs")
+	TEST_ASSERT(!mission.can_turn_in(old_proof), "A retarget must reject the obsolete proof")
+	TEST_ASSERT(mission.can_turn_in(mission.quest_atom), "A retarget must resume proof delivery")
+	qdel(old_proof)
+	SEND_SIGNAL(original, COMSIG_LIVING_DEATH, FALSE)
+	SEND_SIGNAL(replacement, COMSIG_LIVING_DEATH, FALSE)
+	TEST_ASSERT_EQUAL(length(floor_items(/obj/item/holochip)), 1, "Retargeting must not replenish the boss cash entitlement")
+	TEST_ASSERT(mission.turn_in(run_loc_floor_bottom_left, mission.quest_atom), "Retargeted proof must finish the mission")
+	TEST_ASSERT(!mission.turn_in(run_loc_floor_bottom_left, null, TRUE), "Retargeted proof must not allow another turn-in")
+	TEST_ASSERT_EQUAL(mission.reward_calls, 1, "Retargeted proof must pay the mission reward once")
diff --git a/voidcrew/modules/unit_tests/voidcrew_nanite_research.dm b/voidcrew/modules/unit_tests/voidcrew_nanite_research.dm
index d97425efefa..064bc35ec80 100644
--- a/voidcrew/modules/unit_tests/voidcrew_nanite_research.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_nanite_research.dm
@@ -74,6 +74,187 @@
 	TEST_ASSERT_NULL(programmer.linked_techweb, "Programmer UI refresh retained a separated research link")
 	TEST_ASSERT(istype(programmer.current_program, /datum/nanite_program/monitoring), "Programmer UI refresh erased the program being edited")
 
+/// Imports must use the receiving controller's current research, never the disk or cloud's history.
+/datum/unit_test/voidcrew_nanite_research/backup_import
+	abstract_type = /datum/unit_test/voidcrew_nanite_research/backup_import
+	var/obj/machinery/computer/nanite_cloud_controller/controller
+	var/obj/item/disk/nanite_program/backup_disk
+	var/datum/nanite_cloud_backup/cloud
+	var/datum/nanite_program/cloud_program
+	var/datum/nanite_program/cloud_settings
+	var/datum/nanite_program/disk_program
+	var/datum/nanite_program/disk_settings
+	var/datum/tgui/ui
+
+/datum/unit_test/voidcrew_nanite_research/backup_import/proc/setup_import()
+	if(!setup_links())
+		return FALSE
+	web.add_design_by_id("selfscan_nanites")
+	web.researched_designs -= "monitoring_nanites"
+	controller = allocate(/obj/machinery/computer/nanite_cloud_controller)
+	controller.multitool_act(user, tool)
+	controller.current_view = 95
+	controller.generate_backup(controller.current_view, user)
+	cloud = controller.get_backup(controller.current_view)
+	if(!cloud)
+		return FALSE
+	cloud_program = allocate(/datum/nanite_program/self_scan)
+	cloud_program.activation_code = 1234
+	cloud_program.timer_restart = 120
+	cloud_program.set_extra_setting("Scan Type", "Chemical") // NES_SCAN_TYPE
+	cloud.nanites.add_program(null, cloud_program)
+	cloud_settings = allocate(/datum/nanite_program/self_scan)
+	cloud_program.copy_programming(cloud_settings)
+	backup_disk = allocate(/obj/item/disk/nanite_program, controller)
+	controller.disk = backup_disk
+	disk_program = allocate(/datum/nanite_program/self_scan)
+	disk_program.activated = FALSE
+	disk_program.activation_code = 4321
+	disk_program.deactivation_code = 2345
+	disk_program.kill_code = 3456
+	disk_program.trigger_code = 4567
+	disk_program.timer_restart = 230
+	disk_program.timer_shutdown = 340
+	disk_program.timer_trigger = 450
+	disk_program.timer_trigger_delay = 560
+	disk_program.all_rules_required = FALSE
+	disk_program.set_extra_setting("Scan Type", "Nanite") // NES_SCAN_TYPE
+	allocate(/datum/nanite_rule/health, disk_program)
+	backup_disk.backup += disk_program
+	disk_settings = allocate(/datum/nanite_program/self_scan)
+	disk_program.copy_programming(disk_settings)
+	allocated += disk_settings.rules
+	ui = allocate(/datum/tgui, user, controller, "NaniteCloudControl")
+	return TRUE
+
+/datum/unit_test/voidcrew_nanite_research/backup_import/proc/assert_rejected(reason)
+	var/list/contents_before = backup_disk.backup.Copy()
+	controller.ui_act("load_backup", list(), ui)
+	TEST_ASSERT_EQUAL(length(cloud.nanites.programs), 1, "[reason]: rejection changed the cloud's program count")
+	TEST_ASSERT(cloud_program in cloud.nanites.programs, "[reason]: rejection replaced the existing cloud program")
+	TEST_ASSERT(!QDELETED(cloud_program), "[reason]: rejection deleted the existing cloud program")
+	TEST_ASSERT(!cloud_settings.programming_differs(cloud_program), "[reason]: rejection changed existing cloud settings")
+	TEST_ASSERT_EQUAL(controller.disk, backup_disk, "[reason]: rejection discarded the source disk")
+	TEST_ASSERT(!QDELETED(backup_disk), "[reason]: rejection deleted the source disk")
+	TEST_ASSERT_EQUAL(length(backup_disk.backup), length(contents_before), "[reason]: rejection changed the disk's program count")
+	for(var/index in 1 to length(contents_before))
+		TEST_ASSERT_EQUAL(backup_disk.backup[index], contents_before[index], "[reason]: rejection changed a disk entry")
+	TEST_ASSERT(!QDELETED(disk_program), "[reason]: rejection deleted the disk's permitted program")
+	TEST_ASSERT(!disk_settings.programming_differs(disk_program), "[reason]: rejection changed disk settings")
+
+/datum/unit_test/voidcrew_nanite_research/backup_import/permitted/Run()
+	TEST_ASSERT(setup_import(), "Could not prepare backup import testing")
+	web.add_design_by_id("monitoring_nanites")
+	var/datum/nanite_program/second_program = allocate(/datum/nanite_program/monitoring)
+	backup_disk.backup += second_program
+	controller.ui_act("load_backup", list(), ui)
+	TEST_ASSERT(QDELETED(cloud_program), "A permitted import did not replace the old cloud program")
+	TEST_ASSERT_EQUAL(length(cloud.nanites.programs), 2, "A permitted import did not load the entire disk")
+	var/datum/nanite_program/imported = cloud.nanites.programs[1]
+	TEST_ASSERT_EQUAL(imported.type, disk_program.type, "A permitted import changed the program type")
+	TEST_ASSERT(imported != disk_program, "A permitted import installed the source datum instead of a copy")
+	TEST_ASSERT(!disk_settings.programming_differs(imported), "A permitted import lost codes, timers, rules or extra settings")
+	allocated += imported.rules
+	var/datum/nanite_program/second_imported = cloud.nanites.programs[2]
+	TEST_ASSERT_EQUAL(second_imported.type, second_program.type, "A permitted import lost its second program")
+	TEST_ASSERT(second_imported != second_program, "A permitted import took its second program from the disk")
+	TEST_ASSERT_EQUAL(controller.disk, backup_disk, "A permitted import discarded its disk")
+	TEST_ASSERT_EQUAL(backup_disk.backup[1], disk_program, "A permitted import replaced the first disk program")
+	TEST_ASSERT_EQUAL(backup_disk.backup[2], second_program, "A permitted import replaced the second disk program")
+	TEST_ASSERT(!disk_settings.programming_differs(disk_program), "A permitted import changed the disk's settings")
+	backup_disk.backup.Cut()
+	controller.ui_act("load_backup", list(), ui)
+	TEST_ASSERT_EQUAL(length(cloud.nanites.programs), 0, "A valid local research link could not import an empty backup")
+
+/datum/unit_test/voidcrew_nanite_research/backup_import/forbidden/Run()
+	TEST_ASSERT(setup_import(), "Could not prepare backup rejection testing")
+	var/datum/nanite_program/forbidden = allocate(/datum/nanite_program/monitoring)
+	backup_disk.backup += forbidden
+	assert_rejected("Permitted program followed by an unresearched program")
+	TEST_ASSERT(!QDELETED(forbidden), "Rejection deleted the disk's unresearched program")
+	backup_disk.backup.Swap(1, 2)
+	assert_rejected("Unresearched program followed by a permitted program")
+	backup_disk.backup = list(disk_program)
+	var/datum/nanite_program/unknown = allocate(/datum/nanite_program/sensor)
+	unknown.name = disk_program.name
+	backup_disk.backup += unknown
+	web.add_design_by_id("repeater_nanites")
+	assert_rejected("Unknown actual type with a permitted display name and researched sensor subtype")
+	backup_disk.backup = list(disk_program)
+	var/datum/nanite_program/deleted = allocate(/datum/nanite_program/self_scan)
+	qdel(deleted)
+	for(var/invalid in list(null, "invalid program", /datum/nanite_program/self_scan, deleted))
+		backup_disk.backup += list(invalid)
+		assert_rejected("Invalid disk entry [invalid]")
+		backup_disk.backup.Cut(2)
+	// An open catalog must confer no authority after research changes.
+	controller.ui_static_data(user)
+	web.researched_designs["selfscan_nanites"] = FALSE
+	assert_rejected("Research removed after catalog generation")
+
+/datum/unit_test/voidcrew_nanite_research/backup_import/research_link/Run()
+	TEST_ASSERT(setup_import(), "Could not prepare backup research-link testing")
+	controller.unsync_research_servers()
+	assert_rejected("Missing receiver research, despite the cloud's old research attribution")
+	backup_disk.backup.Cut()
+	assert_rejected("Empty backup without receiver research")
+	var/datum/techweb/deleted_web = allocate(/datum/techweb)
+	qdel(deleted_web)
+	controller.linked_techweb = deleted_web
+	assert_rejected("Empty backup with a deleted receiver techweb")
+	TEST_ASSERT_NULL(controller.linked_techweb, "A rejected import retained a deleted research link")
+	backup_disk.backup += disk_program
+	for(var/move_server in list(FALSE, TRUE))
+		controller.multitool_act(user, tool)
+		move_apart(controller, move_server)
+		assert_rejected("Separated research endpoints (server moved: [move_server])")
+		TEST_ASSERT_NULL(controller.linked_techweb, "A rejected import retained a foreign research link")
+		TEST_ASSERT(!(controller in web.connected_machines), "A rejected import retained a foreign research registration")
+		server.forceMove(run_loc_floor_bottom_left)
+		controller.forceMove(run_loc_floor_bottom_left)
+	controller.multitool_act(user, tool)
+	var/obj/item/computer_disk/ship_disk/source_disk = server.source_code_hdd
+	source_disk.forceMove(run_loc_floor_bottom_left)
+	// Even a stale reference to the removed disk must not authorize an import.
+	controller.linked_techweb = web
+	web.connected_machines |= controller
+	assert_rejected("Removed research source disk")
+	TEST_ASSERT_NULL(controller.linked_techweb, "A rejected import retained a removed research disk's link")
+	server.attacked_by(source_disk, user)
+	controller.multitool_act(user, tool)
+	backup_disk.forceMove(run_loc_floor_bottom_left)
+	assert_rejected("Removed backup disk with a stale controller reference")
+	backup_disk.forceMove(controller)
+	server.forceMove(remote_turf)
+	controller.forceMove(remote_turf)
+	controller.ui_act("load_backup", list(), ui)
+	TEST_ASSERT(QDELETED(cloud_program), "Moving both endpoints together prevented a permitted import")
+	TEST_ASSERT_EQUAL(length(cloud.nanites.programs), 1, "Moving both endpoints together lost the imported program")
+	var/datum/nanite_program/imported = cloud.nanites.programs[1]
+	allocated += imported.rules
+	TEST_ASSERT(!disk_settings.programming_differs(imported), "Import after movement lost its settings")
+
+/datum/unit_test/voidcrew_nanite_research/backup_import/checkpoint/Run()
+	TEST_ASSERT(setup_import(), "Could not prepare nanite checkpoint testing")
+	controller.current_program = allocate(/datum/nanite_program/monitoring)
+	var/datum/ship_checkpoint/snapshot = allocate(/datum/ship_checkpoint)
+	var/machine_text = snapshot.atom_text(controller)
+	var/datum/parsed_map/parsed = allocate(/datum/parsed_map, "\"a\" = ([machine_text],/turf/template_noop,/area/template_noop)\n(1,1,1) = {\"\na\n\"}\n")
+	var/datum/map_template/template = allocate(/datum/map_template)
+	template.cached_map = parsed
+	template.width = 1
+	template.height = 1
+	TEST_ASSERT(template.load(run_loc_floor_top_right), "Could not load the checkpoint controller")
+	var/obj/machinery/computer/nanite_cloud_controller/rebuilt = locate() in run_loc_floor_top_right
+	TEST_ASSERT_NOTNULL(rebuilt, "The checkpoint omitted its nanite controller")
+	TEST_ASSERT_EQUAL(length(rebuilt.cloud_backups), 0, "The checkpoint retained cloud backup contents")
+	TEST_ASSERT_NULL(rebuilt.disk, "The checkpoint retained its source disk")
+	TEST_ASSERT_NULL(locate(/obj/item/disk/nanite_program) in rebuilt, "The checkpoint copied a program disk into the controller")
+	TEST_ASSERT_NULL(rebuilt.current_program, "The checkpoint retained the program being edited")
+	TEST_ASSERT_NULL(rebuilt.linked_techweb, "The checkpoint retained the original research link")
+	TEST_ASSERT_EQUAL(controller.get_backup(controller.current_view), cloud, "The checkpoint changed the original controller's cloud")
+	TEST_ASSERT_EQUAL(controller.disk, backup_disk, "The checkpoint changed the original controller's disk")
+
 /datum/unit_test/voidcrew_nanite_research/chambers/Run()
 	TEST_ASSERT(setup_links(), "No separate site exists for nanite chamber testing")
 	for(var/move_server in list(FALSE, TRUE))
@@ -143,3 +324,332 @@
 	TEST_ASSERT_EQUAL(controller.get_backup(backup_id), original, "Research separation discarded an existing cloud backup")
 	TEST_ASSERT(program in original.nanites.programs, "Research separation erased an existing cloud program")
 	qdel(controller)
+
+/// Only the rolls are controlled; range, eligibility, armor and synchronization stay real.
+/datum/nanite_program/spreading/infection_test
+	var/list/infection_rolls = list()
+
+/datum/nanite_program/spreading/infection_test/roll_infection_chance(chance)
+	infection_rolls += chance
+	return chance > 0
+
+/datum/nanite_program/nanite_sting/infection_test
+	var/list/infection_rolls = list()
+
+/datum/nanite_program/nanite_sting/infection_test/roll_infection_chance(chance)
+	infection_rolls += chance
+	return chance > 0
+
+/mob/living/carbon/human/consistent/nanite_infection_test
+	var/infection_adjacent = TRUE
+
+/mob/living/carbon/human/consistent/nanite_infection_test/Adjacent(atom/neighbor, atom/target, atom/movable/mover)
+	return infection_adjacent && ..()
+
+/datum/armor/nanite_infection_test
+	bio = 60
+
+/obj/item/clothing/suit/nanite_infection_test
+	armor_type = /datum/armor/nanite_infection_test
+
+/datum/unit_test/voidcrew_nanite_research/proc/monitor_entry(atom/source, mob/living/host)
+	var/list/matches = list()
+	for(var/list/entry as anything in GLOB.crewmonitor.update_data(source))
+		if(entry["ref"] == REF(host))
+			matches += list(entry)
+	TEST_ASSERT_EQUAL(length(matches), 1, "A monitored host must appear exactly once")
+	return matches[1]
+
+/datum/unit_test/voidcrew_nanite_research/proc/monitor_absent(atom/source, mob/living/host)
+	for(var/list/entry as anything in GLOB.crewmonitor.update_data(source))
+		TEST_ASSERT_NOTEQUAL(entry["ref"], REF(host), "The monitor exposed an inactive or foreign host")
+
+/datum/unit_test/voidcrew_nanite_research/monitoring/Run()
+	var/mob/living/carbon/human/patient = allocate(/mob/living/carbon/human/consistent)
+	var/obj/item/source = allocate(/obj/item)
+	var/datum/component/nanites/swarm = patient.AddComponent(/datum/component/nanites)
+	var/datum/nanite_program/monitoring/program = allocate(/datum/nanite_program/monitoring)
+	swarm.add_program(null, program)
+	monitor_absent(source, patient) // Prime the sensor cache before activation.
+	program.on_process()
+	TEST_ASSERT_EQUAL(length(GLOB.crewmonitor.data_by_scope), 0, "Monitoring activation retained cached sensors")
+	TEST_ASSERT_EQUAL(length(GLOB.crewmonitor.last_update), 0, "Monitoring activation retained cache timestamps")
+	program.enable_passive_effect()
+	var/registrations = 0
+	for(var/mob/living/registered in SSnanites.nanite_monitored_mobs)
+		if(registered == patient)
+			registrations++
+	TEST_ASSERT_EQUAL(registrations, 1, "Repeated Monitoring activation duplicated its host")
+	patient.adjustBruteLoss(12)
+	patient.alpha = 0
+	var/obj/item/card/id/id_card = allocate(/obj/item/card/id)
+	id_card.registered_name = "Nanite Patient"
+	id_card.assignment = "Medical Doctor"
+	patient.equip_to_slot(id_card, ITEM_SLOT_ID)
+	var/list/entry = monitor_entry(source, patient)
+	TEST_ASSERT_EQUAL(entry["name"], id_card.registered_name, "Uniformless Monitoring lost ID naming")
+	TEST_ASSERT_EQUAL(entry["assignment"], id_card.assignment, "Monitoring lost ID assignment")
+	TEST_ASSERT_EQUAL(entry["life_status"], patient.stat, "Monitoring lost life status")
+	TEST_ASSERT_EQUAL(entry["brutedam"], round(patient.getBruteLoss(), 1), "Monitoring lost brute damage")
+	TEST_ASSERT_EQUAL(entry["burndam"], round(patient.getFireLoss(), 1), "Monitoring lost burn damage")
+	TEST_ASSERT_EQUAL(entry["toxdam"], round(patient.getToxLoss(), 1), "Monitoring lost toxin damage")
+	TEST_ASSERT_EQUAL(entry["oxydam"], round(patient.getOxyLoss(), 1), "Monitoring lost oxygen damage")
+	TEST_ASSERT_EQUAL(entry["health"], round(patient.health, 1), "Monitoring lost health")
+	TEST_ASSERT_EQUAL(entry["area"], get_area_name(patient, format_text = TRUE), "Monitoring lost location")
+	TEST_ASSERT(!entry["can_track"], "Monitoring bypassed the host's tracking restrictions")
+
+	var/obj/item/clothing/under/color/grey/uniform = allocate(/obj/item/clothing/under/color/grey)
+	uniform.has_sensor = HAS_SENSORS
+	uniform.sensor_mode = SENSOR_LIVING
+	patient.equip_to_slot(uniform, ITEM_SLOT_ICLOTHING)
+	patient.update_suit_sensors()
+	TEST_ASSERT(patient in GLOB.suit_sensors_list, "The deduplication fixture has no suit sensors")
+	GLOB.crewmonitor.data_by_scope.Cut()
+	entry = monitor_entry(source, patient)
+	TEST_ASSERT("area" in entry, "Low suit sensors suppressed Monitoring's location")
+	uniform.has_sensor = BROKEN_SENSORS
+	GLOB.crewmonitor.data_by_scope.Cut()
+	entry = monitor_entry(source, patient)
+	TEST_ASSERT_EQUAL(entry["health"], round(patient.health, 1), "Broken suit sensors corrupted Monitoring")
+	uniform.has_sensor = HAS_SENSORS
+	program.deactivate()
+	TEST_ASSERT_EQUAL(length(GLOB.crewmonitor.data_by_scope), 0, "Monitoring deactivation retained cached sensors")
+	TEST_ASSERT_EQUAL(length(GLOB.crewmonitor.last_update), 0, "Monitoring deactivation retained cache timestamps")
+	TEST_ASSERT(!(patient in SSnanites.nanite_monitored_mobs), "Deactivated Monitoring retained its registration")
+	entry = monitor_entry(source, patient)
+	TEST_ASSERT(!("area" in entry) && !("health" in entry), "Deactivation did not restore the uniform's sensor mode")
+	patient.temporarilyRemoveItemFromInventory(uniform, TRUE)
+	patient.update_suit_sensors()
+	GLOB.crewmonitor.data_by_scope.Cut()
+	monitor_absent(source, patient)
+
+	program.activate()
+	program.on_process()
+	monitor_entry(source, patient)
+	qdel(program)
+	TEST_ASSERT(!(patient in SSnanites.nanite_monitored_mobs), "Deleted Monitoring retained its host")
+	TEST_ASSERT_EQUAL(length(GLOB.crewmonitor.data_by_scope), 0, "Program deletion retained cached Monitoring")
+	monitor_absent(source, patient)
+	program = allocate(/datum/nanite_program/monitoring)
+	swarm.add_program(null, program)
+	program.on_process()
+	monitor_entry(source, patient)
+	qdel(swarm)
+	TEST_ASSERT(!(patient in SSnanites.nanite_monitored_mobs), "Swarm deletion retained Monitoring")
+	TEST_ASSERT_EQUAL(length(GLOB.crewmonitor.data_by_scope), 0, "Swarm deletion retained cached Monitoring")
+	swarm = patient.AddComponent(/datum/component/nanites)
+	program = allocate(/datum/nanite_program/monitoring)
+	swarm.add_program(null, program)
+	program.on_process()
+	monitor_entry(source, patient)
+	qdel(patient)
+	TEST_ASSERT(!(patient in SSnanites.nanite_monitored_mobs), "Host deletion retained Monitoring")
+	TEST_ASSERT_EQUAL(length(GLOB.crewmonitor.data_by_scope), 0, "Host deletion retained cached Monitoring")
+
+/datum/unit_test/voidcrew_nanite_research/monitoring_scope
+	var/list/test_ports = list()
+	var/datum/turf_reservation/local_site
+	var/datum/turf_reservation/neighbour_site
+
+/datum/unit_test/voidcrew_nanite_research/monitoring_scope/Destroy()
+	for(var/obj/docking_port/mobile/voidcrew/port in test_ports)
+		qdel(port, force = TRUE)
+	test_ports = null
+	QDEL_LIST(allocated)
+	QDEL_NULL(local_site)
+	QDEL_NULL(neighbour_site)
+	return ..()
+
+/datum/unit_test/voidcrew_nanite_research/monitoring_scope/Run()
+	local_site = SSmapping.request_turf_block_reservation(4, 3, 1, null, /datum/turf_reservation, /turf/open/floor/iron)
+	TEST_ASSERT_NOTNULL(local_site, "Could not reserve the local sensor site")
+	var/turf/local_turf = local_site.bottom_left_turfs[1]
+	neighbour_site = SSmapping.request_turf_block_reservation(2, 2, 1, local_turf.z)
+	TEST_ASSERT_NOTNULL(neighbour_site, "Could not reserve a neighbouring sensor site")
+	var/turf/neighbour_turf = neighbour_site.bottom_left_turfs[1]
+	var/turf/foreign_turf = get_step(get_step(local_turf, EAST), EAST)
+	var/turf/away_turf = get_step(local_turf, NORTH)
+	for(var/turf/port_turf in list(local_turf, foreign_turf))
+		var/obj/docking_port/mobile/voidcrew/port = new(port_turf)
+		test_ports += port
+		port.width = 1
+		port.height = 1
+		port.shuttle_areas[get_area(port_turf)] = TRUE
+		port.register()
+	var/list/hosts = list()
+	for(var/turf/host_turf in list(local_turf, foreign_turf, away_turf, neighbour_turf))
+		var/mob/living/carbon/human/host = allocate(/mob/living/carbon/human/consistent, host_turf)
+		var/datum/component/nanites/swarm = host.AddComponent(/datum/component/nanites)
+		var/datum/nanite_program/monitoring/program = allocate(/datum/nanite_program/monitoring)
+		swarm.add_program(null, program)
+		program.on_process()
+		hosts += host
+	var/mob/living/local_host = hosts[1]
+	var/mob/living/foreign_host = hosts[2]
+	var/mob/living/away_host = hosts[3]
+	var/mob/living/neighbour_host = hosts[4]
+	TEST_ASSERT_EQUAL(voidcrew_crew_sensor_hull(local_host), test_ports[1], "Local hull fixture is not registered")
+	TEST_ASSERT_EQUAL(voidcrew_crew_sensor_hull(foreign_host), test_ports[2], "Foreign hull fixture is not registered")
+	TEST_ASSERT_NOTEQUAL(map_region_for_turf(local_turf), map_region_for_turf(neighbour_turf), "Site fixtures share a region")
+	monitor_entry(local_host, local_host)
+	monitor_entry(local_host, away_host)
+	monitor_absent(local_host, foreign_host)
+	monitor_absent(local_host, neighbour_host)
+	monitor_entry(foreign_host, foreign_host)
+	monitor_absent(foreign_host, local_host) // A hull cache must not cross to its neighbour.
+	monitor_entry(away_host, away_host)
+	monitor_absent(away_host, local_host)
+	monitor_absent(away_host, neighbour_host)
+	monitor_entry(neighbour_host, neighbour_host)
+	monitor_absent(neighbour_host, away_host) // Same z, different site and cache key.
+
+/datum/unit_test/voidcrew_nanite_research/infection
+	abstract_type = /datum/unit_test/voidcrew_nanite_research/infection
+	var/datum/turf_reservation/infection_block
+	var/mob/living/carbon/human/donor
+	var/mob/living/carbon/human/consistent/nanite_infection_test/target
+	var/datum/component/nanites/source_swarm
+	var/datum/nanite_program/infection_program
+
+/datum/unit_test/voidcrew_nanite_research/infection/Destroy()
+	QDEL_LIST(allocated)
+	QDEL_NULL(infection_block)
+	return ..()
+
+/datum/unit_test/voidcrew_nanite_research/infection/proc/setup_infection(program_type)
+	infection_block = SSmapping.request_turf_block_reservation(8, 3, 1, null, /datum/turf_reservation, /turf/open/floor/iron)
+	TEST_ASSERT_NOTNULL(infection_block, "Could not reserve the infection range fixture")
+	donor = allocate(/mob/living/carbon/human/consistent, infection_block.bottom_left_turfs[1])
+	target = allocate(/mob/living/carbon/human/consistent/nanite_infection_test, get_step(donor, EAST))
+	source_swarm = donor.AddComponent(/datum/component/nanites)
+	infection_program = allocate(program_type)
+	source_swarm.add_program(null, infection_program)
+	source_swarm.cloud_id = 91
+	source_swarm.cloud_ship_ref = WEAKREF(donor) // Distinct pairing sentinel; never synced as a cloud.
+	source_swarm.next_sync = INFINITY
+	return TRUE
+
+/datum/unit_test/voidcrew_nanite_research/infection/proc/check_capacity_and_pairing()
+	var/datum/component/nanites/target_swarm = target.GetComponent(/datum/component/nanites)
+	TEST_ASSERT_NOTNULL(target_swarm, "A naked target did not receive nanites")
+	TEST_ASSERT(locate(infection_program.type) in target_swarm.programs, "Infection did not copy the donor's programming")
+	TEST_ASSERT_EQUAL(target_swarm.cloud_id, 0, "Infection inherited the donor's cloud ID")
+	TEST_ASSERT_NULL(target_swarm.cloud_ship_ref, "Infection inherited the donor's cloud pairing")
+	qdel(target_swarm)
+	var/obj/item/organ/cyberimp/cyberware/test_full_body/bulk = allocate(/obj/item/organ/cyberimp/cyberware/test_full_body)
+	TEST_ASSERT(bulk.Insert(target, TRUE), "Could not fill the target's capacity")
+	target_swarm = target.AddComponent(/datum/component/nanites)
+	var/datum/nanite_program/relay/incumbent = allocate(/datum/nanite_program/relay)
+	target_swarm.add_program(null, incumbent)
+	incumbent.activation_code = 17
+	target_swarm.cloud_id = 92
+	var/datum/weakref/own_pairing = WEAKREF(target)
+	target_swarm.cloud_ship_ref = own_pairing
+	target_swarm.next_sync = INFINITY
+	// Spreading may replace incumbents; Sting must refuse the existing host outright.
+	attempt_infection()
+	TEST_ASSERT(incumbent in target_swarm.programs, "Infection deleted an incumbent despite the capacity gate")
+	TEST_ASSERT_EQUAL(length(target_swarm.programs), 1, "Infection partially installed an over-capacity loadout")
+	TEST_ASSERT_EQUAL(incumbent.activation_code, 17, "Rejected infection changed incumbent settings")
+	TEST_ASSERT_EQUAL(target_swarm.cloud_id, 92, "Infection replaced the target's cloud ID")
+	TEST_ASSERT_EQUAL(target_swarm.cloud_ship_ref, own_pairing, "Infection replaced the target's cloud pairing")
+	qdel(target_swarm)
+	attempt_infection() // New hosts must also use the complete capacity gate.
+	target_swarm = target.GetComponent(/datum/component/nanites)
+	TEST_ASSERT_NOTNULL(target_swarm, "An over-capacity target did not receive its empty swarm")
+	TEST_ASSERT_EQUAL(length(target_swarm.programs), 0, "Infection bypassed capacity on a new host")
+	TEST_ASSERT_EQUAL(target_swarm.cloud_id, 0, "A rejected loadout inherited the donor's cloud")
+	TEST_ASSERT_NULL(target_swarm.cloud_ship_ref, "A rejected loadout inherited the donor's pairing")
+
+/datum/unit_test/voidcrew_nanite_research/infection/proc/attempt_infection()
+	if(istype(infection_program, /datum/nanite_program/spreading))
+		var/datum/nanite_program/spreading/spreading = infection_program
+		spreading.spread_cooldown = world.time
+		spreading.active_effect()
+	else
+		infection_program.next_trigger = world.time
+		infection_program.trigger()
+
+/datum/unit_test/voidcrew_nanite_research/infection/spreading/Run()
+	TEST_ASSERT(setup_infection(/datum/nanite_program/spreading/infection_test), "Could not set up spreading")
+	var/datum/nanite_program/spreading/infection_test/program = infection_program
+	program.spread_cooldown = world.time + 1
+	program.active_effect()
+	TEST_ASSERT_EQUAL(length(program.infection_rolls), 0, "Spreading ran before its cooldown expired")
+	program.spread_cooldown = world.time
+	var/attempt_time = world.time
+	program.active_effect()
+	TEST_ASSERT_EQUAL(program.spread_cooldown, attempt_time + 5 SECONDS, "Spreading lost its five-second spacing")
+	TEST_ASSERT_EQUAL(program.infection_rolls[1], 25, "Spreading changed its per-target probability")
+	TEST_ASSERT_EQUAL(program.infection_rolls[2], 100, "A naked target received suit BIO protection")
+	program.active_effect()
+	TEST_ASSERT_EQUAL(length(program.infection_rolls), 2, "Spreading repeated inside its cooldown")
+	check_capacity_and_pairing()
+	qdel(target.GetComponent(/datum/component/nanites))
+	var/obj/item/organ/cyberimp/cyberware/test_full_body/bulk = target.get_organ_slot("voidcrew_test_chrome_bulk")
+	bulk.Remove(target, TRUE)
+	var/obj/item/clothing/suit/bio_suit/suit = allocate(/obj/item/clothing/suit/bio_suit)
+	target.equip_to_slot(suit, ITEM_SLOT_OCLOTHING)
+	attempt_infection()
+	TEST_ASSERT_NULL(target.GetComponent(/datum/component/nanites), "Spreading ignored full suit BIO protection")
+	TEST_ASSERT_EQUAL(program.infection_rolls[length(program.infection_rolls)], 0, "Spreading changed full BIO resistance")
+	target.temporarilyRemoveItemFromInventory(suit, TRUE)
+	var/obj/item/clothing/suit/nanite_infection_test/partial = allocate(/obj/item/clothing/suit/nanite_infection_test)
+	target.equip_to_slot(partial, ITEM_SLOT_OCLOTHING)
+	attempt_infection()
+	TEST_ASSERT_EQUAL(program.infection_rolls[length(program.infection_rolls)], 40, "Spreading changed partial BIO resistance")
+	qdel(target.GetComponent(/datum/component/nanites))
+	target.temporarilyRemoveItemFromInventory(partial, TRUE)
+	var/turf/origin = get_turf(donor)
+	target.forceMove(locate(origin.x + 6, origin.y, origin.z))
+	program.infection_rolls.Cut()
+	attempt_infection()
+	TEST_ASSERT_EQUAL(length(program.infection_rolls), 0, "Spreading reached beyond five tiles")
+	target.forceMove(locate(origin.x + 5, origin.y, origin.z))
+	attempt_infection()
+	TEST_ASSERT_NOTNULL(target.GetComponent(/datum/component/nanites), "Spreading did not reach its five-tile boundary")
+
+/datum/unit_test/voidcrew_nanite_research/infection/sting/Run()
+	TEST_ASSERT(setup_infection(/datum/nanite_program/nanite_sting/infection_test), "Could not set up Sting")
+	var/datum/nanite_program/nanite_sting/infection_test/program = infection_program
+	var/initial_volume = source_swarm.nanite_volume
+	var/turf/origin = get_turf(donor)
+	target.forceMove(locate(origin.x + 2, origin.y, origin.z))
+	program.trigger()
+	TEST_ASSERT_NULL(target.GetComponent(/datum/component/nanites), "Sting reached beyond one tile")
+	TEST_ASSERT_EQUAL(source_swarm.nanite_volume, initial_volume, "A Sting with no target did not refund its cost")
+	target.forceMove(get_step(donor, EAST))
+	target.infection_adjacent = FALSE
+	attempt_infection()
+	TEST_ASSERT_NULL(target.GetComponent(/datum/component/nanites), "Sting bypassed adjacency")
+	target.infection_adjacent = TRUE
+	program.next_trigger = world.time + 1
+	program.trigger()
+	TEST_ASSERT_EQUAL(length(program.infection_rolls), 0, "Sting ran before its cooldown expired")
+	var/attempt_time = world.time
+	attempt_infection()
+	TEST_ASSERT_EQUAL(program.next_trigger, attempt_time + 10 SECONDS, "Sting lost its ten-second cooldown")
+	TEST_ASSERT_EQUAL(source_swarm.nanite_volume, initial_volume - 5, "Sting changed its five-nanite trigger cost")
+	TEST_ASSERT_EQUAL(program.infection_rolls[1], 100, "A naked Sting target received suit BIO protection")
+	program.trigger()
+	TEST_ASSERT_EQUAL(source_swarm.nanite_volume, initial_volume - 5, "Sting consumed fuel during cooldown")
+	var/datum/component/nanites/target_swarm = target.GetComponent(/datum/component/nanites)
+	TEST_ASSERT_NOTNULL(target_swarm, "Sting did not infect an adjacent naked target")
+	var/target_volume = target_swarm.nanite_volume
+	attempt_infection()
+	TEST_ASSERT_EQUAL(length(program.infection_rolls), 1, "Sting attempted to reinfect an existing host")
+	TEST_ASSERT_EQUAL(target_swarm.nanite_volume, target_volume, "Sting added volume to an existing host")
+	check_capacity_and_pairing()
+	qdel(target.GetComponent(/datum/component/nanites))
+	var/obj/item/organ/cyberimp/cyberware/test_full_body/bulk = target.get_organ_slot("voidcrew_test_chrome_bulk")
+	bulk.Remove(target, TRUE)
+	var/obj/item/clothing/suit/bio_suit/suit = allocate(/obj/item/clothing/suit/bio_suit)
+	target.equip_to_slot(suit, ITEM_SLOT_OCLOTHING)
+	attempt_infection()
+	TEST_ASSERT_NULL(target.GetComponent(/datum/component/nanites), "Sting ignored full suit BIO protection")
+	TEST_ASSERT_EQUAL(program.infection_rolls[length(program.infection_rolls)], 0, "Sting changed full BIO resistance")
+	target.temporarilyRemoveItemFromInventory(suit, TRUE)
+	var/obj/item/clothing/suit/nanite_infection_test/partial = allocate(/obj/item/clothing/suit/nanite_infection_test)
+	target.equip_to_slot(partial, ITEM_SLOT_OCLOTHING)
+	attempt_infection()
+	TEST_ASSERT_EQUAL(program.infection_rolls[length(program.infection_rolls)], 40, "Sting changed partial BIO resistance")
diff --git a/voidcrew/modules/unit_tests/voidcrew_npc_boarding_docking.dm b/voidcrew/modules/unit_tests/voidcrew_npc_boarding_docking.dm
index 3edb5eb579b..e0b35a12b41 100644
--- a/voidcrew/modules/unit_tests/voidcrew_npc_boarding_docking.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_npc_boarding_docking.dm
@@ -3,12 +3,143 @@
 /datum/ai_controller/npc_ship/boarding_docking_test
 	ai_movement = /datum/ai_movement/basic_avoidance
 
+/// Deterministic band and connected crew snapshot; the production accounting stays intact.
+/datum/ai_controller/npc_ship/boarding_docking_test/profile
+	var/datum/overmap_zone/test_zone
+	var/test_crew = 3
+	var/turf/test_floor
+
+/datum/ai_controller/npc_ship/boarding_docking_test/profile/get_raid_zone(obj/structure/overmap/ship/target)
+	return test_zone
+
+/datum/ai_controller/npc_ship/boarding_docking_test/profile/count_player_crew(obj/structure/overmap/ship/target)
+	return test_crew
+
+/datum/ai_controller/npc_ship/boarding_docking_test/profile/get_target_spawn_turfs(obj/structure/overmap/ship/target)
+	return test_floor ? list(test_floor) : list()
+
+/datum/unit_test/voidcrew_npc_boarding_budget/Run()
+	var/obj/structure/overmap/ship/npc/pirate/pirate = allocate(/obj/structure/overmap/ship/npc/pirate)
+	var/obj/structure/overmap/ship/target = allocate(/obj/structure/overmap/ship)
+	var/datum/ai_controller/npc_ship/boarding_docking_test/profile/controller = allocate(/datum/ai_controller/npc_ship/boarding_docking_test/profile, pirate)
+	for(var/band in list(2, 3))
+		for(var/timed_out in list(FALSE, TRUE))
+			target.state = "flying"
+			controller.test_zone = allocate(/datum/overmap_zone, band)
+			controller.test_crew = 3
+			controller.set_target(target)
+			TEST_ASSERT_EQUAL(controller.boarding_budget, 3, "The raid did not capture one boarder per connected crew member")
+			TEST_ASSERT_EQUAL(controller.get_boarding_wave_count(), 1, "A raid has more than one ordinary wave")
+			controller.test_crew = 8
+			controller.test_zone = allocate(/datum/overmap_zone, band == 2 ? 3 : 2)
+			controller.capture_boarding_encounter(target)
+			TEST_ASSERT_EQUAL(controller.boarding_context.zone_type, band, "Movement changed the captured band")
+			TEST_ASSERT_EQUAL(controller.boarding_budget, 3, "Late arrivals changed the initial boarding budget")
+			TEST_ASSERT_EQUAL(controller.reserve_boarders(target, 2), 2, "Combat pods could not reserve part of the wave")
+			controller.cleanup_boarding_signals()
+			TEST_ASSERT_EQUAL(controller.reserve_boarders(target, 10), 1, "Escalation replenished the ordinary budget")
+			TEST_ASSERT_EQUAL(controller.reserve_boarders(target, 1), 0, "A later volley exceeded the engagement budget")
+			controller.set_combat_state("boarding")
+			controller.blackboard["npc_boarding_wave_boarders"] = list()
+			if(timed_out)
+				controller.handle_wave_timeout()
+			else
+				controller.check_wave_complete()
+			TEST_ASSERT_EQUAL(controller.get_combat_state(), band == 3 ? "boarding_cooldown" : "idle", "Clearance/timeout took the wrong band transition")
+			TEST_ASSERT_EQUAL(isnull(controller.get_target()), band != 3, "Yellow did not disengage or red lost its target")
+			controller.clear_target()
+	controller.test_crew = 0
+	controller.set_target(target)
+	TEST_ASSERT_EQUAL(controller.boarding_budget, 1, "An empty crew snapshot did not retain the minimum boarder")
+	controller.clear_target()
+	// A disconnected human with a mind is not connected crew.
+	var/mob/living/carbon/human/consistent/disconnected = allocate(/mob/living/carbon/human/consistent, run_loc_floor_bottom_left)
+	disconnected.mind_initialize()
+	TEST_ASSERT_EQUAL(controller.count_living_crew(target), -1, "An unreadable hull was treated as a crew wipe")
+	var/obj/docking_port/mobile/voidcrew/port = allocate(/obj/docking_port/mobile/voidcrew, run_loc_floor_bottom_left)
+	port.shuttle_areas = list((get_area(disconnected)) = TRUE)
+	target.shuttle = port
+	var/already_listed = (disconnected in GLOB.player_list)
+	GLOB.player_list |= disconnected
+	var/living_count = controller.count_living_crew(target)
+	if(!already_listed)
+		GLOB.player_list -= disconnected
+	target.shuttle = null
+	port.shuttle_areas = list()
+	qdel(port, force = TRUE)
+	TEST_ASSERT_EQUAL(living_count, 0, "A disconnected body inflated the connected crew count")
+
+/datum/npc_combat_interface/boarding_budget_test
+	var/turf/test_floor
+
+/datum/npc_combat_interface/boarding_budget_test/get_random_target_turf(obj/structure/overmap/ship/target_ship)
+	return test_floor
+
+/datum/unit_test/voidcrew_npc_boarding_volley_budget/Run()
+	var/obj/structure/overmap/ship/npc/pirate/pirate = allocate(/obj/structure/overmap/ship/npc/pirate)
+	pirate.boss_type = /mob/living/basic/trooper/pirate/faction/boss/silverscale
+	pirate.boarding_pod_mob_types = list(/mob/living/basic/npc_zone_test)
+	var/obj/structure/overmap/ship/target = allocate(/obj/structure/overmap/ship)
+	var/datum/ai_controller/npc_ship/boarding_docking_test/profile/controller = allocate(/datum/ai_controller/npc_ship/boarding_docking_test/profile, pirate)
+	var/datum/npc_combat_interface/boarding_budget_test/combat = allocate(/datum/npc_combat_interface/boarding_budget_test)
+	combat.owner_ship = pirate
+	combat.test_floor = run_loc_floor_bottom_left
+	controller.test_floor = combat.test_floor
+	for(var/band in list(2, 3))
+		target.state = "flying"
+		pirate.state = "flying"
+		controller.test_zone = allocate(/datum/overmap_zone, band)
+		controller.set_target(target)
+		TEST_ASSERT(combat.fire_boarding_pods(target, 5, list(/mob/living/basic/npc_zone_test)), "Combat volley fixture did not launch")
+		TEST_ASSERT_EQUAL(controller.boarding_pending, 3, "Combat volley exceeded the captured crew size")
+		TEST_ASSERT(!combat.fire_boarding_pods(target, 5), "An overlapping volley exceeded the reserved budget")
+		controller.escalate_to_full_combat(target)
+		TEST_ASSERT_EQUAL(controller.boarding_pending, 0, "Escalation retained cancelled reservations")
+		TEST_ASSERT_EQUAL(controller.boarding_committed, 0, "Escalation spent pods it cancelled")
+		TEST_ASSERT(combat.fire_boarding_pods(target, 5, list(/mob/living/basic/npc_zone_test)), "Cancelled pods did not return to the same engagement budget")
+		// Execute the actual callbacks directly, after cancelling their timers.
+		for(var/timer_id in controller.boarding_timers)
+			deltimer(timer_id)
+		controller.boarding_timers.Cut()
+		for(var/i in 1 to 3)
+			var/mob/living/boarder = controller.deploy_combat_boarder(combat.test_floor, target, /mob/living/basic/npc_zone_test, controller.boarding_context)
+			TEST_ASSERT_NOTNULL(boarder, "A reserved combat pod lost its encounter")
+			TEST_ASSERT_EQUAL(boarder.npc_spawn_context.zone_type, band, "Combat pod used a different band")
+		TEST_ASSERT_EQUAL(controller.boarding_pending, 0, "Deployed pods retained reservations")
+		TEST_ASSERT_EQUAL(combat.fire_boarding_pods(target, 5), band == 3, "Exhausting the ordinary budget took the wrong boss transition")
+		TEST_ASSERT(!combat.fire_boarding_pods(target, 5), "A later combat volley replenished the budget or boss")
+		target.state = "idle"
+		for(var/obj/effect/pod_landingzone/boarding/landing in combat.test_floor)
+			landing.cancel_if_target_docked()
+		controller.clear_target()
+		// The scripted route spends the same budget and cannot launch another wave.
+		target.state = "flying"
+		controller.set_target(target)
+		controller.set_combat_state("boarding")
+		TEST_ASSERT(controller.launch_boarding_wave(1), "The scripted boarding fixture did not launch")
+		TEST_ASSERT_EQUAL(length(controller.blackboard["npc_boarding_wave_boarders"]), 3, "Scripted raid did not launch exactly one boarder per initial crew")
+		TEST_ASSERT_EQUAL(controller.boarding_committed, 3, "Scripted raid escaped shared engagement accounting")
+		var/obj/effect/cleanup_probe = allocate(/obj/effect, combat.test_floor)
+		controller.set_blackboard_key("boarding_cleanup_probe", cleanup_probe)
+		qdel(cleanup_probe)
+		TEST_ASSERT_NULL(controller.blackboard["boarding_cleanup_probe"], "Deleting a tracked object did not clear its blackboard key")
+		var/list/initial_position = controller.blackboard["npc_boarding_target_pos"]
+		TEST_ASSERT_EQUAL(initial_position["x"], target.x, "Blackboard cleanup changed the boarding target's x coordinate")
+		TEST_ASSERT_EQUAL(initial_position["y"], target.y, "Blackboard cleanup changed the boarding target's y coordinate")
+		TEST_ASSERT(!controller.launch_boarding_wave(2), "A second ordinary wave was allowed")
+		TEST_ASSERT(!combat.fire_boarding_pods(target, 5, list(/mob/living/basic/npc_zone_test)) || band == 3, "Combat replenished a scripted raid's ordinary budget")
+		target.state = "idle"
+		for(var/obj/effect/pod_landingzone/boarding/landing in combat.test_floor)
+			landing.cancel_if_target_docked()
+		controller.clear_target()
+
 /datum/unit_test/voidcrew_npc_boarding_docking
 
 /datum/unit_test/voidcrew_npc_boarding_docking/Run()
 	var/obj/structure/overmap/ship/npc/pirate/pirate = allocate(/obj/structure/overmap/ship/npc/pirate)
 	var/obj/structure/overmap/ship/target = allocate(/obj/structure/overmap/ship)
-	var/datum/ai_controller/npc_ship/controller = allocate(/datum/ai_controller/npc_ship/boarding_docking_test, pirate)
+	var/datum/ai_controller/npc_ship/boarding_docking_test/profile/controller = allocate(/datum/ai_controller/npc_ship/boarding_docking_test/profile, pirate)
+	controller.test_zone = allocate(/datum/overmap_zone, 3)
 	var/datum/ai_planning_subtree/npc_ship_combat/planner = allocate(/datum/ai_planning_subtree/npc_ship_combat)
 
 	for(var/ship_state in list("docking", "idle", "undocking"))
@@ -39,6 +170,7 @@
 	target.state = "flying"
 	controller.set_target(target)
 	controller.start_boss_cooldown()
+	TEST_ASSERT_EQUAL(controller.get_combat_state(), "boarding_cooldown", "The red encounter did not schedule a boss")
 	target.state = "idle"
 	controller.spawn_boarding_boss()
 	TEST_ASSERT_NULL(controller.get_target(), "A delayed boss must abort the docked encounter")
diff --git a/voidcrew/modules/unit_tests/voidcrew_npc_zone_profiles.dm b/voidcrew/modules/unit_tests/voidcrew_npc_zone_profiles.dm
new file mode 100644
index 00000000000..05727a42eb3
--- /dev/null
+++ b/voidcrew/modules/unit_tests/voidcrew_npc_zone_profiles.dm
@@ -0,0 +1,1409 @@
+// Voidcrew defines are included after the test harness: zones below are 1/2/3.
+/mob/living/basic/npc_zone_test
+	health = 100
+	maxHealth = 100
+	melee_damage_lower = 10
+	melee_damage_upper = 20
+	combat_mode = TRUE
+	faction = list(FACTION_HOSTILE)
+	ai_controller = /datum/ai_controller/basic_controller/simple/simple_hostile
+	unsuitable_atmos_damage = 0
+	unsuitable_cold_damage = 0
+	unsuitable_heat_damage = 0
+
+/mob/living/basic/npc_zone_test/passive
+	combat_mode = FALSE
+	ai_controller = /datum/ai_controller/basic_controller/simple
+
+/// Deterministic equivalent of the wolf/ice-demon Initialize replacement rolls.
+/mob/living/basic/npc_zone_test/replacement/Initialize(mapload)
+	. = ..()
+	new /mob/living/basic/npc_zone_test(loc)
+	return INITIALIZE_HINT_QDEL
+
+/obj/effect/spawner/random/npc_zone_test
+	loot = list()
+
+/obj/effect/spawner/random/npc_zone_test/Initialize(mapload)
+	. = ..()
+	return INITIALIZE_HINT_NORMAL
+
+/datum/unit_test/voidcrew_npc_zone_profiles/Run()
+	var/turf/location = run_loc_floor_bottom_left
+	var/list/health_factors = list(list(1, 1.35, 1.8), list(1, 1.15, 1.3))
+	var/list/damage_factors = list(list(1, 1.15, 1.35), list(1, 1.1, 1.2))
+	for(var/mob_type in list(/mob/living/basic/npc_zone_test, /mob/living/simple_animal/hostile))
+		for(var/role_index in 1 to 2)
+			for(var/zone in 1 to 3)
+				var/role = role_index == 1 ? "ordinary" : "boss"
+				var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, src, zone, role)
+				var/mob/living/body = spawn_npc_in_zone(mob_type, location, context, FALSE)
+				// Configure an existing legacy type before finalization instead of adding a subtype.
+				body.setMaxHealth(100)
+				body.melee_damage_lower = 10
+				body.melee_damage_upper = 20
+				body.setBruteLoss(40)
+				context.finalize()
+				var/health_factor = health_factors[role_index][zone]
+				var/damage_factor = damage_factors[role_index][zone]
+				TEST_ASSERT(abs(body.maxHealth - 100 * health_factor) < 0.001, "[mob_type]/[role]/[zone]: wrong max health")
+				TEST_ASSERT(abs(body.health / body.maxHealth - 0.6) < 0.001, "Finalization healed a wounded [mob_type]")
+				body.updatehealth()
+				TEST_ASSERT(abs(body.health / body.maxHealth - 0.6) < 0.001, "updatehealth lost scaled damage")
+				TEST_ASSERT(abs(body.melee_damage_upper - 20 * damage_factor) < 0.001, "Wrong melee factor")
+				context.finalize()
+				body.forceMove(run_loc_floor_top_right)
+				body.finalize_npc_zone(allocate(/datum/npc_spawn_context, src, 1, "boss"))
+				TEST_ASSERT_EQUAL(body.npc_spawn_context, context, "Movement/repeated calls replaced the pinned context")
+				TEST_ASSERT(abs(body.maxHealth - 100 * health_factor) < 0.001, "Repeated finalization stacked health")
+				body.fully_heal()
+				TEST_ASSERT_EQUAL(body.health, body.maxHealth, "Healing lost the scaled maximum")
+				body.death()
+				body.revive(ADMIN_HEAL_ALL)
+				TEST_ASSERT(abs(body.maxHealth - 100 * health_factor) < 0.001, "Revival selected a different maximum")
+				body.setBruteLoss(body.maxHealth * 0.4)
+				body.set_npc_zone_melee(30, 40)
+				body.set_npc_zone_melee(30, 40)
+				TEST_ASSERT(abs(body.melee_damage_upper - 40 * damage_factor) < 0.001, "Replacing a weapon stacked its raw force")
+				body.set_npc_zone_health(200)
+				TEST_ASSERT(abs(body.maxHealth - 200 * health_factor) < 0.001, "Raw posse/phase health lost its factor")
+				TEST_ASSERT(abs(body.health / body.maxHealth - 0.6) < 0.001, "Raw health change healed the body")
+				body.exempt_npc_zone()
+				TEST_ASSERT_EQUAL(body.maxHealth, 200, "Exemption did not restore the current raw max health")
+				TEST_ASSERT(abs(body.health / body.maxHealth - 0.6) < 0.001, "Exemption changed health fraction")
+				TEST_ASSERT_EQUAL(body.melee_damage_upper, 40, "Exemption did not restore raw weapon force")
+				context.finalize()
+				TEST_ASSERT(!body.npc_zone_applied, "Exemption was reversed by repeated finalization")
+				qdel(body)
+
+/datum/unit_test/voidcrew_npc_zone_damage/Run()
+	var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, src, 3)
+	var/mob/living/body = spawn_npc_in_zone(/mob/living/basic/npc_zone_test, run_loc_floor_bottom_left, context)
+	var/obj/projectile/bullet/projectile = allocate(/obj/projectile/bullet)
+	var/raw_damage = projectile.damage
+	SEND_SIGNAL(body, COMSIG_PROJECTILE_FIRER_BEFORE_FIRE, projectile)
+	SEND_SIGNAL(body, COMSIG_PROJECTILE_FIRER_BEFORE_FIRE, projectile)
+	TEST_ASSERT(abs(projectile.damage - raw_damage * 1.35) < 0.001, "A reused projectile multiplied damage twice")
+	TEST_ASSERT_EQUAL(npc_zone_damage(10, body), 13.5, "Raw scripted ability did not scale")
+	TEST_ASSERT_EQUAL(npc_zone_damage(13.5, body, TRUE), 13.5, "Already-scaled melee input scaled twice")
+	var/delayed_factor = body.get_npc_zone_damage_factor()
+	qdel(body)
+	TEST_ASSERT_EQUAL(npc_zone_damage(10, delayed_factor), 13.5, "Delayed damage lost its numeric factor after creator deletion")
+
+/datum/unit_test/voidcrew_npc_zone_exemptions/Run()
+	var/turf/location = run_loc_floor_bottom_left
+	// Producers for pets, recruits, guards, arenas and summons share this opt-out.
+	for(var/child_role in list("ordinary", "boss"))
+		var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, src, 3, "exempt")
+		var/mob/living/body = spawn_npc_in_zone(/mob/living/basic/npc_zone_test, location, context)
+		TEST_ASSERT(!body.npc_zone_applied, "Explicit source exemption failed")
+		var/datum/npc_spawn_context/child_context = allocate(/datum/npc_spawn_context, body, 3, child_role)
+		var/mob/living/child = spawn_npc_in_zone(/mob/living/basic/npc_zone_test, location, child_context)
+		TEST_ASSERT(!child.npc_zone_applied, "An exempt descendant lost exemption to its [child_role] role")
+		qdel(body)
+		qdel(child)
+	var/datum/npc_spawn_context/passive_context = allocate(/datum/npc_spawn_context, src, 3)
+	var/mob/living/basic/passive = spawn_npc_in_zone(/mob/living/basic/npc_zone_test/passive, location, passive_context, FALSE)
+	passive_context.finalize()
+	TEST_ASSERT(!passive.npc_zone_applied, "Passive ambient fauna received a hostile profile")
+	qdel(passive)
+	var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, src, 3)
+	var/mob/living/body = spawn_npc_in_zone(/mob/living/basic/npc_zone_test, location, context)
+	body.setBruteLoss(90)
+	var/mob/living/basic/friend = allocate(/mob/living/basic/npc_zone_test, location)
+	friend.exempt_npc_zone()
+	body.befriend(friend)
+	TEST_ASSERT(!body.npc_zone_applied && body.npc_zone_exempt, "Player-owned taming did not remove the profile")
+	TEST_ASSERT(abs(body.health / body.maxHealth - 0.5) < 0.001, "Taming healed the body")
+	qdel(body)
+	for(var/ownership_signal in list(COMSIG_MOB_LOGIN, COMSIG_MOB_MIND_TRANSFERRED_INTO))
+		context = allocate(/datum/npc_spawn_context, src, 3)
+		body = spawn_npc_in_zone(/mob/living/basic/npc_zone_test, location, context)
+		SEND_SIGNAL(body, ownership_signal)
+		TEST_ASSERT(!body.npc_zone_applied && body.npc_zone_exempt, "Ownership signal left a profile active")
+		qdel(body)
+	context = allocate(/datum/npc_spawn_context, src, 3)
+	body = spawn_npc_in_zone(/mob/living/basic/npc_zone_test, location, context)
+	body.mind_initialize()
+	TEST_ASSERT(!body.npc_zone_applied && body.npc_zone_exempt, "Mind initialization left a profile active")
+	qdel(body)
+
+/datum/unit_test/voidcrew_npc_zone_bosses/Run()
+	for(var/boss_type in list(
+		/mob/living/simple_animal/hostile/megafauna,
+		/mob/living/simple_animal/hostile/asteroid/elite,
+		/mob/living/basic/boss,
+		/mob/living/basic/trooper/pirate/faction/boss,
+		/mob/living/basic/bounty_criminal/boss,
+		/mob/living/basic/bounty_criminal/kingpin,
+		/mob/living/basic/bounty_lair_boss,
+		/mob/living/basic/lich,
+		/mob/living/basic/hoarfrost_matriarch,
+		/mob/living/basic/trooper/pirate/faction/silverscale/captain,
+		/mob/living/basic/trooper/pirate/faction/skeleton/captain,
+		/mob/living/basic/trooper/pirate/faction/grey/captain,
+		/mob/living/basic/trooper/pirate/faction/lustrous/captain,
+		/mob/living/basic/trooper/pirate/faction/interdyne/captain,
+		/mob/living/basic/trooper/pirate/faction/irs/captain,
+		/mob/living/basic/trooper/pirate/faction/medieval/captain,
+		/mob/living/simple_animal/hostile/asteroid/old_demon,
+		/mob/living/basic/mining/wolf/alpha,
+		/mob/living/simple_animal/hostile/asteroid/polarbear/warrior,
+	))
+		TEST_ASSERT(npc_zone_boss_type(boss_type), "Approved boss type missing: [boss_type]")
+	TEST_ASSERT(!npc_zone_boss_type(/mob/living/basic/npc_zone_test), "An ordinary mob was classified as a boss")
+	TEST_ASSERT(!npc_zone_boss_type(/mob/living/basic/lich/mirror_image), "Disposable lich images were classified as bosses")
+	// Research's count overrides belong to W1, but its setpiece role is core policy.
+	var/obj/effect/zone_mobs/bug/boss/research_marker = allocate(/obj/effect/zone_mobs/bug/boss)
+	TEST_ASSERT_EQUAL(research_marker.npc_role, "boss", "Research marker did not select the explicit boss role")
+	qdel(research_marker)
+	var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, src, 3)
+	var/mob/living/body = spawn_npc_in_zone(/mob/living/basic/npc_zone_test, run_loc_floor_bottom_left, context, FALSE)
+	body.name = "Captain Boss Kingpin"
+	body.setMaxHealth(10000)
+	body.setBruteLoss(0)
+	context.finalize()
+	TEST_ASSERT_EQUAL(body.npc_zone_role, "ordinary", "Name/health inferred boss status")
+	qdel(body)
+
+/datum/unit_test/voidcrew_npc_zone_matriarch/Run()
+	for(var/zone_type in list(1, 2, 3))
+		var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, src, zone_type)
+		var/mob/living/basic/hoarfrost_matriarch/body = spawn_npc_in_zone(/mob/living/basic/hoarfrost_matriarch, run_loc_floor_bottom_left, context)
+		var/health_factor = zone_type == 3 ? 1.3 : (zone_type == 2 ? 1.15 : 1)
+		var/damage_factor = zone_type == 3 ? 1.2 : (zone_type == 2 ? 1.1 : 1)
+		TEST_ASSERT_EQUAL(body.npc_zone_role, "boss", "The Matriarch received the ordinary profile in zone [zone_type]")
+		TEST_ASSERT(abs(body.maxHealth - 800 * health_factor) < 0.001, "Incorrect Matriarch health in zone [zone_type]")
+		TEST_ASSERT(abs(body.melee_damage_lower - 25 * damage_factor) < 0.001, "Incorrect Matriarch lower melee damage in zone [zone_type]")
+		TEST_ASSERT(abs(body.melee_damage_upper - 30 * damage_factor) < 0.001, "Incorrect Matriarch upper melee damage in zone [zone_type]")
+		qdel(body)
+
+/datum/unit_test/voidcrew_npc_zone_replacements/Run()
+	var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, src, 2)
+	var/mob/living/body = spawn_npc_in_zone(/mob/living/basic/npc_zone_test/replacement, run_loc_floor_bottom_left, context, FALSE)
+	TEST_ASSERT(istype(body, /mob/living/basic/npc_zone_test) && !QDELETED(body), "Constructor failed to return the surviving replacement")
+	TEST_ASSERT(!body.npc_zone_applied, "Replacement finalized before caller setup")
+	body.setMaxHealth(200)
+	body.setBruteLoss(50)
+	context.finalize()
+	TEST_ASSERT_EQUAL(body.maxHealth, 270, "Replacement lost context or caller health setup")
+	TEST_ASSERT(abs(body.health / body.maxHealth - 0.75) < 0.001, "Replacement finalization lost existing damage")
+	TEST_ASSERT_EQUAL(body.npc_spawn_context.source_id, context.source_id, "Replacement lost source identity")
+	qdel(body)
+	// A caller may spawn while map initialization is deferred. Its finalization
+	// request must reach a replacement that did not exist when finalize() ran.
+	context = allocate(/datum/npc_spawn_context, src, 3)
+	var/old_state = SSatoms.initialized
+	SSatoms.initialized = INITIALIZATION_INSSATOMS
+	var/mob/living/pending = spawn_npc_in_zone(/mob/living/basic/npc_zone_test/replacement, run_loc_floor_bottom_left, context)
+	SSatoms.initialized = old_state
+	TEST_ASSERT(!pending.npc_zone_applied, "Deferred body finalized before Initialize")
+	SSatoms.InitAtom(pending, FALSE, list(TRUE))
+	body = locate(/mob/living/basic/npc_zone_test) in run_loc_floor_bottom_left
+	TEST_ASSERT_NOTNULL(body, "Deferred constructor lost its replacement")
+	if(body)
+		TEST_ASSERT_EQUAL(body.maxHealth, 180, "Deferred replacement lost the earlier finalization request")
+		qdel(body)
+
+/datum/unit_test/voidcrew_npc_zone_routes/Run()
+	var/turf/location = run_loc_floor_bottom_left
+	// Random spawners use the same replacement-aware constructor.
+	var/obj/effect/spawner/random/npc_zone_test/random_spawner = allocate(/obj/effect/spawner/random/npc_zone_test, location)
+	random_spawner.npc_spawn_context = allocate(/datum/npc_spawn_context, src, 3)
+	var/mob/living/body = random_spawner.make_item(location, /mob/living/basic/npc_zone_test/replacement)
+	TEST_ASSERT_EQUAL(body.maxHealth, 180, "Random spawner replacement escaped the profile")
+	qdel(body)
+	// Biome and cave generation resolve their generating turf, never a z-only band.
+	var/area/site_area = get_area(location)
+	var/old_flags = site_area.area_flags
+	site_area.area_flags |= MOB_SPAWN_ALLOWED
+	var/datum/biome/biome = allocate(/datum/biome)
+	biome.mob_spawn_list = list(/mob/living/basic/npc_zone_test = 1)
+	biome.mob_spawn_chance = 100
+	biome.generate_features(location)
+	body = locate(/mob/living/basic/npc_zone_test) in location
+	TEST_ASSERT_NOTNULL(body?.npc_spawn_context, "Biome route omitted spawn context")
+	if(body)
+		TEST_ASSERT_EQUAL(body.npc_spawn_context.source_turf, location, "Biome pinned the wrong site")
+		body.npc_spawn_context.on_zone_resolved(2)
+		TEST_ASSERT_EQUAL(body.maxHealth, 135, "Biome route did not finalize after resolution")
+		qdel(body)
+	var/datum/map_generator/cave_generator/cave = allocate(/datum/map_generator/cave_generator)
+	cave.possible_biomes = null
+	cave.open_turf_types = list(location.type)
+	cave.mob_spawn_list = list(/mob/living/basic/npc_zone_test)
+	cave.mob_spawn_chance = 100
+	cave.populate_terrain(list(location), site_area)
+	body = locate(/mob/living/basic/npc_zone_test) in location
+	TEST_ASSERT_NOTNULL(body?.npc_spawn_context, "Cave/asteroid route omitted spawn context")
+	if(body)
+		body.npc_spawn_context.on_zone_resolved(3)
+		TEST_ASSERT_EQUAL(body.maxHealth, 180, "Cave route did not finalize")
+		qdel(body)
+	site_area.area_flags = old_flags
+	// All owned marker themes use 1-2, and explicit setpiece roles survive shared types.
+	for(var/marker_type in list(/obj/effect/zone_mobs/wildlife, /obj/effect/zone_mobs/asteroid, /obj/effect/zone_mobs/wildlife/boss, /obj/effect/zone_mobs/robot/boss, /obj/effect/zone_mobs/cult/boss, /obj/effect/zone_mobs/undead/boss, /obj/effect/zone_mobs/pirate/boss, /obj/effect/zone_mobs/syndicate/boss))
+		var/obj/effect/zone_mobs/marker = allocate(marker_type)
+		if(npc_zone_boss_type(marker_type))
+			TEST_ASSERT_EQUAL(marker.npc_role, "boss", "[marker_type] did not select the boss role")
+		for(var/list/counts in list(marker.count_green, marker.count_yellow, marker.count_red))
+			TEST_ASSERT_EQUAL(counts[1], 1, "[marker_type] minimum count differs")
+			TEST_ASSERT_EQUAL(counts[2], 2, "[marker_type] maximum count differs")
+		qdel(marker)
+	// Initialize in nullspace so the resolver cannot race this explicit do_spawn().
+	var/obj/effect/zone_mobs/marker = allocate(/obj/effect/zone_mobs, null, list(1, 2))
+	marker.forceMove(location)
+	marker.mobs_red = list(/mob/living/basic/npc_zone_test = 1)
+	marker.npc_role = "boss"
+	marker.do_spawn(3)
+	var/count = 0
+	for(var/mob/living/basic/npc_zone_test/guard in range(3, location))
+		count++
+		TEST_ASSERT_EQUAL(guard.npc_zone_role, "boss", "Marker setpiece role was lost")
+		TEST_ASSERT_EQUAL(guard.maxHealth, 130, "Marker output used the ordinary factor")
+		qdel(guard)
+	TEST_ASSERT(count >= 1 && count <= 2, "Marker count escaped the 1-2 budget")
+	qdel(marker)
+	for(var/band in 1 to 3)
+		TEST_ASSERT_EQUAL(SSplanet_mobs.mob_cap_for_band(band), 15, "Band [band] does not have the flat fauna cap")
+
+/datum/unit_test/voidcrew_npc_zone_skeleton_route/Run()
+	var/turf/location = run_loc_floor_bottom_left
+	var/obj/effect/zone_mobs/undead/marker = allocate(/obj/effect/zone_mobs/undead, null, list(1, 1))
+	marker.forceMove(location)
+	marker.scatter_radius = 0
+	marker.mobs_red = list(/mob/living/basic/skeleton/templar = 1)
+	marker.do_spawn(3)
+	var/mob/living/basic/skeleton/templar/skeleton = locate() in location
+	TEST_ASSERT_NOTNULL(skeleton, "Red undead marker did not produce its templar")
+	TEST_ASSERT(!skeleton.combat_mode, "Skeleton fixture no longer starts outside combat mode")
+	TEST_ASSERT_EQUAL(skeleton.npc_zone_role, "ordinary", "Hostile skeleton AI missed its ordinary profile")
+	TEST_ASSERT_EQUAL(skeleton.npc_spawn_context.zone_type, 3, "Skeleton route lost its red source")
+	TEST_ASSERT(abs(skeleton.maxHealth - initial(skeleton.maxHealth) * 1.8) < 0.001, "Red skeleton retained baseline health")
+	TEST_ASSERT(abs(skeleton.melee_damage_upper - initial(skeleton.melee_damage_upper) * 1.35) < 0.001, "Red skeleton retained baseline damage")
+	qdel(skeleton)
+	qdel(marker)
+
+/datum/unit_test/voidcrew_npc_zone_resolver_cleanup/Run()
+	// Nullspace leaves the resolver pending until its final fallback attempt.
+	var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, src)
+	var/mob/living/body = spawn_npc_in_zone(/mob/living/basic/npc_zone_test, run_loc_floor_bottom_left, context)
+	context.resolve_zone()
+	var/datum/zone_resolver/pending = context.resolver
+	TEST_ASSERT_NOTNULL(pending, "Unresolved context did not retain its pending resolver")
+	pending.attempts_left = 0
+	pending.attempt()
+	TEST_ASSERT_EQUAL(context.zone_type, 1, "Resolver fallback did not finalize its context")
+	TEST_ASSERT(body.npc_zone_applied, "Resolver completion did not finalize its surviving NPC")
+	TEST_ASSERT(QDELETED(pending), "Completed resolver did not delete itself")
+	TEST_ASSERT_NULL(context.resolver, "Surviving NPC context retained a completed resolver")
+	qdel(body)
+
+/datum/unit_test/voidcrew_npc_zone_deferred/Run()
+	var/turf/location = run_loc_floor_bottom_left
+	var/datum/planet_mob_tracker/tracker = allocate(/datum/planet_mob_tracker)
+	tracker.surface_z = location.z
+	tracker.zone_band = 2
+	tracker.mob_cap = 1
+	tracker.surface_spawn_turfs[location] = /mob/living/basic/npc_zone_test/replacement
+	var/old_total = SSplanet_mobs.total_managed_mobs
+	SSplanet_mobs.total_managed_mobs = 0
+	var/spawned = SSplanet_mobs.spawn_for_tracker(tracker)
+	SSplanet_mobs.total_managed_mobs = old_total
+	TEST_ASSERT_EQUAL(spawned, 1, "Deferred fauna fixture failed to emit a mob")
+	var/mob/living/basic/npc_zone_test/body = locate() in location
+	TEST_ASSERT_NOTNULL(body, "Deferred fauna lost the replacement")
+	if(body)
+		TEST_ASSERT_EQUAL(body.maxHealth, 135, "Deferred fauna ignored the tracker band")
+		TEST_ASSERT_EQUAL(body.npc_spawn_context.source_id, REF(tracker), "Deferred fauna lost tracker identity")
+		qdel(body)
+
+/// Keep these route fixtures focused on fauna and structures, without natural anomalies.
+/datum/map_generator/planet_generator/npc_zone_test/place_budgeted_anomalies(list/turfs, budget)
+	return 0
+
+/datum/unit_test/voidcrew_npc_zone_planet_routes
+	abstract_type = /datum/unit_test/voidcrew_npc_zone_planet_routes
+	var/turf/location
+	var/datum/biome/original_biome
+	var/original_flags
+	var/original_river
+	var/datum/biome/biome
+	var/datum/map_generator/planet_generator/npc_zone_test/generator
+
+/datum/unit_test/voidcrew_npc_zone_planet_routes/New()
+	. = ..()
+	location = run_loc_floor_bottom_left
+	original_biome = location.generating_biome
+	original_flags = location.turf_flags
+	original_river = location.planet_river
+	biome = allocate(/datum/biome)
+	biome.open_turf_types = list(location.type)
+	biome.flora_spawn_chance = 0
+	biome.feature_spawn_chance = 0
+	biome.mob_spawn_chance = 100
+	biome.dangerous_mob_spawn_list = null
+	location.generating_biome = biome
+	location.turf_flags &= ~(NO_RUINS | TURF_BLOCKS_POPULATE_TERRAIN_FLORAFEATURES)
+	location.planet_river = FALSE
+	generator = allocate(/datum/map_generator/planet_generator/npc_zone_test)
+	generator.throttled = FALSE
+
+/datum/unit_test/voidcrew_npc_zone_planet_routes/Destroy()
+	location.generating_biome = original_biome
+	location.turf_flags = original_flags
+	location.planet_river = original_river
+	return ..()
+
+/datum/unit_test/voidcrew_npc_zone_planet_routes/fallback/Run()
+	TEST_ASSERT_NULL(SSplanet_mobs.tracker_for_turf(location), "Fallback fixture unexpectedly has deferred fauna tracking")
+	var/datum/npc_spawn_context/expected = allocate(/datum/npc_spawn_context, generator, 3, "auto", FALSE, location)
+	for(var/mob_type in list(/mob/living/basic/npc_zone_test, /mob/living/basic/npc_zone_test/replacement, /mob/living/basic/npc_zone_test/passive))
+		biome.mob_spawn_list = list((mob_type) = 1)
+		generator.populate_terrain(list(location), get_area(location), 3)
+		var/mob/living/basic/npc_zone_test/body = locate() in location
+		TEST_ASSERT_NOTNULL(body, "Planet fallback did not produce [mob_type]")
+		allocated += body
+		TEST_ASSERT_EQUAL(body.npc_spawn_context?.role, "auto", "Planet fallback bypassed the environmental hostility gate")
+		TEST_ASSERT_EQUAL(body.npc_spawn_context.source_turf, location, "Planet fallback pinned the wrong source turf")
+		if(mob_type == /mob/living/basic/npc_zone_test/passive)
+			TEST_ASSERT(!body.npc_zone_applied, "Passive fallback fauna received a hostile profile")
+			TEST_ASSERT_EQUAL(body.maxHealth, 100, "Passive fallback fauna health changed")
+		else
+			check_npc_zone_child(body, expected)
+		qdel(body)
+
+/datum/unit_test/voidcrew_npc_zone_planet_routes/megafauna/Run()
+	biome.mob_spawn_list = list(SPAWN_MEGAFAUNA = 1)
+	biome.megafauna_spawn_list = list(/mob/living/simple_animal/hostile/megafauna = 1)
+	generator.populate_terrain(list(location), get_area(location), 3)
+	var/mob/living/simple_animal/hostile/megafauna/boss = locate() in location
+	TEST_ASSERT_NOTNULL(boss, "Planet generator did not place its red megafauna")
+	allocated += boss
+	TEST_ASSERT_EQUAL(boss.npc_spawn_context?.role, "boss", "Planet megafauna omitted its explicit boss role")
+	var/datum/npc_spawn_context/expected = allocate(/datum/npc_spawn_context, generator, 3, "boss", FALSE, location)
+	check_npc_zone_child(boss, expected, boss = TRUE)
+
+/// Both biome tables converge on the same budgeted structure placement route.
+/datum/unit_test/voidcrew_npc_zone_planet_routes/nests/Run()
+	for(var/from_features in list(FALSE, TRUE))
+		biome.mob_spawn_list = from_features ? null : list(/obj/structure/spawner = 1)
+		biome.feature_spawn_list = from_features ? list(/obj/structure/spawner = 1) : null
+		biome.feature_spawn_chance = from_features ? 100 : 0
+		generator.populate_terrain(list(location), get_area(location), 3)
+		var/obj/structure/spawner/nest = locate() in location
+		TEST_ASSERT_NOTNULL(nest, "Planet generator lost a budgeted nest")
+		allocated += nest
+		TEST_ASSERT_EQUAL(nest.npc_spawn_context?.zone_type, 3, "Planet nest lost the selected band")
+		TEST_ASSERT_EQUAL(nest.npc_spawn_context.role, "auto", "Planet nest omitted its environmental role")
+		TEST_ASSERT_EQUAL(nest.npc_spawn_context.source_id, REF(generator), "Planet nest lost its generator source")
+		var/datum/npc_spawn_context/child_context = allocate(/datum/npc_spawn_context, nest)
+		var/mob/living/child = spawn_npc_in_zone(/mob/living/basic/npc_zone_test/replacement, run_loc_floor_top_right, child_context)
+		allocated += child
+		check_npc_zone_child(child, nest.npc_spawn_context)
+		qdel(child)
+		qdel(nest)
+
+/// Use the real vent boss route and a yellow planet footprint on the shared test level.
+/datum/unit_test/voidcrew_npc_zone_ore_vent_route
+	parent_type = /datum/unit_test/voidcrew_npc_zone_packed
+
+/datum/unit_test/voidcrew_npc_zone_ore_vent_route/Run()
+	zones_were_active = SSovermap_zones.zones_active
+	SSovermap_zones.zones_active = TRUE
+	var/turf/base = run_loc_floor_bottom_left
+	var/original_type = base.type
+	var/turf/open/overmap/token = base.ChangeTurf(/turf/open/overmap)
+	overmap_turfs[token] = original_type
+	token.current_zone = allocate(/datum/overmap_zone, 2)
+	var/turf/location = run_loc_floor_top_right
+	var/datum/map_zone/zone = allocate(/datum/map_zone)
+	zone.z_levels = list(reservation)
+	var/datum/map_footprint/footprint = allocate(/datum/map_footprint)
+	footprint.z_value = location.z
+	footprint.set_rect(location.x, location.y, 1, 1)
+	var/obj/structure/overmap/planet/site = allocate(/obj/structure/overmap/planet, token)
+	sites += site
+	site.mapzone = zone
+	site.footprint = footprint
+	var/obj/structure/ore_vent/boss/vent = allocate(/obj/structure/ore_vent/boss, location)
+	vent.summoned_boss = /mob/living/simple_animal/hostile/megafauna
+	vent.start_wave_defense()
+	var/mob/living/simple_animal/hostile/megafauna/boss = locate() in location
+	TEST_ASSERT_NOTNULL(boss, "Vent did not summon its boss")
+	allocated += boss
+	TEST_ASSERT_EQUAL(boss.npc_spawn_context?.role, "boss", "Vent omitted its explicit boss role")
+	var/datum/npc_spawn_context/expected = allocate(/datum/npc_spawn_context, vent, 2, "boss", FALSE, location)
+	check_npc_zone_child(boss, expected, boss = TRUE)
+	// Death still reaches the original conclusion, and its neutral drone stays baseline.
+	boss.set_health(0)
+	boss.death()
+	var/mob/living/basic/node_drone/drone = locate() in location
+	TEST_ASSERT_NOTNULL(drone, "Profiled vent boss lost its death callback")
+	allocated += drone
+	TEST_ASSERT(drone.is_npc_zone_exempt() && !drone.npc_zone_applied, "Vent node drone received a hostile profile")
+	TEST_ASSERT_EQUAL(drone.maxHealth, initial(drone.maxHealth), "Vent node drone health was scaled")
+
+/datum/unit_test/voidcrew_npc_zone_spawner
+	var/mob/living/watcher
+	var/watched_z
+
+/datum/unit_test/voidcrew_npc_zone_spawner/Destroy()
+	if(watched_z)
+		SSmobs.clients_by_zlevel[watched_z] -= watcher
+	return ..()
+
+/datum/unit_test/voidcrew_npc_zone_spawner/proc/setup_body(mob/living/body)
+	TEST_ASSERT(FACTION_HOSTILE in body.faction, "Spawner callback ran before faction assignment")
+	TEST_ASSERT(!body.npc_zone_applied, "Spawner finalized before its setup callback")
+	body.setMaxHealth(200)
+	body.setBruteLoss(50)
+
+/datum/unit_test/voidcrew_npc_zone_spawner/Run()
+	var/turf/location = run_loc_floor_bottom_left
+	watcher = allocate(/mob/living/basic, location)
+	watched_z = location.z
+	SSmobs.clients_by_zlevel[watched_z] |= watcher
+	for(var/list/distances in list(list(1, 0), list(2, 1), list(2, 0)))
+		var/obj/structure/parent = allocate(/obj/structure, location)
+		parent.npc_spawn_context = allocate(/datum/npc_spawn_context, src, 3, "auto", FALSE, location)
+		var/datum/component/spawner/spawner = parent.AddComponent(/datum/component/spawner, \
+			spawn_types = list(/mob/living/basic/npc_zone_test/replacement), \
+			faction = list(FACTION_HOSTILE), spawn_callback = CALLBACK(src, PROC_REF(setup_body)), \
+			spawn_distance = distances[1], spawn_distance_exclude = distances[2])
+		spawner.try_spawn_mob()
+		TEST_ASSERT_EQUAL(length(spawner.spawned_things), 1, "Component branch [distances[1]]/[distances[2]] lost its output")
+		for(var/datum/weakref/body_ref as anything in spawner.spawned_things)
+			var/mob/living/body = body_ref.resolve()
+			TEST_ASSERT_EQUAL(body.maxHealth, 360, "Component finalized before callback health setup")
+			TEST_ASSERT(abs(body.health / body.maxHealth - 0.75) < 0.001, "Component scaling healed the output")
+			qdel(body)
+		qdel(parent)
+
+/// The map parser constructs atoms before SSatoms initializes them. Exercise that
+/// delayed path with a replacement, plus two adjacent site footprints on one z.
+/datum/unit_test/voidcrew_npc_zone_packed
+	var/list/sites = list()
+	var/list/overmap_turfs = list()
+	var/zones_were_active
+
+/datum/unit_test/voidcrew_npc_zone_packed/Destroy()
+	SSovermap_zones.zones_active = zones_were_active
+	for(var/obj/structure/overmap/planet/site as anything in sites)
+		site.mapzone = null
+		site.footprint = null
+	for(var/turf/open/overmap/tile as anything in overmap_turfs)
+		tile.current_zone = null
+		tile.ChangeTurf(overmap_turfs[tile])
+	return ..()
+
+/datum/unit_test/voidcrew_npc_zone_packed/Run()
+	zones_were_active = SSovermap_zones.zones_active
+	SSovermap_zones.zones_active = TRUE
+	var/turf/base = run_loc_floor_bottom_left
+	var/list/locations = list(get_step(base, NORTH), get_step(get_step(base, NORTH), EAST))
+	for(var/band in list(1, 3))
+		var/turf/token = band == 1 ? base : get_step(base, EAST)
+		var/old_type = token.type
+		var/turf/open/overmap/overmap_tile = token.ChangeTurf(/turf/open/overmap)
+		overmap_turfs[overmap_tile] = old_type
+		overmap_tile.current_zone = allocate(/datum/overmap_zone, band)
+		var/turf/inside = locations[band == 1 ? 1 : 2]
+		var/datum/map_zone/zone = allocate(/datum/map_zone)
+		zone.z_levels = list(reservation)
+		var/datum/map_footprint/footprint = allocate(/datum/map_footprint)
+		footprint.z_value = inside.z
+		footprint.set_rect(inside.x, inside.y, 1, 1)
+		var/obj/structure/overmap/planet/site = allocate(/obj/structure/overmap/planet, overmap_tile)
+		sites += site
+		site.mapzone = zone
+		site.footprint = footprint
+		TEST_ASSERT_EQUAL(SSovermap_zones.get_zone_type_anywhere(inside), band, "Packed fixture resolved its neighbour's band")
+		var/old_state = SSatoms.initialized
+		SSatoms.initialized = INITIALIZATION_INSSATOMS
+		var/mob/living/basic/npc_zone_test/mapped = new /mob/living/basic/npc_zone_test/replacement(inside)
+		SSatoms.initialized = old_state
+		SSatoms.InitAtom(mapped, FALSE, list(TRUE))
+		var/mob/living/basic/npc_zone_test/body = locate() in inside
+		TEST_ASSERT_NOTNULL(body, "Mapped Initialize replacement vanished")
+		if(!body)
+			continue
+		body.npc_spawn_context.resolve_zone()
+		TEST_ASSERT_EQUAL(body.npc_spawn_context.zone_type, band, "Mapped replacement resolved a different site")
+		TEST_ASSERT_NULL(body.npc_spawn_context.resolver, "Synchronous construction retained its completed resolver")
+		TEST_ASSERT_EQUAL(body.maxHealth, band == 1 ? 100 : 180, "Mapped replacement used its neighbour's factor")
+		body.forceMove(locations[band == 1 ? 2 : 1])
+		body.finalize_npc_zone()
+		TEST_ASSERT_EQUAL(body.npc_spawn_context.zone_type, band, "Moving a mapped hostile retiered it")
+		qdel(body)
+
+/// Hull crews finalize after their key/setup, and nullspace pods use the captured raid band.
+/datum/unit_test/voidcrew_npc_zone_ship_routes/Run()
+	var/turf/location = run_loc_floor_bottom_left
+	var/obj/structure/overmap/ship/npc/pirate/ship = allocate(/obj/structure/overmap/ship/npc/pirate)
+	var/obj/structure/overmap/ship/target = allocate(/obj/structure/overmap/ship)
+	var/obj/docking_port/mobile/voidcrew/port = allocate(/obj/docking_port/mobile/voidcrew, location)
+	port.shuttle_areas = list((get_area(location)) = TRUE)
+	ship.shuttle = port
+	ship.pool_zone_type = 2
+	ship.crew_min = 2
+	ship.crew_max = 2
+	ship.crew_types = list(/mob/living/basic/npc_zone_test)
+	ship.captain_type = /mob/living/basic/npc_zone_test
+	ship.spawn_crew()
+	TEST_ASSERT_EQUAL(length(ship.tracked_crew), 2, "Hull crew fixture did not spawn its roster")
+	for(var/mob/living/crew as anything in ship.tracked_crew)
+		var/is_captain = locate(/obj/item/ship_key) in crew
+		TEST_ASSERT_EQUAL(crew.npc_zone_role, is_captain ? "boss" : "ordinary", "Hull captain/crew role was lost")
+		TEST_ASSERT(abs(crew.maxHealth - (is_captain ? 115 : 135)) < 0.001, "Hull crew retained the flat pirate multiplier")
+		qdel(crew)
+	ship.tracked_crew.Cut()
+	ship.shuttle = null
+	port.shuttle_areas = list()
+	qdel(port, force = TRUE)
+	var/datum/ai_controller/npc_ship/boarding_docking_test/profile/controller = allocate(/datum/ai_controller/npc_ship/boarding_docking_test/profile, ship)
+	controller.test_floor = location
+	ship.boss_type = /mob/living/basic/trooper/pirate/faction/boss/silverscale
+	for(var/band in list(2, 3))
+		ship.state = "flying"
+		target.state = "flying"
+		controller.test_zone = allocate(/datum/overmap_zone, band)
+		controller.set_target(target)
+		var/mob/living/boarder = create_boarding_pod(location, target, ship, /mob/living/basic/npc_zone_test)
+		TEST_ASSERT_NOTNULL(boarder, "Ordinary pod route did not create a boarder")
+		TEST_ASSERT_EQUAL(boarder.npc_spawn_context.zone_type, band, "A nullspace pod lost the target band")
+		TEST_ASSERT(abs(boarder.maxHealth - (band == 2 ? 135 : 180)) < 0.001, "Ordinary pod used the old flat multiplier")
+		var/mob/living/boss = create_boss_boarding_pod(location, target, ship, ship.boss_type)
+		if(band == 3)
+			TEST_ASSERT_NOTNULL(boss, "Red pod route omitted its boss")
+			TEST_ASSERT_EQUAL(boss.npc_zone_role, "boss", "Boss pod lost its explicit role")
+			TEST_ASSERT(abs(boss.maxHealth - boss.npc_zone_original_max_health * 1.3) < 0.001, "Boss initialization health was scaled incorrectly")
+			TEST_ASSERT_NULL(create_boss_boarding_pod(location, target, ship, ship.boss_type), "A second boss escaped the engagement budget")
+		else
+			TEST_ASSERT_NULL(boss, "Yellow deployed a boss")
+		target.state = "idle"
+		for(var/obj/effect/pod_landingzone/boarding/landing in location)
+			landing.cancel_if_target_docked()
+		controller.clear_target()
+
+/datum/unit_test/voidcrew_npc_zone_bounty_routes/Run()
+	var/turf/location = run_loc_floor_bottom_left
+	var/datum/bounty_record/record = allocate(/datum/bounty_record)
+	record.tier = 2 // BOUNTY_TIER_WANTED
+	record.style = "brawler"
+	var/mob/living/basic/bounty_criminal/criminal = spawn_bounty_criminal(record, location, null)
+	allocated += criminal
+	var/raw_health = criminal.body_tier_health()
+	criminal.npc_spawn_context.on_zone_resolved(3)
+	TEST_ASSERT(abs(criminal.maxHealth - raw_health * 1.8) < 0.001, "Criminal route finalized before body_setup")
+	criminal.setBruteLoss(criminal.maxHealth / 2)
+	var/mob/living/basic/bounty_criminal/decoy/decoy = allocate(/mob/living/basic/bounty_criminal/decoy, location)
+	decoy.body_match(criminal)
+	decoy.body_match(criminal)
+	TEST_ASSERT_EQUAL(decoy.npc_spawn_context.source_id, criminal.npc_spawn_context.source_id, "Decoy lost the fugitive source")
+	TEST_ASSERT_EQUAL(decoy.maxHealth, criminal.maxHealth, "Repeated body_match multiplied copied health")
+	TEST_ASSERT(abs(decoy.health / decoy.maxHealth - criminal.health / criminal.maxHealth) < 0.001, "Decoy copy changed health fraction")
+	var/mob/living/carbon/human/consistent/admin = allocate(/mob/living/carbon/human/consistent, run_loc_floor_top_right)
+	var/datum/bounty_admin_panel/unit_test/panel = allocate(/datum/bounty_admin_panel/unit_test, admin)
+	var/mob/living/basic/bounty_criminal/decoy/admin_decoy = panel.admin_spawn_decoy(admin, criminal)
+	TEST_ASSERT_NOTNULL(admin_decoy, "Admin decoy fixture failed")
+	allocated += admin_decoy
+	TEST_ASSERT_EQUAL(admin_decoy.maxHealth, criminal.maxHealth, "Admin decoy route stacked the copied pool")
+	var/datum/bounty_real_weapon/knife = bounty_real_weapon(/obj/item/knife/combat)
+	knife.apply_melee(criminal)
+	knife.apply_melee(criminal)
+	TEST_ASSERT(abs(criminal.melee_damage_upper - knife.force_high * 1.35) < 0.001, "Bounty weapon replacement stacked or lost the profile")
+	var/mob/living/basic/bounty_criminal/kingpin/kingpin = bounty_kingpin_setup(location, list(), null)
+	allocated += kingpin
+	kingpin.npc_spawn_context.on_zone_resolved(2)
+	TEST_ASSERT_EQUAL(kingpin.npc_zone_role, "boss", "The neutral lounge kingpin missed its explicit boss profile")
+	var/mob/living/basic/bounty_kingpin_goon/goon = kingpin.kingpin_crew.spawn_goon(run_loc_floor_top_right)
+	allocated += goon
+	TEST_ASSERT_EQUAL(goon.npc_spawn_context.zone_type, 2, "Replacement goon lost its kingpin's site band")
+	TEST_ASSERT_EQUAL(goon.npc_zone_role, "ordinary", "Goon inherited the kingpin's boss role")
+	TEST_ASSERT(abs(goon.maxHealth - goon.npc_zone_original_max_health * 1.35) < 0.001, "Replacement goon did not finalize")
+	kingpin.exempt_npc_zone()
+	var/mob/living/basic/bounty_kingpin_goon/owned_goon = kingpin.kingpin_crew.spawn_goon(location)
+	allocated += owned_goon
+	TEST_ASSERT(!owned_goon.npc_zone_applied && owned_goon.npc_zone_exempt, "Player ownership did not propagate to goons")
+
+/datum/unit_test/voidcrew_npc_zone_bounty_damage/Run()
+	var/turf/location = run_loc_floor_bottom_left
+	var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, src, 3, "boss")
+	var/mob/living/basic/bounty_criminal/boss/boss = spawn_npc_in_zone(/mob/living/basic/bounty_criminal/boss/juggernaut, location, context)
+	allocated += boss
+	var/mob/living/basic/npc_zone_test/victim = allocate(/mob/living/basic/npc_zone_test, run_loc_floor_top_right)
+	boss.boss_hit(victim, 10)
+	TEST_ASSERT_EQUAL(victim.getBruteLoss(), 12, "Raw boss ability escaped scaling")
+	boss.boss_hit(victim, 12, already_scaled = TRUE)
+	TEST_ASSERT_EQUAL(victim.getBruteLoss(), 24, "Scaled melee input multiplied twice")
+	var/list/table = boss.boss_health_table()
+	boss.boss_engaged = list("first" = TRUE, "second" = TRUE)
+	boss.boss_apply_posse_health(FALSE)
+	TEST_ASSERT(abs(boss.maxHealth - table[2] * 1.3) < 0.001, "Posse health lost the boss factor")
+	var/obj/effect/bounty_boss_explosive/explosive = allocate(/obj/effect/bounty_boss_explosive, location, boss)
+	var/obj/effect/bounty_boss_fire_pool/pool = allocate(/obj/effect/bounty_boss_fire_pool, location, list(location), 5 SECONDS, boss)
+	var/factor = boss.get_npc_zone_damage_factor()
+	qdel(boss)
+	TEST_ASSERT_EQUAL(explosive.damage_factor, factor, "Delayed explosive lost its creator's factor")
+	TEST_ASSERT_EQUAL(pool.damage_factor, factor, "Delayed fire lost its creator's factor")
+	victim.setMaxHealth(1000)
+	victim.updatehealth()
+	victim.mind_initialize()
+	victim.forceMove(location)
+	var/before_blast = victim.getBruteLoss()
+	var/raw_blast = explosive.damage
+	explosive.detonate()
+	TEST_ASSERT(abs(victim.getBruteLoss() - before_blast - raw_blast * factor) < 0.001, "Orphaned explosive fallback lost or doubled its captured factor")
+	var/before_fire = victim.getBruteLoss()
+	pool.scorch(10)
+	TEST_ASSERT(abs(victim.getBruteLoss() - before_fire - 10 * factor) < 0.001, "Orphaned fire pool lost its captured factor")
+	var/datum/status_effect/bounty_boss_burning/burning = victim.apply_status_effect(/datum/status_effect/bounty_boss_burning, factor)
+	// scorch already applied the refreshable effect.
+	burning = victim.has_status_effect(/datum/status_effect/bounty_boss_burning)
+	var/before = victim.getBruteLoss()
+	burning.tick(1)
+	TEST_ASSERT(abs(victim.getBruteLoss() - before - 3 * factor) < 0.001, "Lingering fire did not retain its numeric factor") // BOUNTY_BOSS_BURNING_DAMAGE
+
+/// Exercise the mafia override in a real club room, which bypasses base marker spawning.
+/datum/unit_test/voidcrew_npc_zone_mafia_room
+	var/turf/room_floor
+	var/area/original_area
+
+/datum/unit_test/voidcrew_npc_zone_mafia_room/Destroy()
+	if(room_floor && original_area)
+		room_floor.change_area(get_area(room_floor), original_area)
+	return ..()
+
+/datum/unit_test/voidcrew_npc_zone_mafia_room/Run()
+	room_floor = run_loc_floor_bottom_left
+	original_area = get_area(room_floor)
+	var/area/ruin/space/has_grav/powered/mafia_club/casino/room = allocate(/area/ruin/space/has_grav/powered/mafia_club/casino)
+	room_floor.change_area(original_area, room)
+	var/obj/effect/zone_mobs/mafia/marker = allocate(/obj/effect/zone_mobs/mafia)
+	marker.forceMove(room_floor)
+	marker.do_spawn(3)
+	var/count = 0
+	var/list/roster = bounty_mafia_room_crew(room.type)
+	for(var/mob/living/basic/trooper/russian/mafia/goon in room_floor)
+		allocated += goon
+		count++
+		TEST_ASSERT(roster[goon.type], "Custom mafia marker escaped its existing room roster")
+		TEST_ASSERT_EQUAL(goon.npc_zone_role, "ordinary", "Custom mafia room output missed finalization")
+		TEST_ASSERT(abs(goon.maxHealth - goon.npc_zone_original_max_health * 1.8) < 0.001, "Custom mafia room output missed the selected factor")
+	TEST_ASSERT(count >= 1 && count <= 2, "Custom mafia marker escaped the 1-2 output budget")
+
+/// Field-route fixtures suppress offer generation, retaining the real spawn/tracking paths.
+/datum/mission/npc_zone_test/generate_mission_details()
+	return
+
+/datum/mission_target/npc_zone_test
+	var/band = 3
+
+/datum/mission_target/npc_zone_test/get_zone_type()
+	return band
+
+/datum/unit_test/voidcrew_npc_zone_mission_routes/Run()
+	var/turf/location = run_loc_floor_bottom_left
+	var/datum/mission/mission = allocate(/datum/mission/npc_zone_test)
+	mission.objective_name = "Test quarry"
+	var/datum/mission_target/npc_zone_test/site = allocate(/datum/mission_target/npc_zone_test, mission)
+	mission.target = site
+	for(var/objective_type in list(/datum/mission_objective/field/kill_named, /datum/mission_objective/field/kill_named/big_game))
+		var/datum/mission_objective/field/kill_named/objective = allocate(objective_type)
+		objective.mission = mission
+		objective.target_mob_type = /mob/living/basic/npc_zone_test/replacement
+		objective.guard_types = list(/mob/living/basic/npc_zone_test/replacement)
+		var/is_hunt = istype(objective, /datum/mission_objective/field/kill_named/big_game)
+		if(is_hunt)
+			var/datum/mission_objective/field/kill_named/big_game/hunt = objective
+			hunt.health_override = 450
+		objective.spawn_field_objects(location)
+		var/mob/living/body = objective.target_mob
+		TEST_ASSERT_NOTNULL(body, "[objective_type] lost its replacement target")
+		TEST_ASSERT_EQUAL(body.npc_spawn_context.source_id, REF(site), "Mission target lost site identity")
+		TEST_ASSERT_EQUAL(body.npc_spawn_context.zone_type, 3, "Mission used its spawn turf instead of its site's band")
+		TEST_ASSERT(abs(body.maxHealth - (is_hunt ? 810 : 180)) < 0.001, "Mission finalized before hunt health setup")
+		var/guards = 0
+		for(var/mob/living/basic/npc_zone_test/guard in range(3, location))
+			if(guard == body)
+				continue
+			guards++
+			TEST_ASSERT_EQUAL(guard.maxHealth, 180, "Mission guard replacement missed finalization")
+			qdel(guard)
+		TEST_ASSERT_EQUAL(guards, 1, "Mission lost an entourage output")
+		mission.forget_quest_atom(body)
+		objective.deactivate()
+		qdel(body)
+		qdel(objective)
+	// Auto role profiles hostile specimens while passive captures remain baseline.
+	for(var/specimen_type in list(/mob/living/basic/npc_zone_test/replacement, /mob/living/basic/butterfly))
+		var/datum/mission_objective/field/capture_beast/capture = allocate(/datum/mission_objective/field/capture_beast)
+		capture.mission = mission
+		capture.target_mob_type = specimen_type
+		capture.spawn_field_objects(location)
+		var/mob/living/body = capture.target_mob
+		var/hostile = specimen_type == /mob/living/basic/npc_zone_test/replacement
+		TEST_ASSERT_EQUAL(body.npc_zone_applied, hostile, "Capture route ignored the environmental hostile gate")
+		if(hostile)
+			TEST_ASSERT_EQUAL(body.maxHealth, 180, "Hostile capture lost the site band")
+		else
+			TEST_ASSERT_EQUAL(body.maxHealth, initial(body.maxHealth), "Passive specimen was scaled")
+		mission.forget_quest_atom(body)
+		capture.deactivate()
+		qdel(body)
+		qdel(capture)
+	var/datum/mission_objective/field/wipe_camp/camp = allocate(/datum/mission_objective/field/wipe_camp)
+	camp.mission = mission
+	camp.squad_types = list(/mob/living/simple_animal/hostile)
+	camp.squad_names = list("Test poacher")
+	// A hostile type makes a missing rescue exemption visible.
+	camp.critter_type = /mob/living/basic/npc_zone_test/replacement
+	camp.spawn_field_objects(location)
+	TEST_ASSERT_EQUAL(length(camp.squad), 1, "Camp did not retain its squad")
+	var/mob/living/poacher = camp.squad[1]
+	TEST_ASSERT_EQUAL(poacher.maxHealth, initial(poacher.maxHealth) * 1.8, "Poacher missed camp-band finalization")
+	var/cages = 0
+	for(var/obj/item/pet_carrier/cage in range(3, location))
+		for(var/mob/living/rescued in cage)
+			cages++
+			TEST_ASSERT(rescued.npc_zone_exempt && !rescued.npc_zone_applied, "Rescued cage replacement received a hostile profile")
+			TEST_ASSERT_EQUAL(rescued.maxHealth, 100, "Rescued animal health was scaled")
+	TEST_ASSERT(cages >= 1, "Camp fixture did not produce a rescued animal")
+	mission.forget_quest_atom(mission.quest_atom)
+	camp.deactivate()
+	qdel(poacher)
+
+/// Actual fauna replacement rolls must defer finalization until the caller finishes setup.
+/datum/unit_test/voidcrew_npc_zone_fauna_routes/Run()
+	var/list/replacement_types = list(
+		/mob/living/basic/mining/wolf/random = /mob/living/basic/mining/wolf/alpha,
+		/mob/living/basic/mining/wolf/wasteland/random = /mob/living/basic/mining/wolf/alpha/wasteland,
+		/mob/living/simple_animal/hostile/asteroid/polarbear/random = /mob/living/simple_animal/hostile/asteroid/polarbear/warrior,
+		/mob/living/simple_animal/hostile/asteroid/hermit/survivor/random = /mob/living/simple_animal/hostile/asteroid/hermit/ranged,
+	)
+	for(var/spawn_type in replacement_types)
+		var/found_replacement = FALSE
+		// Stop at the first replacement. Even the 15% rolls miss all 256 with probability < 1e-18.
+		for(var/attempt in 1 to 256)
+			var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, src, 2)
+			var/mob/living/body = spawn_npc_in_zone(spawn_type, run_loc_floor_bottom_left, context, FALSE)
+			TEST_ASSERT(!body.npc_zone_applied, "[spawn_type] finalized during its replacement roll")
+			found_replacement = istype(body, replacement_types[spawn_type])
+			body.setMaxHealth(200)
+			body.setBruteLoss(50)
+			context.finalize()
+			var/is_boss = npc_zone_boss_type(body.type)
+			TEST_ASSERT(abs(body.maxHealth - (is_boss ? 230 : 270)) < 0.001, "[spawn_type] lost replacement role or caller setup")
+			TEST_ASSERT(abs(body.health / body.maxHealth - 0.75) < 0.001, "[spawn_type] healed during finalization")
+			TEST_ASSERT_EQUAL(body.npc_spawn_context, context, "Replacement acquired a second context")
+			qdel(body)
+			if(found_replacement)
+				break
+		TEST_ASSERT(found_replacement, "[spawn_type] never exercised its replacement route")
+
+/datum/unit_test/voidcrew_npc_zone_crystal_route/Run()
+	var/turf/location = run_loc_floor_bottom_left
+	var/obj/structure/spawner/sea_crystal/crystal = allocate(/obj/structure/spawner/sea_crystal, location)
+	crystal.npc_spawn_context.on_zone_resolved(3)
+	var/source_id = crystal.npc_spawn_context.source_id
+	crystal.summon_count = 1
+	TEST_ASSERT(crystal.summon_minions(), "Crystal could not commit a retaliation wave")
+	qdel(crystal)
+	sleep(4 SECONDS)
+	var/mob/living/basic/mining/hivelord/beach/hivelord = locate() in range(1, location)
+	TEST_ASSERT_NOTNULL(hivelord, "Committed crystal retaliation vanished with its source")
+	TEST_ASSERT_EQUAL(hivelord.npc_spawn_context.source_id, source_id, "Delayed retaliation lost crystal identity")
+	TEST_ASSERT_EQUAL(hivelord.npc_spawn_context.zone_type, 3, "Delayed retaliation resolved against its landing turf")
+	TEST_ASSERT(abs(hivelord.maxHealth - hivelord.npc_zone_original_max_health * 1.8) < 0.001, "Delayed retaliation did not finalize")
+	allocated += hivelord
+
+/datum/unit_test/voidcrew_npc_zone_ambush_route/Run()
+	var/turf/location = run_loc_floor_bottom_left
+	var/datum/ambient_place/site/site = allocate(/datum/ambient_place/site, null, location)
+	site.band = 2
+	var/mob/living/basic/ambient_npc/planet/peddler/peddler = allocate(/mob/living/basic/ambient_npc/planet/peddler, location)
+	peddler.set_place(site)
+	var/mob/living/basic/bait = allocate(/mob/living/basic, run_loc_floor_top_right)
+	var/datum/ambient_activity/caravan_ambush/ambush = allocate(/datum/ambient_activity/caravan_ambush, peddler)
+	var/mob/living/raider = ambush.spawn_raider(/mob/living/basic/npc_zone_test/replacement, run_loc_floor_top_right, bait)
+	allocated += raider
+	// spawn_pack owns this ledger and Destroy unregisters the pack's attack signal.
+	ambush.pack += WEAKREF(raider)
+	TEST_ASSERT_EQUAL(raider.npc_spawn_context.source_id, REF(site), "Caravan ambusher lost site identity")
+	TEST_ASSERT_EQUAL(raider.maxHealth, 135, "Caravan ambusher ignored the site band")
+	TEST_ASSERT(raider.GetComponent(/datum/component/leash), "Caravan ambusher missed its setup")
+	TEST_ASSERT_EQUAL(raider.ai_controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET], bait, "Caravan target setup was lost")
+	for(var/faction_token in raider.faction)
+		TEST_ASSERT(!findtext("[faction_token]", "planetary_"), "Caravan ambusher kept the planet's faction")
+
+/// A hull fixture provides floor and crew, with real overmap resolution for its token.
+/obj/structure/overmap/ship/npc_zone_test
+	var/turf/test_floor
+
+/obj/structure/overmap/ship/npc_zone_test/get_random_open_ship_turf(max_tries = 20)
+	return test_floor
+
+/obj/structure/overmap/ship/npc_zone_test/is_aboard(atom/thing)
+	return get_turf(thing) == test_floor
+
+/obj/structure/overmap/ship/npc_zone_test/get_event_crew()
+	return list(1, 2, 3, 4, 5)
+
+/datum/round_event/voidcrew/vent_clog/npc_zone_test
+	var/obj/machinery/atmospherics/components/unary/vent_pump/test_vent
+
+/datum/round_event/voidcrew/vent_clog/npc_zone_test/get_vent()
+	return test_vent
+
+/datum/voidcrew_cargo_shuttle/npc_zone_test
+	var/list/test_turfs
+
+/datum/voidcrew_cargo_shuttle/npc_zone_test/get_cargo_bay_turfs()
+	return test_turfs.Copy()
+
+/datum/unit_test/voidcrew_npc_zone_event_routes
+	parent_type = /datum/unit_test/voidcrew_npc_zone_packed
+
+/datum/unit_test/voidcrew_npc_zone_event_routes/Run()
+	zones_were_active = SSovermap_zones.zones_active
+	SSovermap_zones.zones_active = TRUE
+	var/turf/base = run_loc_floor_bottom_left
+	var/original_type = base.type
+	var/turf/open/overmap/token = base.ChangeTurf(/turf/open/overmap)
+	overmap_turfs[token] = original_type
+	var/datum/overmap_zone/red = allocate(/datum/overmap_zone, 3)
+	var/datum/overmap_zone/green = allocate(/datum/overmap_zone, 1)
+	token.current_zone = red
+	var/turf/location = run_loc_floor_top_right
+	var/obj/structure/overmap/ship/npc_zone_test/ship = allocate(/obj/structure/overmap/ship/npc_zone_test, token)
+	ship.test_floor = location
+	var/obj/docking_port/mobile/voidcrew/port = allocate(/obj/docking_port/mobile/voidcrew, location)
+	ship.shuttle = port
+	var/datum/round_event/voidcrew/portal_storm/storm = allocate(/datum/round_event/voidcrew/portal_storm, FALSE)
+	storm.target_ship = ship
+	storm.setup()
+	storm.hostile_types = list(/mob/living/basic/npc_zone_test/replacement = 1)
+	storm.boss_types = list(/mob/living/basic/npc_zone_test/replacement = 1)
+	storm.mob_cap = 2
+	storm.spawn_slots_remaining = 2
+	storm.pulses_remaining = 1
+	storm.boss_pending = TRUE
+	token.current_zone = green
+	storm.spawn_pulse()
+	var/list/roles = list()
+	for(var/mob/living/basic/npc_zone_test/body in location)
+		roles += body.npc_zone_role
+		TEST_ASSERT_EQUAL(body.npc_spawn_context.zone_type, 3, "Portal pulse retiered after the ship moved bands")
+		TEST_ASSERT(abs(body.maxHealth - (body.npc_zone_role == "boss" ? 130 : 180)) < 0.001, "Portal slot lost its explicit role")
+		qdel(body)
+	TEST_ASSERT_EQUAL(length(roles), 2, "Portal fixture lost an output")
+	TEST_ASSERT(("ordinary" in roles) && ("boss" in roles), "Portal boss and ordinary slots used the same role")
+	storm.kill()
+	qdel(storm)
+	// Docked tokens are nested in their destination; the hull floor need not resolve at all.
+	token.current_zone = red
+	var/obj/structure/overmap/planet/site = allocate(/obj/structure/overmap/planet, token)
+	ship.forceMove(site)
+	ship.docked = site
+	var/obj/machinery/atmospherics/components/unary/vent_pump/vent = allocate(/obj/machinery/atmospherics/components/unary/vent_pump, location)
+	var/datum/round_event/voidcrew/vent_clog/npc_zone_test/clog = allocate(/datum/round_event/voidcrew/vent_clog/npc_zone_test, FALSE)
+	clog.target_ship = ship
+	clog.test_vent = vent
+	clog.setup()
+	ship.forceMove(token)
+	ship.docked = null
+	ship.state = "transit"
+	token.current_zone = green
+	clog.spawned_mob = /mob/living/basic/npc_zone_test/replacement
+	clog.produce_mob()
+	TEST_ASSERT_EQUAL(length(clog.living_mobs), 1, "Vent fixture did not emit a hostile")
+	for(var/datum/weakref/body_ref as anything in clog.living_mobs)
+		var/mob/living/body = body_ref.resolve()
+		TEST_ASSERT_EQUAL(body.npc_spawn_context.zone_type, 3, "Vent used transit floor or the new ship band")
+		TEST_ASSERT_EQUAL(body.maxHealth, 180, "Vent replacement missed finalization")
+		qdel(body)
+	clog.life_check()
+	clog.spawned_mob = /mob/living/basic/butterfly
+	clog.produce_mob()
+	for(var/datum/weakref/body_ref as anything in clog.living_mobs)
+		var/mob/living/body = body_ref.resolve()
+		TEST_ASSERT(!body.npc_zone_applied, "Harmless vent fauna was scaled")
+		qdel(body)
+	clog.kill()
+	qdel(clog)
+	qdel(vent)
+	// Exercise each complete hostile loan roster, including optional additions.
+	var/datum/voidcrew_cargo_shuttle/npc_zone_test/cargo = allocate(/datum/voidcrew_cargo_shuttle/npc_zone_test)
+	cargo.target_ship = ship
+	cargo.test_turfs = block(get_step(token, NORTH), get_step(location, WEST))
+	for(var/loan_type in list(/datum/voidcrew_shuttle_loan/syndiehijacking, /datum/voidcrew_shuttle_loan/lots_of_bees, /datum/voidcrew_shuttle_loan/russian_party, /datum/voidcrew_shuttle_loan/spider_gift))
+		token.current_zone = red
+		var/datum/voidcrew_shuttle_loan/loan = allocate(loan_type)
+		loan.spawn_items(cargo)
+		var/hostiles = 0
+		for(var/turf/tile as anything in cargo.test_turfs)
+			for(var/mob/living/body in tile)
+				if(!isbasicmob(body) && !isanimal(body))
+					continue
+				if(!body.npc_spawn_context || body.npc_zone_exempt)
+					continue
+				hostiles++
+				TEST_ASSERT_EQUAL(body.npc_spawn_context.zone_type, 3, "[loan_type] resolved against the cargo bay")
+				TEST_ASSERT_EQUAL(body.npc_spawn_context.source_id, REF(cargo), "[loan_type] lost its delivery identity")
+				TEST_ASSERT(body.npc_zone_applied, "[loan_type] missed its explicit hostile encounter role")
+				if(body.npc_zone_applied)
+					TEST_ASSERT(abs(body.maxHealth - body.npc_zone_original_max_health * 1.8) < 0.001, "[loan_type] missed ordinary scaling")
+				qdel(body)
+		TEST_ASSERT(hostiles >= 1, "[loan_type] did not emit profiled cargo")
+		token.current_zone = green
+		var/mob/living/late = loan.spawn_hostile(/mob/living/basic/npc_zone_test, location, cargo)
+		TEST_ASSERT_EQUAL(late.maxHealth, 180, "A later loan output selected a different host band")
+		qdel(late)
+		qdel(loan)
+	ship.shuttle = null
+	qdel(port, force = TRUE)
+
+/datum/unit_test/voidcrew_npc_zone_recruit_route/Run()
+	var/obj/structure/overmap/ship/ship = strays_test_ship(ambient_test_room_bounds())
+	var/mob/living/carbon/human/consistent/leader = allocate(/mob/living/carbon/human/consistent, run_loc_floor_top_right)
+	var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, src, 3, "ordinary")
+	var/mob/living/basic/ambient_npc/stray/stranded/stray = spawn_npc_in_zone(/mob/living/basic/ambient_npc/stray/stranded, run_loc_floor_bottom_left, context, FALSE)
+	allocated += stray
+	stray.faction = list(FACTION_HOSTILE)
+	context.finalize()
+	TEST_ASSERT(stray.npc_zone_applied, "Recruit fixture did not begin profiled")
+	stray.setBruteLoss(stray.maxHealth / 2)
+	TEST_ASSERT(stray.accept_offer(leader, ship), "Recruit fixture could not join")
+	TEST_ASSERT(stray.npc_zone_exempt && !stray.npc_zone_applied, "Recruitment retained a hostile profile")
+	TEST_ASSERT(abs(stray.health / stray.maxHealth - 0.5) < 0.001, "Recruitment healed the recruit")
+	var/datum/npc_spawn_context/child_context = allocate(/datum/npc_spawn_context, stray, 3)
+	var/mob/living/child = spawn_npc_in_zone(/mob/living/basic/npc_zone_test/replacement, run_loc_floor_bottom_left, child_context)
+	allocated += child
+	TEST_ASSERT(child.npc_zone_exempt && !child.npc_zone_applied, "Recruit descendants lost exemption")
+
+/// Check a real route's output against raw type stats, never against its stored originals.
+/datum/unit_test/proc/check_npc_zone_child(mob/living/child, datum/npc_spawn_context/parent_context, exempt = FALSE, boss = FALSE)
+	TEST_ASSERT_NOTNULL(child, "Child route did not produce a surviving body")
+	if(!child)
+		return
+	TEST_ASSERT_NOTNULL(child.npc_spawn_context, "[child.type] omitted its construction context")
+	if(!child.npc_spawn_context)
+		return
+	TEST_ASSERT_EQUAL(child.npc_spawn_context.source_id, parent_context.source_id, "[child.type] lost its parent's source identity")
+	TEST_ASSERT_EQUAL(child.npc_spawn_context.zone_type, parent_context.zone_type, "[child.type] resolved against its landing site")
+	TEST_ASSERT_EQUAL(child.npc_zone_applied, !exempt, "[child.type] ignored its source exemption")
+	if(exempt)
+		TEST_ASSERT(child.npc_zone_exempt, "[child.type] did not retain permanent exemption")
+		TEST_ASSERT_EQUAL(child.maxHealth, initial(child.maxHealth), "Exempt child health was scaled")
+		return
+	var/list/health_factors = boss ? list(1, 1.15, 1.3) : list(1, 1.35, 1.8)
+	var/list/damage_factors = boss ? list(1, 1.1, 1.2) : list(1, 1.15, 1.35)
+	TEST_ASSERT_EQUAL(child.npc_zone_role, boss ? "boss" : "ordinary", "Child inherited its parent's role instead of its own")
+	TEST_ASSERT(abs(child.maxHealth - initial(child.maxHealth) * health_factors[parent_context.zone_type]) < 0.001, "[child.type] did not scale its raw health exactly once")
+	TEST_ASSERT(abs(child.melee_damage_upper - initial(child.melee_damage_upper) * damage_factors[parent_context.zone_type]) < 0.001, "[child.type] did not scale its raw melee exactly once")
+	var/previous_health = child.maxHealth
+	child.npc_spawn_context.finalize()
+	TEST_ASSERT_EQUAL(child.maxHealth, previous_health, "Child finalization stacked its profile")
+
+/// Force the replacement parasite so its inheritance is deterministic.
+/mob/living/basic/mining/legion/npc_zone_test/consume(mob/living/carbon/human/consumed)
+	. = ..()
+	var/obj/item/organ/legion_tumour/tumour = new()
+	tumour.Insert(consumed, special = TRUE, movement_flags = DELETE_IF_REPLACED)
+
+/datum/unit_test/voidcrew_npc_zone_child_routes/Run()
+	var/turf/location = run_loc_floor_bottom_left
+	var/turf/landing = run_loc_floor_top_right
+	var/mob/living/basic/bait = allocate(/mob/living/basic/npc_zone_test, landing)
+	for(var/band in 1 to 3)
+		for(var/exempt in list(FALSE, TRUE))
+			var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, src, band, "boss", exempt)
+			var/mob/living/basic/mining/hivelord/hive = spawn_npc_in_zone(/mob/living/basic/mining/hivelord, location, context)
+			hive.forceMove(landing)
+			hive.spawn_brood.complete_spawn(location, bait)
+			var/mob/living/basic/hivelord_brood/brood = locate() in location
+			check_npc_zone_child(brood, context, exempt)
+			TEST_ASSERT_EQUAL(brood.ai_controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET], bait, "Hivelord attack brood lost its target setup")
+			qdel(brood)
+			hive.ai_controller.set_blackboard_key(BB_BASIC_MOB_CURRENT_TARGET, bait)
+			hive.complete_spawn(location)
+			brood = locate() in location
+			check_npc_zone_child(brood, context, exempt)
+			TEST_ASSERT_EQUAL(brood.ai_controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET], bait, "Hivelord death brood lost its target setup")
+			qdel(brood)
+			// This callback must also finalize an Initialize replacement after setup.
+			hive.death_spawn_type = /mob/living/basic/npc_zone_test/replacement
+			hive.complete_spawn(location)
+			var/mob/living/basic/npc_zone_test/replacement = locate() in location
+			check_npc_zone_child(replacement, context, exempt)
+			qdel(replacement)
+			var/datum/action/cooldown/mob_cooldown/skull_launcher/launcher = allocate(/datum/action/cooldown/mob_cooldown/skull_launcher)
+			launcher.Grant(hive)
+			launcher.spawn_skull(location, bait)
+			var/mob/living/basic/legion_brood/skull = locate() in location
+			check_npc_zone_child(skull, context, exempt)
+			TEST_ASSERT_EQUAL(skull.created_by.resolve(), hive, "Legion skull lost creator assignment")
+			// The infected human is a victim, not the source or controller of the legion.
+			var/mob/living/carbon/human/victim = allocate(/mob/living/carbon/human/consistent, location)
+			skull.infest(victim)
+			var/mob/living/basic/mining/legion/infested = locate() in location
+			check_npc_zone_child(infested, context, exempt)
+			TEST_ASSERT_EQUAL(infested.stored_mob, victim, "Infestation finalized before consuming its victim")
+			qdel(infested)
+			var/mob/living/carbon/human/host = allocate(/mob/living/carbon/human/consistent, location)
+			var/obj/item/organ/legion_tumour/tumour = allocate(/obj/item/organ/legion_tumour)
+			tumour.npc_spawn_context = context
+			tumour.spawn_type = /mob/living/basic/mining/legion/npc_zone_test
+			tumour.Insert(host, special = TRUE)
+			skull = tumour.spawn_brood(landing)
+			check_npc_zone_child(skull, context, exempt)
+			TEST_ASSERT_EQUAL(skull.created_by.resolve(), host, "Tumour brood missed its host assignment")
+			qdel(skull)
+			tumour.infest()
+			infested = locate() in location
+			check_npc_zone_child(infested, context, exempt)
+			var/obj/item/organ/legion_tumour/replacement_tumour = host.get_organ_slot(ORGAN_SLOT_PARASITE_EGG)
+			TEST_ASSERT_EQUAL(replacement_tumour.npc_spawn_context.source_id, context.source_id, "Replacement parasite lost the original infection source")
+			TEST_ASSERT_EQUAL(replacement_tumour.npc_spawn_context.zone_type, band, "Replacement parasite retiered against its host")
+			qdel(infested)
+			qdel(launcher)
+			qdel(hive)
+
+/datum/unit_test/voidcrew_npc_zone_legion_split_route/Run()
+	var/turf/location = run_loc_floor_bottom_left
+	for(var/exempt in list(FALSE, TRUE))
+		var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, src, 3, "boss", exempt)
+		var/mob/living/simple_animal/hostile/megafauna/legion/parent = spawn_npc_in_zone(/mob/living/simple_animal/hostile/megafauna/legion, location, context)
+		parent.forceMove(run_loc_floor_top_right)
+		parent.Split()
+		var/list/mediums = list()
+		for(var/mob/living/simple_animal/hostile/megafauna/legion/medium/child in run_loc_floor_top_right)
+			mediums += child
+			check_npc_zone_child(child, context, exempt, TRUE)
+		TEST_ASSERT_EQUAL(length(mediums), 3, "Large Legion did not produce three medium children")
+		var/mob/living/simple_animal/hostile/megafauna/legion/medium/medium = mediums[1]
+		medium.forceMove(location)
+		medium.Split()
+		var/small_count = 0
+		for(var/mob/living/simple_animal/hostile/megafauna/legion/small/child in location)
+			small_count++
+			check_npc_zone_child(child, context, exempt, TRUE)
+			qdel(child)
+		TEST_ASSERT_EQUAL(small_count, 3, "Medium Legion did not produce three small children")
+		QDEL_LIST(mediums)
+		qdel(parent)
+
+/datum/unit_test/voidcrew_npc_zone_legion_skull_route/Run()
+	var/turf/location = run_loc_floor_bottom_left
+	var/turf/landing = run_loc_floor_top_right
+	var/mob/living/basic/bait = allocate(/mob/living/basic/npc_zone_test, location)
+	for(var/exempt in list(FALSE, TRUE))
+		var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, src, 3, "boss", exempt, location)
+		var/mob/living/simple_animal/hostile/megafauna/legion/parent = spawn_npc_in_zone(/mob/living/simple_animal/hostile/megafauna/legion, location, context)
+		parent.forceMove(landing)
+		parent.create_legion_skull.create(bait)
+		var/mob/living/basic/legion_brood/skull = locate() in landing
+		check_npc_zone_child(skull, context, exempt)
+		TEST_ASSERT_EQUAL(skull.npc_spawn_context.source_turf, location, "Megafauna skull repinned its source after its creator moved")
+		TEST_ASSERT_EQUAL(skull.created_by.resolve(), parent, "Megafauna skull lost its creator assignment")
+		TEST_ASSERT_EQUAL(skull.ai_controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET], bait, "Megafauna skull lost its attack target")
+		var/mob/living/carbon/human/victim = allocate(/mob/living/carbon/human/consistent, landing)
+		skull.infest(victim)
+		var/mob/living/basic/mining/legion/infested = locate() in landing
+		check_npc_zone_child(infested, context, exempt)
+		TEST_ASSERT_EQUAL(infested.npc_spawn_context.source_turf, location, "Infestation lost the megafauna's pinned source")
+		TEST_ASSERT_EQUAL(infested.stored_mob, victim, "Megafauna skull infestation did not consume its victim")
+		qdel(infested)
+		qdel(parent)
+
+/// The post hook overrides health and faction and must run before finalization.
+/datum/action/cooldown/spell/conjure/npc_zone_test
+	summon_type = list(/mob/living/basic/npc_zone_test/replacement)
+	summon_radius = 0
+
+/datum/action/cooldown/spell/conjure/npc_zone_test/post_summon(atom/summoned_object, atom/cast_on)
+	var/mob/living/body = summoned_object
+	if(body.npc_zone_applied)
+		CRASH("Conjure finalized before post_summon setup")
+	body.faction = list(FACTION_HOSTILE)
+	body.setMaxHealth(200)
+	body.setBruteLoss(50)
+	// Basic setBruteLoss() does not update health when the previous loss was zero.
+	body.updatehealth()
+
+/datum/unit_test/voidcrew_npc_zone_conjure_route/Run()
+	var/turf/location = run_loc_floor_bottom_left
+	var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, src, 3, "boss")
+	var/mob/living/caster = spawn_npc_in_zone(/mob/living/basic/npc_zone_test, run_loc_floor_top_right, context)
+	var/datum/action/cooldown/spell/conjure/npc_zone_test/spell = allocate(/datum/action/cooldown/spell/conjure/npc_zone_test)
+	spell.Grant(caster)
+	for(var/player_owned in list(FALSE, TRUE))
+		if(player_owned)
+			caster.mind_initialize()
+		spell.cast(location)
+		var/mob/living/basic/npc_zone_test/body = locate() in location
+		TEST_ASSERT_NOTNULL(body, "Conjure lost its Initialize replacement")
+		TEST_ASSERT_EQUAL(body.maxHealth, player_owned ? 200 : 360, "Conjure lost ownership exemption or post-summon health setup")
+		TEST_ASSERT(abs(body.health / body.maxHealth - 0.75) < 0.001, "Conjure finalization healed its output")
+		TEST_ASSERT_EQUAL(body.npc_spawn_context.source_id, context.source_id, "Conjure lost caster source identity")
+		TEST_ASSERT_EQUAL(body.npc_zone_exempt, player_owned, "Player summons did not retain exemption")
+		var/datum/npc_spawn_context/child_context = allocate(/datum/npc_spawn_context, body)
+		var/mob/living/child = spawn_npc_in_zone(/mob/living/basic/npc_zone_test, location, child_context)
+		check_npc_zone_child(child, context, player_owned)
+		qdel(child)
+		qdel(body)
+	qdel(caster)
+
+/datum/unit_test/voidcrew_npc_zone_lich_routes/Run()
+	var/turf/location = run_loc_floor_bottom_left
+	var/obj/structure/overmap/space_ruin/lich_lair/site = allocate(/obj/structure/overmap/space_ruin/lich_lair)
+	site.npc_spawn_context = allocate(/datum/npc_spawn_context, site, 3)
+	site.ruin_bottom_left = location
+	var/datum/map_template/ruin/template = allocate(/datum/map_template/ruin)
+	template.width = 1
+	template.height = 1
+	site.ruin_template = template
+	allocate(/obj/effect/landmark/lich/boss_spawn, location)
+	site.link_interior()
+	var/mob/living/basic/lich/lich = site.lich_ref?.resolve()
+	TEST_ASSERT_NOTNULL(lich, "Lich site's fallback spawn did not bind a boss")
+	allocated += lich
+	check_npc_zone_child(lich, site.npc_spawn_context, FALSE, TRUE)
+	// A mapped lich uses the auto role and starts with combat mode off.
+	var/datum/npc_spawn_context/auto_context = allocate(/datum/npc_spawn_context, site, 3)
+	var/mob/living/basic/lich/mapped = spawn_npc_in_zone(/mob/living/basic/lich, run_loc_floor_top_right, auto_context)
+	check_npc_zone_child(mapped, site.npc_spawn_context, FALSE, TRUE)
+	qdel(mapped)
+	var/datum/action/cooldown/spell/conjure/lich_raise_dead/raise = allocate(/datum/action/cooldown/spell/conjure/lich_raise_dead)
+	raise.Grant(lich)
+	raise.cast(lich)
+	TEST_ASSERT_EQUAL(length(lich.live_summons), 2, "Lich did not register its conjured minions")
+	for(var/mob/living/minion as anything in lich.live_summons)
+		check_npc_zone_child(minion, site.npc_spawn_context)
+		TEST_ASSERT("verdigris" in minion.faction, "Lich summon missed its faction setup") // FACTION_LICH
+	var/mob/living/basic/victim = allocate(/mob/living/basic/npc_zone_test, run_loc_floor_top_right)
+	var/datum/action/cooldown/spell/pointed/lich_mirror_images/images = allocate(/datum/action/cooldown/spell/pointed/lich_mirror_images)
+	images.Grant(lich)
+	images.cast(victim)
+	TEST_ASSERT(length(images.copies) >= 1, "Lich mirror route produced no registered copies")
+	for(var/mob/living/basic/lich/mirror_image/image as anything in images.copies)
+		check_npc_zone_child(image, site.npc_spawn_context)
+		TEST_ASSERT(image in lich.live_summons, "Mirror image bypassed the lich's cleanup registry")
+		image.on_attacked(image, victim, ATTACKER_DAMAGING_ATTACK)
+		TEST_ASSERT_EQUAL(victim.getBruteLoss(), round(20.25, DAMAGE_PRECISION), "Mirror retaliation did not use its ordinary damage factor")
+		victim.fully_heal()
+	var/datum/action/cooldown/spell/pointed/lich_grave_dirt/dirt = allocate(/datum/action/cooldown/spell/pointed/lich_grave_dirt)
+	dirt.Grant(lich)
+	dirt.cast(victim)
+	TEST_ASSERT_EQUAL(dirt.npc_damage_factor, 1.2, "Grave dirt did not capture the boss's damage factor")
+	dirt.Remove(lich)
+	qdel(lich)
+	dirt.burn_tick(list(get_turf(victim)), world.time)
+	TEST_ASSERT_EQUAL(victim.getBruteLoss(), 6, "Delayed grave dirt lost damage scaling after creator deletion")
+	qdel(dirt)
+
+/// Use the actual guard creation path and its record, without a second prison map load.
+/datum/unit_test/voidcrew_npc_zone_guard_route
+	parent_type = /datum/unit_test/voidcrew_outpost_management
+
+/datum/unit_test/voidcrew_npc_zone_guard_route/Run()
+	var/obj/structure/overmap/dynamic/player_outpost/home = prison_test_claim("npczoneguard")
+	TEST_ASSERT_NOTNULL(home, "Guard profile fixture could not load its prison")
+	home.npc_spawn_context = allocate(/datum/npc_spawn_context, home, 3)
+	var/datum/outpost_prison/prison = test_prison(home)
+	var/datum/outpost_guard_record/record = prison.add_guard_record(TRUE)
+	var/mob/living/basic/outpost_prison_guard/guard = record.guard
+	check_npc_zone_child(guard, home.npc_spawn_context, TRUE)
+	var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, guard)
+	var/mob/living/child = spawn_npc_in_zone(/mob/living/basic/npc_zone_test, get_turf(guard), context)
+	check_npc_zone_child(child, home.npc_spawn_context, TRUE)
+	qdel(child)
+
+/// Arena geometry is irrelevant to spawn_wave's provided turf list.
+/datum/colosseum_controller/npc_zone_test/snapshot_arena()
+	return
+
+/datum/unit_test/voidcrew_npc_zone_arena_route/Run()
+	var/datum/colosseum_controller/controller = allocate(/datum/colosseum_controller/npc_zone_test)
+	controller.state = "live" // COLOSSEUM_STATE_LIVE
+	var/datum/colosseum_modifier/beast_interlude/modifier = allocate(/datum/colosseum_modifier/beast_interlude)
+	modifier.controller = controller
+	modifier.spawn_wave(list(run_loc_floor_bottom_left), list(/mob/living/basic/mining/legion = 1))
+	TEST_ASSERT_EQUAL(length(modifier.beasts), 1, "Arena wave lost its output")
+	var/mob/living/basic/mining/legion/beast = modifier.beasts[1]
+	TEST_ASSERT(beast.npc_zone_exempt && !beast.npc_zone_applied, "Colosseum beast received an environmental profile")
+	var/datum/action/cooldown/mob_cooldown/skull_launcher/launcher = beast.ai_controller.blackboard[BB_TARGETED_ACTION]
+	launcher.spawn_skull(run_loc_floor_top_right, null)
+	var/mob/living/basic/legion_brood/skull = locate() in run_loc_floor_top_right
+	TEST_ASSERT(skull.npc_zone_exempt && !skull.npc_zone_applied, "Arena beast descendants escaped exemption")
+	qdel(skull)
+
+/// Real wave methods use their deployed objective's source, not the player's mind.
+/datum/unit_test/voidcrew_npc_zone_vestige_routes/Run()
+	var/turf/center = get_step(get_step(run_loc_floor_bottom_left, NORTH), EAST)
+	var/mob/living/carbon/human/keeper = allocate(/mob/living/carbon/human/consistent, center)
+	keeper.mind_initialize()
+	var/obj/item/vestige_blood_votive/votive = allocate(/obj/item/vestige_blood_votive, center)
+	votive.npc_spawn_context = allocate(/datum/npc_spawn_context, votive, 2)
+	var/datum/vestige_trial/vigil/vigil = allocate(/datum/vestige_trial/vigil, keeper.mind)
+	vigil.votive = votive
+	vigil.unfold(keeper)
+	TEST_ASSERT_EQUAL(length(vigil.clots), 3, "Cult fixture did not unfold its hostile pack")
+	for(var/mob/living/clot as anything in vigil.clots)
+		check_npc_zone_child(clot, votive.npc_spawn_context)
+	vigil.reset_rite()
+	var/obj/structure/vestige_dragon_egg/dragon = allocate(/obj/structure/vestige_dragon_egg, center)
+	dragon.npc_spawn_context = allocate(/datum/npc_spawn_context, dragon, 3)
+	dragon.assault_underway = TRUE
+	dragon.wave_pending = TRUE
+	dragon.wave_perch = pick(vestige_hunt_approaches(dragon, 4))
+	dragon.unleash_wave()
+	TEST_ASSERT_EQUAL(length(dragon.brood), 2, "Dragon trial did not emit its wave")
+	for(var/mob/living/hunter as anything in dragon.brood.Copy())
+		check_npc_zone_child(hunter, dragon.npc_spawn_context)
+		qdel(hunter)
+	var/obj/structure/vestige_comb_egg/comb = allocate(/obj/structure/vestige_comb_egg, center)
+	comb.npc_spawn_context = allocate(/datum/npc_spawn_context, comb, 2)
+	comb.assault_underway = TRUE
+	comb.squad_pending = TRUE
+	comb.squad_perch = pick(vestige_hunt_approaches(comb, 4, chew_resin = TRUE))
+	comb.land_squad()
+	TEST_ASSERT_EQUAL(length(comb.chewers), 1, "Comb trial did not emit its first squad")
+	for(var/mob/living/chewer as anything in comb.chewers.Copy())
+		check_npc_zone_child(chewer, comb.npc_spawn_context)
+		qdel(chewer)
+	var/obj/structure/vestige_tremor_line/line = allocate(/obj/structure/vestige_tremor_line, center)
+	line.npc_spawn_context = allocate(/datum/npc_spawn_context, line, 3)
+	var/datum/vestige_trial/loom_tremor/loom = allocate(/datum/vestige_trial/loom_tremor, keeper.mind)
+	loom.send_thief(line, keeper)
+	TEST_ASSERT_EQUAL(length(loom.thieves), 1, "Spider trial did not emit a thief")
+	for(var/mob/living/thief as anything in loom.thieves.Copy())
+		check_npc_zone_child(thief, line.npc_spawn_context)
+		TEST_ASSERT_EQUAL(thief.ai_controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET], line, "Spider thief missed its target setup")
+		qdel(thief)
+	// Reward pets retain baseline stats even under an explicit hostile role.
+	var/datum/npc_spawn_context/pet_context = allocate(/datum/npc_spawn_context, src, 3, "boss")
+	var/mob/living/pet = spawn_npc_in_zone(/mob/living/basic/carp/pet/vestige_hatchling, center, pet_context)
+	allocated += pet
+	TEST_ASSERT(pet.npc_zone_exempt && !pet.npc_zone_applied, "Reward dragonet received a hostile profile")
+
+/datum/unit_test/voidcrew_npc_zone_player_spell_route/Run()
+	var/turf/center = get_step(get_step(run_loc_floor_bottom_left, NORTH), EAST)
+	var/mob/living/carbon/human/caster = allocate(/mob/living/carbon/human/consistent, center)
+	caster.mind_initialize()
+	var/datum/action/cooldown/spell/grave_mirage/spell = allocate(/datum/action/cooldown/spell/grave_mirage)
+	spell.Grant(caster)
+	spell.cast(caster)
+	TEST_ASSERT(length(spell.mirages) >= 1, "Player mirage spell produced no copies")
+	for(var/mob/living/mirage as anything in spell.mirages)
+		TEST_ASSERT(mirage.npc_zone_exempt && !mirage.npc_zone_applied, "Player mirage received an environmental profile")
+		TEST_ASSERT_EQUAL(mirage.maxHealth, initial(mirage.maxHealth), "Player mirage health was scaled")
+		TEST_ASSERT_EQUAL(mirage.npc_spawn_context.source_id, REF(caster), "Player mirage lost caster identity")
+	var/mob/living/carbon/human/victim = allocate(/mob/living/carbon/human/consistent, get_step(caster, EAST))
+	victim.stat = HARD_CRIT
+	var/obj/item/organ/legion_tumour/tumour = allocate(/obj/item/organ/legion_tumour)
+	TEST_ASSERT(tumour.try_apply(victim, caster), "Manual tumour fixture could not reach the infestation route")
+	// The victim starts beside the caster, and the infestation stays on the victim's tile.
+	var/mob/living/basic/mining/legion/infested = locate() in get_turf(victim)
+	TEST_ASSERT_NOTNULL(infested, "Manual tumour did not produce a legion")
+	TEST_ASSERT(infested.npc_zone_exempt && !infested.npc_zone_applied, "Player-applied infestation lost the player's exemption")
+	qdel(infested)
+
+/// Low-zone shooters use the unchanged base pistol archetype before W3 scaling.
+/datum/unit_test/voidcrew_npc_ladder_profiles/Run()
+	var/list/shooters = list(
+		/mob/living/basic/trooper/nanotrasen/ranged/smg,
+		/mob/living/basic/trooper/nanotrasen/ranged/assault,
+		/mob/living/basic/trooper/nanotrasen/ranged/elite,
+		/mob/living/basic/trooper/nanotrasen/ranged/smg/customs,
+		/mob/living/basic/trooper/nanotrasen/ranged/assault/customs,
+		/mob/living/basic/trooper/syndicate/ranged/smg,
+		/mob/living/basic/trooper/syndicate/ranged/shotgun,
+		/mob/living/basic/trooper/syndicate/ranged/smg/space/stormtrooper,
+	)
+	for(var/mob_type in shooters)
+		for(var/zone in 1 to 3)
+			var/is_nt = ispath(mob_type, /mob/living/basic/trooper/nanotrasen)
+			var/is_customs = mob_type == /mob/living/basic/trooper/nanotrasen/ranged/smg/customs || mob_type == /mob/living/basic/trooper/nanotrasen/ranged/assault/customs
+			var/replaced = zone == 1 || (zone == 2 && (!is_nt || is_customs || mob_type == /mob/living/basic/trooper/nanotrasen/ranged/elite))
+			var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, src, zone)
+			var/mob/living/basic/trooper/body = spawn_npc_in_zone(mob_type, run_loc_floor_bottom_left, context)
+			var/datum/component/ranged_attacks/ranged = body.GetComponent(/datum/component/ranged_attacks)
+			TEST_ASSERT_NOTNULL(ranged, "[mob_type] lost its ranged attack")
+			if(replaced)
+				TEST_ASSERT_EQUAL(ranged.casing_type, is_nt ? /obj/item/ammo_casing/c45 : /obj/item/ammo_casing/c9mm, "[mob_type]/[zone] retained its advanced ammunition")
+				TEST_ASSERT(!ranged.burst_shots, "[mob_type]/[zone] retained its burst")
+				TEST_ASSERT_EQUAL(ranged.cooldown_time, 1 SECONDS, "Replacement changed the base pistol cadence")
+				TEST_ASSERT(abs(body.maxHealth - (zone == 2 ? 135 : 100)) < 0.001, "Replacement did not receive W3 scaling exactly once")
+			else
+				TEST_ASSERT_EQUAL(ranged.casing_type, initial(body:casingtype), "A retained higher-zone shooter changed ammunition")
+				TEST_ASSERT_EQUAL(ranged.cooldown_time, initial(body:ranged_cooldown), "A retained shooter changed cadence")
+			qdel(body)
+	for(var/mob_type in list(/mob/living/basic/trooper/syndicate/melee/sword, /mob/living/basic/trooper/syndicate/melee/sword/space/stormtrooper))
+		var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, src, 1)
+		var/mob/living/basic/trooper/syndicate/melee/guard = spawn_npc_in_zone(mob_type, run_loc_floor_bottom_left, context)
+		TEST_ASSERT_EQUAL(guard.melee_damage_upper, 15, "Green sword guard did not become the knife archetype")
+		TEST_ASSERT_EQUAL(guard.maxHealth, 100, "Green stormtrooper kept its stormtrooper health")
+		TEST_ASSERT_EQUAL(guard.armour_penetration, 0, "Green sword guard kept its armor penetration")
+		TEST_ASSERT_EQUAL(guard.projectile_deflect_chance, 0, "Green sword guard kept its energy shield")
+		qdel(guard)
+
+/// Deferred resolution and movement cannot change a pirate's loot band or pay twice.
+/datum/unit_test/voidcrew_npc_ladder_deferred/Run()
+	var/turf/source = run_loc_floor_bottom_left
+	var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, src, null, "ordinary", FALSE, source)
+	var/mob/living/basic/trooper/pirate/faction/medieval/melee/pirate = spawn_npc_in_zone(/mob/living/basic/trooper/pirate/faction/medieval/melee, source, context)
+	TEST_ASSERT(!pirate.weapon_loot_initialized, "Unresolved pirate rolled against a guessed zone")
+	pirate.forceMove(run_loc_floor_top_right)
+	context.on_zone_resolved(2)
+	TEST_ASSERT(pirate.weapon_loot_initialized, "Resolved source did not initialize the pirate's weapon")
+	TEST_ASSERT_EQUAL(context.source_turf, source, "Moving a pirate changed its spawn source")
+	context.on_zone_resolved(3)
+	TEST_ASSERT_EQUAL(context.zone_type, 2, "Later resolution replaced a pinned zone")
+	context.finalize()
+	TEST_ASSERT_EQUAL(pirate.maxHealth, 135, "Deferred loot setup changed or stacked the W3 profile")
+	qdel(pirate)
+
+/// A real conjure cast cannot manufacture basic-mob or legacy-simple-animal guns.
+/datum/unit_test/voidcrew_npc_ladder_summons/Run()
+	var/turf/floor = run_loc_floor_bottom_left
+	var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, src, 3)
+	var/mob/living/caster = spawn_npc_in_zone(/mob/living/basic/npc_zone_test, run_loc_floor_top_right, context)
+	var/datum/action/cooldown/spell/conjure/spell = allocate(/datum/action/cooldown/spell/conjure)
+	spell.summon_radius = 0
+	spell.Grant(caster)
+	for(var/mob_type in list(/mob/living/basic/trooper/russian/ranged, /mob/living/basic/trooper/pirate/faction/irs/captain, /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner))
+		spell.summon_type = list(mob_type)
+		spell.cast(floor)
+		var/mob/living/summoned = locate(mob_type) in floor
+		TEST_ASSERT_NOTNULL(summoned, "Conjure failed to produce [mob_type]")
+		TEST_ASSERT(summoned.npc_spawn_context.suppress_gun_loot, "Summoned [mob_type] lost its construction restriction")
+		var/list/before = floor.get_all_contents()
+		summoned.health = 0
+		summoned.death(TRUE)
+		TEST_ASSERT(summoned.stat == DEAD || QDELETED(summoned), "Summoned [mob_type] did not actually die")
+		for(var/obj/item/drop in floor.get_all_contents() - before)
+			TEST_ASSERT(!istype(drop, /obj/item/gun), "A conjured [mob_type] manufactured a gun")
+		for(var/atom/movable/drop in floor.contents - before)
+			qdel(drop)
+		qdel(summoned)
+	qdel(caster)
+
+/// Primordial-demon replacements remain a red encounter, with normal W3 inheritance.
+/datum/unit_test/voidcrew_npc_ladder_ice_demons/Run()
+	for(var/zone in 1 to 3)
+		var/found_elite = FALSE
+		for(var/attempt in 1 to (zone == 3 ? 256 : 16))
+			var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, src, zone)
+			var/mob/living/body = spawn_npc_in_zone(/mob/living/basic/mining/ice_demon/random, run_loc_floor_bottom_left, context)
+			found_elite = istype(body, /mob/living/simple_animal/hostile/asteroid/old_demon)
+			TEST_ASSERT(zone == 3 || !found_elite, "A low-zone ice demon became a primordial demon")
+			TEST_ASSERT_EQUAL(body.npc_spawn_context, context, "Ice demon replacement lost its source")
+			if(found_elite)
+				TEST_ASSERT_EQUAL(body.maxHealth, 390, "Red primordial demon lost its W3 boss profile")
+			qdel(body)
+			if(found_elite)
+				break
+		if(zone == 3)
+			TEST_ASSERT(found_elite, "Red ice demons never exercised their elite replacement")
diff --git a/voidcrew/modules/unit_tests/voidcrew_ore_balance.dm b/voidcrew/modules/unit_tests/voidcrew_ore_balance.dm
new file mode 100644
index 00000000000..71f2fc37585
--- /dev/null
+++ b/voidcrew/modules/unit_tests/voidcrew_ore_balance.dm
@@ -0,0 +1,483 @@
+// Zone literals: the test harness is included before Voidcrew defines.
+/datum/unit_test/voidcrew_ore_balance
+	var/list/sites = list()
+	var/list/changed_turfs = list()
+	var/list/original_areas = list()
+	var/list/original_blocked = list()
+
+/datum/unit_test/voidcrew_ore_balance/Destroy()
+	for(var/obj/structure/ore_vent/vent in allocated)
+		SSore_generation.processed_vents -= vent
+	for(var/obj/structure/overmap/event/meteor/field in allocated)
+		field.mapzone = null
+		field.footprint = null
+	for(var/obj/structure/overmap/planet/site in sites)
+		site.mapzone = null
+		site.footprint = null
+	for(var/turf/changed as anything in original_areas)
+		changed.change_area(get_area(changed), original_areas[changed])
+	for(var/turf/changed as anything in changed_turfs)
+		if(istype(changed, /turf/open/overmap))
+			var/turf/open/overmap/chart = changed
+			chart.current_zone = null
+		changed.ChangeTurf(changed_turfs[changed])
+	. = ..()
+	for(var/turf/chart as anything in original_blocked)
+		if(original_blocked[chart])
+			GLOB.overmap_blocked_turfs[chart] = original_blocked[chart]
+		else
+			GLOB.overmap_blocked_turfs -= chart
+
+/datum/unit_test/voidcrew_ore_balance/proc/change(turf/location, turf_type)
+	var/old_type = location.type
+	var/turf/result = location.ChangeTurf(turf_type)
+	if(!changed_turfs[result])
+		changed_turfs[result] = old_type
+	return result
+
+/datum/unit_test/voidcrew_ore_balance/proc/planet_at(turf/surface, turf/token, zone_type)
+	var/turf/open/overmap/chart = change(token, /turf/open/overmap)
+	chart.current_zone = allocate(/datum/overmap_zone, zone_type)
+	var/obj/structure/overmap/planet/site = allocate(/obj/structure/overmap/planet, chart)
+	site.zone_band = zone_type
+	var/datum/map_zone/zone = allocate(/datum/map_zone)
+	zone.z_levels = list(reservation)
+	var/datum/map_footprint/footprint = allocate(/datum/map_footprint)
+	footprint.z_value = surface.z
+	footprint.set_rect(surface.x, surface.y, 1, 1)
+	site.mapzone = zone
+	site.footprint = footprint
+	sites += site
+	return site
+
+/datum/unit_test/voidcrew_ore_balance/Run()
+	var/list/expected = list(
+		list(110, 40, 16, 16, 8, 5, 2, 2, 1),
+		list(80, 40, 20, 20, 16, 12, 6, 4, 2),
+		list(50, 36, 24, 24, 24, 20, 12, 8, 2),
+	)
+	var/list/ores = list(/obj/item/stack/ore/iron, /obj/item/stack/ore/plasma, /obj/item/stack/ore/silver, /obj/item/stack/ore/titanium, /obj/item/stack/ore/gold, /obj/item/stack/ore/uranium, /obj/item/stack/ore/diamond, /obj/item/stack/ore/bluespace_crystal, /obj/item/stack/ore/bananium)
+	for(var/zone_type in 1 to 3)
+		var/list/weights = ordinary_ore_weights(zone_type)
+		var/list/row = expected[zone_type]
+		TEST_ASSERT_EQUAL(length(weights), 9, "Every profile must contain all nine ordinary ores")
+		for(var/index in 1 to length(ores))
+			TEST_ASSERT_EQUAL(weights[ores[index]], row[index], "Incorrect zone ore weight")
+			TEST_ASSERT(weights[ores[index]] > 0, "An ordinary ore is zone-exclusive")
+			TEST_ASSERT(is_ordinary_ore(ores[index]), "The ordinary ore classifier lost a profile entry")
+		weights[/obj/item/stack/ore/iron] = -1
+		var/list/fresh = ordinary_ore_weights(zone_type)
+		TEST_ASSERT_EQUAL(fresh[/obj/item/stack/ore/iron], row[1], "A caller mutated the profile")
+	TEST_ASSERT_EQUAL(ordinary_ore_zone(null), 1, "Unzoned rock must use green")
+	TEST_ASSERT_EQUAL(ordinary_ore_zone(99), 1, "Unknown rock must use green")
+	TEST_ASSERT(!is_ordinary_ore(null) && !is_ordinary_ore(/obj/item/boulder/gulag), "Special rock was classified as ordinary ore")
+	var/list/severity_rows = list(list(60, 30, 10), list(25, 50, 25), list(10, 30, 60))
+	var/list/meteor_types = list(/obj/structure/overmap/event/meteor/minor, /obj/structure/overmap/event/meteor, /obj/structure/overmap/event/meteor/majour)
+	for(var/zone_type in 1 to 3)
+		var/list/weights = meteor_severity_weights(zone_type)
+		var/list/row = severity_rows[zone_type]
+		var/list/applied = meteor_event_weights(GLOB.overmap_event_pick_list, zone_type)
+		var/old_total = 0
+		var/new_total = 0
+		for(var/index in 1 to 3)
+			var/path = meteor_types[index]
+			TEST_ASSERT_EQUAL(weights[path], row[index], "Incorrect meteor severity weight")
+			old_total += GLOB.overmap_event_pick_list[path]
+			new_total += applied[path]
+		TEST_ASSERT_EQUAL(new_total, old_total, "Severity changed the total meteor selection weight")
+
+// Suppress special turf replacements in this fixture, while using production profiles.
+/turf/closed/mineral/random/ore_balance_probe
+	var/test_zone = 1
+	var/allow_test_roll = FALSE
+
+/turf/closed/mineral/random/ore_balance_probe/ore_profile_zone()
+	return test_zone
+
+/turf/closed/mineral/random/ore_balance_probe/mineral_chances()
+	return list(/turf/closed/mineral/glacial = 5)
+
+/turf/closed/mineral/random/ore_balance_probe/ore_initial_roll(percentile = rand(1, 100))
+	if(!allow_test_roll)
+		return FALSE
+	return ..()
+
+/datum/unit_test/voidcrew_ore_balance/walls/Run()
+	var/turf/closed/mineral/random/ore_balance_probe/wall = change(run_loc_floor_bottom_left, /turf/closed/mineral/random/ore_balance_probe)
+	var/list/chances = list(8, 12, 16)
+	for(var/zone_type in 1 to 3)
+		wall.test_zone = zone_type
+		wall.allow_test_roll = TRUE
+		TEST_ASSERT_EQUAL(wall.ore_roll_chance(), chances[zone_type], "Incorrect initial planet wall chance")
+		TEST_ASSERT(wall.ore_initial_roll(chances[zone_type]), "The final successful percentile failed")
+		TEST_ASSERT(!wall.ore_initial_roll(chances[zone_type] + 1), "The first failed percentile succeeded")
+		var/list/choices = wall.ore_spawn_choices()
+		var/list/counts = list()
+		for(var/choice in choices)
+			counts[choice]++
+		var/list/expected = ordinary_ore_weights(zone_type)
+		for(var/ore in expected)
+			TEST_ASSERT_EQUAL(counts[ore], expected[ore], "The subtype cache leaked a different zone profile")
+		TEST_ASSERT_EQUAL(counts[/turf/closed/mineral/glacial], 5, "An authored special vein lost its weight")
+		for(var/iteration in 1 to 30)
+			wall.Change_Ore(/obj/item/stack/ore/iron, iteration % 2)
+			TEST_ASSERT(wall.mineralAmt >= 1 && wall.mineralAmt <= 3, "A direct or spread-style Change_Ore used the old amount")
+	var/obj/structure/ore_vent/vent = allocate(/obj/structure/ore_vent, get_step(wall, NORTH))
+	wall.test_zone = 1
+	TEST_ASSERT_EQUAL(wall.ore_roll_chance(), 8, "A nearby vent changed the wall chance")
+	for(var/iteration in 1 to 20)
+		TEST_ASSERT(wall.ordinary_ore_amount(wall.mineralType) in list(1, 2, 3), "A nearby vent changed the wall yield")
+	vent.forceMove(get_step(wall, EAST))
+	TEST_ASSERT_EQUAL(wall.ore_roll_chance(), 8, "Moving a vent changed the wall chance")
+	var/turf/closed/mineral/gibtonite/gib = change(get_step(wall, EAST), /turf/closed/mineral/gibtonite)
+	TEST_ASSERT_EQUAL(gib.ordinary_ore_amount(null), initial(gib.mineralAmt), "Gibtonite bookkeeping was treated as ore")
+	wall.mineralAmt = 7
+	wall.Change_Ore(/obj/item/boulder/gulag)
+	TEST_ASSERT_EQUAL(wall.mineralAmt, 7, "A gulag boulder was treated as ordinary ore")
+
+/turf/closed/mineral/random/asteroid_field/ore_balance_probe
+	var/test_zone = 1
+	var/roll_calls = 0
+
+/turf/closed/mineral/random/asteroid_field/ore_balance_probe/ore_profile_zone()
+	return test_zone
+
+/turf/closed/mineral/random/asteroid_field/ore_balance_probe/ore_initial_roll(percentile = rand(1, 100))
+	roll_calls++
+	return FALSE
+
+/turf/closed/mineral/random/asteroid_field/minor/ore_balance_probe/ore_initial_roll(percentile = rand(1, 100))
+	return FALSE
+
+/turf/closed/mineral/random/asteroid_field/majour/ore_balance_probe/ore_initial_roll(percentile = rand(1, 100))
+	return FALSE
+
+/datum/map_generator/cave_generator/asteroid_field/ore_balance_probe
+	weighted_closed_turf_types = list(/turf/closed/mineral/random/asteroid_field/ore_balance_probe = 1)
+	blob_count_min = 1
+	blob_count_max = 1
+	blob_radius_min = 3
+	blob_radius_max = 3
+	initial_closed_chance = 100
+	smoothing_iterations = 0
+	mob_spawn_chance = 0
+	flora_spawn_chance = 0
+	feature_spawn_chance = 0
+
+/datum/unit_test/voidcrew_ore_balance/asteroids/Run()
+	var/list/generators = list(/datum/map_generator/cave_generator/asteroid_field/minor, /datum/map_generator/cave_generator/asteroid_field, /datum/map_generator/cave_generator/asteroid_field/majour)
+	var/list/walls = list(/turf/closed/mineral/random/asteroid_field/minor, /turf/closed/mineral/random/asteroid_field, /turf/closed/mineral/random/asteroid_field/majour)
+	for(var/index in 1 to 3)
+		var/datum/map_generator/cave_generator/asteroid_field/generator = allocate(generators[index])
+		TEST_ASSERT_EQUAL(generator.closed_turf_types[1], walls[index], "Severity was not configured before wall initialization")
+	var/turf/closed/mineral/random/asteroid_field/minor_rock = change(run_loc_floor_bottom_left, /turf/closed/mineral/random/asteroid_field/minor/ore_balance_probe)
+	TEST_ASSERT_EQUAL(minor_rock.ore_roll_chance(), 10, "Incorrect minor storm chance")
+	var/turf/closed/mineral/random/asteroid_field/major_rock = change(run_loc_floor_bottom_left, /turf/closed/mineral/random/asteroid_field/majour/ore_balance_probe)
+	TEST_ASSERT_EQUAL(major_rock.ore_roll_chance(), 15, "Incorrect major storm chance")
+	var/turf/closed/mineral/random/asteroid_field/ore_balance_probe/wall = change(run_loc_floor_bottom_left, /turf/closed/mineral/random/asteroid_field/ore_balance_probe)
+	TEST_ASSERT_EQUAL(wall.ore_roll_chance(), 12, "Incorrect moderate storm chance")
+	TEST_ASSERT_EQUAL(wall.roll_calls, 1, "Asteroid initialization rolled ore more than once")
+	TEST_ASSERT_NULL(wall.mineralType, "A failed initial roll was topped up")
+	for(var/zone_type in 1 to 3)
+		wall.test_zone = zone_type
+		for(var/iteration in 1 to 30)
+			wall.Change_Ore(/obj/item/stack/ore/diamond)
+			TEST_ASSERT(wall.mineralAmt >= (zone_type == 3 ? 2 : 1) && wall.mineralAmt <= (zone_type == 1 ? 2 : 3), "Incorrect asteroid zone quantity")
+	var/turf/closed/mineral/random/asteroid_field/ore_balance_probe/spread_wall = change(get_step(wall, EAST), /turf/closed/mineral/random/asteroid_field/ore_balance_probe)
+	spread_wall.mineralAmt = 99
+	wall.Change_Ore(/obj/item/stack/ore/iron)
+	// Exercise classic spreading itself, with ample attempts at the unchanged 20% roll.
+	for(var/iteration in 1 to 200)
+		wall.Spread_Vein()
+		if(spread_wall.mineralType)
+			break
+	TEST_ASSERT_EQUAL(spread_wall.mineralType, /obj/item/stack/ore/iron, "Classic vein spreading no longer reaches adjacent random rock")
+	TEST_ASSERT(spread_wall.mineralAmt >= 1 && spread_wall.mineralAmt <= 2, "A spread-created asteroid wall retained its old quantity")
+	var/datum/map_generator/cave_generator/asteroid_field/generator = allocate(/datum/map_generator/cave_generator/asteroid_field/ore_balance_probe)
+	var/area/centcom/asteroid/voidcrew/field_area = new
+	allocated += field_area
+	var/turf/bottom_left = get_step(get_step(run_loc_floor_bottom_left, NORTH), NORTH)
+	var/list/candidates = block(bottom_left, locate(bottom_left.x + 12, bottom_left.y + 12, bottom_left.z))
+	for(var/turf/candidate as anything in candidates)
+		changed_turfs[candidate] = candidate.type
+		original_areas[candidate] = get_area(candidate)
+	var/list/generated = generator.generate_terrain(candidates, field_area)
+	generator.populate_terrain(generated, field_area)
+	var/rock_count = 0
+	for(var/turf/closed/mineral/random/asteroid_field/ore_balance_probe/rock in generated)
+		rock_count++
+		TEST_ASSERT_EQUAL(rock.roll_calls, 1, "Generation seeded the same asteroid wall twice")
+		TEST_ASSERT_NULL(rock.mineralType, "Generation topped up an unsuccessful wall roll")
+	TEST_ASSERT(rock_count > 0, "The asteroid generation fixture produced no rock")
+
+/datum/unit_test/voidcrew_ore_balance/vents/Run()
+	var/turf/green_surface = run_loc_floor_bottom_left
+	var/turf/red_surface = get_step(green_surface, EAST)
+	var/obj/structure/overmap/planet/green = planet_at(green_surface, get_step(green_surface, NORTH), 1)
+	var/obj/structure/overmap/planet/red = planet_at(red_surface, get_step(red_surface, NORTH), 3)
+	var/turf/yellow_surface = get_step(red_surface, EAST)
+	var/obj/structure/overmap/planet/yellow_site = planet_at(yellow_surface, get_step(yellow_surface, NORTH), 2)
+	var/turf/closed/mineral/green_rock = change(green_surface, /turf/closed/mineral)
+	var/turf/closed/mineral/red_rock = change(red_surface, /turf/closed/mineral)
+	TEST_ASSERT_EQUAL(green_rock.ore_profile_zone(), 1, "Green rock inherited its packed neighbour's profile")
+	TEST_ASSERT_EQUAL(red_rock.ore_profile_zone(), 3, "Red rock inherited its packed neighbour's profile")
+	var/obj/structure/ore_vent/first = allocate(/obj/structure/ore_vent, green_surface)
+	var/obj/structure/ore_vent/second = allocate(/obj/structure/ore_vent, green_surface)
+	var/obj/structure/ore_vent/other = allocate(/obj/structure/ore_vent, red_surface)
+	var/obj/structure/ore_vent/yellow_vent = allocate(/obj/structure/ore_vent, yellow_surface)
+	TEST_ASSERT_EQUAL(first.boulders_remaining, 20, "Incorrect green vent cap")
+	TEST_ASSERT_EQUAL(other.boulders_remaining, 40, "Incorrect red vent cap")
+	TEST_ASSERT_EQUAL(yellow_vent.boulders_remaining, 30, "Incorrect yellow vent cap")
+	TEST_ASSERT_EQUAL(green.ore_reserve.sheets_remaining, 3000, "Incorrect green reserve")
+	TEST_ASSERT_EQUAL(red.ore_reserve.sheets_remaining, 10000, "Incorrect red reserve")
+	TEST_ASSERT_EQUAL(yellow_site.ore_reserve.sheets_remaining, 6000, "Incorrect yellow reserve")
+	first.mineral_breakdown = list(/datum/material/iron = 1)
+	second.mineral_breakdown = first.mineral_breakdown.Copy()
+	green.ore_reserve.sheets_remaining = 2
+	SSore_generation.processed_vents |= list(first, second)
+	var/obj/item/boulder/last = first.produce_boulder(TRUE)
+	TEST_ASSERT(last, "The final partial boulder was refused")
+	allocated += last
+	var/total = 0
+	for(var/material in last.custom_materials)
+		total += last.custom_materials[material]
+	TEST_ASSERT_EQUAL(total / SHEET_MATERIAL_AMOUNT, 2, "The final boulder exceeded the shared reserve")
+	TEST_ASSERT_EQUAL(first.boulders_remaining, 19, "A partial boulder did not debit the vent counter once")
+	TEST_ASSERT_EQUAL(green.ore_reserve.sheets_remaining, 0, "Manual extraction did not debit the shared reserve")
+	TEST_ASSERT_NULL(second.produce_boulder(), "Automatic production bypassed the shared reserve")
+	TEST_ASSERT_EQUAL(second.boulders_remaining, 20, "Failed extraction consumed a vent counter")
+	assert_spent_vent(second)
+	TEST_ASSERT(!(first in SSore_generation.processed_vents) && !(second in SSore_generation.processed_vents), "Exhausted vents remained in automatic processing")
+	TEST_ASSERT_EQUAL(red.ore_reserve.sheets_remaining, 10000, "Packed neighbour reserves were shared")
+	first.forceMove(red_surface)
+	TEST_ASSERT_EQUAL(first.bound_ore_reserve(), green.ore_reserve, "An imported vent rebound to its destination")
+	var/datum/map_zone/old_zone = green.mapzone
+	var/datum/map_footprint/old_footprint = green.footprint
+	green.mapzone = null
+	green.footprint = null
+	TEST_ASSERT_EQUAL(green.get_ore_reserve().sheets_remaining, 0, "Unloading refilled the planet reserve")
+	green.mapzone = old_zone
+	green.footprint = old_footprint
+	var/obj/structure/ore_vent/replacement = allocate(/obj/structure/ore_vent, green_surface)
+	TEST_ASSERT_EQUAL(replacement.bound_ore_reserve(), green.ore_reserve, "Reload or replacement created a new reserve")
+	TEST_ASSERT_NULL(replacement.produce_boulder(TRUE), "Replacement refilled the reserve")
+	other.mineral_breakdown = list(/datum/material/iron = 1)
+	var/list/empty_payload = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT - 1)
+	var/unchanged_balance = red.ore_reserve.sheets_remaining
+	var/unchanged_counter = other.boulders_remaining
+	TEST_ASSERT(!other.commit_ore_payload(empty_payload), "A payload without a whole sheet produced a boulder")
+	TEST_ASSERT_EQUAL(red.ore_reserve.sheets_remaining, unchanged_balance, "An empty payload debited the reserve")
+	TEST_ASSERT_EQUAL(other.boulders_remaining, unchanged_counter, "An empty payload debited the vent counter")
+	other.boulders_remaining = 1
+	SSore_generation.processed_vents |= other
+	var/obj/item/boulder/final_automatic = other.produce_boulder()
+	TEST_ASSERT(final_automatic, "Automatic extraction failed with both limits available")
+	allocated += final_automatic
+	var/balance = red.ore_reserve.sheets_remaining
+	TEST_ASSERT_NULL(other.produce_boulder(TRUE), "Manual extraction bypassed the automatic vent counter")
+	TEST_ASSERT_EQUAL(red.ore_reserve.sheets_remaining, balance, "Failed manual extraction debited the reserve")
+	TEST_ASSERT(!(other in SSore_generation.processed_vents), "A capped vent remained in automatic processing")
+	assert_spent_vent(other)
+
+/// Both local exhaustion and an exhausted shared reserve must refuse before do_after.
+/datum/unit_test/voidcrew_ore_balance/proc/assert_spent_vent(obj/structure/ore_vent/vent)
+	var/mob/living/carbon/human/miner = allocate(/mob/living/carbon/human/consistent, get_turf(vent))
+	ADD_TRAIT(miner, TRAIT_BOULDER_BREAKER, TRAIT_SOURCE_UNIT_TESTS)
+	vent.discovered = TRUE
+	var/examine_text = jointext(vent.examine(miner), "\n")
+	TEST_ASSERT(findtext(examine_text, "The seam is spent."), "An exhausted vent did not describe the spent seam")
+	TEST_ASSERT(!findtext(examine_text, "This vent produces"), "An exhausted vent advertised boulder production")
+	var/start_tick = world.time
+	var/start_stamina = miner.getStaminaLoss()
+	var/start_count = vent.boulders_remaining
+	var/datum/planet_ore_reserve/reserve = vent.bound_ore_reserve()
+	var/start_reserve = reserve.sheets_remaining
+	vent.attack_hand(miner, list())
+	TEST_ASSERT_EQUAL(world.time, start_tick, "Striking an exhausted vent entered the delay")
+	TEST_ASSERT_EQUAL(miner.getStaminaLoss(), start_stamina, "Striking an exhausted vent spent stamina")
+	TEST_ASSERT_NULL(vent.produce_boulder(TRUE), "An exhausted vent produced a manual boulder")
+	TEST_ASSERT_NULL(vent.produce_boulder(), "An exhausted vent produced an automatic boulder")
+	TEST_ASSERT_EQUAL(vent.boulders_remaining, start_count, "Refused production consumed a vent counter")
+	TEST_ASSERT_EQUAL(reserve.sheets_remaining, start_reserve, "Refused production debited the reserve")
+
+/datum/unit_test/voidcrew_ore_balance/vent_retrieval
+	var/list/old_processed_vents
+	var/list/old_exhausted_vents
+	var/list/old_available_boulders
+
+/datum/unit_test/voidcrew_ore_balance/vent_retrieval/New()
+	..()
+	// Fire the real subsystem without producing or collecting any other site's stock.
+	old_processed_vents = SSore_generation.processed_vents
+	old_exhausted_vents = SSore_generation.exhausted_vents
+	old_available_boulders = SSore_generation.available_boulders
+	SSore_generation.processed_vents = list()
+	SSore_generation.exhausted_vents = list()
+	SSore_generation.available_boulders = list()
+
+/datum/unit_test/voidcrew_ore_balance/vent_retrieval/Destroy()
+	SSore_generation.processed_vents = old_processed_vents
+	SSore_generation.exhausted_vents = old_exhausted_vents
+	SSore_generation.available_boulders = old_available_boulders
+	return ..()
+
+/datum/unit_test/voidcrew_ore_balance/vent_retrieval/Run()
+	var/turf/vent_turf = run_loc_floor_bottom_left
+	var/turf/partner_turf = get_step(vent_turf, EAST)
+	var/turf/retrieval_turf = get_step(partner_turf, EAST)
+	var/obj/structure/overmap/planet/site = planet_at(vent_turf, get_step(vent_turf, NORTH), 1)
+	site.footprint.set_rect(vent_turf.x, vent_turf.y, 2, 1)
+	for(var/exhaust_reserve in list(FALSE, TRUE))
+		// A unique vent is absent from possible_vents, but its stock must remain discoverable too.
+		var/obj/structure/ore_vent/vent = allocate(/obj/structure/ore_vent/starter_resources, vent_turf)
+		var/obj/item/boulder/old_rock = vent.produce_boulder()
+		TEST_ASSERT(old_rock, "The retrieval fixture failed to produce its initial boulder")
+		allocated += old_rock
+		var/obj/structure/ore_vent/partner
+		var/obj/item/boulder/partner_rock
+		if(exhaust_reserve)
+			partner = allocate(/obj/structure/ore_vent, partner_turf)
+			partner.mineral_breakdown = list(/datum/material/iron = 1)
+			partner.tapped = TRUE
+			SSore_generation.processed_vents |= partner
+			partner_rock = partner.produce_boulder()
+			TEST_ASSERT(partner_rock, "The shared-reserve fixture failed to produce its initial boulder")
+			allocated += partner_rock
+			site.ore_reserve.sheets_remaining = 1
+		else
+			vent.boulders_remaining = 1
+
+		SSore_generation.fire(FALSE)
+		allocated |= SSore_generation.available_boulders
+		var/expected_stock = exhaust_reserve ? 3 : 2
+		TEST_ASSERT(!(null in SSore_generation.available_boulders), "Exhaustion added a null boulder to retrieval stock")
+		TEST_ASSERT(!(vent in SSore_generation.processed_vents), "An exhausted vent kept producing")
+		TEST_ASSERT(old_rock in SSore_generation.available_boulders, "Exhaustion hid a vent's existing boulder")
+		TEST_ASSERT_EQUAL(length(SSore_generation.available_boulders), expected_stock, "The exhaustion tick lost or duplicated a boulder")
+		if(exhaust_reserve)
+			TEST_ASSERT(!(partner in SSore_generation.processed_vents), "A shared-reserve vent kept producing")
+			TEST_ASSERT(partner_rock in SSore_generation.available_boulders, "Shared exhaustion hid another vent's stock")
+		var/remaining_sheets = site.ore_reserve.sheets_remaining
+		var/remaining_boulders = vent.boulders_remaining
+		for(var/iteration in 1 to 2)
+			SSore_generation.fire(FALSE)
+			TEST_ASSERT(old_rock in SSore_generation.available_boulders, "A later subsystem tick hid an exhausted vent's boulder")
+			TEST_ASSERT_EQUAL(length(SSore_generation.available_boulders), expected_stock, "A later tick lost stock or produced extra boulders")
+		TEST_ASSERT_EQUAL(site.ore_reserve.sheets_remaining, remaining_sheets, "Discovery debited an exhausted reserve")
+		TEST_ASSERT_EQUAL(vent.boulders_remaining, remaining_boulders, "Discovery debited an exhausted vent")
+
+		var/obj/machinery/brm/retriever = allocate(/obj/machinery/brm, retrieval_turf)
+		retriever.set_machine_stat(NONE)
+		retriever.toggled_on = TRUE
+		retriever.boulders_processing_max = 1
+		retriever.process()
+		var/obj/item/boulder/collected = locate() in retrieval_turf
+		TEST_ASSERT(collected, "A retrieval machine could not collect an exhausted vent's boulder")
+		TEST_ASSERT(!(collected in SSore_generation.available_boulders), "Collection left the boulder listed")
+		SSore_generation.fire(FALSE)
+		TEST_ASSERT(!(collected in SSore_generation.available_boulders), "A collected boulder was rediscovered")
+		TEST_ASSERT_EQUAL(length(SSore_generation.available_boulders), expected_stock - 1, "Collection hid the remaining boulders")
+		for(var/obj/item/boulder/rock in SSore_generation.available_boulders.Copy())
+			qdel(rock)
+		TEST_ASSERT_EQUAL(length(SSore_generation.available_boulders), 0, "Deleted boulders remained listed")
+		SSore_generation.fire(FALSE)
+		TEST_ASSERT_EQUAL(length(SSore_generation.available_boulders), 0, "Deleted boulders were rediscovered")
+		qdel(collected)
+		qdel(retriever)
+		qdel(vent)
+		if(partner)
+			qdel(partner)
+		TEST_ASSERT_EQUAL(length(SSore_generation.exhausted_vents), 0, "Deleted vents remained in boulder discovery")
+
+/datum/unit_test/voidcrew_ore_balance/vent_weights/Run()
+	var/list/old_pool = SSore_generation.ore_vent_minerals
+	var/obj/structure/ore_vent/vent = allocate(/obj/structure/ore_vent)
+	// One positive option makes weighted selection deterministic; uniform pick can select zero.
+	SSore_generation.ore_vent_minerals = list(/datum/material/iron = 2, /datum/material/gold = 0)
+	var/first = vent.select_vent_mineral(TRUE)
+	var/remaining = SSore_generation.ore_vent_minerals[/datum/material/iron]
+	var/second = vent.select_vent_mineral(TRUE)
+	var/empty = length(SSore_generation.ore_vent_minerals)
+	// Exercise the branch where this vent already owns every remaining allocation.
+	SSore_generation.ore_vent_minerals = list(/datum/material/iron = 1)
+	vent.mineral_breakdown = list(/datum/material/iron = 1)
+	var/fallback = vent.select_vent_mineral(TRUE)
+	var/after_fallback = length(SSore_generation.ore_vent_minerals)
+	var/list/old_fallback = GLOB.ore_vent_minerals_lavaland
+	GLOB.ore_vent_minerals_lavaland = list(/datum/material/iron = 1000, /datum/material/gold = 1)
+	SSore_generation.ore_vent_minerals = list(/datum/material/iron = 1000000, /datum/material/gold = 1000)
+	vent.mineral_breakdown = list()
+	var/mapload_iron = 0
+	var/dynamic_iron = 0
+	for(var/iteration in 1 to 256)
+		if(vent.select_vent_mineral(TRUE) == /datum/material/iron)
+			mapload_iron++
+		if(vent.select_vent_mineral(FALSE) == /datum/material/iron)
+			dynamic_iron++
+	GLOB.ore_vent_minerals_lavaland = old_fallback
+	SSore_generation.ore_vent_minerals = old_pool
+	TEST_ASSERT_EQUAL(first, /datum/material/iron, "Mapload selection ignored the available weighted pool")
+	TEST_ASSERT_EQUAL(second, /datum/material/iron, "An allocation count was removed before exhaustion")
+	TEST_ASSERT_EQUAL(remaining, 1, "Allocation did not decrement by one")
+	TEST_ASSERT_EQUAL(empty, 0, "Exhausted allocations were retained")
+	TEST_ASSERT(fallback && fallback != /datum/material/iron, "Empty available pool selected a null or duplicate material")
+	TEST_ASSERT_EQUAL(after_fallback, 0, "Fallback did not spend its surrogate allocation")
+	TEST_ASSERT(mapload_iron >= 240, "Mapload allocation used uniform rather than weighted selection")
+	TEST_ASSERT(dynamic_iron >= 240, "Dynamic allocation used uniform rather than weighted selection")
+
+// Borrow the test room without sweeping it; exercise the real unload state machine.
+/obj/structure/overmap/event/meteor/ore_balance_probe
+	var/docks_removed_while_retiring = FALSE
+	var/footprint_released_while_claimed = FALSE
+
+/obj/structure/overmap/event/meteor/ore_balance_probe/remove_docks()
+	docks_removed_while_retiring = retiring && !loaded
+	return ..()
+
+/obj/structure/overmap/event/meteor/ore_balance_probe/remove_mapzone()
+	footprint_released_while_claimed = retiring && SSovermap.worldgen_owner == src && !reserve_dock
+	mapzone = null
+	footprint = null
+
+/datum/unit_test/voidcrew_ore_balance/teardown/Run()
+	var/turf/inside = run_loc_floor_bottom_left
+	var/obj/structure/overmap/event/meteor/ore_balance_probe/field = allocate(/obj/structure/overmap/event/meteor/ore_balance_probe)
+	var/datum/map_zone/zone = allocate(/datum/map_zone)
+	zone.z_levels = list(reservation)
+	var/datum/map_footprint/footprint = allocate(/datum/map_footprint)
+	footprint.z_value = inside.z
+	footprint.set_rect(inside.x, inside.y, 1, 1)
+	field.mapzone = zone
+	field.footprint = footprint
+	field.loaded = TRUE
+	field.reserve_dock = allocate(/obj/docking_port/stationary, inside)
+	field.first_dock_taken = TRUE
+	field.unload_level()
+	TEST_ASSERT(!field.retiring && field.loaded, "An occupied berth was torn down")
+	field.first_dock_taken = FALSE
+	var/mob/living/basic/player = allocate(/mob/living/basic, inside)
+	// The teardown guard reads the connected-mob index, not GLOB.player_list.
+	var/list/players_on_level = SSmobs.clients_by_zlevel[inside.z]
+	players_on_level |= player
+	var/player_blocked = !field.can_release_interior()
+	player.forceMove(get_step(inside, EAST))
+	var/neighbour_blocked = !field.can_release_interior()
+	players_on_level -= player
+	TEST_ASSERT(player_blocked, "A connected occupant did not prevent teardown")
+	TEST_ASSERT(!neighbour_blocked, "A player outside the footprint prevented teardown")
+	field.load_level() // The loaded field must be reused, never regenerated.
+	TEST_ASSERT_EQUAL(field.footprint, footprint, "Redocking replaced an existing field")
+	var/fields_before = length(GLOB.meteor_fields)
+	original_blocked[inside] = GLOB.overmap_blocked_turfs[inside]
+	GLOB.overmap_blocked_turfs[inside] = TRUE
+	field.unload_level()
+	TEST_ASSERT(field.docks_removed_while_retiring, "Docks were removed before marking the field terminal")
+	TEST_ASSERT(field.footprint_released_while_claimed, "Footprint release lost the worldgen claim")
+	TEST_ASSERT(QDELETED(field), "Successful unloading left the event alive")
+	TEST_ASSERT_EQUAL(length(GLOB.meteor_fields), fields_before - 1, "Teardown generated a replacement field")
+	TEST_ASSERT(!GLOB.overmap_blocked_turfs[inside], "A retired field left a phantom route obstruction")
+	TEST_ASSERT(SSovermap.worldgen_owner != field, "Successful teardown leaked its worldgen lock")
+	var/obj/structure/overmap/event/meteor/retired = allocate(/obj/structure/overmap/event/meteor)
+	retired.retiring = TRUE
+	retired.load_level()
+	TEST_ASSERT_NULL(retired.mapzone, "Loading regenerated a retiring field")
diff --git a/voidcrew/modules/unit_tests/voidcrew_outpost_management.dm b/voidcrew/modules/unit_tests/voidcrew_outpost_management.dm
index 9df0207cd9f..fe32466688f 100644
--- a/voidcrew/modules/unit_tests/voidcrew_outpost_management.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_outpost_management.dm
@@ -83,7 +83,7 @@
 	TEST_ASSERT_NULL(home.current_advert, "An unfunded broadcast went live")
 	var/list/broadcast_data = console_panel.ui_data(owner)
 	TEST_ASSERT_EQUAL(broadcast_data["advert_denial"], "Insufficient outpost funds", "An unfunded broadcast gave no visible rejection reason")
-	home.treasury.adjust_money(2500, "Broadcast fixture") // OUTPOST_ADVERT_COST; fork defines follow test includes.
+	home.treasury.adjust_money(500, "Broadcast fixture") // OUTPOST_ADVERT_COST; fork defines follow test includes.
 	TEST_ASSERT_NULL(console_panel.advert_denial(owner), "Funding the treasury left stale broadcast rejection feedback")
 	TEST_ASSERT_EQUAL(console_panel.advert_denial(resident), "Not authorized", "Missing treasury authority gave no broadcast rejection reason")
 	act(console_panel, owner, "buy_advert", null)
diff --git a/voidcrew/modules/unit_tests/voidcrew_outpost_network.dm b/voidcrew/modules/unit_tests/voidcrew_outpost_network.dm
index 21c6c00756e..b08638f9b50 100644
--- a/voidcrew/modules/unit_tests/voidcrew_outpost_network.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_outpost_network.dm
@@ -294,6 +294,33 @@
 
 // ===== LIFECYCLE AND THE ZONE SEAM =====
 
+/// The placement walk follows railings without crossing their blocked edges.
+/datum/unit_test/voidcrew_outpost_network_pad_edges/Run()
+	var/obj/structure/overmap/trader_outpost/market = allocate(/obj/structure/overmap/trader_outpost/general)
+	var/turf/start = run_loc_floor_bottom_left
+	var/turf/destination = get_step(start, NORTH)
+	var/obj/structure/railing/unbreakable/railing = allocate(/obj/structure/railing/unbreakable, start)
+	railing.setDir(EAST)
+	TEST_ASSERT(!market.network_pad_step_blocked(start, destination), "A side railing blocked travel along the walkway")
+	railing.setDir(NORTH)
+	TEST_ASSERT(market.network_pad_step_blocked(start, destination), "The placement walk crossed a railing on its starting tile")
+	railing.setDir(NORTHEAST)
+	TEST_ASSERT(market.network_pad_step_blocked(start, destination), "The placement walk crossed a corner railing")
+	railing.forceMove(destination)
+	railing.setDir(SOUTH)
+	TEST_ASSERT(market.network_pad_step_blocked(start, destination), "The placement walk crossed a railing on its destination tile")
+	railing.setDir(EAST)
+	TEST_ASSERT(!market.network_pad_step_blocked(start, destination), "A destination's side railing blocked travel along the walkway")
+	var/obj/structure/table/obstruction = allocate(/obj/structure/table, destination)
+	TEST_ASSERT(market.network_pad_step_blocked(start, destination), "The placement walk passed through dense furniture")
+	qdel(obstruction)
+	// The pad stays in the checkpoint lobby: a checkpoint door is a wall to the placement search
+	var/obj/machinery/door/airlock/outpost/checkpoint/inner/checkpoint_door = allocate(/obj/machinery/door/airlock/outpost/checkpoint/inner, destination)
+	TEST_ASSERT(market.network_pad_step_blocked(start, destination), "A checkpoint door let the placement search through")
+	qdel(checkpoint_door)
+	allocate(/obj/structure/outpost_exit_gate, destination)
+	TEST_ASSERT(market.network_pad_step_blocked(start, destination), "An exit gate let the placement search through")
+
 /datum/unit_test/voidcrew_outpost_network_lifecycle
 	parent_type = /datum/unit_test/voidcrew_outpost_management
 
@@ -325,20 +352,26 @@
 	TEST_ASSERT_EQUAL(account.account_balance, 1000, "A trip to a deleted pad charged the traveller")
 	TEST_ASSERT_NULL(room_b.pad_ref?.resolve(), "The room kept a deleted pad")
 
-	// Trading outposts get a public pad at load, if the test world has any
+	// Exercise every checkpoint layout even when the test world has no loaded traders.
+	var/list/markets = GLOB.trader_outposts.Copy()
+	for(var/market_type in list(/obj/structure/overmap/trader_outpost/general, /obj/structure/overmap/trader_outpost/outfitter, /obj/structure/overmap/trader_outpost/black_market))
+		var/obj/structure/overmap/trader_outpost/market = allocate(market_type)
+		TEST_ASSERT(market.load_level(), "Could not load [market_type] for the network placement check")
+		markets += market
+	// Trading outposts get exactly one public pad in their connected concourse.
 	var/checked = 0
-	for(var/obj/structure/overmap/trader_outpost/market as anything in GLOB.trader_outposts)
+	for(var/obj/structure/overmap/trader_outpost/market as anything in markets)
 		if(!market.loaded)
 			continue
 		var/obj/machinery/outpost_network_pad/trader/public_pad = market.network_pad_ref?.resolve()
 		TEST_ASSERT(istype(public_pad), "[market.name] has no network pad")
+		TEST_ASSERT_EQUAL(market.spawn_network_pad(), public_pad, "[market.name] duplicated its network pad")
 		TEST_ASSERT(istype(get_area(public_pad), /area/voidcrew/trader_outpost), "[market.name]'s pad is outside its concourse")
 		TEST_ASSERT(!(get_turf(public_pad) in market.lobby_alcove_turfs), "[market.name]'s pad is in the elevator alcove")
 		TEST_ASSERT_NULL(public_pad.arrival_tile_denial(), "[market.name]'s arrival spot is blocked")
 		TEST_ASSERT_EQUAL(public_pad.arrival_denial(visitor, public_pad), "No route", "A trader pad routes to itself")
 		checked++
-	if(!checked)
-		log_test("No trading outpost is loaded in this test world; trader pads were not checked.")
+	TEST_ASSERT(checked >= 3, "The three trader checkpoint layouts were not checked")
 	network_test_cleanup(rig)
 
 // ===== ONE CHARGE PER PAD, BUSY RULES, CLUTTER (abuse review B-06, B-11, B-12, B-14) =====
diff --git a/voidcrew/modules/unit_tests/voidcrew_outpost_prison_bounty.dm b/voidcrew/modules/unit_tests/voidcrew_outpost_prison_bounty.dm
index 279aebcc16c..476543914c7 100644
--- a/voidcrew/modules/unit_tests/voidcrew_outpost_prison_bounty.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_outpost_prison_bounty.dm
@@ -798,7 +798,8 @@
 	allocated += crewman.mind
 	var/datum/team/voidcrew/team = allocate(/datum/team/voidcrew)
 	team.ship = ship
-	crewman.mind.ship_teams = list(team)
+	ship.ship_team = team
+	team.join_member(crewman.mind)
 	var/list/choice = prison.bounty_extra_speech(caught, 100)
 	TEST_ASSERT(islist(choice) && length(choice) == 3, "With the Meridian's crewman in sight, they said nothing about it ([json_encode(choice)])")
 	TEST_ASSERT_EQUAL(choice[1], "bounty_captor_seen", "The call-out's context is [choice[1]]")
diff --git a/voidcrew/modules/unit_tests/voidcrew_outpost_safe_hubs.dm b/voidcrew/modules/unit_tests/voidcrew_outpost_safe_hubs.dm
index 6c1d1cbd5ca..57877bccdc6 100644
--- a/voidcrew/modules/unit_tests/voidcrew_outpost_safe_hubs.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_outpost_safe_hubs.dm
@@ -45,3 +45,185 @@
 			if(findtext(text, banned))
 				TEST_FAIL("[map_path] ([template_path]) places [banned], which spawns hostiles inside a trader outpost")
 	TEST_ASSERT(checked, "No trader outpost map was checked")
+
+/**
+ * Loads all three trader outposts and checks their checkpoints (voidcrew/modules/trade/outpost_checkpoint.dm):
+ * every mapped scan chamber links up where the map put it with a scanner on its wall, the lift lands in the
+ * checkpoint lobby, the lobby and the exterior only reach the concourse through a checkpoint, and one real
+ * cycle refuses a gun and passes a clean visitor. The chamber's rules themselves are in
+ * voidcrew_trader_checkpoint.dm.
+ */
+/datum/unit_test/voidcrew_trader_checkpoint_maps/Run()
+	// checkpoint id -> list(outer x, outer y, inner x, inner y, chamber tiles, has a guard), map-local coordinates
+	var/list/expected = list(
+		/obj/structure/overmap/trader_outpost/general = list(
+			"halcyon_arrivals" = list(38, 35, 38, 38, 4, TRUE),
+		),
+		/obj/structure/overmap/trader_outpost/outfitter = list(
+			"quartermain_gate" = list(20, 9, 20, 12, 4, TRUE),
+			"quartermain_west_yard" = list(11, 30, 13, 30, 1, FALSE),
+			"quartermain_east_yard" = list(38, 8, 36, 8, 1, FALSE),
+		),
+		/obj/structure/overmap/trader_outpost/black_market = list(
+			"undertow_door" = list(30, 5, 29, 7, 2, TRUE),
+			"undertow_bar" = list(36, 18, 34, 18, 1, FALSE),
+		),
+	)
+	// The lift landing's bottom-left tile
+	var/list/landings = list(
+		/obj/structure/overmap/trader_outpost/general = list(37, 27),
+		/obj/structure/overmap/trader_outpost/outfitter = list(14, 7),
+		/obj/structure/overmap/trader_outpost/black_market = list(34, 2),
+	)
+	var/checked = 0
+	for(var/host_type in expected)
+		var/obj/structure/overmap/trader_outpost/market = allocate(host_type)
+		TEST_ASSERT(market.load_level(), "Could not load [host_type]")
+		var/turf/origin = market.template_bottom_left
+		var/list/entries = expected[host_type]
+		TEST_ASSERT_EQUAL(length(market.checkpoints), length(entries), "[host_type] has the wrong number of checkpoints")
+		for(var/checkpoint_id in entries)
+			var/list/entry = entries[checkpoint_id]
+			var/datum/outpost_checkpoint/checkpoint = market.checkpoints[checkpoint_id]
+			TEST_ASSERT_NOTNULL(checkpoint, "[host_type] is missing checkpoint [checkpoint_id]")
+			TEST_ASSERT_EQUAL(get_turf(checkpoint.outer_door), locate(origin.x + entry[1] - 1, origin.y + entry[2] - 1, origin.z), "[checkpoint_id]'s outer door moved")
+			TEST_ASSERT_EQUAL(get_turf(checkpoint.inner_door), locate(origin.x + entry[3] - 1, origin.y + entry[4] - 1, origin.z), "[checkpoint_id]'s inner door moved")
+			TEST_ASSERT_EQUAL(length(checkpoint.chamber_turfs), entry[5], "[checkpoint_id]'s chamber is the wrong size")
+			TEST_ASSERT_NOTNULL(checkpoint.sensor, "[checkpoint_id] has no wall scanner")
+			TEST_ASSERT(get_turf(checkpoint.sensor) in checkpoint.chamber_turfs, "[checkpoint_id]'s wall scanner is not in its chamber")
+			TEST_ASSERT(isclosedturf(get_step(checkpoint.sensor, checkpoint.sensor.dir)), "[checkpoint_id]'s wall scanner is not on a wall")
+			TEST_ASSERT_EQUAL(!isnull(checkpoint.guard), entry[6], "[checkpoint_id]'s guard is missing or unexpected")
+			TEST_ASSERT(market.is_secured_turf(checkpoint.secured_turf), "[checkpoint_id]'s inner door does not lead past the checkpoint")
+			TEST_ASSERT(!market.is_secured_turf(checkpoint.lobby_turf), "[checkpoint_id]'s outer door opens onto the concourse")
+			for(var/turf/tile as anything in checkpoint.chamber_turfs + list(get_turf(checkpoint.outer_door), get_turf(checkpoint.inner_door)))
+				TEST_ASSERT(!market.is_secured_turf(tile), "[checkpoint_id] has a chamber or door tile past the checkpoint")
+			TEST_ASSERT(HAS_TRAIT(checkpoint.inner_door, "outpost_property") && HAS_TRAIT(checkpoint.outer_door, "outpost_property"), "[checkpoint_id]'s doors are not outpost property")
+			if(checkpoint.guard)
+				TEST_ASSERT(locate(/datum/shop_sku/weapons_permit) in checkpoint.guard.shop?.skus, "[checkpoint_id]'s guard does not sell permits")
+		// The lift lands in the checkpoint lobby, in its old order, with its panel in reach
+		TEST_ASSERT_EQUAL(length(market.lobby_alcove_turfs), 9, "[host_type]'s lift lost a landing tile")
+		var/list/landing = landings[host_type]
+		var/index = 0
+		for(var/y_offset in 0 to 2)
+			for(var/x_offset in 0 to 2)
+				var/turf/tile = locate(origin.x + landing[1] + x_offset - 1, origin.y + landing[2] + y_offset - 1, origin.z)
+				TEST_ASSERT_EQUAL(market.lobby_alcove_turfs[++index], tile, "[host_type]'s landing order changed")
+				TEST_ASSERT(isopenturf(tile) && !market.is_secured_turf(tile), "[host_type]'s landing is walled or past the checkpoint")
+				for(var/atom/movable/blocker in tile)
+					TEST_ASSERT(!blocker.density, "[blocker] blocks [host_type]'s lift landing")
+		TEST_ASSERT_EQUAL(length(market.lobby_panels), 1, "[host_type]'s lift panel disappeared")
+		var/obj/machinery/outpost_elevator/panel = market.lobby_panels[1]
+		TEST_ASSERT(get_turf(panel) in market.lobby_alcove_turfs, "[host_type]'s lift panel is out of reach of its riders")
+		check_elevator_travel(market, panel)
+		// The public network pad arrives in the lobby
+		var/obj/machinery/outpost_network_pad/trader/pad = market.network_pad_ref?.resolve()
+		TEST_ASSERT(istype(pad), "[host_type] has no network pad")
+		TEST_ASSERT(!market.is_secured_turf(get_turf(pad)) && !market.is_secured_turf(pad.arrival_turf), "[host_type]'s network pad lands people past the checkpoint")
+		// Sealed: the lobby and the exterior reach the concourse only through a checkpoint
+		var/turf/leak = flood_to_concourse(market, market.lobby_alcove_turfs)
+		TEST_ASSERT_NULL(leak, "[host_type]'s lift reaches the concourse around the checkpoint")
+		var/list/exterior = list()
+		for(var/turf/tile as anything in block(origin, locate(origin.x + market.outpost_template.width - 1, origin.y + market.outpost_template.height - 1, origin.z)))
+			if(istype(tile.loc, /area/space) && isopenturf(tile))
+				exterior += tile
+		leak = flood_to_concourse(market, exterior)
+		TEST_ASSERT_NULL(leak, "[host_type]'s exterior reaches the concourse around the checkpoint")
+		// One real cycle at the main checkpoint
+		var/datum/outpost_checkpoint/main
+		for(var/checkpoint_id in market.checkpoints)
+			var/datum/outpost_checkpoint/candidate = market.checkpoints[checkpoint_id]
+			if(candidate.guard)
+				main = candidate
+		TEST_ASSERT_NOTNULL(main, "[host_type] has no guarded checkpoint")
+		var/mob/living/carbon/human/visitor = allocate(/mob/living/carbon/human/consistent, main.chamber_turfs[1])
+		var/obj/item/gun/weapon = allocate(/obj/item/gun/ballistic/automatic/pistol, visitor)
+		TEST_ASSERT(main.request_cycle(visitor), "[host_type]'s inner door did not take a scan request")
+		main.finish_scan()
+		TEST_ASSERT_EQUAL(main.state, "rejecting", "[host_type]'s checkpoint let a gun through") // CHECKPOINT_REJECTING
+		qdel(weapon)
+		main.set_state("idle") // CHECKPOINT_IDLE
+		sleep(2 SECONDS)
+		main.close_door(main.outer_door)
+		sleep(2 SECONDS)
+		TEST_ASSERT(main.outer_door.density, "[host_type]'s outer door did not close")
+		TEST_ASSERT_EQUAL(main.state, "scanning", "Closing the outer door on a visitor did not scan") // CHECKPOINT_SCANNING
+		main.finish_scan()
+		TEST_ASSERT_EQUAL(main.state, "passing", "[host_type]'s checkpoint refused a clean visitor") // CHECKPOINT_PASSING
+		sleep(2 SECONDS)
+		TEST_ASSERT(!main.inner_door.density, "[host_type]'s inner door did not open for a clean visitor")
+		checked++
+	TEST_ASSERT_EQUAL(checked, 3, "Did not check all three trader outposts")
+
+/**
+ * The first concourse tile past the checkpoint reached from `starts`, or null. Walls, full windows,
+ * shutters, checkpoint doors and exit gates stop the walk; furniture, railings and ordinary doors do
+ * not. False walls stop it too: the Undertow's hidden restroom doors to the hull are its smugglers' way.
+ */
+/datum/unit_test/voidcrew_trader_checkpoint_maps/proc/flood_to_concourse(obj/structure/overmap/trader_outpost/market, list/starts)
+	var/list/reached = list()
+	var/list/queue = list()
+	for(var/turf/start as anything in starts)
+		reached[start] = TRUE
+		queue += start
+	var/index = 1
+	while(index <= length(queue))
+		var/turf/current = queue[index++]
+		if(market.is_secured_turf(current))
+			return current
+		for(var/direction in GLOB.cardinals)
+			var/turf/next = get_step(current, direction)
+			if(!next || reached[next])
+				continue
+			reached[next] = TRUE
+			if(!seal_barrier(next))
+				queue += next
+	return null
+
+/datum/unit_test/voidcrew_trader_checkpoint_maps/proc/seal_barrier(turf/tile)
+	if(isclosedturf(tile))
+		return TRUE
+	for(var/obj/thing in tile)
+		if(istype(thing, /obj/machinery/door/airlock/outpost/checkpoint) || istype(thing, /obj/structure/outpost_exit_gate) || istype(thing, /obj/machinery/door/poddoor) || istype(thing, /obj/structure/falsewall))
+			return TRUE
+		if(istype(thing, /obj/structure/window))
+			var/obj/structure/window/pane = thing
+			if(pane.fulltile)
+				return TRUE
+	return FALSE
+
+/// Move nine passengers down and back through the real elevator proc, retaining their tile order.
+/datum/unit_test/voidcrew_trader_checkpoint_maps/proc/check_elevator_travel(obj/structure/overmap/trader_outpost/market, obj/machinery/outpost_elevator/lobby_panel)
+	var/datum/outpost_berth/berth = new(market, 1, null)
+	market.berths[1] = berth
+	berth.reservation = SSmapping.request_turf_block_reservation(3, 3, 1)
+	TEST_ASSERT_NOTNULL(berth.reservation, "Could not reserve an elevator destination")
+	for(var/turf/tile as anything in block(berth.reservation.bottom_left_turfs[1], berth.reservation.top_right_turfs[1]))
+		berth.alcove_turfs += tile.ChangeTurf(/turf/open/indestructible)
+	berth.panel = new /obj/machinery/outpost_elevator(berth.alcove_turfs[1])
+	berth.panel.outpost = market
+	berth.panel.berth = berth
+	var/list/obj/item/coin/passengers = list()
+	var/list/stationary_fixtures = list()
+	for(var/turf/landing as anything in market.lobby_alcove_turfs)
+		passengers += allocate(/obj/item/coin, landing)
+		for(var/obj/machinery/fixture in landing)
+			if(fixture.anchored)
+				stationary_fixtures[fixture] = landing
+	var/mob/living/carbon/human/rider = allocate(/mob/living/carbon/human, market.lobby_alcove_turfs[5])
+	TEST_ASSERT(get_dist(rider, lobby_panel) <= 1, "Elevator controls are out of reach of a standing rider")
+	lobby_panel.complete_ride(1, WEAKREF(rider))
+	for(var/obj/machinery/fixture as anything in stationary_fixtures)
+		TEST_ASSERT_EQUAL(get_turf(fixture), stationary_fixtures[fixture], "Elevator carried an anchored fixture downstairs")
+	for(var/i in 1 to 9)
+		TEST_ASSERT_EQUAL(get_turf(passengers[i]), berth.alcove_turfs[i], "Elevator changed the outgoing tile order")
+	TEST_ASSERT_EQUAL(get_turf(rider), berth.alcove_turfs[5], "Elevator did not carry the rider down")
+	berth.panel.complete_ride(0, WEAKREF(rider))
+	for(var/obj/machinery/fixture as anything in stationary_fixtures)
+		TEST_ASSERT_EQUAL(get_turf(fixture), stationary_fixtures[fixture], "Elevator moved an anchored fixture on return")
+	for(var/i in 1 to 9)
+		TEST_ASSERT_EQUAL(get_turf(passengers[i]), market.lobby_alcove_turfs[i], "Elevator changed the returning tile order")
+	TEST_ASSERT_EQUAL(get_turf(rider), market.lobby_alcove_turfs[5], "Elevator did not return the rider")
+	qdel(rider)
+	for(var/obj/item/coin/passenger as anything in passengers)
+		qdel(passenger)
+	qdel(berth)
diff --git a/voidcrew/modules/unit_tests/voidcrew_outpost_ship_bay.dm b/voidcrew/modules/unit_tests/voidcrew_outpost_ship_bay.dm
index e45e45978c5..62438310b96 100644
--- a/voidcrew/modules/unit_tests/voidcrew_outpost_ship_bay.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_outpost_ship_bay.dm
@@ -31,9 +31,9 @@
 	TEST_ASSERT_EQUAL(home.ship_bay_silo(), home_silo, "Selected storage was ignored")
 	qdel(second_silo)
 	TEST_ASSERT_NOTNULL(home.install_ship_bay(owner), "Unfunded installation succeeded")
-	home.treasury.adjust_money(10000, "Ship bay test") // Fork defines follow the test includes.
+	home.treasury.adjust_money(6000, "Ship bay test") // Fork defines follow the test includes.
 	TEST_ASSERT_NOTNULL(home.install_ship_bay(owner), "Installation without materials succeeded")
-	TEST_ASSERT_EQUAL(home.treasury.account_balance, 10000, "Missing materials still charged the treasury")
+	TEST_ASSERT_EQUAL(home.treasury.account_balance, 6000, "Missing materials still charged the treasury")
 	var/list/cost = home.ship_bay_material_cost()
 	for(var/material in cost)
 		home_silo.materials.insert_amount_mat(cost[material], material)
diff --git a/voidcrew/modules/unit_tests/voidcrew_planet_anomalies.dm b/voidcrew/modules/unit_tests/voidcrew_planet_anomalies.dm
new file mode 100644
index 00000000000..11c647045fa
--- /dev/null
+++ b/voidcrew/modules/unit_tests/voidcrew_planet_anomalies.dm
@@ -0,0 +1,195 @@
+/// A deterministic miss on every random sample, followed by the real exhaustive pass.
+/datum/map_generator/planet_generator/anomaly_test
+	var/turf/forced_sample
+	var/sample_calls = 0
+
+/datum/map_generator/planet_generator/anomaly_test/pick_anomaly_turf(list/turfs)
+	// Deliberately replace random sampling; placement and all safety checks remain real.
+	sample_calls++
+	return forced_sample
+
+/// Small, reversible ground fixtures on the unit-test level, with harmless anomaly types.
+/datum/unit_test/voidcrew_planet_anomalies
+	abstract_type = /datum/unit_test/voidcrew_planet_anomalies
+	var/datum/biome/ground_biome
+	var/list/original_turfs = list()
+	var/list/remembered_turfs = list()
+	var/list/original_anomalies
+	var/list/obj/structure/overmap/planet/planets = list()
+
+/datum/unit_test/voidcrew_planet_anomalies/New()
+	. = ..()
+	ground_biome = allocate(/datum/biome)
+	ground_biome.open_turf_types = list(/turf/open/floor/plating = 1)
+	ground_biome.flora_spawn_chance = 0
+	ground_biome.feature_spawn_chance = 0
+	ground_biome.mob_spawn_chance = 0
+	original_anomalies = GLOB.voidcrew_planet_anomalies
+	GLOB.voidcrew_planet_anomalies = list(/obj/effect/anomaly/grav/planetary = 1)
+
+/datum/unit_test/voidcrew_planet_anomalies/Destroy()
+	GLOB.voidcrew_planet_anomalies = original_anomalies
+	original_anomalies = null
+	for(var/obj/structure/overmap/planet/planet as anything in planets)
+		// These fixtures borrow the test level, never its teardown authority.
+		planet.footprint = null
+		planet.mapzone = null
+	planets.Cut()
+	QDEL_LIST(allocated)
+	for(var/list/snapshot as anything in original_turfs)
+		var/turf/target = locate(snapshot[1], snapshot[2], snapshot[3])
+		for(var/obj/effect/anomaly/anomaly in target)
+			qdel(anomaly)
+		if(target.type != snapshot[4])
+			target = target.ChangeTurf(snapshot[4])
+		target.change_area(get_area(target), snapshot[8])
+		target.turf_flags = snapshot[5]
+		target.generating_biome = snapshot[6]
+		target.planet_river = snapshot[7]
+		target.density = snapshot[9]
+	original_turfs.Cut()
+	remembered_turfs.Cut()
+	ground_biome = null
+	return ..()
+
+/datum/unit_test/voidcrew_planet_anomalies/proc/remember_turf(turf/target)
+	var/key = "[target.x],[target.y],[target.z]"
+	if(remembered_turfs[key])
+		return
+	remembered_turfs[key] = TRUE
+	original_turfs += list(list(target.x, target.y, target.z, target.type, target.turf_flags, target.generating_biome, target.planet_river, get_area(target), target.density))
+
+/datum/unit_test/voidcrew_planet_anomalies/proc/ground(x, y)
+	var/turf/target = locate(x, y, run_loc_floor_bottom_left.z)
+	remember_turf(target)
+	target = target.ChangeTurf(/turf/open/floor/plating)
+	target.change_area(get_area(target), get_area(run_loc_floor_bottom_left))
+	target.generating_biome = ground_biome
+	target.turf_flags &= ~NO_RUINS
+	target.planet_river = FALSE
+	return target
+
+/datum/unit_test/voidcrew_planet_anomalies/proc/anomalies_on(list/turfs)
+	var/list/found = list()
+	for(var/turf/target as anything in turfs)
+		for(var/obj/effect/anomaly/anomaly in target)
+			found += anomaly
+	return found
+
+/// Drive populate_terrain itself, so a correct define behind a leftover chance roll fails.
+/datum/unit_test/voidcrew_planet_anomalies/counts/Run()
+	var/list/turfs = list(ground(40, 40), ground(60, 40), ground(80, 40))
+	var/datum/map_generator/planet_generator/generator = allocate(/datum/map_generator/planet_generator)
+	generator.throttled = FALSE
+	// Literals 1/2/3 are ZONE_GREEN/YELLOW/RED; fork defines are included after tests.
+	for(var/band in 1 to 3)
+		generator.populate_terrain(turfs, get_area(turfs[1]), band)
+		var/list/spawned = anomalies_on(turfs)
+		TEST_ASSERT_EQUAL(length(spawned), band, "Band [band] did not seed its natural anomaly count")
+		QDEL_LIST(spawned)
+
+/// Exhaustive placement recovers all missed sites, while keeping every rejection intact.
+/datum/unit_test/voidcrew_planet_anomalies/sampling_misses/Run()
+	var/turf/river = ground(40, 40)
+	river.planet_river = TRUE
+	var/turf/dense = ground(41, 40)
+	dense.density = TRUE
+	var/turf/no_biome = ground(42, 40)
+	no_biome.generating_biome = null
+	var/turf/wrong_ground = ground(43, 40)
+	var/datum/biome/other_biome = allocate(/datum/biome)
+	other_biome.open_turf_types = list(/turf/open/space = 1)
+	wrong_ground.generating_biome = other_biome
+	var/turf/structure = ground(44, 40)
+	allocate(/obj/structure, structure)
+	var/turf/occupied = ground(45, 40)
+	allocate(/mob/living/basic, occupied)
+	var/list/rejected = list(river, dense, no_biome, wrong_ground, structure, occupied)
+	var/list/legal = list(ground(40, 60), ground(60, 60), ground(80, 60))
+	var/datum/map_generator/planet_generator/anomaly_test/generator = allocate(/datum/map_generator/planet_generator/anomaly_test)
+	generator.throttled = FALSE
+	generator.forced_sample = river
+	TEST_ASSERT_EQUAL(generator.place_budgeted_anomalies(rejected + legal, 3), 3, "Sampling misses lost a safely placeable anomaly")
+	TEST_ASSERT_EQUAL(generator.sample_calls, 400, "The fixture did not exhaust PLANET_ANOMALY_PLACEMENT_ATTEMPTS")
+	TEST_ASSERT_EQUAL(length(anomalies_on(legal)), 3, "The fallback did not fill all legal sites")
+	TEST_ASSERT_EQUAL(length(anomalies_on(rejected)), 0, "The fallback put an anomaly on unsafe ground")
+	dense.density = FALSE
+
+/// Geometry may leave a shortfall; 19 tiles is too close, exactly 20 is legal.
+/datum/unit_test/voidcrew_planet_anomalies/shortfall/Run()
+	var/turf/first = ground(40, 40)
+	var/turf/too_close = ground(59, 40)
+	var/turf/boundary = ground(60, 40)
+	var/datum/map_generator/planet_generator/anomaly_test/generator = allocate(/datum/map_generator/planet_generator/anomaly_test)
+	generator.throttled = FALSE
+	generator.forced_sample = first
+	TEST_ASSERT_EQUAL(generator.place_budgeted_anomalies(list(first, too_close, boundary), 3), 2, "A shortfall forced an anomaly inside the separation limit")
+	TEST_ASSERT_NULL(locate(/obj/effect/anomaly) in too_close, "An anomaly was placed within 20 tiles")
+	TEST_ASSERT_NOTNULL(locate(/obj/effect/anomaly) in boundary, "An anomaly exactly 20 tiles away was refused")
+	TEST_ASSERT_EQUAL(generator.place_budgeted_anomalies(list(), 1), 0, "Empty ground filled an anomaly budget")
+	TEST_ASSERT_EQUAL(generator.place_budgeted_anomalies(list(first), 0), 0, "A zero budget placed an anomaly")
+
+/// Real landing-strip flags and leashes stay local to two neighbouring footprints.
+/datum/unit_test/voidcrew_planet_anomalies/landing_neighbours/Run()
+	var/datum/space_level/level = SSmapping.z_list[run_loc_floor_bottom_left.z]
+	var/list/sites = list()
+	var/list/strips = list()
+	for(var/index in 1 to 2)
+		var/obj/structure/overmap/planet/planet = allocate(/obj/structure/overmap/planet)
+		planets += planet
+		var/datum/map_footprint/footprint = allocate(/datum/map_footprint, null, "planet", index, planet)
+		footprint.attach_level(level)
+		footprint.set_rect(40 + (index - 1) * 10, 40, 5, 60)
+		planet.footprint = footprint
+		var/strip_top = planet.get_dock_strip_top_y(level)
+		strips += ground(footprint.low_x, strip_top)
+		sites += ground(footprint.low_x, strip_top + 1)
+		for(var/turf/target as anything in footprint.get_block())
+			remember_turf(target)
+
+	var/datum/map_generator/planet_generator/anomaly_test/generator = allocate(/datum/map_generator/planet_generator/anomaly_test)
+	generator.throttled = FALSE
+	for(var/index in 1 to 2)
+		var/obj/structure/overmap/planet/planet = planets[index]
+		planet.reserve_dock_strip(level)
+		var/turf/strip = strips[index]
+		TEST_ASSERT(strip.turf_flags & NO_RUINS, "The landing-clearance boundary was not reserved")
+		if(index == 1)
+			var/turf/neighbour_strip = strips[2]
+			TEST_ASSERT(!(neighbour_strip.turf_flags & NO_RUINS), "Reserving one strip changed its neighbour")
+		generator.forced_sample = strip
+		TEST_ASSERT_EQUAL(generator.place_budgeted_anomalies(list(strip, sites[index]), 1), 1, "The strip consumed a planet's anomaly budget")
+		TEST_ASSERT_NULL(locate(/obj/effect/anomaly) in strip, "An anomaly formed in the landing clearance")
+
+	TEST_ASSERT(get_dist(sites[1], sites[2]) < 20, "The fixture must put the two sites within natural separation distance")
+	for(var/index in 1 to 2)
+		var/obj/effect/anomaly/anomaly = locate(/obj/effect/anomaly) in sites[index]
+		TEST_ASSERT_NOTNULL(anomaly, "A neighbour's anomaly consumed this planet's allowance")
+		var/datum/component/anomaly_site_leash/leash = anomaly.GetComponent(/datum/component/anomaly_site_leash)
+		TEST_ASSERT_NOTNULL(leash, "The natural anomaly has no site leash")
+		TEST_ASSERT(leash.allows(sites[index]), "The anomaly cannot stand on its own site")
+		TEST_ASSERT(!leash.allows(strips[index]), "The anomaly can enter its landing strip")
+		TEST_ASSERT(!leash.allows(sites[3 - index]), "The anomaly can enter the neighbouring footprint")
+
+/// A purchased arrival adds one anomaly alongside the already-filled natural allowance.
+/datum/unit_test/voidcrew_planet_anomalies/chart_budget/Run()
+	var/list/natural_sites = list(ground(40, 40), ground(60, 40), ground(80, 40))
+	var/turf/chart_site = ground(100, 40)
+	var/datum/map_generator/planet_generator/generator = allocate(/datum/map_generator/planet_generator)
+	generator.throttled = FALSE
+	generator.populate_terrain(natural_sites, get_area(natural_sites[1]), 3) // ZONE_RED
+	TEST_ASSERT_EQUAL(length(anomalies_on(natural_sites)), 3, "The natural budget was not filled before arrival")
+	var/obj/structure/overmap/ship/buyer = allocate(/obj/structure/overmap/ship)
+	var/obj/structure/overmap/space_ruin/site = allocate(/obj/structure/overmap/space_ruin)
+	var/datum/rumor_chart/anomaly/unit_test/chart = new
+	chart.anomaly_type = /obj/effect/anomaly/grav/planetary
+	chart.test_site = site
+	chart.test_turf = chart_site
+	buyer.add_pending_rumor(chart)
+	TEST_ASSERT_EQUAL(buyer.reveal_pending_rumor(chart), site, "The purchased chart did not reveal")
+	buyer.docked = site
+	SEND_SIGNAL(buyer, "voidcrew_ship_docked")
+	TEST_ASSERT_EQUAL(length(anomalies_on(natural_sites + list(chart_site))), 4, "The chart shared the natural budget")
+	SEND_SIGNAL(buyer, "voidcrew_ship_docked")
+	TEST_ASSERT_EQUAL(length(anomalies_on(natural_sites + list(chart_site))), 4, "A spent chart surfaced twice")
+	buyer.docked = null
diff --git a/voidcrew/modules/unit_tests/voidcrew_planetary_factions.dm b/voidcrew/modules/unit_tests/voidcrew_planetary_factions.dm
index 5f657798308..434cfceb69f 100644
--- a/voidcrew/modules/unit_tests/voidcrew_planetary_factions.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_planetary_factions.dm
@@ -8,6 +8,268 @@
  */
 /datum/unit_test/voidcrew_planetary_factions
 
+/// Check real death drops, including corpse equipment, rather than visual weapons.
+/datum/unit_test/voidcrew_melee_death_drops/Run()
+	var/list/mob_loot = list(
+		/mob/living/basic/trooper/pirate/faction/silverscale/captain = list(/obj/item/claymore/shortsword),
+		/mob/living/basic/trooper/pirate/faction/lustrous/captain = list(/obj/item/claymore/shortsword),
+		/mob/living/basic/trooper/pirate/faction/interdyne/captain = list(/obj/item/claymore/shortsword),
+		/mob/living/basic/trooper/pirate/faction/boss/silverscale = list(
+			/obj/item/clothing/suit/hooded/cloak/drake,
+			/obj/item/clothing/head/hooded/cloakhood/drake,
+		),
+		/mob/living/basic/trooper/pirate/faction/boss/skeleton = list(/obj/item/gun/ballistic/shotgun/hook),
+		/mob/living/basic/skeleton/templar = list(
+			/obj/effect/decal/remains/human,
+			/obj/item/clothing/suit/chaplainsuit/armor/templar,
+			/obj/item/clothing/head/helmet/chaplain,
+			/obj/item/hatchet,
+		),
+	)
+	var/turf/death_turf = run_loc_floor_bottom_left
+	for(var/mob_type in mob_loot)
+		var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, src, 2)
+		var/mob/living/basic/victim = spawn_npc_in_zone(mob_type, death_turf, context)
+		// Keep the original body to exercise the repeated-death guard safely.
+		victim.basic_mob_flags &= ~DEL_ON_DEATH
+		var/list/before_death = death_turf.get_all_contents()
+		var/list/expected_loot = mob_loot[mob_type].Copy()
+		if(istype(victim, /mob/living/basic/trooper/pirate/faction))
+			expected_loot += list(/mob/living/carbon/human, /obj/item/holochip)
+		victim.death()
+		TEST_ASSERT_EQUAL(victim.stat, DEAD, "[mob_type] must actually die")
+		var/list/drops = death_turf.contents - before_death
+		for(var/drop_type in expected_loot)
+			var/count = 0
+			for(var/atom/movable/drop in drops)
+				if(istype(drop, drop_type))
+					count++
+			TEST_ASSERT_EQUAL(count, 1, "[mob_type] must drop [drop_type] exactly once")
+
+		var/expected_count = length(expected_loot)
+		if(istype(victim, /mob/living/basic/trooper/pirate/faction))
+			var/mob/living/basic/trooper/pirate/faction/pirate = victim
+			var/is_boss = istype(pirate, /mob/living/basic/trooper/pirate/faction/boss)
+			var/obj/item/holochip/payment = locate() in drops
+			TEST_ASSERT_NOTNULL(payment, "[mob_type] must retain its credit drop")
+			TEST_ASSERT_EQUAL(payment.credits, is_boss ? 3000 : 1000, "[mob_type] must retain its payout")
+			if(!is_boss)
+				var/auxiliary_count = 0
+				for(var/obj/item/drop in drops)
+					if(drop.type in pirate.random_loot_2)
+						auxiliary_count++
+				TEST_ASSERT_EQUAL(auxiliary_count, 1, "[mob_type] must retain one auxiliary drop")
+				expected_count++
+		TEST_ASSERT_EQUAL(length(drops), expected_count, "[mob_type] emitted extra or missing death drops")
+		var/list/all_drops = death_turf.get_all_contents() - before_death
+		for(var/obj/item/drop in all_drops)
+			TEST_ASSERT(!istype(drop, /obj/item/claymore/cutlass), "[mob_type] still drops a cutlass")
+			TEST_ASSERT(!istype(drop, /obj/item/claymore/weak), "[mob_type] still drops a holy sword")
+
+		var/list/after_death = death_turf.get_all_contents()
+		victim.death()
+		TEST_ASSERT_EQUAL(length(death_turf.get_all_contents() - after_death), 0, "A repeated death call duplicated [mob_type]'s loot")
+		victim.revive(ADMIN_HEAL_ALL)
+		victim.death()
+		TEST_ASSERT_EQUAL(length(death_turf.get_all_contents() - after_death), 0, "Reviving [mob_type] refilled its corpse or weapons")
+		for(var/atom/movable/drop in drops)
+			qdel(drop)
+		qdel(victim)
+
+/// Every ordinary faction/style uses one pinned weapon draw and one corpse.
+/datum/unit_test/voidcrew_pirate_ladder_drops/Run()
+	var/list/green = list(/obj/item/knife/combat/survival, /obj/item/spear, /obj/item/melee/baseball_bat)
+	var/list/yellow = npc_ladder_yellow_melee()
+	for(var/family in list("grey", "skeleton", "silverscale", "lustrous", "interdyne", "irs", "medieval"))
+		for(var/style in list("melee", "ranged"))
+			var/mob_type = text2path("/mob/living/basic/trooper/pirate/faction/[family]/[style]")
+			TEST_ASSERT_NOTNULL(mob_type, "Missing faction/style [family]/[style]")
+			for(var/zone in 1 to 3)
+				var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, src, zone)
+				var/mob/living/basic/trooper/pirate/faction/pirate = spawn_npc_in_zone(mob_type, run_loc_floor_top_right, context)
+				TEST_ASSERT(pirate.basic_mob_flags & DEL_ON_DEATH, "[mob_type] lost deletion on death")
+				pirate.basic_mob_flags &= ~DEL_ON_DEATH
+				pirate.forceMove(run_loc_floor_bottom_left)
+				var/list/before = run_loc_floor_bottom_left.get_all_contents()
+				pirate.death()
+				var/list/drops = run_loc_floor_bottom_left.get_all_contents() - before
+				var/weapons = 0
+				var/corpses = 0
+				for(var/atom/drop in drops)
+					if(ishuman(drop))
+						corpses++
+					if(!isitem(drop))
+						continue
+					if(drop.type in (zone == 1 ? green : yellow))
+						weapons++
+					else if(istype(drop, /obj/item/gun))
+						weapons++
+						var/expected_gun = zone == 2 ? /obj/item/gun/energy/laser : /obj/item/gun/ballistic/automatic/c20r/unrestricted
+						TEST_ASSERT(zone != 1 && drop.type == expected_gun, "[mob_type]/[zone] emitted a gun outside its spawn-zone pool")
+					TEST_ASSERT(!istype(drop, /obj/item/claymore/cutlass) && !istype(drop, /obj/item/melee/energy/sword) && !istype(drop, /obj/item/switchblade) && !istype(drop, /obj/item/pen/edagger), "[mob_type] emitted a former weapon or corpse duplicate")
+				TEST_ASSERT_EQUAL(weapons, 1, "[mob_type]/[zone] must pay exactly one weapon including corpse equipment")
+				TEST_ASSERT_EQUAL(corpses, 1, "[mob_type] must leave exactly one corpse")
+				var/list/after = run_loc_floor_bottom_left.get_all_contents()
+				pirate.revive(ADMIN_HEAL_ALL)
+				pirate.death(TRUE)
+				TEST_ASSERT_EQUAL(length(run_loc_floor_bottom_left.get_all_contents() - after), 0, "Revival/gibbing duplicated [mob_type]'s payout")
+				for(var/atom/movable/drop in run_loc_floor_bottom_left.contents - before)
+					qdel(drop)
+				qdel(pirate)
+
+/// Enumerate the Bernoulli inputs, avoiding statistical rate assertions.
+/datum/unit_test/voidcrew_pirate_ladder_odds/Run()
+	var/mob/living/basic/trooper/pirate/faction/pirate = allocate(/mob/living/basic/trooper/pirate/faction)
+	var/list/green_counts = list()
+	var/yellow_guns = 0
+	var/red_guns = 0
+	var/red_prizes = 0
+	for(var/roll in 1 to 100)
+		var/green_type = pirate.roll_ladder_weapon(1, roll)
+		green_counts[green_type]++
+		var/yellow_type = pirate.roll_ladder_weapon(2, roll)
+		var/red_type = pirate.roll_ladder_weapon(3, roll)
+		if(ispath(yellow_type, /obj/item/gun))
+			yellow_guns++
+			TEST_ASSERT_EQUAL(yellow_type, /obj/item/gun/energy/laser, "Yellow pirates must roll a laser")
+		else
+			TEST_ASSERT(yellow_type in npc_ladder_yellow_melee(), "Yellow pirate drew non-ladder melee")
+		if(ispath(red_type, /obj/item/gun))
+			red_guns++
+			TEST_ASSERT_EQUAL(red_type, /obj/item/gun/ballistic/automatic/c20r/unrestricted, "Red pirates must roll an unrestricted C20r")
+		else
+			TEST_ASSERT(red_type in npc_ladder_yellow_melee(), "Red pirate drew non-ladder melee")
+		red_prizes += npc_ladder_red_drop(roll)
+	TEST_ASSERT_EQUAL(green_counts[/obj/item/knife/combat/survival], 50, "Green survival knife chance changed")
+	TEST_ASSERT_EQUAL(green_counts[/obj/item/spear], 25, "Green spear chance changed")
+	TEST_ASSERT_EQUAL(green_counts[/obj/item/melee/baseball_bat], 25, "Green bat chance changed")
+	TEST_ASSERT_EQUAL(yellow_guns, 5, "Yellow pirate gun chance changed")
+	TEST_ASSERT_EQUAL(red_guns, 10, "Red pirate gun chance changed")
+	TEST_ASSERT_EQUAL(red_prizes, 25, "Physical red boss weapons must roll at 25 percent")
+
+/// Fixed captain and boss prizes cannot also hide weapons in corpse slots.
+/datum/unit_test/voidcrew_pirate_fixed_ladder/Run()
+	var/list/prizes = list(
+		/mob/living/basic/trooper/pirate/faction/skeleton/captain = /obj/item/gun/energy/laser,
+		/mob/living/basic/trooper/pirate/faction/irs/captain = /obj/item/gun/energy/laser,
+		/mob/living/basic/trooper/pirate/faction/medieval/captain = /obj/item/fireaxe,
+		/mob/living/basic/trooper/pirate/faction/boss/irs = /obj/item/gun/energy/laser,
+		/mob/living/basic/trooper/pirate/faction/boss/medieval = /obj/item/claymore/shortsword,
+		/mob/living/basic/trooper/pirate/faction/boss/interdyne = /obj/item/gun/syringe/syndicate,
+		/mob/living/basic/trooper/pirate/faction/boss/grey = /obj/item/storage/toolbox/mechanical/old/clean,
+		/mob/living/basic/trooper/pirate/faction/boss/lustrous = /obj/item/cain_and_abel,
+	)
+	var/turf/floor = run_loc_floor_bottom_left
+	for(var/mob_type in prizes)
+		var/datum/npc_spawn_context/context = allocate(/datum/npc_spawn_context, src, 3)
+		var/mob/living/basic/trooper/pirate/faction/pirate = spawn_npc_in_zone(mob_type, floor, context)
+		var/expected = length(pirate.rare_loot_pool) ? (prizes[mob_type] in pirate.rolled_rare_loot) : 1
+		var/list/before = floor.get_all_contents()
+		pirate.death(TRUE)
+		var/count = 0
+		for(var/obj/item/drop in floor.get_all_contents() - before)
+			if(drop.type == prizes[mob_type])
+				count++
+			TEST_ASSERT(!istype(drop, /obj/item/fireaxe/boardingaxe) && !istype(drop, /obj/item/gun/magic/midas_hand) && !istype(drop, /obj/item/gun/energy/e_gun/nuclear), "[mob_type] retained an obsolete corpse/boss weapon")
+		TEST_ASSERT_EQUAL(count, expected, "[mob_type] emitted the wrong number of its fixed/rolled prize")
+		for(var/atom/movable/drop in floor.contents - before)
+			qdel(drop)
+
+/// Crusher and ordinary lists share the original rare roll and keep utility loot.
+/datum/unit_test/voidcrew_megafauna_ladder/Run()
+	var/list/weapons = list(
+		/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner = /obj/item/melee/cleaving_saw,
+		/mob/living/simple_animal/hostile/megafauna/hierophant = /obj/item/hierophant_club,
+	)
+	for(var/mob_type in weapons)
+		var/mob/living/simple_animal/hostile/megafauna/boss = allocate(mob_type)
+		var/weapon_type = weapons[mob_type]
+		TEST_ASSERT_EQUAL((weapon_type in boss.loot), boss.npc_red_weapon_drop, "Ordinary list ignored the original boss roll")
+		TEST_ASSERT_EQUAL((weapon_type in boss.crusher_loot), boss.npc_red_weapon_drop, "Crusher list rerolled the boss weapon")
+		if(istype(boss, /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner))
+			TEST_ASSERT(/obj/item/gun/energy/recharge/kinetic_accelerator in boss.loot, "Miner lost its guaranteed work tool")
+			TEST_ASSERT(/obj/item/crusher_trophy/miner_eye in boss.crusher_loot, "Miner lost its crusher trophy")
+		else
+			TEST_ASSERT(/obj/item/crusher_trophy/vortex_talisman in boss.crusher_loot, "Hierophant lost its crusher trophy")
+		qdel(boss)
+	for(var/weapon_drop in list(FALSE, TRUE))
+		for(var/crusher in list(FALSE, TRUE))
+			var/turf/floor = run_loc_floor_bottom_left
+			var/mob/living/simple_animal/hostile/megafauna/colossus/boss = allocate(/mob/living/simple_animal/hostile/megafauna/colossus, floor)
+			boss.npc_red_weapon_drop = weapon_drop
+			boss.true_spawn = FALSE
+			boss.del_on_death = FALSE
+			if(crusher)
+				boss.spawn_crusher_loot()
+			var/list/before = floor.get_all_contents()
+			boss.health = 0
+			boss.death()
+			var/obj/structure/closet/crate/necropolis/colossus/chest = locate() in floor
+			TEST_ASSERT_NOTNULL(chest, "Colossus death did not create a chest")
+			TEST_ASSERT_EQUAL(chest.ladder_weapon_drop, weapon_drop, "Chest lost its original boss's roll")
+			chest.open(null, TRUE, FALSE)
+			TEST_ASSERT_EQUAL(length(floor.get_all_contents_type(/obj/item/cain_and_abel)), weapon_drop, "Colossus chest ignored its pinned weapon roll")
+			TEST_ASSERT_EQUAL(length(floor.get_all_contents_type(/obj/item/crusher_trophy/blaster_tubes)), crusher, "Colossus chest lost or added a crusher trophy")
+			var/list/after = floor.get_all_contents()
+			boss.revive(ADMIN_HEAL_ALL)
+			boss.health = 0
+			boss.death()
+			TEST_ASSERT_EQUAL(length(floor.get_all_contents() - after), 0, "Revived Colossus printed another chest")
+			for(var/atom/movable/drop in floor.contents - before)
+				qdel(drop)
+			qdel(boss)
+
+/// The hoard keeps its nonweapon payout and consumes its original staff roll once.
+/datum/unit_test/voidcrew_lich_ladder_hoard
+	var/saved_hoard_spent
+	var/obj/structure/overmap/space_ruin/lich_lair/saved_site
+	var/state_saved = FALSE
+
+/datum/unit_test/voidcrew_lich_ladder_hoard/Destroy()
+	if(state_saved)
+		GLOB.lich_hoard_dropped = saved_hoard_spent
+		GLOB.lich_lair = saved_site
+	saved_site = null
+	return ..()
+
+/datum/unit_test/voidcrew_lich_ladder_hoard/Run()
+	saved_hoard_spent = GLOB.lich_hoard_dropped
+	saved_site = GLOB.lich_lair
+	state_saved = TRUE
+	GLOB.lich_lair = null
+	var/turf/floor = run_loc_floor_bottom_left
+	var/mob/living/basic/lich/lich = allocate(/mob/living/basic/lich, floor)
+	for(var/weapon_drop in list(FALSE, TRUE))
+		GLOB.lich_hoard_dropped = FALSE
+		lich.npc_red_weapon_drop = weapon_drop
+		var/list/before = list()
+		for(var/turf/tile in range(1, floor))
+			before |= tile.get_all_contents()
+		TEST_ASSERT_NOTNULL(drop_lich_hoard(lich), "Lich did not pay its hoard")
+		var/list/after = list()
+		for(var/turf/tile in range(1, floor))
+			after |= tile.get_all_contents()
+		var/staves = 0
+		var/items = 0
+		for(var/obj/item/drop in after - before)
+			items++
+			if(istype(drop, /obj/item/melee/verdigris_staff))
+				staves++
+		TEST_ASSERT_EQUAL(staves, weapon_drop, "Lich hoard ignored its original staff roll")
+		TEST_ASSERT_EQUAL(items, length(GLOB.lich_hoard_contents) - 1 + weapon_drop, "Lich lost a nonweapon hoard item")
+		TEST_ASSERT_NULL(drop_lich_hoard(lich), "A repeated lich payout rerolled its staff or hoard")
+		for(var/atom/movable/drop in after - before)
+			qdel(drop)
+
+/// Unguarded cave weapons keep exactly their old combined weights.
+/datum/unit_test/voidcrew_cave_ladder_pools/Run()
+	for(var/cave_type in list(/obj/structure/spawner/cave, /obj/structure/spawner/cave/beach))
+		var/obj/structure/spawner/cave/cave = allocate(cave_type)
+		TEST_ASSERT_EQUAL(cave.caveloot["green_melee"], istype(cave, /obj/structure/spawner/cave/beach) ? 35 : 38, "Cave weapon substitution changed its combined weight")
+		for(var/entry in cave.caveloot)
+			if(ispath(entry))
+				TEST_ASSERT(!ispath(entry, /obj/item/gun) && !ispath(entry, /obj/item/kinetic_crusher) && !ispath(entry, /obj/item/spear/explosive) && !ispath(entry, /obj/item/melee/greykingsword) && !ispath(entry, /obj/item/melee/energy/sword), "Cave retained a former weapon payout")
+
 /datum/unit_test/voidcrew_planetary_factions/Run()
 	var/datum/space_level/test_level = SSmapping.z_list[run_loc_floor_bottom_left.z]
 	if(!test_level)
diff --git a/voidcrew/modules/unit_tests/voidcrew_resale.dm b/voidcrew/modules/unit_tests/voidcrew_resale.dm
new file mode 100644
index 00000000000..d6be684611a
--- /dev/null
+++ b/voidcrew/modules/unit_tests/voidcrew_resale.dm
@@ -0,0 +1,220 @@
+// Fork defines compile after tests; trait names and expected prices are literals here.
+/datum/unit_test/voidcrew_resale
+	parent_type = /datum/unit_test/voidcrew_launch_cargo_fixture
+	abstract_type = /datum/unit_test/voidcrew_resale
+
+/datum/unit_test/voidcrew_resale/proc/seller()
+	var/mob/living/carbon/human/user = allocate(/mob/living/carbon/human/consistent, run_loc_floor_bottom_left)
+	var/obj/item/card/id/id = allocate(/obj/item/card/id)
+	id.registered_account = allocate(/datum/bank_account, "Resale test", null, 1, FALSE)
+	user.put_in_active_hand(id)
+	return user
+
+/datum/unit_test/voidcrew_resale/soap/Run()
+	save_economy()
+	var/mob/living/carbon/human/user = seller()
+	var/datum/shop_sku/general/soap/sku = allocate(/datum/shop_sku/general/soap)
+	var/obj/item/soap/bought = sku.dispense(user, null)
+	TEST_ASSERT(is_trader_good(bought), "Shop soap was not stamped")
+	var/datum/export_report/report = export_item_and_contents(bought, apply_elastic = FALSE, dry_run = TRUE)
+	TEST_ASSERT_EQUAL(counterlist_sum(report.total_value), 0, "Bought soap paid cargo")
+	var/datum/shop_buyback/ledger = allocate(/datum/shop_buyback)
+	ledger.item_path = /obj/item/soap
+	ledger.pay_credits = 10
+	ledger.demand = 2
+	TEST_ASSERT(!ledger.matches(bought), "A buyback accepted bought soap")
+	TEST_ASSERT(!ledger.try_sell(user, null), "The sale path consumed bought soap")
+	TEST_ASSERT(!QDELETED(bought), "Refused goods were consumed")
+	TEST_ASSERT_EQUAL(ledger.get_denial_reason(user), "I don't buy back shop stock.", "Bought goods lack their refusal")
+	var/obj/item/soap/salvaged = allocate(/obj/item/soap, user)
+	report = export_item_and_contents(salvaged, apply_elastic = FALSE, dry_run = TRUE)
+	TEST_ASSERT(counterlist_sum(report.total_value) > 0, "An unbought copy no longer exports")
+	var/datum/bank_account/account = get_shop_buyback_account(user)
+	var/balance = account.account_balance
+	TEST_ASSERT(ledger.try_sell(user, null), "An unbought copy no longer sells at a buyback")
+	TEST_ASSERT_EQUAL(account.account_balance, balance + 10, "Buyback did not pay for the unbought copy")
+
+/obj/structure/closet/crate/resale_test/PopulateContents()
+	var/obj/item/storage/box/nested = new(src)
+	new /obj/item/soap(nested)
+
+/datum/unit_test/voidcrew_resale/bundles/Run()
+	save_economy()
+	var/mob/living/carbon/human/user = seller()
+	var/datum/shop_sku/sku = allocate(/datum/shop_sku)
+	sku.item_path = /obj/structure/closet/crate/resale_test
+	var/obj/structure/closet/crate/crate = sku.dispense(user, null)
+	TEST_ASSERT(crate.contents_initialized, "A bought crate left lazy stock unstamped")
+	var/obj/item/storage/box/nested = locate() in crate
+	var/obj/item/soap/soap = locate() in nested
+	TEST_ASSERT(is_trader_good(crate) && is_trader_good(nested) && is_trader_good(soap), "Nested delivery contents lost provenance")
+	var/obj/item/soap/later_addition = allocate(/obj/item/soap, nested)
+	TEST_ASSERT(!is_trader_good(later_addition), "A bought box contaminated later additions")
+	var/datum/shop_sku/dregs/party_keg/keg_sku = allocate(/datum/shop_sku/dregs/party_keg)
+	var/atom/movable/keg = keg_sku.dispense(user, null)
+	var/datum/export_report/report = export_item_and_contents(keg, apply_elastic = FALSE, dry_run = TRUE)
+	TEST_ASSERT(is_trader_good(keg), "The keg structure was not stamped")
+	TEST_ASSERT_EQUAL(counterlist_sum(report.total_value), 0, "Bought beer keg or its reagents paid cargo")
+	var/datum/market_item/entry = allocate(/datum/market_item)
+	var/obj/item/market_uplink/uplink = allocate(/obj/item/market_uplink)
+	var/datum/market_purchase/purchase = allocate(/datum/market_purchase, entry, uplink, "resale test", TRUE)
+	var/obj/item/storage/fish_case/blackmarket/fish_case = allocate(/obj/item/storage/fish_case/blackmarket)
+	purchase.post_purchase_effects(fish_case)
+	var/obj/item/fish/fish = locate() in fish_case
+	TEST_ASSERT_NOTNULL(fish, "The ominous fish case contained no fish")
+	TEST_ASSERT(is_trader_good(fish_case) && is_trader_good(fish), "Black market bundle contents were not stamped")
+	var/datum/shop_buyback/fish_ledger = allocate(/datum/shop_buyback)
+	fish_ledger.item_path = /obj/item/fish
+	TEST_ASSERT(!fish_ledger.matches(fish), "A black market fish could be fenced")
+	var/datum/supply_pack/custom/golem_pack = allocate(/datum/supply_pack/custom, "Golem", 0, list(/obj/item/slime_extract/grey = 1))
+	var/datum/supply_order/disposable/golem_order = allocate(/datum/supply_order/disposable, golem_pack)
+	golem_order.manifest_can_fail = FALSE
+	var/obj/structure/closet/crate/golem_crate = golem_order.generate(run_loc_floor_bottom_left)
+	var/obj/item/slime_extract/grey/extract = locate() in golem_crate
+	TEST_ASSERT(is_trader_good(extract), "Cargo-delivered golem orders were not stamped")
+	var/obj/item/paper/fluff/jobs/cargo/manifest/manifest = locate() in golem_crate
+	TEST_ASSERT(is_trader_good(manifest), "An order-console manifest escaped the stamp")
+	var/datum/shop_buyback/skunk/slime_extract/skunk = allocate(/datum/shop_buyback/skunk/slime_extract)
+	TEST_ASSERT(!skunk.matches(extract), "Skunkworks bought an ordered extract")
+	var/datum/supply_pack/bitrunning/bit_pack = allocate(/datum/supply_pack/bitrunning, "Bitrunner", 0, list(/obj/item/soap = 1))
+	var/obj/structure/closet/crate/bit_crate = bit_pack.generate(run_loc_floor_bottom_left)
+	var/obj/item/soap/bit_soap = locate() in bit_crate
+	TEST_ASSERT(is_trader_good(bit_soap), "The bitrunning cargo fallback delivered unstamped goods")
+
+/datum/unit_test/voidcrew_resale/catalog_food/Run()
+	save_economy()
+	var/mob/living/carbon/human/user = seller()
+	for(var/sku_type in list(
+		/datum/shop_sku/diner/fries,
+		/datum/shop_sku/diner/hotdog,
+		/datum/shop_sku/diner/muffin,
+		/datum/shop_sku/diner/plated/house_burger,
+		/datum/shop_sku/diner/plated/omelette,
+		/datum/shop_sku/diner/plated/egg_fried_rice,
+		/datum/shop_sku/diner/plated/fish_and_chips,
+		/datum/shop_sku/diner/eggs,
+		/datum/shop_sku/diner/plated/rotating/gumbo,
+		/datum/shop_sku/diner/plated/rotating/risotto,
+		/datum/shop_sku/dregs/fry_basket,
+		/datum/shop_sku/dregs/monkey_kebab,
+		/datum/shop_sku/dregs/meat_pie,
+	))
+		var/datum/shop_sku/sku = allocate(sku_type)
+		var/atom/movable/goods = sku.dispense(user, null)
+		var/datum/export_report/report = export_item_and_contents(goods, apply_elastic = FALSE, dry_run = TRUE)
+		TEST_ASSERT_EQUAL(counterlist_sum(report.total_value), 0, "[sku_type] retained its direct food-export loop")
+
+/datum/unit_test/voidcrew_resale/stacks/Run()
+	var/obj/item/stack/sheet/iron/bought = create_trader_goods(/obj/item/stack/sheet/iron, run_loc_floor_bottom_left, 10)
+	var/obj/item/stack/sheet/iron/split = bought.split_stack(3)
+	TEST_ASSERT(is_trader_good(split), "Splitting laundered bought sheets")
+	var/obj/item/stack/sheet/iron/salvaged = allocate(/obj/item/stack/sheet/iron, null, 2, FALSE)
+	TEST_ASSERT_EQUAL(split.merge_without_del(salvaged), 3, "The stacks did not merge")
+	TEST_ASSERT(is_trader_good(salvaged), "Merging bought sheets into salvage laundered them")
+	var/obj/item/stack/sheet/iron/other = allocate(/obj/item/stack/sheet/iron, null, 2, FALSE)
+	TEST_ASSERT_EQUAL(other.merge_without_del(bought), 2, "The reverse merge failed")
+	TEST_ASSERT(is_trader_good(bought), "Merging salvage into bought sheets cleared the mark")
+	qdel(split)
+	var/obj/item/storage/box/bundle = allocate(/obj/item/storage/box)
+	create_trader_goods(/obj/item/stack/sheet/iron, bundle, 125)
+	var/total = 0
+	for(var/obj/item/stack/sheet/iron/stack in bundle)
+		total += stack.amount
+		TEST_ASSERT(is_trader_good(stack), "An overflow stack escaped the delivery stamp")
+	TEST_ASSERT_EQUAL(total, 125, "An oversized delivery lost sheets")
+
+/datum/unit_test/voidcrew_resale/contract_rewards/Run()
+	var/obj/structure/overmap/ship/ship = allocate(/obj/structure/overmap/ship)
+	var/datum/mission/m1_board_test/mission = allocate(/datum/mission/m1_board_test)
+	mission.servant = ship
+	mission.value = 0
+	mission.voucher_count = 0
+	mission.mission_reward = null
+	mission.mission_rewards = list(/obj/item/soap, /obj/item/stack/sheet/iron)
+	mission.reward_amounts = list(/obj/item/stack/sheet/iron = 75)
+	mission.distribute_rewards(run_loc_floor_bottom_left)
+	var/obj/item/soap/soap = locate() in run_loc_floor_bottom_left
+	TEST_ASSERT(is_trader_good(soap), "Contract reward goods were not stamped")
+	var/total = 0
+	for(var/obj/item/stack/sheet/iron/stack in run_loc_floor_bottom_left)
+		total += stack.amount
+		TEST_ASSERT(is_trader_good(stack), "A contract reward stack was not stamped")
+	TEST_ASSERT_EQUAL(total, 75, "The contract lost its bundled stack count")
+
+/datum/unit_test/voidcrew_resale/cooking/Run()
+	save_economy()
+	var/mob/living/carbon/human/user = seller()
+	user.mind_initialize()
+	var/datum/shop_sku/sku = allocate(/datum/shop_sku)
+	sku.item_path = /obj/item/food/piedough
+	var/obj/item/food/piedough/dough = sku.dispense(user, null)
+	TEST_ASSERT(is_trader_good(dough), "The bought ingredient was not stamped")
+	var/obj/item/plate/oven_tray/tray = allocate(/obj/item/plate/oven_tray, run_loc_floor_bottom_left)
+	dough.forceMove(tray)
+	var/datum/component/bakeable/baking = dough.GetComponent(/datum/component/bakeable)
+	TEST_ASSERT_NOTNULL(baking, "Dough lost its baking recipe")
+	baking.on_baking_start(dough, tray, user)
+	baking.finish_baking(tray)
+	var/obj/item/food/pie/plain/bread = locate() in tray
+	TEST_ASSERT_NOTNULL(bread, "The bought ingredient did not cook")
+	TEST_ASSERT(!is_trader_good(bread), "Cooking copied the ingredient's resale mark")
+	var/datum/export_report/report = export_item_and_contents(bread, apply_elastic = FALSE, dry_run = TRUE)
+	TEST_ASSERT(counterlist_sum(report.total_value) > 0, "Cooked food from a bought ingredient no longer exports")
+	bread.forceMove(user)
+	var/datum/shop_buyback/diner/home_cooking/ledger = allocate(/datum/shop_buyback/diner/home_cooking)
+	TEST_ASSERT(ledger.try_sell(user, null), "A cooked product was refused at the diner")
+
+/datum/unit_test/voidcrew_resale/clinic/Run()
+	var/mob/living/carbon/human/user = seller()
+	var/datum/shop_buyback/clinic/heart/ledger = allocate(/datum/shop_buyback/clinic/heart)
+	var/obj/item/organ/heart/cybernetic/cyber = allocate(/obj/item/organ/heart/cybernetic, user)
+	TEST_ASSERT(!ledger.matches(cyber), "Sawbones accepted a cybernetic heart")
+	TEST_ASSERT(!ledger.try_sell(user, null), "Sawbones bought a cybernetic heart")
+	var/obj/item/organ/heart/natural = allocate(/obj/item/organ/heart)
+	user.put_in_hands(natural)
+	var/datum/bank_account/account = get_shop_buyback_account(user)
+	var/balance = account.account_balance
+	TEST_ASSERT(ledger.try_sell(user, null), "Sawbones refused a natural heart")
+	TEST_ASSERT_EQUAL(account.account_balance, balance + 150, "Natural-heart intake price changed")
+	var/obj/machinery/limbgrower/printer = allocate(/obj/machinery/limbgrower, run_loc_floor_bottom_left)
+	printer.being_built = allocate(/datum/design/heart)
+	printer.build_item(list())
+	var/obj/item/organ/heart/printed = locate() in run_loc_floor_bottom_left
+	TEST_ASSERT_NOTNULL(printed, "The limbgrower did not print a heart")
+	TEST_ASSERT(HAS_TRAIT(printed, "printed_organ"), "Printed natural-type organs lost their provenance")
+	TEST_ASSERT(!ledger.matches(printed), "Sawbones accepted a printed organic heart")
+	var/datum/outpost_shop/vendor/patchup_clinic/clinic = allocate(/datum/outpost_shop/vendor/patchup_clinic)
+	for(var/datum/shop_buyback/intake as anything in clinic.buybacks)
+		TEST_ASSERT(!ispath(intake.item_path, /obj/item/defibrillator), "The clinic still buys defibrillators")
+	TEST_ASSERT_EQUAL(length(clinic.buybacks), 4, "The clinic lost another intake line")
+
+/datum/unit_test/voidcrew_resale/market_floor/Run()
+	save_economy()
+	var/list/expected_floors = list(
+		/datum/material/diamond = 230,
+		/datum/material/bluespace = 160,
+		/datum/material/gold = 80,
+		/datum/material/titanium = 80,
+		/datum/material/uranium = 60,
+		/datum/material/silver = 30,
+		/datum/material/plasma = 15,
+		/datum/material/iron = 5,
+		/datum/material/glass = 5,
+	)
+	SSeconomy.pack_price_modifier = 0.1
+	for(var/datum/material/material as anything in expected_floors)
+		var/floor_price = expected_floors[material]
+		SSstock_market.materials_prices[material] = 1
+		TEST_ASSERT_EQUAL(material_market_buy_price(material), floor_price, "[material] has the wrong crashed-price ask")
+		var/list/contents = list()
+		contents[initial(material.sheet_type)] = 3
+		var/datum/supply_pack/custom/minerals/pack = allocate(/datum/supply_pack/custom/minerals, "Floor test", 3, contents)
+		var/datum/supply_order/disposable/materials/order = allocate(/datum/supply_order/disposable/materials, pack)
+		order.paying_account = allocate(/datum/bank_account, "Floor test", null, 1, FALSE)
+		order.applied_coupon = allocate(/obj/item/coupon)
+		order.applied_coupon.discount_pct_off = 1
+		TEST_ASSERT_EQUAL(order.get_final_cost(), floor_price * 3 + CARGO_CRATE_VALUE, "[material] fell below its floor after modifiers")
+		SSstock_market.materials_prices[material] = floor_price + 10
+		order.append_order(contents, 0)
+		TEST_ASSERT_EQUAL(order.get_final_cost(), floor_price * 3 + (floor_price + 10) * 3 + CARGO_CRATE_VALUE, "Appending a material order lost its live ask or earlier quote")
+		TEST_ASSERT_EQUAL(SSstock_market.materials_prices[material], floor_price + 10, "A buy floor changed the sale bid")
diff --git a/voidcrew/modules/unit_tests/voidcrew_research_lifecycle.dm b/voidcrew/modules/unit_tests/voidcrew_research_lifecycle.dm
index 48467bfef6a..14641d72d3f 100644
--- a/voidcrew/modules/unit_tests/voidcrew_research_lifecycle.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_research_lifecycle.dm
@@ -1,5 +1,9 @@
 /// Revoking an experiment link must cancel pending physical callbacks and rewards.
+/datum/unit_test/voidcrew_relay_experiment_lifecycle
+	parent_type = /datum/unit_test/voidcrew_experiment_reward_fixture
+
 /datum/unit_test/voidcrew_relay_experiment_lifecycle/Run()
+	make_reward_ship(run_loc_floor_bottom_left)
 	var/mob/living/carbon/human/user = allocate(/mob/living/carbon/human/consistent)
 	var/obj/machinery/rnd/server/ship/server = allocate(/obj/machinery/rnd/server/ship)
 	var/obj/item/computer_disk/ship_disk/disk = allocate(/obj/item/computer_disk/ship_disk)
@@ -202,3 +206,361 @@
 	TEST_ASSERT_EQUAL(length(printer.current_unlocked_designs), 0, "Disk removal retained component designs")
 	remote_disk.forceMove(run_loc_floor_bottom_left)
 	TEST_ASSERT_NULL(fabricator.stored_research, "Removing the current disk retained the exofab's link")
+
+/// One-tile ships exercise real service-site ownership without loading a fleet of maps.
+/datum/unit_test/voidcrew_experiment_reward_fixture
+	parent_type = /datum/unit_test/voidcrew_outpost_management
+	abstract_type = /datum/unit_test/voidcrew_experiment_reward_fixture
+	var/list/reward_ports = list()
+	var/list/reward_areas = list()
+
+/datum/unit_test/voidcrew_experiment_reward_fixture/Destroy()
+	for(var/obj/docking_port/mobile/voidcrew/port in reward_ports)
+		if(port.current_ship)
+			port.current_ship.shuttle = null
+		port.current_ship = null
+		port.shuttle_areas = list()
+		qdel(port, force = TRUE)
+	for(var/turf/tile as anything in reward_areas)
+		var/area/shuttle/voidcrew/room = get_area(tile)
+		tile.change_area(room, reward_areas[tile])
+		room.shuttle_port = null
+		qdel(room)
+	return ..()
+
+/datum/unit_test/voidcrew_experiment_reward_fixture/proc/make_reward_ship(turf/tile)
+	var/area/shuttle/voidcrew/room = new
+	reward_areas[tile] = get_area(tile)
+	tile.change_area(get_area(tile), room)
+	var/obj/docking_port/mobile/voidcrew/port = new(tile)
+	reward_ports += port
+	port.width = 1
+	port.height = 1
+	port.dwidth = 0
+	port.dheight = 0
+	port.shuttle_areas = list((room) = TRUE)
+	room.shuttle_port = port
+	port.register()
+	var/obj/structure/overmap/ship/ship = allocate(/obj/structure/overmap/ship)
+	SSovermap.simulated_ships |= ship
+	ship.shuttle = port
+	port.current_ship = ship
+	ship.state = "idle"
+	ship.ship_team = new /datum/team/voidcrew
+	ship.ship_team.ship = ship
+	return ship
+
+/datum/unit_test/voidcrew_experiment_reward_fixture/proc/install_reward_disk(obj/machinery/rnd/server/ship/server, mob/living/user)
+	var/obj/item/computer_disk/ship_disk/disk = allocate(/obj/item/computer_disk/ship_disk)
+	server.attacked_by(disk, user)
+	return disk.stored_research
+
+/// A real physical callback, including an intrinsic reward in addition to the flat 200.
+/datum/unit_test/voidcrew_experiment_reward_fixture/proc/complete_arcade(datum/techweb/web, turf/tile)
+	var/obj/item/experi_scanner/scanner = allocate(/obj/item/experi_scanner, tile)
+	var/datum/component/experiment_handler/handler = scanner.GetComponent(/datum/component/experiment_handler)
+	var/datum/experiment/physical/arcade_winner/experiment = allocate(/datum/experiment/physical/arcade_winner)
+	experiment.points_reward = list(TECHWEB_POINT_TYPE_GENERIC = 37)
+	web.available_experiments |= experiment
+	handler.link_techweb(web, TRUE)
+	handler.link_experiment(experiment)
+	var/obj/machinery/computer/arcade/arcade = allocate(/obj/machinery/computer/arcade, tile)
+	TEST_ASSERT(handler.action_experiment(null, arcade), "Physical reward fixture could not register its callback")
+	SEND_SIGNAL(arcade, COMSIG_ARCADE_PRIZEVEND)
+	TEST_ASSERT(experiment.completed && web.completed_experiments[experiment.type] == experiment, "Physical completion was not restored on this disk")
+	TEST_ASSERT(!experiment.finish_experiment(handler), "A duplicate physical callback was accepted")
+
+/// Publish through the ordnance route, which bypasses experiment.finish_experiment().
+/datum/unit_test/voidcrew_experiment_reward_fixture/proc/publish_reward_paper(datum/techweb/web)
+	var/experiment_type = /datum/experiment/ordnance/explosive/lowyieldbomb
+	web.add_experiment(experiment_type)
+	for(var/datum/experiment/experiment as anything in web.available_experiments)
+		if(experiment.type == experiment_type)
+			experiment.points_reward = list(TECHWEB_POINT_TYPE_GENERIC = 37)
+	var/datum/scientific_paper/paper = allocate(/datum/scientific_paper)
+	paper.experiment_path = experiment_type
+	paper.tier = 1
+	paper.partner_path = /datum/scientific_partner/mining
+	paper.gains = list(1, 1)
+	TEST_ASSERT(web.add_scientific_paper(paper), "The ordnance reward fixture could not publish")
+	TEST_ASSERT_NOTNULL(web.completed_experiments[experiment_type], "Publication did not restore experiment completion")
+	var/points = web.research_points[TECHWEB_POINT_TYPE_GENERIC]
+	paper.tier = 2
+	TEST_ASSERT(web.add_scientific_paper(paper), "A later publication tier was refused")
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC], points, "A later paper tier paid another completion reward")
+
+/// Regular servers retain an independent, once-per-web completion ledger.
+/datum/unit_test/voidcrew_experiment_reward_fixture/regular_server_entitlement/Run()
+	for(var/index in 1 to 2)
+		var/obj/machinery/rnd/server/server = allocate(/obj/machinery/rnd/server)
+		var/datum/techweb/web = server.stored_research
+		TEST_ASSERT_NOTNULL(web, "A regular R&D server has no techweb")
+		complete_arcade(web, get_turf(server))
+		TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC], 237, "A regular server lost its flat or intrinsic completion reward")
+		publish_reward_paper(web)
+		TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC], 474, "A regular server lost its publication reward")
+		// Restoring local completion cannot reset the web's grant claims.
+		web.completed_experiments.Cut()
+		complete_arcade(web, get_turf(server))
+		TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC], 474, "A regular server paid the same experiment twice")
+
+/// A physical source on a ship without a crew record still pays its own grants once.
+/datum/unit_test/voidcrew_experiment_reward_fixture/crewless_ship_entitlement/Run()
+	var/obj/structure/overmap/ship/ship = make_reward_ship(run_loc_floor_bottom_left)
+	QDEL_NULL(ship.ship_team)
+	TEST_ASSERT_NULL(ship.get_crew_record(), "The crewless reward fixture has a crew record")
+	var/mob/living/carbon/human/user = allocate(/mob/living/carbon/human/consistent)
+	var/obj/machinery/rnd/server/ship/server = allocate(/obj/machinery/rnd/server/ship)
+	var/datum/techweb/web = install_reward_disk(server, user)
+	complete_arcade(web, get_turf(server))
+	publish_reward_paper(web)
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC], 474, "A crewless source lost its flat or intrinsic rewards")
+	// The fallback belongs to the web, so moving its disk cannot reset it.
+	var/obj/item/computer_disk/ship_disk/disk = server.source_code_hdd
+	disk.forceMove(run_loc_floor_bottom_left)
+	server.attacked_by(disk, user)
+	web.completed_experiments.Cut()
+	complete_arcade(web, get_turf(server))
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC], 474, "A crewless source repaid an experiment after disk reinsertion")
+
+/datum/unit_test/voidcrew_experiment_reward_fixture/crew_entitlement/Run()
+	var/obj/structure/overmap/ship/first_ship = make_reward_ship(run_loc_floor_bottom_left)
+	var/mob/living/carbon/human/user = allocate(/mob/living/carbon/human/consistent)
+	var/obj/machinery/rnd/server/ship/server = allocate(/obj/machinery/rnd/server/ship)
+	var/datum/techweb/web = install_reward_disk(server, user)
+	TEST_ASSERT_EQUAL(web.experiment_reward_ledger(), first_ship.get_crew_record().research_reward_ledger, "The physical source did not resolve its crew's ledger")
+	complete_arcade(web, get_turf(server))
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC], 237, "Physical completion did not pay the flat and intrinsic rewards once")
+	publish_reward_paper(web)
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC], 474, "Ordnance and physical reward routes disagree")
+	server.source_code_hdd.forceMove(run_loc_floor_bottom_left)
+	web = install_reward_disk(server, user)
+	complete_arcade(web, get_turf(server))
+	publish_reward_paper(web)
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC] || 0, 0, "A fresh source disk repaid the same crew")
+	// A simultaneous second server and a later replacement both use the same entitlement.
+	var/obj/machinery/rnd/server/ship/second = allocate(/obj/machinery/rnd/server/ship)
+	web = install_reward_disk(second, user)
+	complete_arcade(web, get_turf(second))
+	publish_reward_paper(web)
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC] || 0, 0, "A second server multiplied one crew's rewards")
+	qdel(server)
+	qdel(second)
+	server = allocate(/obj/machinery/rnd/server/ship)
+	web = install_reward_disk(server, user)
+	complete_arcade(web, get_turf(server))
+	publish_reward_paper(web)
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC] || 0, 0, "Replacing the physical servers reset entitlement")
+	var/obj/structure/overmap/ship/other_ship = make_reward_ship(run_loc_floor_top_right)
+	TEST_ASSERT(other_ship.get_crew_record().research_reward_ledger != first_ship.get_crew_record().research_reward_ledger, "Separate crews share one ledger")
+	server = allocate(/obj/machinery/rnd/server/ship, run_loc_floor_top_right)
+	web = install_reward_disk(server, user)
+	complete_arcade(web, get_turf(server))
+	publish_reward_paper(web)
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC], 474, "A separate crew could not earn its own experiment rewards")
+
+/datum/unit_test/voidcrew_experiment_reward_fixture/relay_entitlement/Run()
+	var/obj/structure/overmap/dynamic/player_outpost/home = allocate(/obj/structure/overmap/dynamic/player_outpost)
+	home.shell_template = allocate(/datum/map_template/player_outpost/test_fixture)
+	home.founder_ckey = "researchledgerowner"
+	TEST_ASSERT(home.load_level(), "The reward-ledger outpost could not load")
+	var/mob/living/carbon/human/owner = make_player(home.arrival_turf, home.founder_ckey)
+	var/obj/machinery/rnd/server/ship/server = allocate(/obj/machinery/rnd/server/ship, home.arrival_turf)
+	server.set_machine_stat(NONE)
+	var/datum/techweb/web = install_reward_disk(server, owner)
+	TEST_ASSERT_EQUAL(web.experiment_reward_ledger(), home.research_reward_ledger, "Outpost research did not resolve its site ledger")
+	for(var/turf/tile as anything in list(run_loc_floor_bottom_left, run_loc_floor_top_right))
+		var/obj/structure/overmap/ship/ship = make_reward_ship(tile)
+		ship.docked = home
+		var/mob/living/carbon/human/crew = make_player(tile, "researchrelay[tile.x][tile.y]")
+		ship.ship_team.add_member(crew.mind)
+		var/obj/machinery/rnd/server/relay/relay = allocate(/obj/machinery/rnd/server/relay, tile)
+		relay.set_machine_stat(NONE)
+		var/datum/outpost_research_link/link = home.propose_research_link(owner, server, ship, server.source_code_hdd)
+		TEST_ASSERT_NOTNULL(link, "The reward fixture could not propose a relay")
+		TEST_ASSERT(link.approve(crew, relay), "The reward fixture could not approve a relay")
+		TEST_ASSERT_EQUAL(relay.stored_research.experiment_reward_ledger(), home.research_reward_ledger, "A relay used the consuming crew's ledger")
+		TEST_ASSERT_EQUAL(length(ship.get_crew_record().research_reward_ledger), 0, "Sharing outpost research consumed the visitor's entitlement")
+	complete_arcade(web, run_loc_floor_bottom_left)
+	publish_reward_paper(web)
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC], 474, "Relay-backed research did not award exactly once to the source site")
+	var/obj/item/experi_scanner/other_scanner = allocate(/obj/item/experi_scanner, run_loc_floor_top_right)
+	var/datum/component/experiment_handler/other_handler = other_scanner.GetComponent(/datum/component/experiment_handler)
+	other_handler.link_techweb(web, TRUE)
+	var/datum/experiment/completed = web.completed_experiments[/datum/experiment/physical/arcade_winner]
+	TEST_ASSERT(!other_handler.can_select_experiment(completed), "A second relay could select already-completed work")
+	TEST_ASSERT(!completed.finish_experiment(other_handler), "A second relay accepted a stale completion")
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC], 474, "A second relay multiplied the source reward")
+	// Repeat on a new disk and server at the site, then expose it through both relays again.
+	qdel(server)
+	server = allocate(/obj/machinery/rnd/server/ship, home.arrival_turf)
+	server.set_machine_stat(NONE)
+	web = install_reward_disk(server, owner)
+	for(var/obj/docking_port/mobile/voidcrew/port in reward_ports)
+		var/obj/structure/overmap/ship/ship = port.current_ship
+		var/datum/mind/member = ship.ship_team.members[1]
+		var/obj/machinery/rnd/server/relay/relay = locate() in get_turf(port)
+		var/datum/outpost_research_link/link = home.propose_research_link(owner, server, ship, server.source_code_hdd)
+		TEST_ASSERT_NOTNULL(link, "The replacement source could not invite an existing relay crew")
+		TEST_ASSERT(link.approve(member.current, relay), "An existing relay could not reconnect to the replacement source")
+		TEST_ASSERT_EQUAL(relay.stored_research.experiment_reward_ledger(), home.research_reward_ledger, "Reconnecting a relay replaced the site ledger")
+		TEST_ASSERT_EQUAL(length(ship.get_crew_record().research_reward_ledger), 0, "Outpost rewards consumed a visitor crew's entitlement")
+	complete_arcade(web, run_loc_floor_top_right)
+	publish_reward_paper(web)
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC] || 0, 0, "Replacing an outpost server reset its shared entitlement")
+	// An uninstalled disk falls back to its own claims, never the outpost's shared ledger.
+	server.source_code_hdd.forceMove(home.arrival_turf)
+	TEST_ASSERT_EQUAL(web.experiment_reward_ledger(), web.local_experiment_reward_ledger, "A removed source disk did not fall back to its web-local ledger")
+	TEST_ASSERT(web.experiment_reward_ledger() != home.research_reward_ledger, "A removed source disk retained its outpost reward owner")
+
+/// Synthetic nodes isolate payment accounting while using real purchase, import and completion procs.
+/datum/unit_test/voidcrew_experiment_refunds
+	var/node_number = 0
+
+/datum/unit_test/voidcrew_experiment_refunds/Destroy()
+	SSresearch.point_types -= "receipt_test"
+	return ..()
+
+/datum/unit_test/voidcrew_experiment_refunds/proc/refund_node(list/costs, list/discounts)
+	var/datum/techweb_node/node = allocate(/datum/techweb_node)
+	node.id = "receipt_test_[++node_number]"
+	node.research_costs = costs
+	node.discount_experiments = discounts
+	SSresearch.techweb_nodes[node.id] = node
+	return node
+
+/datum/unit_test/voidcrew_experiment_refunds/proc/finish(datum/techweb/web, experiment_type)
+	var/datum/experiment/experiment = allocate(experiment_type)
+	experiment.completed = TRUE
+	web.available_experiments |= experiment
+	web.complete_experiment(experiment)
+	return experiment
+
+/datum/unit_test/voidcrew_experiment_refunds/Run()
+	SSresearch.point_types["receipt_test"] = "Test"
+	var/first_type = /datum/experiment/physical/arcade_winner
+	var/second_type = /datum/experiment/physical/meat_wall_explosion
+	var/datum/techweb/web = allocate(/datum/techweb)
+	web.add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = 1000, "receipt_test" = 1000))
+	var/datum/techweb_node/node = refund_node(list(TECHWEB_POINT_TYPE_GENERIC = 100, "receipt_test" = 40), list((first_type) = 20, (second_type) = 50))
+	var/costs_before = json_encode(node.research_costs)
+	web.boost_techweb_node(node, list(TECHWEB_POINT_TYPE_GENERIC = 70, "receipt_test" = 10))
+	TEST_ASSERT(web.research_node(node, FALSE, TRUE, FALSE), "The boosted paid node could not be researched")
+	var/datum/techweb_node/another = refund_node(list(TECHWEB_POINT_TYPE_GENERIC = 80), list((first_type) = 15))
+	TEST_ASSERT(web.research_node(another, FALSE, TRUE, FALSE), "A second paid node could not be researched")
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC], 890, "Boosts did not reduce the actual debit")
+	TEST_ASSERT_EQUAL(web.research_points["receipt_test"], 970, "The second point currency was not charged correctly")
+	var/datum/techweb/imported = allocate(/datum/techweb)
+	web.copy_research_to(imported)
+	TEST_ASSERT(imported.researched_nodes[node.id] && imported.researched_nodes[another.id], "The transfer fixture did not import its nodes")
+	TEST_ASSERT_EQUAL(length(imported.experiment_payment_receipts), 0, "Research transfer copied another web's payment receipts")
+	finish(imported, first_type)
+	finish(imported, second_type)
+	TEST_ASSERT_EQUAL(imported.research_points[TECHWEB_POINT_TYPE_GENERIC], 400, "Imported nodes created discount refunds beyond their completion grants")
+	var/datum/experiment/first = finish(web, first_type)
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC], 1125, "One experiment did not pay its grant and refund both paid nodes' discounts")
+	TEST_ASSERT_EQUAL(web.research_points["receipt_test"], 990, "The discount did not refund its own point currency")
+	var/datum/experiment/second = finish(web, second_type)
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC], 1335, "Several discounts exceeded the node's remaining actual payment plus completion grants")
+	TEST_ASSERT_EQUAL(web.research_points["receipt_test"], 1000, "Refunds exceeded actual payment in the second currency")
+	web.complete_experiment(first)
+	web.complete_experiment(second)
+	// Even restoring completion from scratch must not refill consumed receipts.
+	web.completed_experiments -= first_type
+	finish(web, first_type)
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC], 1335, "Repeated completion repaid a grant or refunded a consumed discount")
+	TEST_ASSERT_EQUAL(web.research_points["receipt_test"], 1000, "Repeated completion refilled another currency's receipt")
+	var/list/price = node.get_price(web)
+	TEST_ASSERT_EQUAL(price[TECHWEB_POINT_TYPE_GENERIC], 0, "Discounts and boosts returned a negative price")
+	TEST_ASSERT_EQUAL(price["receipt_test"], 0, "Experiment discounts returned a negative price in another currency")
+	TEST_ASSERT_EQUAL(json_encode(node.research_costs), costs_before, "Pricing mutated a shared node's base costs")
+	price = node.get_price(null)
+	price[TECHWEB_POINT_TYPE_GENERIC] = -10
+	TEST_ASSERT_EQUAL(json_encode(node.research_costs), costs_before, "Unhosted pricing returned the shared cost list")
+	var/datum/techweb/unpaid = allocate(/datum/techweb)
+	var/datum/techweb_node/free_node = refund_node(list(TECHWEB_POINT_TYPE_GENERIC = 100), list((first_type) = 50))
+	unpaid.boost_techweb_node(free_node, list(TECHWEB_POINT_TYPE_GENERIC = 200))
+	TEST_ASSERT(unpaid.research_node(free_node, FALSE, TRUE, FALSE), "The fully boosted free node could not unlock")
+	var/datum/techweb_node/starting = refund_node(list(TECHWEB_POINT_TYPE_GENERIC = 100), list((first_type) = 50))
+	starting.starting_node = TRUE
+	TEST_ASSERT(unpaid.research_node(starting, TRUE, FALSE, FALSE), "The starting-node fixture could not unlock")
+	var/datum/techweb_node/failed = refund_node(list(TECHWEB_POINT_TYPE_GENERIC = 100), list((first_type) = 50))
+	TEST_ASSERT(!unpaid.research_node(failed, FALSE, TRUE, FALSE), "An unaffordable purchase succeeded")
+	TEST_ASSERT_EQUAL(length(unpaid.experiment_payment_receipts), 0, "A free, starting or failed purchase created refund entitlement")
+	finish(unpaid, first_type)
+	TEST_ASSERT_EQUAL(unpaid.research_points[TECHWEB_POINT_TYPE_GENERIC], 200, "An unpaid node created a refund beyond its completion grant")
+
+/// Crew reward claims must not suppress legitimate web-local refunds on replacement disks.
+/datum/unit_test/voidcrew_experiment_reward_fixture/refund_after_reward/Run()
+	var/obj/structure/overmap/ship/ship = make_reward_ship(run_loc_floor_bottom_left)
+	var/mob/living/carbon/human/user = allocate(/mob/living/carbon/human/consistent)
+	var/obj/machinery/rnd/server/ship/server = allocate(/obj/machinery/rnd/server/ship)
+	var/datum/techweb/web = install_reward_disk(server, user)
+	ship.get_crew_record().research_reward_ledger[/datum/experiment/physical/arcade_winner] = TRUE
+	web.add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = 100))
+	var/datum/techweb_node/node = allocate(/datum/techweb_node)
+	node.id = "rewarded_experiment_refund_test"
+	node.research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 100)
+	node.discount_experiments = list(/datum/experiment/physical/arcade_winner = 60)
+	TEST_ASSERT(web.research_node(node, FALSE, TRUE, FALSE), "An already-rewarded experiment's node could not be paid for")
+	complete_arcade(web, get_turf(server))
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC], 60, "An existing crew reward either suppressed a paid refund or paid the completion bonus again")
+
+/datum/unit_test/voidcrew_research_note_conservation/Run()
+	var/obj/item/research_notes/notes = allocate(/obj/item/research_notes, run_loc_floor_bottom_left, 60, "biology")
+	TEST_ASSERT(!notes.merge(notes), "A paper merged with itself")
+	TEST_ASSERT(!QDELETED(notes) && notes.value == 60, "A self-merge changed or consumed its paper")
+	var/obj/item/research_notes/incoming = allocate(/obj/item/research_notes, run_loc_floor_bottom_left, 50, "physics")
+	TEST_ASSERT(notes.merge(incoming), "Different-origin papers could not merge")
+	TEST_ASSERT(QDELETED(incoming), "Merging retained the incoming paper")
+	TEST_ASSERT_EQUAL(notes.value, 110, "A mixed-origin merge created a bonus")
+	TEST_ASSERT_EQUAL(notes.icon_state, "paperslip_words", "Merging did not update the paper's appearance")
+	incoming = allocate(/obj/item/research_notes, run_loc_floor_bottom_left, 2390, "biology")
+	notes.attackby(incoming, null, list(), list())
+	TEST_ASSERT(QDELETED(incoming), "The item interaction retained the incoming paper")
+	TEST_ASSERT_EQUAL(notes.value, 2500, "The item interaction did not conserve note value")
+	TEST_ASSERT_EQUAL(notes.icon_state, "paper_words", "The item interaction did not update appearance")
+	notes.attackby(notes, null, list(), list())
+	TEST_ASSERT(!QDELETED(notes) && notes.value == 2500, "The item interaction accepted a self-merge")
+	incoming = allocate(/obj/item/research_notes, run_loc_floor_bottom_left, 0, "chemistry")
+	TEST_ASSERT(notes.merge(incoming), "A zero-value incoming paper could not merge")
+	TEST_ASSERT(QDELETED(incoming) && notes.value == 2500, "A zero-value paper changed the total or survived merging")
+
+/// Exercise reconstruction after the original hull and team are deleted; round identity survives.
+/datum/unit_test/voidcrew_checkpoints/research_reward_ledger
+	destroy_original = TRUE
+
+/datum/unit_test/voidcrew_checkpoints/research_reward_ledger/build_hull(datum/checkpoint_construction/job, obj/structure/overmap/dynamic/player_outpost/registry_test/home, datum/outpost_berth/ship_bay/bay, mob/living/carbon/human/captain, obj/structure/overmap/ship/original, datum/ship_checkpoint_ui/registry_test/panel, datum/ship_checkpoint/snapshot)
+	var/datum/voidcrew_crew_record/crew = snapshot.crew_record_ref?.resolve()
+	TEST_ASSERT_NOTNULL(crew, "Deleting the original hull lost the checkpoint's crew")
+	var/list/ledger = crew.research_reward_ledger
+	TEST_ASSERT_EQUAL(job.crew_record_ref.resolve(), crew, "Reconstruction copied or replaced the saved crew")
+	ledger[/datum/experiment/physical/arcade_winner] = TRUE
+	crew.mission_suit_paid = TRUE
+	job.fast_forward(1)
+	TEST_ASSERT(QDELETED(snapshot), "The checkpoint was not consumed at the first piece")
+	TEST_ASSERT_EQUAL(job.crew_record_ref.resolve().research_reward_ledger, ledger, "Consuming the checkpoint lost the ledger")
+	ledger[/datum/experiment/ordnance/explosive/lowyieldbomb] = TRUE
+	crew.mission_gadget_paid = TRUE
+	job.fast_forward()
+	var/obj/structure/overmap/ship/rebuilt = bay.ship
+	TEST_ASSERT_NOTNULL(rebuilt, "The reward-ledger checkpoint did not finish reconstruction")
+	TEST_ASSERT_EQUAL(rebuilt.get_crew_record(), crew, "The rebuilt hull did not restore its crew")
+	TEST_ASSERT_EQUAL(rebuilt.get_crew_record().research_reward_ledger, ledger, "The rebuilt crew restored an older reward entitlement")
+	TEST_ASSERT(crew.mission_suit_paid && crew.mission_gadget_paid, "Reconstruction reset guarded prize claims")
+	TEST_ASSERT_NULL(rebuilt.award_guarded_prize("kill", 3, get_turf(rebuilt.shuttle)), "Reconstruction repaid a guarded prize")
+	var/obj/machinery/rnd/server/ship/server = allocate(/obj/machinery/rnd/server/ship, get_turf(rebuilt.shuttle))
+	var/obj/item/computer_disk/ship_disk/disk = allocate(/obj/item/computer_disk/ship_disk)
+	server.attacked_by(disk, captain)
+	var/datum/techweb/web = disk.stored_research
+	TEST_ASSERT_EQUAL(web.experiment_reward_ledger(), ledger, "The reconstructed physical server did not resolve the continued ledger")
+	for(var/experiment_type in list(/datum/experiment/physical/arcade_winner, /datum/experiment/ordnance/explosive/lowyieldbomb))
+		var/datum/experiment/experiment = allocate(experiment_type)
+		experiment.completed = TRUE
+		web.available_experiments |= experiment
+		web.complete_experiment(experiment)
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC] || 0, 0, "Reconstruction repaid a reward claimed after snapshot capture")
+	// The inherited checkpoint checks still require the reconstructed hull to contain no added stock.
+	qdel(disk)
+	qdel(server)
+	return captain
diff --git a/voidcrew/modules/unit_tests/voidcrew_round_end.dm b/voidcrew/modules/unit_tests/voidcrew_round_end.dm
new file mode 100644
index 00000000000..9877604c1ff
--- /dev/null
+++ b/voidcrew/modules/unit_tests/voidcrew_round_end.dm
@@ -0,0 +1,202 @@
+/// REALTIMEOFDAY reads the clock on every use, so real-time checks allow a couple of deciseconds.
+#define ROUND_END_NEAR(actual, expected) (abs((actual) - (expected)) <= 2)
+
+/// Exercise real scheduling without constructing another subsystem or waiting for the timers.
+/datum/unit_test/voidcrew_round_end
+	var/list/saved_overmap
+	var/list/saved_ticker
+	var/saved_limit
+	var/saved_transfer
+	var/saved_nuked
+	var/list/saved_ports
+
+/datum/unit_test/voidcrew_round_end/proc/clear_schedule()
+	for(var/field in list("jump_timer", "round_end_request_timer", "round_end_timer"))
+		if(SSovermap.vars[field])
+			deltimer(SSovermap.vars[field])
+			SSovermap.vars[field] = null
+	for(var/alert_timer in SSovermap.jump_alert_timers)
+		deltimer(alert_timer)
+	SSovermap.jump_alert_timers = list()
+	SSovermap.jump_launch_time = null
+	SSovermap.round_end_time = null
+	SSovermap.jump_mode = 0 // BS_JUMP_IDLE; Voidcrew defines follow test includes.
+
+/// Whether a timer runs on real time rather than world.time.
+/datum/unit_test/voidcrew_round_end/proc/is_real_time(timer_id)
+	var/datum/timedevent/timer = SStimer.timer_id_dict[timer_id]
+	return timer && (timer.flags & TIMER_CLIENT_TIME)
+
+/// Body of the newest station announcement, or null.
+/datum/unit_test/voidcrew_round_end/proc/last_announcement()
+	for(var/datum/feed_channel/channel as anything in GLOB.news_network.network_channels)
+		if(channel.channel_name == NEWSCASTER_STATION_ANNOUNCEMENTS && length(channel.messages))
+			var/datum/feed_message/message = channel.messages[length(channel.messages)]
+			return message.body
+
+/datum/unit_test/voidcrew_round_end/Destroy()
+	if(saved_overmap)
+		clear_schedule()
+		for(var/field in saved_overmap)
+			SSovermap.vars[field] = saved_overmap[field]
+		for(var/field in saved_ticker)
+			SSticker.vars[field] = saved_ticker[field]
+		CONFIG_SET(number/round_time_limit, saved_limit)
+		CONFIG_SET(flag/allow_vote_transfer, saved_transfer)
+		GLOB.station_was_nuked = saved_nuked
+		SSshuttle.mobile_docking_ports = saved_ports
+	saved_overmap = null
+	saved_ticker = null
+	saved_ports = null
+	return ..()
+
+/datum/unit_test/voidcrew_round_end/Run()
+	saved_limit = CONFIG_GET(number/round_time_limit)
+	saved_transfer = CONFIG_GET(flag/allow_vote_transfer)
+	saved_nuked = GLOB.station_was_nuked
+	saved_ports = SSshuttle.mobile_docking_ports
+	saved_overmap = list()
+	for(var/field in list("jump_timer", "jump_mode", "round_end_time", "round_end_request_timer", "round_end_timer", "jump_launch_time", "jump_alert_timers"))
+		saved_overmap[field] = SSovermap.vars[field]
+		SSovermap.vars[field] = null
+	SSovermap.jump_alert_timers = list()
+	saved_ticker = list()
+	for(var/field in list("current_state", "force_ending", "round_start_time", "roundend_check_paused", "setup_done"))
+		saved_ticker[field] = SSticker.vars[field]
+	SSovermap.jump_mode = 0 // BS_JUMP_IDLE
+	// Prevent any completion report or movement of real ships from this test.
+	SSticker.current_state = GAME_STATE_FINISHED
+	SSticker.setup_done = TRUE
+	SSshuttle.mobile_docking_ports = list()
+	var/datum/config_entry/number/round_time_limit/entry = config.entries_by_type[/datum/config_entry/number/round_time_limit]
+	TEST_ASSERT_EQUAL(initial(entry.default), 360, "Untouched server configs must default to six hours")
+	CONFIG_SET(number/round_time_limit, initial(entry.default))
+	CONFIG_SET(flag/allow_vote_transfer, TRUE)
+	var/datum/vote/transfer_vote/vote = allocate(/datum/vote/transfer_vote)
+	SSticker.current_state = GAME_STATE_PREGAME
+	TEST_ASSERT(!vote.is_config_enabled(), "A lobby transfer vote must not get ahead of the automatic schedule")
+	TEST_ASSERT_NOTEQUAL(vote.can_be_initiated(TRUE), VOTE_AVAILABLE, "A forced lobby vote must not get ahead of the automatic schedule")
+	SSticker.current_state = GAME_STATE_FINISHED
+	var/started_at = world.time - (5 MINUTES)
+	SSticker.round_start_time = started_at
+	var/real_now = REALTIMEOFDAY
+	SSovermap.arm_round_end(SSticker, started_at)
+	TEST_ASSERT(ROUND_END_NEAR(SSovermap.round_end_time, real_now - (5 MINUTES) + (360 MINUTES)), "Deadline must be six real hours after the actual roundstart, not world start or lobby time")
+	TEST_ASSERT(is_real_time(SSovermap.round_end_timer), "Completion must run on real time, not world.time")
+	TEST_ASSERT(is_real_time(SSovermap.round_end_request_timer), "The first warning must run on real time, not world.time")
+	TEST_ASSERT(ROUND_END_NEAR(REALTIMEOFDAY + timeleft(SSovermap.round_end_timer), SSovermap.round_end_time), "Completion was not armed at the six-hour deadline")
+	TEST_ASSERT(ROUND_END_NEAR(REALTIMEOFDAY + timeleft(SSovermap.round_end_request_timer), SSovermap.round_end_time - (12 MINUTES)), "Fleet preparation must start twelve minutes before the deadline")
+	TEST_ASSERT_NULL(SSovermap.jump_countdown_text(), "The countdown must not show before the first warning")
+	var/original_timer = SSovermap.round_end_timer
+	SSovermap.arm_round_end(SSticker, world.time)
+	TEST_ASSERT_EQUAL(SSovermap.round_end_timer, original_timer, "Repeated start signals must not extend the round")
+	TEST_ASSERT(!SSovermap.request_jump(), "A transfer vote must not bring the fleet jump forward")
+	TEST_ASSERT(!vote.is_config_enabled(), "Transfer voting must be hidden while a fixed departure is armed")
+	TEST_ASSERT_NOTEQUAL(vote.can_be_initiated(FALSE), VOTE_AVAILABLE, "Players must not start a transfer vote during a timed round")
+	TEST_ASSERT_NOTEQUAL(vote.can_be_initiated(TRUE), VOTE_AVAILABLE, "A forced transfer vote must not replace the fixed departure")
+	// Ordinary end conditions and player restart votes cannot shorten a timed round.
+	GLOB.station_was_nuked = TRUE
+	TEST_ASSERT(!SSticker.check_finished(), "A station event must not end a timed round early")
+	SSticker.force_ending = FORCE_END_ROUND
+	SSticker.fire()
+	TEST_ASSERT_EQUAL(SSticker.force_ending, END_ROUND_AS_NORMAL, "An ordinary forced ending must defer to the fixed deadline")
+	SSticker.force_ending = ADMIN_FORCE_END_ROUND
+	SSticker.fire()
+	TEST_ASSERT_EQUAL(SSticker.force_ending, ADMIN_FORCE_END_ROUND, "Explicit admin endings must remain available")
+	TEST_ASSERT(SSovermap.cancel_jump(FALSE), "Admins must be able to cancel before the first announcement")
+	TEST_ASSERT_NULL(SSovermap.round_end_time, "Cancellation left an active deadline")
+	TEST_ASSERT_NULL(SSovermap.round_end_request_timer, "Cancellation left a fleet request armed")
+	TEST_ASSERT_NULL(SSovermap.round_end_timer, "Cancellation left completion armed")
+	TEST_ASSERT(vote.is_config_enabled(), "Cancellation must restore transfer voting")
+	TEST_ASSERT(SSticker.check_finished(), "Cancellation must restore normal event endings")
+
+	CONFIG_SET(number/round_time_limit, 30)
+	real_now = REALTIMEOFDAY
+	SSovermap.arm_round_end(SSticker, world.time - (5 MINUTES))
+	TEST_ASSERT(ROUND_END_NEAR(SSovermap.round_end_time, real_now + (25 MINUTES)), "Config duration was not applied")
+	TEST_ASSERT(ROUND_END_NEAR(REALTIMEOFDAY + timeleft(SSovermap.round_end_request_timer), real_now + (13 MINUTES)), "Config duration did not move the fleet preparation")
+	clear_schedule()
+
+	// The whole departure from the first warning: T-12 warning, T-7 and T-3 alerts, T-2 launch, T-0 end.
+	real_now = REALTIMEOFDAY
+	SSovermap.arm_round_end(SSticker, world.time - (18 MINUTES))
+	TEST_ASSERT(ROUND_END_NEAR(SSovermap.round_end_time, real_now + (12 MINUTES)), "Deadline missed for a round eighteen minutes in")
+	TEST_ASSERT(timeleft(SSovermap.round_end_request_timer) <= 2, "The first warning must be due twelve minutes before the end")
+	deltimer(SSovermap.round_end_request_timer)
+	var/articles = GLOB.news_network.message_count
+	SSovermap.request_scheduled_jump()
+	TEST_ASSERT_EQUAL(GLOB.news_network.message_count, articles + 1, "The first warning was not announced")
+	var/announced = last_announcement()
+	if(announced)
+		TEST_ASSERT(findtext(announced, "fleet jump in 10 minutes"), "Unexpected first warning: [announced]")
+	TEST_ASSERT(ROUND_END_NEAR(SSovermap.jump_launch_time, SSovermap.round_end_time - (2 MINUTES)), "Launch must come two minutes before the end")
+	TEST_ASSERT(is_real_time(SSovermap.jump_timer), "The launch must run on real time, not world.time")
+	TEST_ASSERT(ROUND_END_NEAR(REALTIMEOFDAY + timeleft(SSovermap.jump_timer), SSovermap.jump_launch_time), "The launch timer does not match the countdown")
+	TEST_ASSERT_EQUAL(length(SSovermap.jump_alert_timers), 2, "The five- and one-minute alerts were not both scheduled")
+	TEST_ASSERT(is_real_time(SSovermap.jump_alert_timers[1]), "The alerts must run on real time, not world.time")
+	TEST_ASSERT(ROUND_END_NEAR(REALTIMEOFDAY + timeleft(SSovermap.jump_alert_timers[1]), SSovermap.jump_launch_time - (5 MINUTES)), "The red alert must play five minutes before launch")
+	TEST_ASSERT(ROUND_END_NEAR(REALTIMEOFDAY + timeleft(SSovermap.jump_alert_timers[2]), SSovermap.jump_launch_time - (1 MINUTES)), "The last alert must play one minute before launch")
+	var/countdown = SSovermap.jump_countdown_text()
+	TEST_ASSERT(countdown == "Fleet Jump: 10:00" || findtext(countdown, "Fleet Jump: 09:5") == 1, "The countdown must start at the first warning (got [countdown])")
+	var/mob/living/carbon/human/consistent/viewer = allocate(/mob/living/carbon/human/consistent)
+	var/shown = FALSE
+	for(var/line in viewer.get_status_tab_items())
+		if(findtext("[line]", "Fleet Jump: "))
+			shown = TRUE
+	TEST_ASSERT(shown, "The countdown is missing from the status panel")
+	articles = GLOB.news_network.message_count
+	SSovermap.jump_alert(5 MINUTES)
+	TEST_ASSERT_EQUAL(GLOB.news_network.message_count, articles + 1, "The five-minute alert did not play")
+	announced = last_announcement()
+	if(announced)
+		TEST_ASSERT(findtext(announced, "fleet jump in 5 minutes"), "Unexpected five-minute alert: [announced]")
+	// A server that slept through the alerts wakes with all of them due: only the newest one plays.
+	SSovermap.jump_launch_time = REALTIMEOFDAY + (30 SECONDS)
+	articles = GLOB.news_network.message_count
+	SSovermap.jump_alert(5 MINUTES)
+	TEST_ASSERT_EQUAL(GLOB.news_network.message_count, articles, "An overtaken five-minute alert still played")
+	SSovermap.jump_alert(1 MINUTES)
+	TEST_ASSERT_EQUAL(GLOB.news_network.message_count, articles + 1, "The one-minute alert did not play")
+	TEST_ASSERT(SSovermap.cancel_jump(FALSE), "Admins must be able to cancel an announced departure")
+	TEST_ASSERT_NULL(SSovermap.jump_countdown_text(), "Cancellation left the countdown running")
+	TEST_ASSERT_EQUAL(length(SSovermap.jump_alert_timers), 0, "Cancellation left departure alerts armed")
+
+	// Simulate a delayed preparation callback: both later stages retain absolute deadlines.
+	SSovermap.arm_round_end(SSticker, world.time - (19 MINUTES))
+	deltimer(SSovermap.round_end_request_timer)
+	SSovermap.request_scheduled_jump()
+	TEST_ASSERT(ROUND_END_NEAR(REALTIMEOFDAY + timeleft(SSovermap.jump_timer), SSovermap.round_end_time - SSovermap.jump_completion_time), "Late preparation must not push launch back")
+	TEST_ASSERT_EQUAL(length(SSovermap.jump_alert_timers), 2, "Nine minutes before launch still leaves room for both alerts")
+	original_timer = SSovermap.jump_timer
+	TEST_ASSERT(!SSovermap.request_jump(), "A second request must not reset an announced departure")
+	TEST_ASSERT_EQUAL(SSovermap.jump_timer, original_timer, "A repeated request replaced the launch timer")
+	TEST_ASSERT(SSovermap.cancel_jump(FALSE), "Admins must be able to cancel an announced departure")
+	TEST_ASSERT_NULL(SSovermap.jump_timer, "Cancellation left a launch armed")
+
+	CONFIG_SET(number/round_time_limit, 1)
+	SSovermap.arm_round_end(SSticker, world.time)
+	TEST_ASSERT(timeleft(SSovermap.round_end_request_timer) <= 1, "Short configurations must begin departure on the next timer tick")
+	deltimer(SSovermap.round_end_request_timer)
+	SSovermap.request_scheduled_jump()
+	TEST_ASSERT(timeleft(SSovermap.jump_timer) <= 1, "A short round must not wait the normal ten-minute preparation")
+	TEST_ASSERT_EQUAL(length(SSovermap.jump_alert_timers), 0, "A short round has no time for departure alerts")
+	deltimer(SSovermap.jump_timer)
+	original_timer = SSovermap.round_end_timer
+	SSovermap.initiate_jump()
+	TEST_ASSERT_EQUAL(SSovermap.round_end_timer, original_timer, "Launching ships must not replace the absolute completion timer")
+	TEST_ASSERT_NULL(SSovermap.jump_countdown_text(), "The countdown must stop at launch")
+	TEST_ASSERT(!SSovermap.cancel_jump(FALSE), "A launched fleet must retain the existing no-cancellation rule")
+	deltimer(SSovermap.round_end_timer)
+	SSovermap.complete_jump()
+	TEST_ASSERT_EQUAL(SSovermap.jump_mode, 3, "Completion must use BS_JUMP_COMPLETED")
+	TEST_ASSERT(SSticker.check_finished(), "A completed jump must trigger normal round completion")
+	clear_schedule()
+	CONFIG_SET(number/round_time_limit, 0)
+	SSovermap.arm_round_end(SSticker, world.time)
+	TEST_ASSERT_NULL(SSovermap.round_end_time, "Zero must disable the automatic deadline")
+	TEST_ASSERT_NULL(SSovermap.round_end_request_timer, "Zero must not arm fleet preparation")
+	TEST_ASSERT_NULL(SSovermap.round_end_timer, "Zero must not arm completion")
+	TEST_ASSERT(vote.is_config_enabled(), "Untimed rounds must retain transfer votes")
+	TEST_ASSERT_EQUAL(vote.can_be_initiated(FALSE), VOTE_AVAILABLE, "Disabling the deadline must restore the current transfer vote API")
+
+#undef ROUND_END_NEAR
diff --git a/voidcrew/modules/unit_tests/voidcrew_ruin_turrets.dm b/voidcrew/modules/unit_tests/voidcrew_ruin_turrets.dm
new file mode 100644
index 00000000000..009d01447b7
--- /dev/null
+++ b/voidcrew/modules/unit_tests/voidcrew_ruin_turrets.dm
@@ -0,0 +1,44 @@
+/// Exercise the wreck's real crowbar path without a timed action.
+/obj/item/crowbar/ruin_turret_test
+	var/salvage_uses = 0
+
+/obj/item/crowbar/ruin_turret_test/use_tool(atom/target, mob/living/user, delay, amount = 0, volume = 0, datum/callback/extra_checks)
+	salvage_uses++
+	return TRUE
+
+/datum/unit_test/voidcrew_ruin_turret_salvage/Run()
+	var/mob/living/carbon/human/user = allocate(/mob/living/carbon/human, get_step(run_loc_floor_bottom_left, EAST))
+	var/obj/item/crowbar/ruin_turret_test/crowbar = allocate(__IMPLIED_TYPE__)
+	for(var/turret_type in list(/obj/machinery/porta_turret/ruin, /obj/machinery/porta_turret/ai/ruin))
+		var/obj/machinery/porta_turret/turret = allocate(turret_type, run_loc_floor_bottom_left)
+		TEST_ASSERT_NULL(turret.stored_gun, "[turret_type] retained a salvageable gun")
+		turret.deconstruct(TRUE)
+		TEST_ASSERT(QDELETED(turret), "[turret_type] was not deconstructed")
+		TEST_ASSERT_NULL(locate(/obj/item/gun) in run_loc_floor_bottom_left, "Deconstructing [turret_type] released a gun")
+
+		turret = allocate(turret_type, run_loc_floor_bottom_left)
+		turret.on = FALSE
+		turret.set_machine_stat(turret.machine_stat | BROKEN)
+		var/previous_uses = crowbar.salvage_uses
+		turret.attackby(crowbar, user, list(), list())
+		TEST_ASSERT_EQUAL(crowbar.salvage_uses, previous_uses + 1, "[turret_type] did not reach crowbar salvage")
+		TEST_ASSERT(QDELETED(turret), "Salvaging [turret_type] left the wreck behind")
+		TEST_ASSERT_NULL(locate(/obj/item/gun) in run_loc_floor_bottom_left, "Salvaging [turret_type] released a gun")
+
+/datum/unit_test/voidcrew_ruin_turret_firing/Run()
+	var/list/variants = list(
+		/obj/machinery/porta_turret/ruin = /obj/machinery/porta_turret,
+		/obj/machinery/porta_turret/ai/ruin = /obj/machinery/porta_turret/ai,
+	)
+	for(var/ruin_type in variants)
+		var/obj/machinery/porta_turret/ruin_turret = allocate(ruin_type, run_loc_floor_bottom_left)
+		var/obj/machinery/porta_turret/original_turret = allocate(variants[ruin_type], get_step(run_loc_floor_bottom_left, EAST))
+		ruin_turret.on = FALSE
+		original_turret.on = FALSE
+		if(ruin_type == /obj/machinery/porta_turret/ruin)
+			original_turret.setup(allocate(/obj/item/gun/energy/lasercannon))
+		for(var/property in list("stun_projectile", "lethal_projectile", "stun_projectile_sound", "lethal_projectile_sound", "base_icon_state", "shot_delay", "reqpower", "scan_range", "turret_flags", "mode"))
+			TEST_ASSERT_EQUAL(ruin_turret.vars[property], original_turret.vars[property], "[ruin_type] changed [property]")
+		TEST_ASSERT(!ruin_turret.uses_stored, "[ruin_type] still requires its discarded gun to fire")
+		TEST_ASSERT_NULL(ruin_turret.stored_gun, "[ruin_type] retained a physical gun after setup")
+		TEST_ASSERT_NOTNULL(original_turret.stored_gun, "[variants[ruin_type]] lost its original gun")
diff --git a/voidcrew/modules/unit_tests/voidcrew_ship_hulls.dm b/voidcrew/modules/unit_tests/voidcrew_ship_hulls.dm
index 1027b39db5a..7a1054560e6 100644
--- a/voidcrew/modules/unit_tests/voidcrew_ship_hulls.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_ship_hulls.dm
@@ -386,4 +386,16 @@
 		SSshuttle.unload_preview()
 	TEST_ASSERT(checked >= 5, "only [checked] purchasable hulls were checked for port overhang")
 
+/// Replacement storage paths used by legacy hulls must spawn their supplies during initialization.
+/datum/unit_test/voidcrew_hull_storage_contents
+
+/datum/unit_test/voidcrew_hull_storage_contents/Run()
+	var/list/storage_types = list(
+		/obj/item/storage/belt/sheath/sabre,
+		/obj/item/storage/medkit/surgery,
+	)
+	for(var/storage_type in storage_types)
+		var/obj/item/storage/container = allocate(storage_type)
+		TEST_ASSERT(length(container.contents) > 0, "[storage_type] spawned without supplies")
+
 #undef SHIP_MODULE_MAP_ROOT
diff --git a/voidcrew/modules/unit_tests/voidcrew_ship_modules.dm b/voidcrew/modules/unit_tests/voidcrew_ship_modules.dm
index 8fe76e92923..3a45cef6abf 100644
--- a/voidcrew/modules/unit_tests/voidcrew_ship_modules.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_ship_modules.dm
@@ -226,3 +226,81 @@
 	module.job_slots_add_by_theme -= "medical"
 	actual = get_module_job_definitions(null, selections, slots, "medical")
 	TEST_ASSERT_EQUAL(actual[1], shared[1], "removing an override did not restore the existing room crew")
+
+/// First and subsequent chaplains receive one holy weapon, even with occupied hands.
+/datum/unit_test/voidcrew_chaplain_starting_equipment
+	var/original_religion
+	var/original_deity
+	var/original_bible_name
+	var/original_bible_icon_state
+	var/original_bible_inhand_icon_state
+	var/original_holy_weapon_type
+	var/datum/religion_sect/original_religious_sect
+
+/datum/unit_test/voidcrew_chaplain_starting_equipment/New()
+	..()
+	original_religion = GLOB.religion
+	original_deity = GLOB.deity
+	original_bible_name = GLOB.bible_name
+	original_bible_icon_state = GLOB.bible_icon_state
+	original_bible_inhand_icon_state = GLOB.bible_inhand_icon_state
+	original_holy_weapon_type = GLOB.holy_weapon_type
+	original_religious_sect = GLOB.religious_sect
+
+/datum/unit_test/voidcrew_chaplain_starting_equipment/Destroy()
+	GLOB.religion = original_religion
+	GLOB.deity = original_deity
+	GLOB.bible_name = original_bible_name
+	GLOB.bible_icon_state = original_bible_icon_state
+	GLOB.bible_inhand_icon_state = original_bible_inhand_icon_state
+	GLOB.holy_weapon_type = original_holy_weapon_type
+	GLOB.religious_sect = original_religious_sect
+	return ..()
+
+/datum/unit_test/voidcrew_chaplain_starting_equipment/Run()
+	var/datum/job/chaplain/chaplain_job = allocate(/datum/job/chaplain)
+	GLOB.religious_sect = null
+	GLOB.bible_icon_state = null
+	GLOB.bible_inhand_icon_state = null
+	for(var/selected_weapon in list(null, /obj/item/nullrod/claymore))
+		for(var/full_hands in list(FALSE, TRUE))
+			GLOB.religion = null
+			GLOB.deity = null
+			GLOB.bible_name = null
+			GLOB.holy_weapon_type = selected_weapon
+			check_chaplain(chaplain_job, full_hands, selected_weapon || /obj/item/nullrod, HOLY_ROLE_HIGHPRIEST)
+			TEST_ASSERT(GLOB.religion, "The first chaplain did not establish a religion")
+			check_chaplain(chaplain_job, full_hands, selected_weapon || /obj/item/nullrod, HOLY_ROLE_PRIEST)
+			TEST_ASSERT_EQUAL(GLOB.holy_weapon_type, selected_weapon, "Spawning a chaplain changed the selected holy weapon")
+
+/datum/unit_test/voidcrew_chaplain_starting_equipment/proc/check_chaplain(datum/job/chaplain/chaplain_job, full_hands, expected_weapon, expected_role)
+	var/mob/living/carbon/human/consistent/chaplain = allocate(/mob/living/carbon/human/consistent)
+	chaplain.mind_initialize()
+	chaplain.equipOutfit(/datum/outfit/job/chaplain)
+	if(full_hands)
+		for(var/hand_index in 1 to length(chaplain.held_items))
+			TEST_ASSERT(chaplain.put_in_hand(allocate(/obj/item/pen), hand_index), "Could not fill the chaplain's hands")
+	var/turf/spawn_turf = get_turf(chaplain)
+	var/list/previous_contents = spawn_turf.contents.Copy()
+	chaplain_job.after_spawn(chaplain, null)
+
+	var/list/holy_weapons = chaplain.get_all_contents_type(/obj/item/nullrod)
+	for(var/obj/item/nullrod/dropped_weapon in (spawn_turf.contents - previous_contents))
+		holy_weapons += dropped_weapon
+	var/context = "holy role [expected_role], full hands [full_hands], weapon [expected_weapon]"
+	TEST_ASSERT_EQUAL(length(holy_weapons), 1, "Chaplain must receive exactly one holy weapon ([context])")
+	var/obj/item/nullrod/holy_weapon = holy_weapons[1]
+	TEST_ASSERT_EQUAL(holy_weapon.type, expected_weapon, "Chaplain received the wrong holy weapon ([context])")
+	if(full_hands)
+		TEST_ASSERT_EQUAL(holy_weapon.loc, spawn_turf, "The holy weapon must drop at the chaplain's feet when hands are full")
+		TEST_ASSERT_EQUAL(chaplain.get_num_held_items(), 2, "The holy weapon displaced an existing held item")
+	else
+		TEST_ASSERT(chaplain.is_holding(holy_weapon), "The chaplain did not hold their holy weapon ([context])")
+	if(!GLOB.holy_weapon_type)
+		TEST_ASSERT(holy_weapon.GetComponent(/datum/component/subtype_picker), "The default null rod lost its weapon selection")
+	TEST_ASSERT_EQUAL(chaplain.mind.holy_role, expected_role, "Chaplain received the wrong holy role ([context])")
+	var/list/bibles = chaplain.get_all_contents_type(/obj/item/book/bible/booze)
+	TEST_ASSERT_EQUAL(length(bibles), 1, "Chaplain must retain their bible ([context])")
+	var/obj/item/book/bible/booze/holy_bible = bibles[1]
+	TEST_ASSERT_EQUAL(holy_bible.name, GLOB.bible_name, "Chaplain bible lost the established name")
+	TEST_ASSERT_EQUAL(holy_bible.deity_name, GLOB.deity, "Chaplain bible lost the established deity")
diff --git a/voidcrew/modules/unit_tests/voidcrew_ship_starting_guns.dm b/voidcrew/modules/unit_tests/voidcrew_ship_starting_guns.dm
new file mode 100644
index 00000000000..66cffed7263
--- /dev/null
+++ b/voidcrew/modules/unit_tests/voidcrew_ship_starting_guns.dm
@@ -0,0 +1,65 @@
+/// Inspect finished inventories so the shared equip hook cannot silently delete guns.
+/datum/unit_test/voidcrew_ship_starting_guns/Run()
+	var/list/suit_guns = list(
+		/datum/outfit/job/hos = /obj/item/gun/energy/e_gun,
+		/datum/outfit/job/captain/syndicate = /obj/item/gun/ballistic/revolver/mateba,
+		/datum/outfit/job/assistant/syndicate = /obj/item/gun/ballistic/automatic/pistol,
+		/datum/outfit/job/workshop_hiryu_class_carrier_job_20 = /obj/item/gun/ballistic/shotgun/doublebarrel,
+		/datum/outfit/job/workshop_hiryu_class_carrier_job_12 = /obj/item/gun/ballistic/shotgun/doublebarrel,
+		/datum/outfit/job/workshop_hiryu_class_carrier_job_14 = /obj/item/gun/ballistic/shotgun/doublebarrel,
+	)
+	for(var/outfit_type in suit_guns)
+		var/datum/outfit/job/outfit = allocate(outfit_type)
+		var/mob/living/carbon/human/consistent/wearer = allocate(__IMPLIED_TYPE__)
+		outfit.equip(wearer)
+		TEST_ASSERT(istype(wearer.s_store, suit_guns[outfit_type]), "[outfit_type] lost its starting gun after equip.")
+		if(outfit_type == /datum/outfit/job/assistant/syndicate)
+			TEST_ASSERT(istype(wearer.l_store, /obj/item/ammo_box/magazine/m10mm), "The syndicate crew member lost their spare magazine.")
+		if(ispath(outfit_type, /datum/outfit/job/workshop_hiryu_class_carrier_job_20) || ispath(outfit_type, /datum/outfit/job/workshop_hiryu_class_carrier_job_12) || ispath(outfit_type, /datum/outfit/job/workshop_hiryu_class_carrier_job_14))
+			TEST_ASSERT(locate(/obj/item/storage/box/lethalshot) in wearer.get_all_contents(), "[outfit_type] lost its shotgun ammunition.")
+	var/datum/outfit/job/bridge_assistant/bridge_outfit = allocate(__IMPLIED_TYPE__)
+	var/mob/living/carbon/human/consistent/bridge_wearer = allocate(__IMPLIED_TYPE__)
+	bridge_outfit.equip(bridge_wearer)
+	TEST_ASSERT(istype(bridge_wearer.l_store, /obj/item/gun/energy/e_gun/mini), "The bridge assistant lost their pocket gun.")
+
+/// Locker contents are generated at different times; check both immediate and lazy stock.
+/datum/unit_test/voidcrew_ship_starting_lockers/Run()
+	var/list/locker_guns = list(
+		/obj/structure/closet/secure_closet/captains = /obj/item/gun/energy/e_gun,
+		/obj/structure/closet/secure_closet/hop = /obj/item/gun/energy/e_gun,
+		/obj/structure/closet/secure_closet/hos = /obj/item/gun/energy/e_gun/hos,
+		/obj/structure/closet/secure_closet/armory2 = /obj/item/gun/ballistic/shotgun/riot,
+	)
+	for(var/locker_type in locker_guns)
+		var/obj/structure/closet/locker = allocate(locker_type)
+		if(!locker.contents_initialized)
+			locker.contents_initialized = TRUE
+			locker.PopulateContents()
+			SEND_SIGNAL(locker, COMSIG_CLOSET_CONTENTS_INITIALIZED)
+		TEST_ASSERT(locate(locker_guns[locker_type]) in locker.get_all_contents(), "[locker_type] lost its starting gun.")
+		if(locker_type == /obj/structure/closet/secure_closet/armory2)
+			TEST_ASSERT(locate(/obj/item/storage/box/rubbershot) in locker, "The ballistics locker lost its shell boxes.")
+
+/// Marine vouchers retain each faction's original choices and spare ammunition.
+/datum/unit_test/voidcrew_ship_starting_vouchers/Run()
+	var/obj/machinery/vending/security/marine/syndicate = allocate(__IMPLIED_TYPE__)
+	var/list/syndicate_choices = list(
+		"M-90gl Carbine" = /obj/item/gun/ballistic/automatic/m90/unrestricted,
+		"sniper rifle" = /obj/item/gun/ballistic/rifle/sniper_rifle,
+		"C-20r SMG" = /obj/item/gun/ballistic/automatic/c20r/unrestricted,
+		"Bulldog Shotgun" = /obj/item/gun/ballistic/shotgun/bulldog/unrestricted,
+	)
+	TEST_ASSERT_EQUAL(length(syndicate.voucher_items), length(syndicate_choices), "The syndicate vendor has the wrong voucher options.")
+	for(var/choice in syndicate_choices)
+		TEST_ASSERT_EQUAL(syndicate.voucher_items[choice], syndicate_choices[choice], "The syndicate vendor lost [choice].")
+	for(var/magazine in list(/obj/item/ammo_box/magazine/m9mm, /obj/item/ammo_box/magazine/m10mm, /obj/item/ammo_box/magazine/smgm45, /obj/item/ammo_box/magazine/sniper_rounds, /obj/item/ammo_box/magazine/m12g))
+		TEST_ASSERT_EQUAL(syndicate.products[magazine], 3, "The syndicate vendor lost spare [magazine].")
+	var/obj/machinery/vending/security/marine/solgov/solgov = allocate(__IMPLIED_TYPE__)
+	var/list/solgov_choices = list(
+		"Tactical Energy Gun" = /obj/item/gun/energy/e_gun/stun,
+		"Inferno Pistol" = /obj/item/gun/energy/laser/thermal/inferno,
+		"Cryo Pistol" = /obj/item/gun/energy/laser/thermal/cryo,
+	)
+	TEST_ASSERT_EQUAL(length(solgov.voucher_items), length(solgov_choices), "The SolGov vendor has the wrong voucher options.")
+	for(var/choice in solgov_choices)
+		TEST_ASSERT_EQUAL(solgov.voucher_items[choice], solgov_choices[choice], "The SolGov vendor lost [choice].")
diff --git a/voidcrew/modules/unit_tests/voidcrew_shop_catalog.dm b/voidcrew/modules/unit_tests/voidcrew_shop_catalog.dm
index bbe4508086f..4730d60cedf 100644
--- a/voidcrew/modules/unit_tests/voidcrew_shop_catalog.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_shop_catalog.dm
@@ -24,6 +24,9 @@
 			continue
 		shops_checked++
 		var/list/every_sku = shop.sku_types + shop.rotating_pool + shop.rare_pool + shop.chart_pool
+		for(var/datum/shop_rotation/rotation as anything in shop.live_rotations)
+			for(var/sku_type in rotation.pool)
+				every_sku += sku_type
 		for(var/datum/shop_sku/sku_type as anything in every_sku)
 			if(!ispath(sku_type, /datum/shop_sku))
 				TEST_FAIL("[shop_type] lists [sku_type], which is not a /datum/shop_sku")
@@ -44,15 +47,14 @@
 		for(var/datum/shop_buyback/buyback_type as anything in shop.buyback_types)
 			if(!ispath(buyback_type, /datum/shop_buyback))
 				TEST_FAIL("[shop_type] lists [buyback_type] as a buyback, which is not a /datum/shop_buyback")
-		for(var/reward in shop.exclusive_rewards)
-			if(!ispath(reward, /atom/movable))
-				TEST_FAIL("[shop_type] lists exclusive reward [reward], which is not a spawnable movable. The contract that pays it out gives nothing")
 		for(var/list/request as anything in shop.mission_requests)
 			if(!islist(request))
 				TEST_FAIL("[shop_type] has a malformed mission_requests row")
 				continue
 			if(!ispath(request["type"], /atom/movable))
 				TEST_FAIL("[shop_type] requests [request["type"]], which is not a spawnable movable")
+			if(!is_outpost_procurement_type(request["type"]))
+				TEST_FAIL("[shop_type] requests unsupported procurement goods [request["type"]]")
 			if((request["amount"] || 0) < 1)
 				TEST_FAIL("[shop_type] requests [request["amount"]] of [request["type"]]")
 			// A stack ask is settled off ONE stack (deliver/can_turn_in), so an
@@ -64,7 +66,514 @@
 				var/ceiling = initial(asked.max_amount)
 				if(request["amount"] > ceiling)
 					TEST_FAIL("[shop_type] requests [request["amount"]] of [request["type"]], but that stack caps at [ceiling] - the contract can never be turned in")
+		TEST_ASSERT_EQUAL(length(shop.get_procurement_requests()), length(shop.mission_requests), "[shop_type] has procurement rows that fail eligibility")
 		qdel(shop)
 
 	TEST_ASSERT(shops_checked >= 5, "only [shops_checked] shops with a category list were checked")
 	TEST_ASSERT(skus_checked >= 100, "only [skus_checked] SKUs were checked. The catalog walk is not seeing the shelves")
+
+	var/list/banned_gear = list(
+		/obj/item/restraints/legcuffs/bola,
+		/obj/item/clothing/glasses/hud/health/sunglasses,
+		/obj/item/mod/core/standard,
+	)
+	for(var/datum/shop_sku/sku_type as anything in subtypesof(/datum/shop_sku))
+		TEST_ASSERT(!(initial(sku_type.item_path) in banned_gear), "[sku_type] still sells removed craftable gear.")
+		TEST_ASSERT(findtext("[initial(sku_type.item_path)]/", "/obj/item/blueprint/") != 1, "[sku_type] still sells a schematic.")
+
+/// Existing field-good quantities and difficulties, including owner exceptions.
+/datum/unit_test/voidcrew_procurement_catalog/Run()
+	// Difficulty literals are EASY/MEDIUM/HARD (1/2/3); fork defines compile later.
+	var/list/expected_catalogs = list(
+		/datum/outpost_shop/general = list(
+			list(/obj/item/fish, 1, 1),
+			list(/obj/item/stack/sheet/animalhide/bear, 1, 2),
+			list(/obj/item/stack/spice_pods, 6, 2),
+			list(/obj/item/sea_crystal, 1, 3),
+		),
+		/datum/outpost_shop/black_market = list(
+			list(/obj/item/stack/telecrystal_raw, 10, 3),
+			list(/obj/item/organ/monster_core/regenerative_core/legion, 1, 3),
+		),
+		/datum/outpost_shop/outfitter = list(
+			list(/obj/item/stack/sheet/animalhide/goliath_hide, 4, 3),
+			list(/obj/item/stack/sheet/sinew, 4, 2),
+			list(/obj/item/stack/glacial_core, 5, 2),
+			list(/obj/item/mod/construction/broken_core, 2, 1),
+			list(/obj/item/mod/control/pre_equipped, 1, 2),
+			list(/obj/item/mod/module/springlock, 1, 2),
+			list(/obj/item/mod/module/visor/rave, 1, 2),
+			list(/obj/item/mod/module/balloon, 1, 2),
+			list(/obj/item/mod/module/stamp, 1, 2),
+		),
+	)
+	for(var/shop_type in expected_catalogs)
+		var/datum/outpost_shop/shop = allocate(shop_type)
+		var/list/expected_requests = expected_catalogs[shop_type]
+		TEST_ASSERT_EQUAL(length(shop.mission_requests), length(expected_requests), "[shop_type] has unexpected procurement rows")
+		for(var/list/expected as anything in expected_requests)
+			var/list/found
+			for(var/list/request as anything in shop.mission_requests)
+				if(request["type"] == expected[1])
+					found = request
+					break
+			TEST_ASSERT_NOTNULL(found, "[shop_type] lost its [expected[1]] request")
+			TEST_ASSERT_EQUAL(found["amount"], expected[2], "[shop_type] changed its [expected[1]] quantity")
+			TEST_ASSERT_EQUAL(found["difficulty"], expected[3], "[shop_type] changed its [expected[1]] difficulty")
+		if(istype(shop, /datum/outpost_shop/general))
+			TEST_ASSERT(shop.extra_offer_mix[/datum/mission/outpost_supply/angler] > 0, "The owner's angler exception must remain available")
+			TEST_ASSERT(shop.extra_offer_mix[/datum/mission/outpost_supply/cook] > 0, "The owner's Kitchen Orders must remain available")
+
+	var/datum/outpost_shop/vendor/suit_fitter/fitter = allocate(/datum/outpost_shop/vendor/suit_fitter)
+	TEST_ASSERT_EQUAL(length(fitter.mission_requests), 6, "The fitter must supply all six salvage requests")
+	var/datum/mission/delivery/delivery = allocate(/datum/mission/delivery)
+	TEST_ASSERT_EQUAL(delivery.weight, 0, "Ore-only ship deliveries must not roll")
+	TEST_ASSERT(delivery.generation_failed, "Explicit generation must also refuse suspended ship deliveries")
+	TEST_ASSERT_EQUAL(length(delivery.objectives), 0, "Suspended deliveries must not build an ore objective")
+
+/// Unsupported and malformed rows never enter the ordinary supply pool.
+/datum/unit_test/voidcrew_procurement_filter/Run()
+	var/datum/outpost_shop/general/shop = allocate(/datum/outpost_shop/general)
+	var/list/valid = list("type" = /obj/item/stack/telecrystal_raw, "name" = "raw telecrystal", "amount" = 10, "difficulty" = 3)
+	shop.mission_requests = list(
+		"malformed",
+		list("type" = /obj/item/stack/ore/iron, "name" = "iron", "amount" = 10, "difficulty" = 1),
+		list("type" = /obj/item/stack/sheet/plasteel, "name" = "plasteel", "amount" = 10, "difficulty" = 2),
+		list("type" = /obj/item/stack/cable_coil, "name" = "cable", "amount" = 30, "difficulty" = 1),
+		list("type" = /obj/item/mod/control, "name" = "control", "amount" = 1, "difficulty" = 1),
+		list("type" = /obj/item/mod/module, "name" = "module", "amount" = 1, "difficulty" = 1),
+		list("type" = /obj/item/mod/module/storage, "name" = "module", "amount" = 1, "difficulty" = 1),
+		list("type" = /obj/item/stack/telecrystal_raw, "name" = "raw telecrystal", "amount" = 0, "difficulty" = 3),
+		list("type" = /obj/item/stack/telecrystal_raw, "name" = "raw telecrystal", "amount" = 31, "difficulty" = 3),
+		list("type" = /obj/item/stack/telecrystal_raw, "name" = "raw telecrystal", "amount" = 1.5, "difficulty" = 3),
+		list("type" = /obj/item/stack/telecrystal_raw, "name" = "raw telecrystal", "amount" = 10),
+	)
+	var/datum/mission/outpost_supply/rejected = allocate(/datum/mission/outpost_supply, shop)
+	TEST_ASSERT(rejected.generation_failed, "An unsupported-only request pool must fail generation")
+	shop.mission_requests += list(valid)
+	var/list/filtered = shop.get_procurement_requests()
+	TEST_ASSERT_EQUAL(length(filtered), 1, "Unsupported rows survived the eligibility filter")
+	TEST_ASSERT_EQUAL(filtered[1], valid, "The filter must retain the original compliant request")
+	var/datum/mission/outpost_supply/accepted = allocate(/datum/mission/outpost_supply, shop)
+	TEST_ASSERT(!accepted.generation_failed, "A compliant request must still generate")
+	TEST_ASSERT_EQUAL(accepted.required_type, valid["type"], "Generation chose an unsupported request")
+	TEST_ASSERT_EQUAL(accepted.required_amount, 10, "Generation changed a compliant quantity")
+	TEST_ASSERT_EQUAL(accepted.difficulty, 3, "Generation changed a compliant difficulty")
+	TEST_ASSERT(istype(accepted.objectives[1], /datum/mission_objective/deliver/procurement), "Ordinary supply requests must use procurement validation")
+
+/// Empty and unsupported-only pools must let other offers fill the board.
+/datum/unit_test/voidcrew_procurement_empty_board/Run()
+	var/obj/structure/overmap/trader_outpost/outpost = allocate(/obj/structure/overmap/trader_outpost)
+	// Kitchen Orders need no overmap target, making this a deterministic board.
+	outpost.shop.extra_offer_mix = list(
+		/datum/mission/recovery/kill/outpost = 0,
+		/datum/mission/recovery/outpost = 0,
+		/datum/mission/outpost_courier = 0,
+		/datum/mission/outpost_supply/cook = 1,
+	)
+	var/list/pools = list(
+		list(),
+		list(list("type" = /obj/item/stack/ore/iron, "name" = "iron", "amount" = 10, "difficulty" = 1)),
+		list(list("type" = /obj/item/stack/glacial_core, "name" = "glacial cores", "amount" = 5, "difficulty" = 2)),
+	)
+	for(var/list/pool as anything in pools)
+		for(var/datum/mission/posted as anything in outpost.shop_offers.Copy())
+			qdel(posted)
+		outpost.shop_offers.Cut()
+		outpost.shop.mission_requests = pool
+		outpost.next_contract_refill = world.time
+		outpost.ensure_shop_offers()
+		// OUTPOST_SHOP_OFFER_COUNT = 4, defined after this test's include.
+		TEST_ASSERT_EQUAL(length(outpost.shop_offers), 4, "Supply eligibility stalled the outpost board")
+		TEST_ASSERT_EQUAL(outpost.has_posted_offer_type(/datum/mission/outpost_supply), length(pool) && is_outpost_procurement_type(pool[1]["type"]), "Only eligible pools should force a plain supply request")
+
+/// Exact loot-module eligibility must not silently expand with printable designs.
+/datum/unit_test/voidcrew_procurement_module_sources/Run()
+	var/list/loot_modules = list(/obj/item/mod/module/springlock, /obj/item/mod/module/visor/rave, /obj/item/mod/module/balloon, /obj/item/mod/module/stamp)
+	var/obj/effect/spawner/random/mod/maint/spawner_type = /obj/effect/spawner/random/mod/maint
+	var/list/loot = initial(spawner_type.loot)
+	for(var/module_type in loot_modules)
+		TEST_ASSERT(module_type in loot, "Eligible [module_type] lost its loot source")
+		TEST_ASSERT(is_outpost_procurement_type(module_type), "The loot module [module_type] must be supported")
+	for(var/datum/design/design_type as anything in subtypesof(/datum/design))
+		TEST_ASSERT(!(initial(design_type.build_path) in loot_modules), "[design_type] can print eligible loot module [initial(design_type.build_path)]")
+	for(var/datum/crafting_recipe/recipe_type as anything in subtypesof(/datum/crafting_recipe))
+		TEST_ASSERT(!(initial(recipe_type.result) in loot_modules), "[recipe_type] can craft an eligible loot module")
+
+/// Procurement rejects forged submissions and consumes only eligible goods.
+/datum/unit_test/voidcrew_procurement_turn_in/Run()
+	var/obj/structure/overmap/ship/receiving_ship = allocate(/obj/structure/overmap/ship)
+	receiving_ship.ship_account = allocate(/datum/bank_account)
+	var/list/unsupported_types = list(
+		/obj/item/stack/ore/iron,
+		/obj/item/stack/sheet/plasteel,
+		/obj/item/stack/cable_coil,
+		/obj/item/mod/control,
+		/obj/item/mod/module,
+		/obj/item/mod/module/storage,
+		/obj/item/mod/module/visor/meson,
+		/obj/item/mod/module/balloon/advanced,
+	)
+	for(var/item_type in unsupported_types)
+		var/datum/mission/mission = allocate(/datum/mission)
+		mission.requires_item = TRUE
+		mission.servant = receiving_ship
+		mission.active = TRUE
+		var/datum/mission_objective/deliver/procurement/ask = new
+		ask.required_type = item_type
+		mission.add_objective(ask)
+		var/obj/item/item = allocate(item_type)
+		TEST_ASSERT(!mission.turn_in(run_loc_floor_bottom_left, item), "A forged [item_type] turn-in must fail")
+		TEST_ASSERT_EQUAL(ask.accept_item(item, run_loc_floor_bottom_left), 0, "Direct acceptance must refuse unsupported [item_type]") // MISSION_ITEM_REFUSED
+		TEST_ASSERT(!QDELETED(item), "Refusing [item_type] must not consume it")
+
+	var/datum/mission/control_mission = allocate(/datum/mission)
+	control_mission.requires_item = TRUE
+	control_mission.servant = receiving_ship
+	control_mission.active = TRUE
+	var/datum/mission_objective/deliver/procurement/control_ask = new
+	control_ask.required_type = /obj/item/mod/control/pre_equipped
+	control_mission.add_objective(control_ask)
+	var/obj/item/mod/control/manufactured = allocate(/obj/item/mod/control)
+	TEST_ASSERT(!control_mission.turn_in(run_loc_floor_bottom_left, manufactured), "An assembled base control cannot satisfy a salvaged-control ask")
+	var/obj/item/mod/control/pre_equipped/salvaged = allocate(/obj/item/mod/control/pre_equipped/standard)
+	var/mob/living/carbon/human/wearer = allocate(/mob/living/carbon/human/consistent)
+	TEST_ASSERT(wearer.equip_to_slot_if_possible(salvaged, ITEM_SLOT_BACK), "The control fixture must be worn")
+	TEST_ASSERT(!control_mission.turn_in(run_loc_floor_bottom_left, salvaged), "A worn salvaged control must be refused")
+	TEST_ASSERT_EQUAL(control_ask.accept_item(salvaged, run_loc_floor_bottom_left), 0, "Direct acceptance must also refuse a worn control")
+	TEST_ASSERT(!QDELETED(salvaged), "A refused worn suit must survive")
+	TEST_ASSERT(wearer.dropItemToGround(salvaged), "The salvaged control must be removable")
+	TEST_ASSERT(control_mission.turn_in(run_loc_floor_bottom_left, salvaged), "An unworn pre-equipped control must be accepted")
+	TEST_ASSERT(QDELETED(salvaged), "The accepted control must be consumed")
+
+	var/datum/mission_objective/deliver/procurement/exact_module = allocate(/datum/mission_objective/deliver/procurement)
+	exact_module.required_type = /obj/item/mod/module/balloon
+	var/obj/item/mod/module/balloon/advanced/descendant = allocate(/obj/item/mod/module/balloon/advanced)
+	TEST_ASSERT(!exact_module.can_turn_in(descendant), "A loot-module ask must reject a different descendant type")
+	TEST_ASSERT_EQUAL(exact_module.accept_item(descendant, run_loc_floor_bottom_left), 0, "Direct acceptance must preserve exact module matching")
+	TEST_ASSERT(!QDELETED(descendant), "A refused module must survive")
+
+	var/list/loose_types = list(/obj/item/sea_crystal, /obj/item/organ/monster_core/regenerative_core/legion, /obj/item/mod/construction/broken_core, /obj/item/mod/module/springlock, /obj/item/mod/module/visor/rave, /obj/item/mod/module/balloon, /obj/item/mod/module/stamp)
+	for(var/item_type in loose_types)
+		var/datum/mission/mission = allocate(/datum/mission)
+		mission.requires_item = TRUE
+		mission.servant = receiving_ship
+		mission.active = TRUE
+		var/datum/mission_objective/deliver/procurement/ask = new
+		ask.required_type = item_type
+		ask.required_amount = 2
+		mission.add_objective(ask)
+		var/obj/item/first = allocate(item_type)
+		var/obj/item/second = allocate(item_type)
+		mission.register_quest_atom(first)
+		TEST_ASSERT(mission.turn_in(run_loc_floor_bottom_left, first), "The first [item_type] must count as progress")
+		TEST_ASSERT(QDELETED(first), "The first loose item must be consumed")
+		TEST_ASSERT_NULL(mission.quest_atom, "Consumption must forget the quest atom before deletion")
+		TEST_ASSERT(!mission.failed, "Consuming a tracked item must not void the mission")
+		TEST_ASSERT_EQUAL(ask.delivered_count, 1, "Loose deliveries must count one item per hand-over")
+		TEST_ASSERT(!mission.turn_in(run_loc_floor_bottom_left, first), "A consumed item cannot be submitted twice")
+		TEST_ASSERT(mission.turn_in(run_loc_floor_bottom_left, second), "The second [item_type] must finish the request")
+		TEST_ASSERT(QDELETED(second), "The second loose item must be consumed")
+		TEST_ASSERT(QDELETED(mission), "The counted request must finish")
+
+	var/list/stack_cases = list(list(/obj/item/stack/telecrystal_raw, 10), list(/obj/item/stack/glacial_core, 5), list(/obj/item/stack/spice_pods, 6))
+	for(var/list/stack_case as anything in stack_cases)
+		var/datum/mission/mission = allocate(/datum/mission)
+		mission.requires_item = TRUE
+		mission.servant = receiving_ship
+		mission.active = TRUE
+		var/datum/mission_objective/deliver/procurement/ask = new
+		ask.required_type = stack_case[1]
+		ask.required_amount = stack_case[2]
+		mission.add_objective(ask)
+		var/obj/item/stack/short_stack = allocate(stack_case[1], run_loc_floor_bottom_left, ask.required_amount - 1, FALSE)
+		var/obj/item/stack/full_stack = allocate(stack_case[1], run_loc_floor_bottom_left, ask.required_amount + 2, FALSE)
+		TEST_ASSERT(!mission.turn_in(run_loc_floor_bottom_left, short_stack), "A short eligible stack must be refused")
+		TEST_ASSERT_EQUAL(ask.accept_item(short_stack, run_loc_floor_bottom_left), 0, "Direct acceptance must also check stack quantities")
+		TEST_ASSERT_EQUAL(short_stack.amount, stack_case[2] - 1, "A refused stack must remain untouched")
+		mission.register_quest_atom(full_stack)
+		TEST_ASSERT(mission.turn_in(run_loc_floor_bottom_left, full_stack), "A full eligible stack must be accepted")
+		TEST_ASSERT_EQUAL(full_stack.amount, 2, "Only the configured stack quantity must be consumed")
+		TEST_ASSERT(QDELETED(mission), "A full stack must finish the request")
+
+/// The authored ladder is shared stock, with exactly one SKU for each listed weapon.
+/datum/unit_test/voidcrew_ladder_catalog/Run()
+	var/list/catalogs = list(
+		/datum/outpost_shop/general = list(
+			list(/datum/shop_sku/general/hunting_knife, /obj/item/knife/hunting, 4, 200, 0),
+			list(/datum/shop_sku/general/survival_knife, /obj/item/knife/combat/survival, 4, 350, 0),
+			list(/datum/shop_sku/general/surplus_rifle, /obj/item/gun/ballistic/rifle/boltaction/surplus, 2, 900, 0),
+		),
+		/datum/outpost_shop/outfitter = list(
+			list(/datum/shop_sku/outfitter/combat_knife, /obj/item/knife/combat, 3, 900, 0),
+			list(/datum/shop_sku/outfitter/shortsword, /obj/item/claymore/shortsword, 2, 1200, 0),
+			list(/datum/shop_sku/outfitter/ablative_bat, /obj/item/melee/baseball_bat/ablative, 2, 1000, 0),
+			list(/datum/shop_sku/outfitter/fireaxe, /obj/item/fireaxe, 2, 1500, 0),
+			list(/datum/shop_sku/outfitter/sabre, /obj/item/melee/sabre, 1, 1800, 0),
+			list(/datum/shop_sku/outfitter/laser_gun, /obj/item/gun/energy/laser, 1, 1500, 0),
+			list(/datum/shop_sku/outfitter/riot_shotgun, /obj/item/gun/ballistic/shotgun/riot, 1, 1800, 0),
+			list(/datum/shop_sku/outfitter/energy_gun, /obj/item/gun/energy/e_gun, 1, 2400, 0),
+		),
+		/datum/outpost_shop/black_market = list(
+			list(/datum/shop_sku/black_market/boarding_axe, /obj/item/fireaxe/boardingaxe, 1, 2400, 0),
+			list(/datum/shop_sku/black_market/cutlass, /obj/item/claymore/cutlass, 1, 3000, 3),
+			list(/datum/shop_sku/black_market/rare/energy_sword, /obj/item/melee/energy/sword/saber, 1, 4000, 4),
+			list(/datum/shop_sku/black_market/c20r, /obj/item/gun/ballistic/automatic/c20r/unrestricted, 1, 3600, 2),
+			list(/datum/shop_sku/black_market/wt550, /obj/item/gun/ballistic/automatic/wt550, 1, 4200, 2),
+			list(/datum/shop_sku/black_market/rotating/mateba, /obj/item/gun/ballistic/revolver/mateba, 1, 3000, 1),
+		),
+		/datum/outpost_shop/vendor/ripperdoc = list(
+			list(/datum/shop_sku/ripperdoc/monowire, /obj/item/organ/cyberimp/arm/toolkit/cyberware/monowire, 1, 0, 3),
+			list(/datum/shop_sku/ripperdoc/mantis, /obj/item/cyberware_pair_case/mantis_blades, 1, 0, 4),
+			list(/datum/shop_sku/ripperdoc/gorilla, /obj/item/cyberware_pair_case/gorilla_arms, 1, 0, 3),
+		),
+	)
+	for(var/shop_type in catalogs)
+		var/datum/outpost_shop/shop = allocate(shop_type)
+		var/list/every_sku = shop.sku_types + shop.rotating_pool + shop.rare_pool + shop.favor_sku_types
+		for(var/list/row as anything in catalogs[shop_type])
+			TEST_ASSERT(row[1] in every_sku, "[shop_type] lost [row[1]]")
+			var/datum/shop_sku/sku = allocate(row[1])
+			TEST_ASSERT_EQUAL(sku.item_path, row[2], "[sku.type] dispenses the wrong weapon")
+			TEST_ASSERT_EQUAL(sku.stock_min, row[3], "[sku.type] has random lower stock")
+			TEST_ASSERT_EQUAL(sku.stock_max, row[3], "[sku.type] has the wrong stock cap")
+			TEST_ASSERT_EQUAL(sku.stock, row[3], "[sku.type] starts with the wrong stock")
+			TEST_ASSERT_EQUAL(sku.price_credits, row[4], "[sku.type] has the wrong credit price")
+			TEST_ASSERT_EQUAL(sku.price_vouchers, row[5], "[sku.type] has the wrong voucher price")
+			var/copies = 0
+			for(var/datum/shop_sku/other as anything in every_sku)
+				if(initial(other.item_path) == sku.item_path)
+					copies++
+			TEST_ASSERT_EQUAL(copies, 1, "[shop_type] has duplicate [sku.item_path] shelves")
+			if(ispath(sku.item_path, /obj/item/gun))
+				TEST_ASSERT(row[1] in shop.sku_types, "A gun must stay on its core shelf")
+				TEST_ASSERT_EQUAL(sku.restock_interval, 1 HOURS, "Gun replenishment must be hourly")
+				TEST_ASSERT_EQUAL(timeleft(sku.restock_timer), 1 HOURS, "The hourly delivery is not scheduled")
+			else if(row[5])
+				TEST_ASSERT_EQUAL(sku.restock_interval, INFINITY, "Red melee/chrome must remain finite")
+				TEST_ASSERT_NULL(sku.restock_timer, "Finite melee acquired a refill timer")
+			if(ispath(sku.item_path, /obj/item/gun) || row[5])
+				TEST_ASSERT(sku.fixed_price, "A restricted weapon can be discounted")
+				TEST_ASSERT(!sku.contract_reward, "A restricted weapon can pay a contract")
+
+/// Check removed sources across all owned shelf families, including undealt stock.
+/datum/unit_test/voidcrew_ladder_removed_shelves/Run()
+	var/list/allowed_guns = list(
+		/obj/item/gun/ballistic/rifle/boltaction/surplus,
+		/obj/item/gun/energy/disabler,
+		/obj/item/gun/energy/laser,
+		/obj/item/gun/energy/e_gun,
+		/obj/item/gun/ballistic/shotgun/riot,
+		/obj/item/gun/ballistic/automatic/c20r/unrestricted,
+		/obj/item/gun/ballistic/automatic/wt550,
+		/obj/item/gun/ballistic/revolver/mateba,
+	)
+	var/list/printed_gear = list(
+		/obj/item/gps, /obj/item/storage/belt/utility/full, /obj/item/weldingtool/largetank,
+		/obj/item/lightreplacer, /obj/item/holosign_creator/atmos, /obj/item/construction/rcd/loaded,
+		/obj/item/healthanalyzer, /obj/item/pickaxe, /obj/item/pickaxe/drill, /obj/item/clothing/glasses/meson,
+		/obj/item/t_scanner/adv_mining_scanner/lesser, /obj/item/bodybag/bluespace, /obj/item/clothing/glasses/welding,
+		/obj/item/flashlight/seclite, /obj/item/assembly/flash/handheld, /obj/item/clothing/shoes/magboots,
+		/obj/item/crowbar/power, /obj/item/defibrillator/compact, /obj/item/suppressor, /obj/item/mod/module/active_sonar,
+		/obj/item/cultivator, /obj/item/shovel/spade, /obj/item/hatchet, /obj/item/secateurs,
+		/obj/item/reagent_containers/cup/watering_can, /obj/item/plant_analyzer, /obj/item/fishing_rod/tech,
+	)
+	for(var/shop_type in list(/datum/outpost_shop/general, /datum/outpost_shop/outfitter, /datum/outpost_shop/black_market, /datum/outpost_shop/vendor/potting_shed, /datum/outpost_shop/vendor/bait_shop, /datum/outpost_shop/vendor/ripperdoc))
+		var/datum/outpost_shop/shop = allocate(shop_type)
+		for(var/datum/shop_sku/sku_type as anything in shop.sku_types + shop.rotating_pool + shop.rare_pool + shop.favor_sku_types)
+			var/item_path = initial(sku_type.item_path)
+			TEST_ASSERT(!(item_path in printed_gear), "[shop_type] still sells printable gear [item_path]")
+			if(ispath(item_path, /obj/item/gun))
+				TEST_ASSERT(item_path in allowed_guns, "[shop_type] bypasses the ladder with [item_path]")
+			TEST_ASSERT(item_path != /obj/item/organ/cyberimp/arm/toolkit/cyberware/ronin && item_path != /obj/item/organ/cyberimp/arm/toolkit/cyberware/bunker_buster, "Splice still sells a gun arm")
+
+/// Convoys and rotations cannot accelerate deliveries or revive finite stock.
+/datum/unit_test/voidcrew_ladder_restock/Run()
+	var/datum/outpost_shop/shop = allocate(/datum/outpost_shop)
+	shop.add_sku(/datum/shop_sku/general/surplus_rifle, "core")
+	var/datum/shop_sku/gun = shop.skus[1]
+	gun.stock = 0
+	var/timer_id = gun.restock_timer
+	for(var/convoy in 1 to 6)
+		shop.convoy_restock()
+		TEST_ASSERT_EQUAL(gun.stock, 0, "A convoy bypassed the hourly refill")
+		TEST_ASSERT_EQUAL(gun.restock_timer, timer_id, "Convoys reset the gun clock")
+	gun.restock_unit()
+	TEST_ASSERT_EQUAL(gun.stock, 1, "One delivery must return one gun")
+	gun.restock_unit()
+	gun.restock_unit()
+	TEST_ASSERT_EQUAL(gun.stock, 2, "Hourly stock exceeded its cap")
+	gun.stock = 0
+	gun.reserved_stock = 1
+	gun.restock_unit()
+	gun.restock_unit()
+	TEST_ASSERT_EQUAL(gun.stock, 1, "Restocking duplicated reserved stock")
+	qdel(shop)
+	TEST_ASSERT_NULL(timeleft(timer_id), "Deleting the shop left a gun delivery alive")
+
+	for(var/sku_type in list(/datum/shop_sku/outfitter/lethalshot, /datum/shop_sku/outfitter/smg_mag, /datum/shop_sku/ripperdoc/ronin_mag))
+		var/datum/outpost_shop/ammo_shop = allocate(/datum/outpost_shop)
+		ammo_shop.add_sku(sku_type, "core")
+		var/datum/shop_sku/ammo = ammo_shop.skus[1]
+		ammo.stock = 0
+		ammo_shop.convoy_restock()
+		TEST_ASSERT(ammo.stock > 0, "Ammunition lost ordinary convoy refills")
+		TEST_ASSERT_NULL(ammo.restock_timer, "Ammunition acquired a gun clock")
+
+	for(var/sku_type in list(/datum/shop_sku/general/rotating/freight_crate, /datum/shop_sku/black_market/rare/energy_sword, /datum/shop_sku/general/surplus_rifle))
+		for(var/weighted in list(FALSE, TRUE))
+			var/datum/outpost_shop/rotating = allocate(/datum/outpost_shop)
+			rotating.rotating_pool = list(sku_type, /datum/shop_sku/general/soap)
+			if(weighted)
+				var/datum/shop_rotation/rotation = new
+				rotation.pool = list()
+				rotation.pool[sku_type] = 1
+				rotation.pool[/datum/shop_sku/general/soap] = 1
+				rotating.live_rotations += rotation
+				rotating.add_rotation_sku(rotation, sku_type)
+			else
+				rotating.add_sku(sku_type, "rotating")
+			var/datum/shop_sku/finite = rotating.skus[1]
+			finite.stock = 0
+			for(var/convoy in 1 to 8)
+				rotating.convoy_restock()
+				TEST_ASSERT_EQUAL(length(rotating.skus), 1, "A rotation duplicated restricted stock")
+				TEST_ASSERT_EQUAL(rotating.skus[1], finite, "A rotation replaced the exhausted SKU and its clock")
+				TEST_ASSERT_EQUAL(finite.stock, 0, "A rotation refilled restricted stock")
+
+	for(var/sku_type in list(/datum/shop_sku/general/hunting_knife, /datum/shop_sku/outfitter/fireaxe, /datum/shop_sku/black_market/boarding_axe))
+		var/datum/outpost_shop/melee_shop = allocate(/datum/outpost_shop)
+		melee_shop.add_sku(sku_type, "core")
+		var/datum/shop_sku/melee = melee_shop.skus[1]
+		melee.stock = 0
+		melee_shop.convoy_restock()
+		TEST_ASSERT(melee.stock > 0, "Green/yellow melee stopped replenishing")
+
+/// Actual favor and authored specials cannot discount restricted weapons.
+/datum/unit_test/voidcrew_ladder_prices_and_contracts/Run()
+	var/mob/living/carbon/human/user = allocate(/mob/living/carbon/human/consistent, run_loc_floor_bottom_left)
+	user.mind_initialize()
+	allocated += user.mind
+	var/obj/structure/overmap/ship/ship = allocate(/obj/structure/overmap/ship)
+	var/datum/team/voidcrew/team = allocate(/datum/team/voidcrew)
+	team.ship = ship
+	ship.ship_team = team
+	team.join_member(user.mind)
+	var/datum/outpost_shop/shop = allocate(/datum/outpost_shop)
+	shop.grant_favor(ship, 6) // FAVOR_TIER_TRUSTED
+	TEST_ASSERT_EQUAL(shop.get_discount_pct(ship), 15, "Favor fixture did not reach the maximum discount")
+	var/list/restricted = list(
+		/datum/shop_sku/general/surplus_rifle, /datum/shop_sku/outfitter/disabler,
+		/datum/shop_sku/outfitter/laser_gun, /datum/shop_sku/outfitter/energy_gun, /datum/shop_sku/outfitter/riot_shotgun,
+		/datum/shop_sku/black_market/c20r, /datum/shop_sku/black_market/wt550, /datum/shop_sku/black_market/rotating/mateba,
+		/datum/shop_sku/black_market/cutlass, /datum/shop_sku/black_market/rare/energy_sword,
+		/datum/shop_sku/ripperdoc/monowire, /datum/shop_sku/ripperdoc/gorilla, /datum/shop_sku/ripperdoc/mantis,
+		/datum/shop_sku/general/rotating/freight_crate, /datum/shop_sku/black_market/mystery_cache, /datum/shop_sku/black_market/mystery_cache_rare,
+	)
+	for(var/sku_type in restricted)
+		shop.add_sku(sku_type, "core") // Test the flag even if a shelf changes later.
+		var/datum/shop_sku/sku = shop.skus[length(shop.skus)]
+		shop.roll_special()
+		TEST_ASSERT_EQUAL(sku.discount_pct, 0, "A restricted weapon went on special")
+		sku.discount_pct = 30
+		TEST_ASSERT_EQUAL(sku.get_credit_price(user), sku.price_credits, "A special/favor combination changed a fixed price")
+	for(var/attempt in 1 to 20)
+		var/datum/mission/mission = allocate(/datum/mission)
+		mission.difficulty = 3 // MISSION_DIFFICULTY_HARD
+		mission.contract_pay_mult = 100 // Every shelf price fits, so price cannot hide a leak.
+		TEST_ASSERT(shop.roll_contract_reward(mission), "Restricted-only shelves could not quote currency")
+		TEST_ASSERT_EQUAL(length(mission.get_reward_types()), 0, "A contract paid a gun, red melee/chrome or bought cache")
+		TEST_ASSERT_EQUAL(length(mission.contract_stock), 0, "A contract reserved restricted stock")
+	var/datum/bank_account/account = allocate(/datum/bank_account, "Ladder counter test", null, 1, FALSE)
+	account.account_balance = 2700
+	ship.ship_account = account
+	var/obj/item/card/id/advanced/card = allocate(/obj/item/card/id/advanced)
+	qdel(card.registered_account)
+	card.registered_account = account
+	TEST_ASSERT(user.put_in_hands(card), "First buyer could not carry their ID")
+	var/mob/living/carbon/human/other_buyer = allocate(/mob/living/carbon/human/consistent, run_loc_floor_top_right)
+	other_buyer.mind_initialize()
+	allocated += other_buyer.mind
+	team.join_member(other_buyer.mind)
+	var/obj/item/card/id/advanced/other_card = allocate(/obj/item/card/id/advanced)
+	qdel(other_card.registered_account)
+	other_card.registered_account = account
+	TEST_ASSERT(other_buyer.put_in_hands(other_card), "Second buyer could not carry their ID")
+	var/datum/shop_sku/rifle = shop.skus[1]
+	TEST_ASSERT(rifle.try_purchase(user, null), "The first shared-stock purchase failed")
+	TEST_ASSERT(rifle.try_purchase(other_buyer, null), "A second buyer could not buy the remaining rifle")
+	TEST_ASSERT_EQUAL(rifle.stock, 0, "Two buyers did not exhaust the same stock")
+	TEST_ASSERT_EQUAL(account.account_balance, 900, "Actual purchases bypassed the fixed price")
+	TEST_ASSERT(!rifle.try_purchase(other_buyer, null), "An exhausted SKU sold another gun")
+	TEST_ASSERT_EQUAL(account.account_balance, 900, "A refused purchase took money")
+	rifle.restock_unit()
+	TEST_ASSERT(rifle.try_purchase(other_buyer, null), "An hourly delivery could not be purchased")
+	TEST_ASSERT_EQUAL(account.account_balance, 0, "The returned rifle sold at a discount")
+	user.mind.ship_teams = list()
+	team.ship = null
+
+/// Bought and premium crates have exact freight odds and no extra weapon draws.
+/datum/unit_test/voidcrew_ladder_bought_caches/Run()
+	var/list/gun_pools = list(
+		list(/obj/item/gun/ballistic/rifle/boltaction/surplus, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver/c38/detective, /obj/item/gun/ballistic/shotgun/doublebarrel),
+		list(/obj/item/gun/ballistic/shotgun/riot, /obj/item/gun/ballistic/automatic/tommygun, /obj/item/gun/ballistic/automatic/mini_uzi),
+	)
+	var/list/gun_weights = list(list(940, 59, 1), list(45, 54, 1), list(15, 35, 50))
+	var/list/melee_weights = list(list(900, 99, 1), list(35, 64, 1), list(10, 45, 45))
+	var/list/chances = list(8, 19, 33)
+	var/list/classes = list("green", "yellow", "red")
+	var/list/caches = list(
+		list(/datum/shop_sku/general/rotating/freight_crate, 750, 0),
+		list(/datum/shop_sku/black_market/mystery_cache, 0, 2),
+		list(/datum/shop_sku/black_market/mystery_cache_rare, 0, 4),
+	)
+	for(var/list/row as anything in caches)
+		var/datum/shop_sku/sku = allocate(row[1])
+		TEST_ASSERT_EQUAL(sku.stock, 1, "Bought caches must have exactly one unit")
+		TEST_ASSERT_EQUAL(sku.price_credits, row[2], "Bought cache has the wrong credit price")
+		TEST_ASSERT_EQUAL(sku.price_vouchers, row[3], "Bought cache has the wrong voucher price")
+		TEST_ASSERT_EQUAL(sku.restock_interval, INFINITY, "Bought caches can refill")
+		for(var/zone in 1 to 3) // ZONE_GREEN/YELLOW/RED compile later.
+			var/obj/structure/closet/crate/zone_loot/syndicate/trader/cache = allocate(sku.item_path, run_loc_floor_bottom_left)
+			cache.on_zone_resolved(zone)
+			cache.forceMove(run_loc_floor_top_right)
+			TEST_ASSERT_EQUAL(cache.loot_zone, zone, "Moving bought cargo changed its origin zone")
+			TEST_ASSERT_EQUAL(cache.get_gun_chance(), chances[zone], "Bought cache has the wrong gun probability")
+			var/list/weapon_paths = list()
+			for(var/class_index in 1 to 3)
+				var/list/gun_class_weights = cache.get_weapon_class_weights(TRUE)
+				var/list/melee_class_weights = cache.get_weapon_class_weights(FALSE)
+				TEST_ASSERT_EQUAL(gun_class_weights[classes[class_index]], gun_weights[zone][class_index], "Bought cache has wrong gun class weights")
+				TEST_ASSERT_EQUAL(melee_class_weights[classes[class_index]], melee_weights[zone][class_index], "Bought cache has wrong melee class weights")
+				var/list/guns = cache.get_weapon_pool(TRUE, classes[class_index])
+				TEST_ASSERT(compare_list(guns, gun_pools[min(2, class_index)]), "Freight gun class changed or gained advanced weapons")
+				weapon_paths |= guns
+				weapon_paths |= cache.get_weapon_pool(FALSE, classes[class_index])
+			var/datum/loot_theme/theme = GLOB.loot_themes[cache.theme]
+			var/list/original_pools = list(theme.loot_common.Copy(), theme.loot_uncommon.Copy(), theme.loot_prime.Copy(), theme.loot_uniques.Copy())
+			var/list/pools = cache.get_supply_pools()
+			for(var/tier in pools)
+				var/list/pool = pools[tier]
+				TEST_ASSERT(length(pool), "Filtering bought cargo emptied a supply tier")
+				for(var/item_path in pool)
+					TEST_ASSERT(!(item_path in weapon_paths) && !ispath(item_path, /obj/item/gun) && !ispath(item_path, /obj/item/knife), "Supplies can pay an extra weapon")
+					TEST_ASSERT(!ispath(item_path, /obj/item/organ/cyberimp), "Bought cargo can pay chrome")
+				pool.Cut() // A caller may consume every working pool safely.
+			var/weapon_count = 0
+			cache.PopulateContents()
+			for(var/obj/item/item in cache.contents)
+				if(item.type in weapon_paths)
+					weapon_count++
+			TEST_ASSERT_EQUAL(weapon_count, 1, "Bought/premium cache did not pay exactly one weapon")
+			var/contents_count = length(cache.contents)
+			var/spare_count = 0
+			for(var/obj/item/gun/gun in cache.contents)
+				if(GLOB.loot_gun_spare_ammo[gun.type])
+					spare_count++
+					var/ammo_path = GLOB.loot_gun_spare_ammo[gun.type]
+					TEST_ASSERT(locate(ammo_path) in cache, "A freight gun arrived without its spare reload")
+			TEST_ASSERT(contents_count - spare_count >= 2 + (zone == 3 ? 2 : zone == 2 ? 1 : 0) + cache.bonus_draws, "Premium crate lost ordinary draws")
+			TEST_ASSERT(contents_count - spare_count <= 3 + (zone == 3 ? 2 : zone == 2 ? 1 : 0) + cache.bonus_draws, "Premium crate added unbudgeted draws")
+			cache.PopulateContents()
+			TEST_ASSERT_EQUAL(length(cache.contents), contents_count, "Reopening bought cargo paid twice")
+			TEST_ASSERT(deep_compare_list(list(theme.loot_common, theme.loot_uncommon, theme.loot_prime, theme.loot_uniques), original_pools), "Bought cargo mutated the shared theme")
diff --git a/voidcrew/modules/unit_tests/voidcrew_survey_capabilities.dm b/voidcrew/modules/unit_tests/voidcrew_survey_capabilities.dm
index 48a3d1de328..c549ce58e2f 100644
--- a/voidcrew/modules/unit_tests/voidcrew_survey_capabilities.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_survey_capabilities.dm
@@ -115,3 +115,117 @@
 	TEST_ASSERT(console.mapping_enabled && console.obj_sight && console.mob_sight, "Explicit debug override lost its sight capabilities")
 	console.activate_survey_map(user)
 	TEST_ASSERT_EQUAL(console.map_refreshes, 1, "Explicit debug override could not reach map loading without a disk")
+
+/// Real overmap tiles and disk research drive the quote and completion paths.
+/datum/unit_test/voidcrew_research_movement/survey_capabilities/rewards
+	var/list/overmap_turfs = list()
+
+/datum/unit_test/voidcrew_research_movement/survey_capabilities/rewards/Destroy()
+	for(var/turf/open/overmap/tile as anything in overmap_turfs)
+		tile.current_zone = null
+		tile.ChangeTurf(overmap_turfs[tile])
+	return ..()
+
+/datum/unit_test/voidcrew_research_movement/survey_capabilities/rewards/proc/zone_tile(turf/location, zone_type)
+	var/old_type = location.type
+	var/turf/open/overmap/tile = location.ChangeTurf(/turf/open/overmap)
+	overmap_turfs[tile] = old_type
+	tile.current_zone = allocate(/datum/overmap_zone, zone_type)
+	return tile
+
+/datum/unit_test/voidcrew_research_movement/survey_capabilities/rewards/Run()
+	TEST_ASSERT(setup_links(), "No local research disk exists for survey reward testing")
+	var/obj/machinery/computer/camera_advanced/shuttle_docker/survey/launch_test/map_gate_test/console = map_console()
+	// Voidcrew zone defines are included later: green = 1, yellow = 2, red = 3.
+	var/turf/green = zone_tile(get_step(run_loc_floor_bottom_left, NORTH), 1)
+	var/turf/open/overmap/target_tile = zone_tile(get_step(green, EAST), 1)
+	var/list/bases = list(
+		/obj/structure/overmap/star = 250,
+		/obj/structure/overmap/planet = 150,
+		/obj/structure/overmap/space_ruin = 75,
+		/obj/structure/overmap/event/emp = 100,
+		/obj/structure/overmap/event/electric = 75,
+		/obj/structure/overmap/event/meteor = 50,
+		/obj/structure/overmap/event/nebula = 25, // SURVEY_NEBULA_BASE, including dangerous variants.
+	)
+	for(var/family in bases)
+		for(var/variant_type in typesof(family))
+			var/obj/structure/overmap/variant = variant_type
+			var/expected = ispath(variant_type, /obj/structure/overmap/planet/empty) ? 0 : bases[family]
+			TEST_ASSERT_EQUAL(initial(variant.survey_value), expected, "[variant_type] has an incorrect survey base")
+	var/list/tier_multipliers = list(1, 1, 1.1, 1.25)
+	var/list/zone_multipliers = list(1, 1.25, 1.5)
+	for(var/tier in 1 to 4)
+		learn_tiers(web, tier)
+		for(var/zone in 1 to 3)
+			target_tile.current_zone = allocate(/datum/overmap_zone, zone)
+			for(var/family in bases)
+				var/obj/structure/overmap/target = allocate(family, target_tile)
+				if(istype(target, /obj/structure/overmap/planet))
+					// Substitute surface generation only; record and reward code still runs.
+					var/obj/structure/overmap/planet/planet = target
+					planet.loaded = TRUE
+				console.ship_port.current_ship.forceMove(target_tile)
+				check_award(console, target, bases[family] * tier_multipliers[tier] * zone_multipliers[zone])
+			// The ship stays in green while each remote storm is in the target's zone.
+			console.ship_port.current_ship.forceMove(green)
+			for(var/family in list(/obj/structure/overmap/event/emp, /obj/structure/overmap/event/electric))
+				var/obj/structure/overmap/target = allocate(family, target_tile)
+				TEST_ASSERT(console.is_survey_at_range(target), "Remote-storm fixture shares the ship's tile")
+				check_award(console, target, bases[family] * tier_multipliers[tier] * zone_multipliers[zone] * 0.6)
+	// Removing the disk must revoke its multiplier even without another UI refresh.
+	var/obj/structure/overmap/star/star = allocate(/obj/structure/overmap/star, green)
+	console.ship_port.current_ship.forceMove(green)
+	server.source_code_hdd.forceMove(run_loc_floor_bottom_left)
+	check_award(console, star, 250)
+	// Printing is the boundary: fractional awards must survive both banking and notes.
+	var/points_before = console.banked_points
+	var/list/old_notes = list()
+	for(var/obj/item/research_notes/notes in get_turf(console))
+		old_notes += notes
+	console.print_survey_notes(user)
+	var/obj/item/research_notes/printed
+	for(var/obj/item/research_notes/notes in get_turf(console))
+		if(!(notes in old_notes))
+			printed = notes
+			allocated += notes
+	TEST_ASSERT(printed, "Survey notes were not printed")
+	TEST_ASSERT_EQUAL(printed.value, points_before, "Printing changed the banked research value")
+	TEST_ASSERT_EQUAL(console.banked_points, 0, "Printing did not empty the banked research")
+
+/datum/unit_test/voidcrew_research_movement/survey_capabilities/rewards/proc/check_award(obj/machinery/computer/camera_advanced/shuttle_docker/survey/launch_test/console, obj/structure/overmap/target, expected)
+	console.test_candidates = list(target)
+	var/list/quote = console.get_survey_value(target)
+	TEST_ASSERT_EQUAL(quote["cash"], 0, "[target.type] quoted currency")
+	TEST_ASSERT(abs(quote["points"] - expected) < 0.001, "[target.type] quoted [quote["points"]] research instead of [expected]")
+	var/list/ui_data = console.ui_data(user)
+	TEST_ASSERT(!("bankedCash" in ui_data), "Survey UI still exposes a cash balance")
+	var/list/targets = ui_data["surveyTargets"]
+	var/list/target_quote = targets[1]
+	TEST_ASSERT(!("cash" in target_quote), "Survey target UI still exposes currency")
+	TEST_ASSERT_EQUAL(target_quote["points"], quote["points"], "Target UI disagrees with the reward quote")
+	var/points_before = console.banked_points
+	console.survey_celestial_object(user, ref(target))
+	TEST_ASSERT(console.survey_in_progress, "[target.type] could not start a survey")
+	deltimer(console.survey_timer)
+	console.complete_survey(target)
+	TEST_ASSERT(abs(console.banked_points - points_before - expected) < 0.01, "[target.type] awarded different research from its quote")
+	TEST_ASSERT(console.is_object_surveyed(target), "[target.type] completion did not retain the survey record")
+
+/// Checkpoint snapshots preserve fittings, never a console's accumulated research.
+/datum/unit_test/voidcrew_survey_checkpoint_points/Run()
+	var/obj/machinery/computer/camera_advanced/shuttle_docker/survey/console = allocate(/obj/machinery/computer/camera_advanced/shuttle_docker/survey)
+	console.banked_points = 123.75
+	var/datum/ship_checkpoint/snapshot = allocate(/datum/ship_checkpoint)
+	var/serialized = snapshot.atom_text(console)
+	TEST_ASSERT(!findtext(serialized, "banked_points"), "Checkpoint serialized banked survey research")
+	var/map_text = "//[DMM2TGM_MESSAGE]\n\"a\" = (\n[serialized],\n/turf/template_noop,\n/area/template_noop)\n\n(1,1,1) = {\"\na\n\"}\n"
+	var/datum/parsed_map/parsed = allocate(/datum/parsed_map, map_text)
+	var/turf/destination = run_loc_floor_top_right
+	TEST_ASSERT(parsed.load(destination.x, destination.y, destination.z, crop_map = TRUE), "Checkpoint survey fitting could not be reconstructed")
+	var/obj/machinery/computer/camera_advanced/shuttle_docker/survey/rebuilt = locate() in destination
+	TEST_ASSERT(rebuilt && rebuilt != console, "Checkpoint did not create a new survey console")
+	allocated += rebuilt
+	SSatoms.InitializeAtoms(list(rebuilt))
+	TEST_ASSERT_EQUAL(rebuilt.banked_points, 0, "Checkpoint reconstruction duplicated banked research")
+	TEST_ASSERT_EQUAL(console.banked_points, 123.75, "Snapshot changed the original console's research")
diff --git a/voidcrew/modules/unit_tests/voidcrew_survey_identity.dm b/voidcrew/modules/unit_tests/voidcrew_survey_identity.dm
index 982c569d280..9168efb6fc4 100644
--- a/voidcrew/modules/unit_tests/voidcrew_survey_identity.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_survey_identity.dm
@@ -36,3 +36,266 @@
 	. = ..()
 	if(force_reference_reuse)
 		return QDEL_HINT_HARDDEL_NOW
+
+/// Small physical interiors exercise the real site resolver without generating whole maps.
+/datum/unit_test/voidcrew_survey_scanner
+	abstract_type = /datum/unit_test/voidcrew_survey_scanner
+	var/list/test_sites = list()
+	var/list/test_ports = list()
+
+/datum/unit_test/voidcrew_survey_scanner/Destroy()
+	for(var/obj/structure/overmap/site as anything in test_sites)
+		if(QDELETED(site))
+			continue
+		// These synthetic rectangles own no terrain to tear down.
+		site.vars["footprint"] = null
+		site.vars["mapzone"] = null
+	test_sites = null
+	for(var/obj/docking_port/mobile/voidcrew/port as anything in test_ports)
+		port.current_ship = null
+		port.shuttle_areas = list()
+		qdel(port, force = TRUE)
+	test_ports = null
+	return ..()
+
+/datum/unit_test/voidcrew_survey_scanner/proc/make_footprint(obj/structure/overmap/site, turf/tile)
+	var/datum/map_footprint/footprint = allocate(/datum/map_footprint)
+	footprint.z_value = tile.z
+	footprint.set_rect(tile.x, tile.y, 1, 1)
+	footprint.set_owner(site)
+	return footprint
+
+/datum/unit_test/voidcrew_survey_scanner/proc/make_site(site_type, turf/tile)
+	var/obj/structure/overmap/site = allocate(site_type)
+	site.vars["footprint"] = make_footprint(site, tile)
+	site.vars["mapzone"] = allocate(/datum/map_zone)
+	test_sites += site
+	return site
+
+/datum/unit_test/voidcrew_survey_scanner/proc/make_scanner(turf/tile)
+	var/obj/machinery/survey_scanner/scanner = allocate(/obj/machinery/survey_scanner, tile)
+	scanner.set_anchored(TRUE)
+	scanner.cell = allocate(/obj/item/stock_parts/power_store/cell/bluespace, scanner)
+	return scanner
+
+/datum/unit_test/voidcrew_survey_scanner/proc/make_ship_turf(turf/tile)
+	var/obj/docking_port/mobile/voidcrew/port = new(tile)
+	port.width = 1
+	port.height = 1
+	port.dwidth = 0
+	port.dheight = 0
+	port.shuttle_areas = list()
+	port.shuttle_areas[get_area(tile)] = TRUE
+	port.current_ship = allocate(/obj/structure/overmap/ship)
+	port.register()
+	test_ports += port
+	return port
+
+/// Drive a paid scan without waiting for the cadence; process() itself is unchanged.
+/datum/unit_test/voidcrew_survey_scanner/proc/scan_now(obj/machinery/survey_scanner/scanner)
+	scanner.next_scan = world.time
+	scanner.process(2)
+
+/datum/unit_test/voidcrew_survey_scanner/servo_outputs/Run()
+	var/turf/tile = run_loc_floor_bottom_left
+	var/obj/structure/overmap/site = make_site(/obj/structure/overmap/planet/lava, tile)
+	var/obj/machinery/survey_scanner/scanner = make_scanner(tile)
+	var/list/servo_objects = list(/obj/item/stock_parts/servo, /obj/item/stock_parts/servo/nano, /obj/item/stock_parts/servo/pico, /obj/item/stock_parts/servo/femto)
+	var/list/servo_datums = list(/datum/stock_part/servo, /datum/stock_part/servo/tier2, /datum/stock_part/servo/tier3, /datum/stock_part/servo/tier4)
+	var/list/expected_outputs = list(9, 12, 15, 18)
+	for(var/datum/part as anything in scanner.component_parts.Copy())
+		if(istype(part, /obj/item/stock_parts/servo) || istype(part, /datum/stock_part/servo))
+			scanner.component_parts -= part
+			if(isitem(part))
+				qdel(part)
+	for(var/use_datums in list(FALSE, TRUE))
+		for(var/tier in 1 to 4)
+			var/datum/servo
+			if(use_datums)
+				servo = GLOB.stock_part_datums[servo_datums[tier]]
+			else
+				servo = allocate(servo_objects[tier], scanner)
+			scanner.component_parts += servo
+			scanner.RefreshParts()
+			TEST_ASSERT_EQUAL(scanner.research_gain, expected_outputs[tier], "Incorrect servo output at tier [tier] (datum: [use_datums])")
+			var/points_before = scanner.stored_points
+			var/scans_before = site.survey_scans_completed
+			scan_now(scanner)
+			var/expected_gain = expected_outputs[tier] * (1 - scans_before * 0.04)
+			TEST_ASSERT(abs(scanner.stored_points - points_before - expected_gain) < 0.001, "A paid scan did not use the tier [tier] output and existing depletion")
+			scanner.component_parts -= servo
+			if(isitem(servo))
+				qdel(servo)
+	// A tick before the next scan still consumes power, but cannot pay or deplete the site.
+	var/points_before = scanner.stored_points
+	var/scans_before = site.survey_scans_completed
+	var/charge_before = scanner.cell.charge
+	scanner.process(2)
+	TEST_ASSERT_EQUAL(scanner.next_scan, world.time + 10 SECONDS, "The scan cadence changed")
+	TEST_ASSERT_EQUAL(scanner.stored_points, points_before, "A scan paid before its ten-second interval")
+	TEST_ASSERT_EQUAL(site.survey_scans_completed, scans_before, "An idle tick depleted the site")
+	TEST_ASSERT_EQUAL(scanner.cell.charge, charge_before - scanner.active_power_usage * 2, "Idle scanning stopped billing its cell")
+
+/datum/unit_test/voidcrew_survey_scanner/parts_and_power/Run()
+	var/turf/tile = run_loc_floor_bottom_left
+	var/obj/structure/overmap/site = make_site(/obj/structure/overmap/planet/lava, tile)
+	var/obj/machinery/survey_scanner/scanner = make_scanner(tile)
+	for(var/datum/part as anything in scanner.component_parts.Copy())
+		if(istype(part, /obj/item/stock_parts/matter_bin) || istype(part, /datum/stock_part/matter_bin) || istype(part, /obj/item/stock_parts/micro_laser) || istype(part, /datum/stock_part/micro_laser))
+			scanner.component_parts -= part
+			if(isitem(part))
+				qdel(part)
+	scanner.component_parts += GLOB.stock_part_datums[/datum/stock_part/matter_bin/tier4]
+	scanner.component_parts += GLOB.stock_part_datums[/datum/stock_part/micro_laser/tier4]
+	scanner.RefreshParts()
+	TEST_ASSERT_EQUAL(scanner.research_power, 4, "An upgraded matter bin lost its decay effect")
+	TEST_ASSERT_EQUAL(scanner.active_power_usage, initial(scanner.active_power_usage) / 5, "An upgraded laser changed its power effect")
+	scanner.enable()
+	scan_now(scanner)
+	TEST_ASSERT_EQUAL(scanner.stored_points, 9, "A matter bin multiplied the first scan's payout")
+	scan_now(scanner)
+	TEST_ASSERT(abs(scanner.stored_points - 17.91) < 0.001, "A matter bin did not divide depletion")
+	var/points_before = scanner.stored_points
+	scanner.cell.charge = 0
+	scan_now(scanner)
+	TEST_ASSERT(!scanner.enabled, "An empty cell did not stop scanning")
+	TEST_ASSERT_EQUAL(scanner.stored_points, points_before, "An unpaid scan generated research")
+	TEST_ASSERT_EQUAL(site.survey_scans_completed, 2, "An unpaid scan depleted the site")
+
+/datum/unit_test/voidcrew_survey_scanner/shared_depletion/Run()
+	var/turf/tile = run_loc_floor_bottom_left
+	var/turf/neighbor = get_step(tile, EAST)
+	var/obj/structure/overmap/site = make_site(/obj/structure/overmap/planet/lava, tile)
+	var/obj/structure/overmap/other_site = make_site(/obj/structure/overmap/planet/ice, neighbor)
+	var/obj/machinery/survey_scanner/first = make_scanner(tile)
+	var/obj/machinery/survey_scanner/second = make_scanner(tile)
+	first.enable()
+	second.enable()
+	TEST_ASSERT(first.enabled && second.enabled, "Scanners could not start on natural ground")
+	TEST_ASSERT_EQUAL(site.survey_scans_completed, 0, "Enabling a scanner depleted the site")
+	scan_now(first)
+	scan_now(second)
+	TEST_ASSERT_EQUAL(first.stored_points, 9, "The first scan did not start at full value")
+	TEST_ASSERT(abs(second.stored_points - 8.64) < 0.001, "A second scanner did not share the first scanner's depletion")
+	TEST_ASSERT_EQUAL(site.survey_scans_completed, 2, "Successful scanners did not increment one shared counter")
+	second.forceMove(neighbor)
+	var/points_before = second.stored_points
+	scan_now(second)
+	TEST_ASSERT(abs(second.stored_points - points_before - 9) < 0.001, "A neighboring site on the same level inherited depletion")
+	TEST_ASSERT_EQUAL(other_site.survey_scans_completed, 1, "The neighboring site did not retain its own counter")
+	first.disable()
+	qdel(first)
+	var/obj/machinery/survey_scanner/replacement = make_scanner(tile)
+	replacement.enable()
+	scan_now(replacement)
+	TEST_ASSERT(abs(replacement.stored_points - 8.28) < 0.001, "Replacing the machine refreshed its site")
+	// Replace the temporary interior while retaining the persistent overmap contact.
+	var/obj/structure/overmap/planet/planet = site
+	QDEL_NULL(planet.footprint)
+	QDEL_NULL(planet.mapzone)
+	planet.mapzone = allocate(/datum/map_zone)
+	planet.footprint = make_footprint(planet, tile)
+	points_before = replacement.stored_points
+	scan_now(replacement)
+	TEST_ASSERT(abs(replacement.stored_points - points_before - 7.92) < 0.001, "Reloading the interior refreshed depletion")
+	TEST_ASSERT_EQUAL(site.survey_scans_completed, 4, "Replacing the interior lost completed scans")
+	// Exhaust the site with the replacement machine, then try another fresh machine.
+	for(var/attempt in 1 to 30)
+		if(!replacement.enabled)
+			break
+		scan_now(replacement)
+	TEST_ASSERT(!replacement.enabled, "A depleted site never stopped producing")
+	TEST_ASSERT_EQUAL(site.survey_scans_completed, 21, "The existing 0.20 cutoff changed")
+	var/obj/machinery/survey_scanner/fresh = make_scanner(tile)
+	fresh.enable()
+	scan_now(fresh)
+	TEST_ASSERT(!fresh.enabled && !fresh.stored_points, "A fresh scanner produced from an exhausted site")
+	TEST_ASSERT_EQUAL(site.survey_scans_completed, 21, "A failed scan incremented the site counter")
+	// Reuse the old rectangle for a different contact: it starts with its own history.
+	planet.footprint = null
+	planet.mapzone = null
+	var/obj/structure/overmap/new_site = make_site(/obj/structure/overmap/planet/lava, tile)
+	fresh.enable()
+	scan_now(fresh)
+	TEST_ASSERT_EQUAL(fresh.stored_points, 9, "Recycled ground inherited another contact's exhaustion")
+	TEST_ASSERT_EQUAL(new_site.survey_scans_completed, 1, "Recycled ground did not update its new contact")
+
+/datum/unit_test/voidcrew_survey_scanner/site_validation/Run()
+	var/turf/tile = run_loc_floor_bottom_left
+	var/obj/machinery/survey_scanner/scanner = make_scanner(tile)
+	scanner.enable()
+	TEST_ASSERT(!scanner.enabled, "Unowned ground accepted a scanner")
+	TEST_ASSERT_NULL(scanner.get_scan_site(), "Unowned ground resolved through a z-level fallback")
+	scan_now(scanner)
+	TEST_ASSERT(!scanner.stored_points, "Unowned ground produced research")
+	// The shared resolver can identify legacy tenants by z; scanners must not accept that.
+	var/obj/structure/overmap/planet/legacy = make_site(/obj/structure/overmap/planet/lava, tile)
+	QDEL_NULL(legacy.footprint)
+	legacy.mapzone.z_levels += reservation
+	TEST_ASSERT_EQUAL(SSovermap_zones.get_overmap_object_for_turf(tile), legacy, "The legacy z-level fallback fixture did not resolve")
+	TEST_ASSERT_NULL(scanner.get_scan_site(), "A planet without a physical footprint accepted unowned ground")
+	scanner.enable()
+	TEST_ASSERT(!scanner.enabled, "A z-level fallback enabled scanning")
+	scan_now(scanner)
+	TEST_ASSERT(!scanner.stored_points && !legacy.survey_scans_completed, "A z-level fallback produced a paid scan")
+	legacy.mapzone.z_levels.Cut()
+	var/list/accepted = list(/obj/structure/overmap/planet/lava, /obj/structure/overmap/space_ruin, /obj/structure/overmap/event/meteor)
+	var/list/rejected = list(/obj/structure/overmap/dynamic/player_outpost, /obj/structure/overmap/planet/empty, /obj/structure/overmap/planet/empty/crashed_ship, /obj/structure/overmap/planet/energy_signal)
+	for(var/site_type in accepted + rejected)
+		var/obj/structure/overmap/site = make_site(site_type, tile)
+		var/should_scan = (site_type in accepted)
+		TEST_ASSERT_EQUAL(scanner.get_scan_site(), should_scan ? site : null, "Incorrect survey eligibility for [site_type]")
+		scanner.enable()
+		TEST_ASSERT_EQUAL(scanner.enabled, should_scan, "Incorrect startup eligibility for [site_type]")
+		if(should_scan)
+			scanner.disable()
+		// A scanner already running must also reject a move onto ineligible ground.
+		scanner.enabled = TRUE
+		var/points_before = scanner.stored_points
+		scan_now(scanner)
+		TEST_ASSERT_EQUAL(site.survey_scans_completed, should_scan ? 1 : 0, "Incorrect paid-scan eligibility for [site_type]")
+		if(!should_scan)
+			TEST_ASSERT(!scanner.enabled, "A running scanner did not stop at [site_type]")
+			TEST_ASSERT_EQUAL(scanner.stored_points, points_before, "An ineligible site produced research")
+		scanner.disable()
+		site.vars["footprint"] = null
+		site.vars["mapzone"] = null
+	// The site's rectangle includes a docked hull; hull ownership must win.
+	var/obj/structure/overmap/site = make_site(/obj/structure/overmap/planet/lava, tile)
+	var/datum/map_footprint/footprint = site.get_interior_footprint()
+	footprint.set_rect(tile.x, tile.y, 2, 1)
+	scanner.enable()
+	TEST_ASSERT(scanner.enabled, "The natural site did not start before boarding")
+	var/turf/ship_tile = get_step(tile, EAST)
+	make_ship_turf(ship_tile)
+	scanner.forceMove(ship_tile)
+	TEST_ASSERT_NULL(scanner.get_scan_site(), "A docked hull was accepted as planetary ground")
+	var/points_before = scanner.stored_points
+	var/charge_before = scanner.cell.charge
+	scan_now(scanner)
+	TEST_ASSERT(!scanner.enabled, "A scanner moved aboard a docked ship kept running")
+	TEST_ASSERT_EQUAL(scanner.stored_points, points_before, "A scanner paid aboard a docked ship")
+	TEST_ASSERT_EQUAL(scanner.cell.charge, charge_before, "An invalid site consumed scan power")
+	TEST_ASSERT_EQUAL(site.survey_scans_completed, 0, "A shipboard scan depleted the ground below it")
+	scanner.enable()
+	TEST_ASSERT(!scanner.enabled, "A shipboard scanner could be enabled")
+
+/datum/unit_test/voidcrew_survey_scanner/checkpoint_defaults/Run()
+	var/turf/tile = run_loc_floor_bottom_left
+	var/obj/machinery/survey_scanner/source = make_scanner(tile)
+	source.enabled = TRUE
+	source.stored_points = 100
+	var/datum/ship_checkpoint/snapshot = allocate(/datum/ship_checkpoint)
+	var/saved_text = snapshot.atom_text(source)
+	TEST_ASSERT(!findtext(saved_text, "enabled") && !findtext(saved_text, "stored_points") && !findtext(saved_text, "cell"), "Checkpoint serialized live scanner stock or running state")
+	var/obj/machinery/survey_scanner/rebuilt = allocate(source.checkpoint_type(), tile)
+	TEST_ASSERT(!rebuilt.enabled, "A checkpoint-built scanner started enabled")
+	TEST_ASSERT_NULL(rebuilt.cell, "A checkpoint-built scanner supplied a charged cell")
+	TEST_ASSERT(!rebuilt.stored_points, "A checkpoint-built scanner supplied research")
+	make_site(/obj/structure/overmap/planet/lava, tile)
+	make_ship_turf(tile)
+	rebuilt.cell = allocate(/obj/item/stock_parts/power_store/cell/bluespace, rebuilt)
+	rebuilt.enable()
+	TEST_ASSERT(!rebuilt.enabled, "A refueled checkpoint-built scanner started aboard its hull")
+	scan_now(rebuilt)
+	TEST_ASSERT(!rebuilt.stored_points, "A checkpoint-built scanner generated research aboard its hull")
diff --git a/voidcrew/modules/unit_tests/voidcrew_trader_checkpoint.dm b/voidcrew/modules/unit_tests/voidcrew_trader_checkpoint.dm
new file mode 100644
index 00000000000..0af1e8c5db5
--- /dev/null
+++ b/voidcrew/modules/unit_tests/voidcrew_trader_checkpoint.dm
@@ -0,0 +1,781 @@
+/**
+ * Trader outpost checkpoints: the scan chamber, weapons permits, armed trespass, sealed goods and the
+ * outpost's NPCs at the doors (voidcrew/modules/trade/outpost_checkpoint.dm, outpost_checkpoint_guard.dm,
+ * outpost_trespass.dm, outpost_checkpoint_npcs.dm).
+ *
+ * The trade defines are included after the tests, so states and durations are written out with a
+ * comment naming their define.
+ */
+
+/// A five by seven concourse in a reservation: checkpoint lobby below, one two-tile scan chamber, the concourse above
+/datum/unit_test/voidcrew_trader_checkpoint
+	abstract_type = /datum/unit_test/voidcrew_trader_checkpoint
+	var/obj/structure/overmap/trader_outpost/host
+	var/datum/outpost_checkpoint/checkpoint
+	var/obj/machinery/door/airlock/outpost/checkpoint/outer/outer
+	var/obj/machinery/door/airlock/outpost/checkpoint/inner/inner
+	var/mob/living/basic/outpost_trader/checkpoint_guard/guard
+	var/obj/machinery/outpost_checkpoint_sensor/sensor
+	/// In front of the outer door
+	var/turf/lobby
+	/// Beyond the inner door
+	var/turf/secured
+	var/list/turf/chamber = list()
+	/// Turfs moved into a test area -> the area each came from
+	var/list/original_areas = list()
+	/// Areas made for the test
+	var/list/test_areas = list()
+
+/datum/unit_test/voidcrew_trader_checkpoint/Destroy()
+	for(var/turf/location as anything in original_areas)
+		location.change_area(get_area(location), original_areas[location])
+	original_areas = null
+	QDEL_LIST(test_areas)
+	chamber = null
+	return ..()
+
+/datum/unit_test/voidcrew_trader_checkpoint/proc/put_in_area(turf/location, area_type)
+	var/area/target = GLOB.areas_by_type[area_type]
+	if(!target)
+		target = new area_type()
+		test_areas += target
+	if(!original_areas[location])
+		original_areas[location] = get_area(location)
+	location.change_area(get_area(location), target)
+
+/datum/unit_test/voidcrew_trader_checkpoint/proc/fixture(with_guard = TRUE)
+	host = allocate(/obj/structure/overmap/trader_outpost/general)
+	host.outpost_template = new /datum/map_template/trader_outpost
+	host.outpost_template.width = 5
+	host.outpost_template.height = 7
+	host.reservation = SSmapping.request_turf_block_reservation(5, 7, 1)
+	TEST_ASSERT_NOTNULL(host.reservation, "Could not reserve the checkpoint fixture")
+	host.template_bottom_left = host.reservation.bottom_left_turfs[1]
+	var/turf/origin = host.template_bottom_left
+	for(var/dx in 0 to 4)
+		for(var/dy in 0 to 6)
+			var/turf/tile = locate(origin.x + dx, origin.y + dy, origin.z)
+			var/is_wall = dy >= 2 && dy <= 4 && dx != 2 && !(dy == 3 && dx == 3)
+			tile = tile.ChangeTurf(is_wall ? /turf/closed/indestructible : /turf/open/indestructible)
+			put_in_area(tile, dy >= 5 ? /area/voidcrew/trader_outpost : /area/voidcrew/trader_outpost/checkpoint)
+	lobby = locate(origin.x + 2, origin.y + 1, origin.z)
+	secured = locate(origin.x + 2, origin.y + 5, origin.z)
+	chamber = list(locate(origin.x + 2, origin.y + 3, origin.z), locate(origin.x + 3, origin.y + 3, origin.z))
+	outer = allocate(/obj/machinery/door/airlock/outpost/checkpoint/outer, locate(origin.x + 2, origin.y + 2, origin.z))
+	outer.checkpoint_id = "test_checkpoint"
+	outer.set_machine_stat(NONE)
+	inner = allocate(/obj/machinery/door/airlock/outpost/checkpoint/inner, locate(origin.x + 2, origin.y + 4, origin.z))
+	inner.checkpoint_id = "test_checkpoint"
+	inner.set_machine_stat(NONE)
+	for(var/turf/tile as anything in chamber)
+		var/obj/effect/landmark/outpost_checkpoint_chamber/marker = allocate(/obj/effect/landmark/outpost_checkpoint_chamber, tile)
+		marker.checkpoint_id = "test_checkpoint"
+	sensor = allocate(/obj/machinery/outpost_checkpoint_sensor/directional/west, chamber[1])
+	sensor.checkpoint_id = "test_checkpoint"
+	if(with_guard)
+		guard = allocate(/mob/living/basic/outpost_trader/checkpoint_guard/halcyon, locate(origin.x + 4, origin.y + 6, origin.z))
+		guard.checkpoint_id = "test_checkpoint"
+	host.link_interior_machinery()
+	checkpoint = host.checkpoints["test_checkpoint"]
+	TEST_ASSERT_NOTNULL(checkpoint, "The fixture checkpoint did not assemble")
+	TEST_ASSERT_EQUAL(checkpoint.lobby_turf, lobby, "The outer door's far side is not the lobby")
+	TEST_ASSERT_EQUAL(checkpoint.secured_turf, secured, "The inner door's far side is not the concourse")
+	TEST_ASSERT_EQUAL(length(checkpoint.chamber_turfs), 2, "The chamber is not its two marked tiles")
+	TEST_ASSERT_EQUAL(checkpoint.sensor, sensor, "The wall scanner was not matched to the checkpoint")
+	TEST_ASSERT_EQUAL(checkpoint.sweep_dir, NORTH, "The scan does not sweep in from the outer door")
+	if(with_guard)
+		TEST_ASSERT_EQUAL(checkpoint.guard, guard, "The guard was not matched to the checkpoint")
+	return TRUE
+
+/// A person with a mind, standing in the lobby
+/datum/unit_test/voidcrew_trader_checkpoint/proc/visitor(turf/where)
+	var/mob/living/carbon/human/consistent/person = allocate(/mob/living/carbon/human/consistent, where || lobby)
+	person.mind_initialize()
+	allocated += person.mind
+	return person
+
+/// Asks for a cycle as `asker` and settles the scan at once, without the hum
+/datum/unit_test/voidcrew_trader_checkpoint/proc/scan_now(mob/living/asker)
+	if(!checkpoint.request_cycle(asker))
+		return FALSE
+	if(checkpoint.state != "scanning") // CHECKPOINT_SCANNING
+		return FALSE
+	checkpoint.finish_scan()
+	return TRUE
+
+/// Walks the doors back to idle between cases
+/datum/unit_test/voidcrew_trader_checkpoint/proc/settle()
+	sleep(2 SECONDS)
+	if(!inner.density)
+		checkpoint.close_door(inner)
+	if(!outer.density)
+		checkpoint.close_door(outer)
+	sleep(2 SECONDS)
+	checkpoint.set_state("idle") // CHECKPOINT_IDLE
+
+// ===== THE CHAMBER =====
+
+/// Work tools and disablers pass every checkpoint weapon check; a laser remains restricted.
+/datum/unit_test/voidcrew_trader_checkpoint/gun_classification
+	abstract_type = /datum/unit_test/voidcrew_trader_checkpoint/gun_classification
+	var/gun_type
+	var/restricted = FALSE
+
+/datum/unit_test/voidcrew_trader_checkpoint/gun_classification/disabler
+	gun_type = /obj/item/gun/energy/disabler
+
+/datum/unit_test/voidcrew_trader_checkpoint/gun_classification/kinetic_accelerator
+	gun_type = /obj/item/gun/energy/recharge/kinetic_accelerator
+
+/datum/unit_test/voidcrew_trader_checkpoint/gun_classification/plasma_cutter
+	gun_type = /obj/item/gun/energy/plasmacutter
+
+/datum/unit_test/voidcrew_trader_checkpoint/gun_classification/laser
+	gun_type = /obj/item/gun/energy/laser
+	restricted = TRUE
+
+/datum/unit_test/voidcrew_trader_checkpoint/gun_classification/Run()
+	TEST_ASSERT(fixture(FALSE), "Could not prepare the checkpoint")
+	var/mob/living/carbon/human/person = visitor(chamber[1])
+	var/obj/item/gun/held_gun = allocate(gun_type)
+	TEST_ASSERT(person.put_in_hands(held_gun), "Could not hold [gun_type] for the scan")
+	TEST_ASSERT(scan_now(person), "Could not start a scan for [gun_type]")
+	var/expected_state = restricted ? "rejecting" : "passing" // CHECKPOINT_REJECTING / CHECKPOINT_PASSING
+	TEST_ASSERT_EQUAL(checkpoint.state, expected_state, "The scan misclassified [gun_type]")
+	person.forceMove(secured)
+	host.armed_sweep(list(person))
+	TEST_ASSERT(!host.is_armed_trespasser(person.mind), "[gun_type] was flagged before the sighting grace")
+	if(!restricted)
+		TEST_ASSERT(!length(host.armed_sightings), "Holding [gun_type] started an armed sighting")
+	host.armed_sightings[person.mind] = world.time - 2 SECONDS // OUTPOST_ARMED_SIGHTING_GRACE
+	host.armed_sweep(list(person))
+	TEST_ASSERT_EQUAL(!!host.is_armed_trespasser(person.mind), restricted, "Holding [gun_type] was misclassified after the sighting grace")
+	TEST_ASSERT(!length(host.armed_sightings), "An armed sighting of [gun_type] was left pending")
+	// A separate visitor proves the fired-gun signal independently of the holding check.
+	var/mob/living/carbon/human/shooter = visitor(secured)
+	var/obj/item/gun/fired_gun = allocate(gun_type)
+	TEST_ASSERT(shooter.put_in_hands(fired_gun), "Could not hold [gun_type] for firing")
+	SEND_SIGNAL(shooter, COMSIG_MOB_FIRED_GUN, fired_gun, lobby, null, null, list(0, 0))
+	TEST_ASSERT_EQUAL(!!host.is_armed_trespasser(shooter.mind), restricted, "Firing [gun_type] was misclassified")
+	var/obj/item/gun/goods = allocate(gun_type, secured)
+	var/obj/item/handed_over = outpost_seal_goods(goods)
+	if(restricted)
+		TEST_ASSERT(istype(handed_over, /obj/item/outpost_sealed_case), "[gun_type] was handed over without a seal")
+		allocated += handed_over
+		TEST_ASSERT_EQUAL(goods.loc, handed_over, "[gun_type] was left outside its sealed case")
+	else
+		TEST_ASSERT_EQUAL(handed_over, goods, "[gun_type] was needlessly sealed")
+
+/// Clean people pass together, and a clean result is never stored on the doors
+/datum/unit_test/voidcrew_trader_checkpoint/clean_group/Run()
+	TEST_ASSERT(fixture(), "Could not prepare the checkpoint")
+	var/mob/living/carbon/human/first = visitor(chamber[1])
+	var/mob/living/carbon/human/second = visitor(chamber[2])
+	allocate(/obj/item/storage/backpack, second)
+	TEST_ASSERT(scan_now(first), "Walking into the inner door did not start a scan")
+	TEST_ASSERT_EQUAL(checkpoint.state, "passing", "A clean group was not passed") // CHECKPOINT_PASSING
+	sleep(2 SECONDS)
+	TEST_ASSERT(!inner.density, "The inner door did not open for a clean group")
+	TEST_ASSERT(outer.density, "The outer door opened with the inner door")
+	TEST_ASSERT(!checkpoint.request_outer(first), "The outer door opened while the inner door was open")
+	checkpoint.close_door(inner)
+	sleep(2 SECONDS)
+	TEST_ASSERT(inner.density, "The inner door did not close after the pass")
+	TEST_ASSERT_EQUAL(checkpoint.state, "idle", "The checkpoint did not go idle after the pass") // CHECKPOINT_IDLE
+	TEST_ASSERT(!inner.open(), "A pass left the inner door openable")
+	TEST_ASSERT(!inner.open(BYPASS_DOOR_CHECKS), "A forced open() got through the inner door")
+	TEST_ASSERT(!outer.open(BYPASS_DOOR_CHECKS), "A forced open() got through the outer door")
+
+/// The force mode passed to the airlock animation selects its normal or pry sound.
+/datum/unit_test/voidcrew_trader_checkpoint/door_sounds
+	var/list/open_modes = list()
+	var/list/close_modes = list()
+
+/datum/unit_test/voidcrew_trader_checkpoint/door_sounds/Destroy()
+	open_modes = null
+	close_modes = null
+	return ..()
+
+/datum/unit_test/voidcrew_trader_checkpoint/door_sounds/proc/on_open(obj/machinery/door/airlock/door, forced)
+	SIGNAL_HANDLER
+	open_modes[door] = forced
+
+/datum/unit_test/voidcrew_trader_checkpoint/door_sounds/proc/on_close(obj/machinery/door/airlock/door, forced)
+	SIGNAL_HANDLER
+	close_modes[door] = forced
+
+/datum/unit_test/voidcrew_trader_checkpoint/door_sounds/Run()
+	TEST_ASSERT(fixture(FALSE), "Could not prepare the checkpoint")
+	var/mob/living/carbon/human/person = visitor()
+	for(var/obj/machinery/door/airlock/door in list(outer, inner))
+		RegisterSignal(door, COMSIG_AIRLOCK_OPEN, PROC_REF(on_open))
+		RegisterSignal(door, COMSIG_AIRLOCK_CLOSE, PROC_REF(on_close))
+		door.req_access = list(ACCESS_CENT_SPECOPS)
+		TEST_ASSERT(!door.allowed(person), "The visitor unexpectedly has door access")
+	// Ordinary entry keeps the controller's bypass, including power and emag checks.
+	outer.set_machine_stat(NOPOWER)
+	outer.obj_flags |= EMAGGED
+	TEST_ASSERT(checkpoint.request_outer(person), "The checkpoint refused ordinary entry")
+	sleep(1 SECONDS)
+	TEST_ASSERT(!outer.density, "The controller no longer bypasses opening checks")
+	TEST_ASSERT(outer in open_modes, "The outer door did not report an opening")
+	TEST_ASSERT_EQUAL(open_modes[outer], DEFAULT_DOOR_CHECKS, "Ordinary entry selected the pry sound")
+	outer.set_machine_stat(NONE)
+	outer.obj_flags &= ~EMAGGED
+	checkpoint.close_door(outer)
+	TEST_ASSERT(wait_shut(outer), "The outer door did not close")
+	TEST_ASSERT_EQUAL(close_modes[outer], FORCING_DOOR_CHECKS, "Closing the outer door selected the pry sound")
+	// A clean scan opens the inner door without requiring the visitor's access.
+	person.forceMove(chamber[1])
+	TEST_ASSERT(scan_now(person), "Could not start a clean scan")
+	sleep(1 SECONDS)
+	TEST_ASSERT(!inner.density, "The clean scan did not open the inner door")
+	TEST_ASSERT(inner in open_modes, "The inner door did not report an opening")
+	TEST_ASSERT_EQUAL(open_modes[inner], DEFAULT_DOOR_CHECKS, "A scan pass selected the pry sound")
+	person.forceMove(secured)
+	checkpoint.close_door(inner)
+	TEST_ASSERT(wait_shut(inner), "The inner door did not close")
+	TEST_ASSERT_EQUAL(close_modes[inner], FORCING_DOOR_CHECKS, "Closing the inner door selected the pry sound")
+	// Unguarded exterior hatch chambers also cycle outward with the normal sound.
+	TEST_ASSERT(scan_now(person), "Could not start an outward hatch cycle")
+	sleep(1 SECONDS)
+	TEST_ASSERT(!inner.density, "The outward hatch cycle did not open the inner door")
+	TEST_ASSERT_EQUAL(open_modes[inner], DEFAULT_DOOR_CHECKS, "An outward hatch cycle selected the pry sound")
+	checkpoint.close_door(inner)
+	TEST_ASSERT(wait_shut(inner), "The inner door did not close after the outward cycle")
+	// A refusal opens the outer door normally, then closes it once the chamber is clear.
+	person.forceMove(chamber[1])
+	var/obj/item/gun/energy/laser/gun = allocate(/obj/item/gun/energy/laser, chamber[2])
+	TEST_ASSERT(scan_now(person), "Could not start a refused scan")
+	sleep(1 SECONDS)
+	TEST_ASSERT(!outer.density && inner.density, "The refusal did not open only the outer door")
+	TEST_ASSERT_EQUAL(open_modes[outer], DEFAULT_DOOR_CHECKS, "A refusal selected the pry sound")
+	gun.forceMove(lobby)
+	person.forceMove(lobby)
+	checkpoint.check_refused()
+	TEST_ASSERT(wait_shut(outer), "The outer door did not close after the refusal")
+	// Only the successful player breach uses the pry sound. Following through and closing do not.
+	checkpoint.breach(person)
+	sleep(1 SECONDS)
+	TEST_ASSERT(!inner.density, "The breach did not open the inner door")
+	TEST_ASSERT_EQUAL(open_modes[inner], BYPASS_DOOR_CHECKS, "A player breach lost the pry sound")
+	TEST_ASSERT(checkpoint.request_outer(person), "Could not open the outer door during a breach")
+	sleep(1 SECONDS)
+	TEST_ASSERT(!outer.density, "The outer door did not open during the breach")
+	TEST_ASSERT_EQUAL(open_modes[outer], DEFAULT_DOOR_CHECKS, "Following through a breach selected the pry sound")
+	checkpoint.end_breach()
+	TEST_ASSERT(wait_shut(outer) && wait_shut(inner), "The checkpoint did not close after the breach")
+	TEST_ASSERT_EQUAL(close_modes[inner], FORCING_DOOR_CHECKS, "Closing after a breach selected the pry sound")
+	TEST_ASSERT(!inner.open(BYPASS_DOOR_CHECKS), "A breach left permission to open the inner door")
+	// The safety reopening also sounds normal, even when the previous opening was forced.
+	person.forceMove(get_turf(inner))
+	inner.CheckForMobs()
+	TEST_ASSERT(!inner.density, "The door did not reopen for someone in its doorway")
+	TEST_ASSERT_EQUAL(open_modes[inner], DEFAULT_DOOR_CHECKS, "A safety reopening selected the pry sound")
+
+/// Only one door is ever open: the outer door closes before the chamber scans, and nothing opens the inner door around the scan
+/datum/unit_test/voidcrew_trader_checkpoint/interlock/Run()
+	TEST_ASSERT(fixture(), "Could not prepare the checkpoint")
+	var/mob/living/carbon/human/person = visitor()
+	TEST_ASSERT(checkpoint.request_outer(person), "The outer door did not open for someone in the lobby")
+	sleep(2 SECONDS)
+	TEST_ASSERT(!outer.density, "The outer door did not open")
+	person.forceMove(chamber[1])
+	inner.bumpopen(person)
+	TEST_ASSERT(inner.density, "Bumping the inner door opened it")
+	for(var/i in 1 to 30)
+		if(outer.density && !outer.operating)
+			break
+		sleep(0.1 SECONDS)
+	TEST_ASSERT(outer.density, "Asking to go through did not shut the outer door first")
+	TEST_ASSERT_EQUAL(checkpoint.state, "scanning", "Shutting the outer door on someone did not start a scan") // CHECKPOINT_SCANNING
+	TEST_ASSERT(!checkpoint.request_outer(person), "The outer door opened mid-scan")
+	TEST_ASSERT(!checkpoint.request_cycle(person), "A second scan started mid-scan")
+	// Every ordinary route to the inner door
+	inner.try_to_activate_door(person)
+	inner.attack_hand(person, list())
+	var/obj/item/card/id/advanced/id = allocate(/obj/item/card/id/advanced)
+	id.access = list(ACCESS_WEAPONS, ACCESS_SECURITY)
+	inner.attackby(id, person, list(), list())
+	inner.wires.on_pulse(WIRE_OPEN)
+	inner.on_magic_unlock(get_turf(inner), null, person)
+	inner.prison_open()
+	TEST_ASSERT(inner.density && !inner.operating, "An ordinary route opened the inner door mid-scan")
+	sleep(3 SECONDS) // OUTPOST_CHECKPOINT_SCAN_TIME
+	TEST_ASSERT_EQUAL(checkpoint.state, "passing", "The scan did not finish on its own") // CHECKPOINT_PASSING
+
+/// Waits up to `limit` for `door` to be shut and still
+/datum/unit_test/voidcrew_trader_checkpoint/proc/wait_shut(obj/machinery/door/door, limit = 4 SECONDS)
+	for(var/i in 1 to limit / (0.1 SECONDS))
+		if(door.density && !door.operating)
+			return TRUE
+		sleep(0.1 SECONDS)
+	return door.density && !door.operating
+
+/// A gun lying on the chamber floor is refused and stays where it is; the outer door stays open until someone carries it out
+/datum/unit_test/voidcrew_trader_checkpoint/floor_gun/Run()
+	TEST_ASSERT(fixture(), "Could not prepare the checkpoint")
+	var/mob/living/carbon/human/person = visitor(chamber[1])
+	var/obj/item/gun/ballistic/automatic/pistol/gun = allocate(/obj/item/gun/ballistic/automatic/pistol, chamber[2])
+	TEST_ASSERT(scan_now(person), "Could not start a scan")
+	TEST_ASSERT_EQUAL(checkpoint.state, "rejecting", "A gun on the floor passed") // CHECKPOINT_REJECTING
+	TEST_ASSERT_EQUAL(sensor.look, "refused", "The wall scanner did not show the refusal")
+	TEST_ASSERT_EQUAL(get_turf(gun), chamber[2], "The checkpoint moved loose contraband")
+	TEST_ASSERT_EQUAL(get_turf(person), chamber[1], "The checkpoint moved someone it refused")
+	sleep(2 SECONDS)
+	TEST_ASSERT(inner.density, "A refused scan opened the inner door")
+	TEST_ASSERT(!outer.density, "A refused scan did not open the outer door")
+	// While the gun lies there the outer door stays open and nobody gets another scan
+	checkpoint.check_refused()
+	TEST_ASSERT_EQUAL(checkpoint.state, "rejecting", "The chamber stopped refusing with the gun still on its floor") // CHECKPOINT_REJECTING
+	TEST_ASSERT(!outer.density, "The outer door shut on a chamber with a gun on its floor")
+	TEST_ASSERT(!checkpoint.request_cycle(person), "A chamber with a gun on its floor took another scan")
+	checkpoint.request_outer(person)
+	sleep(1 SECONDS)
+	TEST_ASSERT(!outer.density, "A click shut the outer door on a gun still on the floor")
+	// Carried out: the door shuts, and whoever is still inside is scanned again
+	gun.forceMove(lobby)
+	checkpoint.check_refused()
+	TEST_ASSERT(wait_shut(outer), "The outer door stayed open after the gun was carried out")
+	TEST_ASSERT_EQUAL(checkpoint.state, "scanning", "The person left inside was not scanned again") // CHECKPOINT_SCANNING
+	checkpoint.finish_scan()
+	TEST_ASSERT_EQUAL(checkpoint.state, "passing", "A clean person was refused once the gun had gone") // CHECKPOINT_PASSING
+
+/// A gun in a box in a backpack is found; its carrier is never walked out, and gets a new scan once the gun is left outside
+/datum/unit_test/voidcrew_trader_checkpoint/nested_gun/Run()
+	TEST_ASSERT(fixture(), "Could not prepare the checkpoint")
+	var/mob/living/carbon/human/person = visitor(chamber[1])
+	var/obj/item/storage/backpack/bag = allocate(/obj/item/storage/backpack, person)
+	var/obj/item/storage/box/box = allocate(/obj/item/storage/box, bag)
+	allocate(/obj/item/gun/energy/laser, box)
+	TEST_ASSERT(scan_now(person), "Could not start a scan")
+	TEST_ASSERT_EQUAL(checkpoint.state, "rejecting", "A nested gun passed") // CHECKPOINT_REJECTING
+	sleep(2 SECONDS)
+	checkpoint.check_refused()
+	TEST_ASSERT_EQUAL(get_turf(person), chamber[1], "Someone refused was walked out")
+	TEST_ASSERT(!outer.density, "The outer door shut on someone still armed")
+	TEST_ASSERT(!checkpoint.request_cycle(person), "Someone still armed got another scan")
+	// The bag goes into a locker in the lobby; asked again, the chamber scans
+	bag.forceMove(lobby)
+	TEST_ASSERT(checkpoint.request_cycle(person), "Someone who left their gun outside could not ask again")
+	TEST_ASSERT(wait_shut(outer), "The outer door did not shut for the new scan")
+	TEST_ASSERT_EQUAL(checkpoint.state, "scanning", "Asking again did not scan") // CHECKPOINT_SCANNING
+	checkpoint.finish_scan()
+	TEST_ASSERT_EQUAL(checkpoint.state, "passing", "The unarmed person was refused") // CHECKPOINT_PASSING
+
+/// A door never closes on anyone in its doorway, standing or lying, and nobody is moved out of it: it waits
+/datum/unit_test/voidcrew_trader_checkpoint/doorway/Run()
+	TEST_ASSERT(fixture(), "Could not prepare the checkpoint")
+	var/mob/living/carbon/human/person = visitor()
+	TEST_ASSERT(checkpoint.request_outer(person), "The outer door did not open")
+	sleep(2 SECONDS)
+	TEST_ASSERT(!outer.density, "The outer door did not open")
+	var/turf/doorway = get_turf(outer)
+	person.forceMove(doorway)
+	person.set_resting(TRUE, silent = TRUE, instant = TRUE)
+	checkpoint.close_door(outer)
+	sleep(3 SECONDS)
+	TEST_ASSERT(!outer.density, "The outer door closed on someone lying in the doorway")
+	TEST_ASSERT_EQUAL(get_turf(person), doorway, "Someone in the doorway was moved")
+	person.set_resting(FALSE, silent = TRUE, instant = TRUE)
+	person.forceMove(chamber[1])
+	TEST_ASSERT(wait_shut(outer), "The outer door did not close once the doorway was clear")
+	TEST_ASSERT_EQUAL(checkpoint.state, "scanning", "Closing on someone inside did not scan") // CHECKPOINT_SCANNING
+
+/// Implants and organs are part of the person: an arm-mounted gun is found while retracted
+/datum/unit_test/voidcrew_trader_checkpoint/implanted_gun/Run()
+	TEST_ASSERT(fixture(), "Could not prepare the checkpoint")
+	var/mob/living/carbon/human/person = visitor(chamber[1])
+	var/obj/item/organ/cyberimp/arm/toolkit/gun/laser/implant = allocate(/obj/item/organ/cyberimp/arm/toolkit/gun/laser)
+	implant.Insert(person)
+	TEST_ASSERT(implant.owner == person, "The arm implant did not go in")
+	TEST_ASSERT(!length(person.held_items - null), "The implanted gun started out in hand")
+	TEST_ASSERT(scan_now(person), "Could not start a scan")
+	TEST_ASSERT_EQUAL(checkpoint.state, "rejecting", "An implanted gun passed") // CHECKPOINT_REJECTING
+
+/// A smuggler's satchel still hides what is inside it
+/datum/unit_test/voidcrew_trader_checkpoint/shielded_storage/Run()
+	TEST_ASSERT(fixture(), "Could not prepare the checkpoint")
+	var/mob/living/carbon/human/person = visitor(chamber[1])
+	var/obj/item/storage/backpack/bag = allocate(/obj/item/storage/backpack, person)
+	allocate(/obj/item/gun/ballistic/automatic/pistol, bag)
+	ADD_TRAIT(bag, TRAIT_CONTRABAND_BLOCKER, TRAIT_GENERIC)
+	TEST_ASSERT(scan_now(person), "Could not start a scan")
+	TEST_ASSERT_EQUAL(checkpoint.state, "passing", "Contraband-shielded storage lost its shielding") // CHECKPOINT_PASSING
+
+/// Mindshields and weapon-access IDs exempt nobody
+/datum/unit_test/voidcrew_trader_checkpoint/no_exemptions/Run()
+	TEST_ASSERT(fixture(), "Could not prepare the checkpoint")
+	var/mob/living/carbon/human/person = visitor(chamber[1])
+	allocate(/obj/item/gun/ballistic/automatic/pistol, person)
+	ADD_TRAIT(person, TRAIT_MINDSHIELD, TRAIT_GENERIC)
+	var/obj/item/card/id/advanced/id = allocate(/obj/item/card/id/advanced)
+	id.access = list(ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_CAPTAIN)
+	person.equip_to_slot_or_del(allocate(/obj/item/clothing/under/color/grey), ITEM_SLOT_ICLOTHING)
+	person.equip_to_slot_or_del(id, ITEM_SLOT_ID)
+	TEST_ASSERT(scan_now(person), "Could not start a scan")
+	TEST_ASSERT_EQUAL(checkpoint.state, "rejecting", "A mindshield or a weapons ID let a gun through") // CHECKPOINT_REJECTING
+
+/// Someone the outpost bars is refused even with nothing on them
+/datum/unit_test/voidcrew_trader_checkpoint/barred/Run()
+	TEST_ASSERT(fixture(), "Could not prepare the checkpoint")
+	var/mob/living/carbon/human/person = visitor(chamber[1])
+	host.flag_trespasser(person)
+	TEST_ASSERT(scan_now(person), "Could not start a scan")
+	TEST_ASSERT_EQUAL(checkpoint.state, "rejecting", "A barred person was let through") // CHECKPOINT_REJECTING
+
+// ===== PERMITS =====
+
+/// A permit lets its holder through armed; it is personal, the paper proves nothing, and it runs out
+/datum/unit_test/voidcrew_trader_checkpoint/permit/Run()
+	TEST_ASSERT(fixture(), "Could not prepare the checkpoint")
+	var/mob/living/carbon/human/holder = visitor(chamber[1])
+	var/obj/item/storage/backpack/bag = allocate(/obj/item/storage/backpack, holder)
+	allocate(/obj/item/gun/ballistic/automatic/pistol, bag)
+	TEST_ASSERT(host.grant_weapons_permit(holder), "Could not issue a permit")
+	TEST_ASSERT(host.has_weapons_permit(holder), "The permit was not recorded")
+	TEST_ASSERT(scan_now(holder), "Could not start a scan")
+	TEST_ASSERT_EQUAL(checkpoint.state, "passing", "A permit holder was refused") // CHECKPOINT_PASSING
+	settle()
+	// Personal: another person carrying a gun (and the holder's receipt) is still refused
+	holder.forceMove(lobby)
+	var/mob/living/carbon/human/friend = visitor(chamber[2])
+	allocate(/obj/item/gun/ballistic/automatic/pistol, friend)
+	var/obj/item/paper/weapons_permit/receipt = allocate(/obj/item/paper/weapons_permit, friend)
+	receipt.fill_in(holder, host, host.weapon_permits[holder.mind])
+	TEST_ASSERT(scan_now(friend), "Could not start a scan")
+	TEST_ASSERT_EQUAL(checkpoint.state, "rejecting", "Someone else's permit let a gun through") // CHECKPOINT_REJECTING
+	settle()
+	// A gun the holder carries is theirs; one left lying on the floor is not
+	friend.forceMove(lobby)
+	holder.forceMove(chamber[1])
+	var/obj/item/gun/ballistic/automatic/pistol/dropped = allocate(/obj/item/gun/ballistic/automatic/pistol, chamber[2])
+	TEST_ASSERT(scan_now(holder), "Could not start a scan")
+	TEST_ASSERT_EQUAL(checkpoint.state, "rejecting", "A permit covered a gun left on the floor") // CHECKPOINT_REJECTING
+	TEST_ASSERT_EQUAL(get_turf(dropped), chamber[2], "The checkpoint moved the loose gun")
+	qdel(dropped)
+	settle()
+	// Only at the outpost that issued it
+	var/obj/structure/overmap/trader_outpost/elsewhere = allocate(/obj/structure/overmap/trader_outpost/black_market)
+	TEST_ASSERT(!elsewhere.has_weapons_permit(holder), "A permit carried over to another outpost")
+	// It runs out
+	host.weapon_permits[holder.mind] = world.time - 1
+	TEST_ASSERT(!host.has_weapons_permit(holder), "An expired permit still counted")
+	TEST_ASSERT(host.has_weapons_permit(holder, 30 SECONDS), "The lapse grace did not apply") // OUTPOST_WEAPONS_PERMIT_GRACE
+	TEST_ASSERT(scan_now(holder), "Could not start a scan")
+	TEST_ASSERT_EQUAL(checkpoint.state, "rejecting", "An expired permit let a gun through") // CHECKPOINT_REJECTING
+
+// ===== FORCING THE INNER DOOR =====
+
+/// Prying starts a long, alarmed attempt; a breached door flags anyone who goes through it from the chamber
+/datum/unit_test/voidcrew_trader_checkpoint/forced_entry/Run()
+	TEST_ASSERT(fixture(), "Could not prepare the checkpoint")
+	TEST_ASSERT(inner.outpost_forceable() && !outer.outpost_forceable(), "Only the inner door may be forced")
+	var/mob/living/carbon/human/burglar = visitor(chamber[1])
+	var/obj/item/crowbar/crowbar = allocate(/obj/item/crowbar, burglar)
+	burglar.put_in_hands(crowbar)
+	// The outpost property element lets the crowbar through to this door, and the attempt takes time
+	INVOKE_ASYNC(crowbar, TYPE_PROC_REF(/obj/item, melee_attack_chain), burglar, inner, list())
+	sleep(1 SECONDS)
+	TEST_ASSERT(checkpoint.forcing, "Prying the inner door did not start forcing it")
+	TEST_ASSERT(inner.density, "The inner door gave at once")
+	// The outer door's crowbar is still stopped by outpost property
+	crowbar.melee_attack_chain(burglar, outer, list())
+	TEST_ASSERT(outer.density, "A crowbar opened the outer door")
+	// Walking away stops the attempt
+	burglar.forceMove(lobby)
+	sleep(2 SECONDS)
+	TEST_ASSERT(!checkpoint.forcing, "Walking away did not stop the attempt")
+	TEST_ASSERT(inner.density, "An abandoned attempt opened the door")
+	// When it gives, whoever goes through from the chamber is an armed trespasser; someone already inside is not
+	var/mob/living/carbon/human/insider = visitor(secured)
+	burglar.forceMove(chamber[1])
+	checkpoint.breach(burglar)
+	sleep(2 SECONDS)
+	TEST_ASSERT(!inner.density, "A breach did not open the inner door")
+	TEST_ASSERT(checkpoint.request_outer(visitor()), "The outer door stayed interlocked during a breach")
+	burglar.Move(get_turf(inner), NORTH)
+	TEST_ASSERT_EQUAL(get_turf(burglar), get_turf(inner), "Could not walk into the breached doorway")
+	TEST_ASSERT(host.is_armed_trespasser(burglar.mind), "Going through a forced door was not flagged")
+	TEST_ASSERT(host.is_user_barred(burglar), "Going through a forced door did not bar them")
+	burglar.forceMove(secured)
+	insider.Move(get_turf(inner), SOUTH)
+	TEST_ASSERT(!host.is_armed_trespasser(insider.mind), "Stepping into the doorway from inside was flagged")
+	// It does not shut on whoever stands in it
+	checkpoint.end_breach()
+	sleep(2 SECONDS)
+	TEST_ASSERT(!inner.density, "The forced door shut on someone in its doorway")
+	insider.forceMove(secured)
+	TEST_ASSERT(wait_shut(inner), "The forced door did not shut again")
+	TEST_ASSERT_EQUAL(checkpoint.state, "idle", "The checkpoint did not settle after the breach") // CHECKPOINT_IDLE
+
+// ===== ARMED TRESPASS =====
+
+/// A gun drawn past the checkpoint flags its holder once it stays out; holstered, permitted or in the lobby it does not
+/datum/unit_test/voidcrew_trader_checkpoint/drawn_gun/Run()
+	TEST_ASSERT(fixture(FALSE), "Could not prepare the checkpoint")
+	var/mob/living/carbon/human/person = visitor(secured)
+	var/obj/item/gun/ballistic/automatic/pistol/gun = allocate(/obj/item/gun/ballistic/automatic/pistol)
+	var/obj/item/storage/backpack/bag = allocate(/obj/item/storage/backpack)
+	person.equip_to_slot_or_del(bag, ITEM_SLOT_BACK)
+	gun.forceMove(bag)
+	host.armed_sweep(list(person))
+	TEST_ASSERT(!length(host.armed_sightings), "A holstered gun was noticed")
+	person.put_in_hands(gun)
+	host.armed_sweep(list(person))
+	TEST_ASSERT(!host.is_armed_trespasser(person.mind), "A gun was flagged the moment it came out")
+	host.armed_sightings[person.mind] = world.time - 2 SECONDS // OUTPOST_ARMED_SIGHTING_GRACE
+	host.armed_sweep(list(person))
+	TEST_ASSERT(host.is_armed_trespasser(person.mind), "A gun kept out past the checkpoint was not flagged")
+	var/obj/machinery/porta_turret/outpost/turret = allocate(/obj/machinery/porta_turret/outpost, secured)
+	turret.outpost = host
+	TEST_ASSERT(turret.valid_target(person), "The turrets ignore an armed trespasser")
+	// The hostile window ends before the bar does
+	host.armed_trespassers[person.mind] = world.time - 10 MINUTES - 1 // OUTPOST_TRESPASS_HOSTILE_DURATION
+	TEST_ASSERT(!turret.valid_target(person), "The turrets kept shooting after the hostile window")
+	TEST_ASSERT(host.is_user_barred(person), "The bar ended with the hostile window")
+	host.trespass_bars[person.mind] = world.time - 1
+	TEST_ASSERT(!host.is_user_barred(person), "The bar did not lift")
+	// A permit holder, and anyone in the lobby, may carry openly
+	var/mob/living/carbon/human/holder = visitor(secured)
+	holder.put_in_hands(allocate(/obj/item/gun/ballistic/automatic/pistol))
+	host.grant_weapons_permit(holder)
+	var/mob/living/carbon/human/arrival = visitor(lobby)
+	arrival.put_in_hands(allocate(/obj/item/gun/ballistic/automatic/pistol))
+	host.armed_sightings[holder.mind] = world.time - 2 SECONDS
+	host.armed_sightings[arrival.mind] = world.time - 2 SECONDS
+	host.armed_sweep(list(holder, arrival))
+	TEST_ASSERT(!host.is_armed_trespasser(holder.mind), "A permit holder was flagged for carrying")
+	TEST_ASSERT(!host.is_armed_trespasser(arrival.mind), "Someone in the checkpoint lobby was flagged")
+
+/// Firing a gun past the checkpoint without a permit flags the shooter at once
+/datum/unit_test/voidcrew_trader_checkpoint/fired_gun/Run()
+	TEST_ASSERT(fixture(FALSE), "Could not prepare the checkpoint")
+	var/mob/living/carbon/human/shooter = visitor(secured)
+	var/obj/item/gun/ballistic/automatic/pistol/gun = allocate(/obj/item/gun/ballistic/automatic/pistol)
+	SEND_SIGNAL(shooter, COMSIG_MOB_FIRED_GUN, gun, lobby, null, null, list(0, 0))
+	TEST_ASSERT(host.is_armed_trespasser(shooter.mind), "Firing past the checkpoint was not flagged")
+
+/// The traders and the permit desk refuse an armed trespasser, and the desk sells them nothing
+/datum/unit_test/voidcrew_trader_checkpoint/refused_service/Run()
+	TEST_ASSERT(fixture(), "Could not prepare the checkpoint")
+	var/mob/living/carbon/human/person = visitor(get_step(guard, SOUTH))
+	var/datum/shop_sku/weapons_permit/permit = locate() in guard.shop.skus
+	TEST_ASSERT_NOTNULL(permit, "The guard does not sell permits")
+	TEST_ASSERT_EQUAL(permit.price_credits, 1000, "The permit price changed") // OUTPOST_WEAPONS_PERMIT_PRICE
+	TEST_ASSERT(permit.fixed_price && !permit.contract_reward, "The permit can be discounted or paid out by contracts")
+	TEST_ASSERT(permit.can_trade(person, guard), "The permit desk would not serve an ordinary customer")
+	host.flag_trespasser(person)
+	TEST_ASSERT(host.is_user_barred(person), "An armed trespasser is not barred")
+	TEST_ASSERT(!permit.can_trade(person, guard), "The permit desk would serve an armed trespasser")
+	TEST_ASSERT(!permit.try_purchase(person, guard), "An armed trespasser bought a permit")
+	TEST_ASSERT(!host.has_weapons_permit(person), "An armed trespasser got a permit")
+
+// ===== SEALED GOODS AND THE EXIT GATE =====
+
+/// A gun handed over past the checkpoint comes sealed; the seal opens outside the checkpoint
+/datum/unit_test/voidcrew_trader_checkpoint/sealed_goods/Run()
+	TEST_ASSERT(fixture(FALSE), "Could not prepare the checkpoint")
+	var/mob/living/carbon/human/buyer = visitor(secured)
+	var/obj/item/gun/energy/laser/gun = allocate(/obj/item/gun/energy/laser, secured)
+	var/obj/item/outpost_sealed_case/case = outpost_seal_goods(gun)
+	TEST_ASSERT(istype(case), "A gun handed over past the checkpoint was not sealed")
+	allocated += case
+	TEST_ASSERT_EQUAL(gun.loc, case, "The gun is not in its case")
+	buyer.put_in_hands(case)
+	case.attack_self(buyer)
+	TEST_ASSERT_EQUAL(gun.loc, case, "The seal broke past the checkpoint")
+	var/obj/item/coin/coin = allocate(/obj/item/coin, secured)
+	TEST_ASSERT_EQUAL(outpost_seal_goods(coin), coin, "Harmless goods were sealed")
+	buyer.forceMove(lobby)
+	case.attack_self(buyer)
+	TEST_ASSERT(QDELETED(case), "The seal did not break in the lobby")
+	TEST_ASSERT(gun in buyer.held_items, "The gun did not come out of the case")
+	var/obj/item/gun/energy/laser/lobby_gun = allocate(/obj/item/gun/energy/laser, lobby)
+	TEST_ASSERT_EQUAL(outpost_seal_goods(lobby_gun), lobby_gun, "Goods handed over in the lobby were sealed")
+	// A cache crate's lid is sealed whatever it holds
+	var/obj/structure/closet/crate/zone_loot/syndicate/trader/crate = allocate(/obj/structure/closet/crate/zone_loot/syndicate/trader, secured)
+	outpost_seal_goods(crate)
+	TEST_ASSERT(!crate.open(buyer), "A sealed crate opened past the checkpoint")
+	crate.forceMove(lobby)
+	TEST_ASSERT(crate.open(buyer), "A sealed crate did not open in the lobby")
+
+/// The exit gate lets people and things out of the concourse and nothing back in
+/datum/unit_test/voidcrew_trader_checkpoint/exit_gate/Run()
+	TEST_ASSERT(fixture(FALSE), "Could not prepare the checkpoint")
+	var/turf/origin = host.template_bottom_left
+	// Open a second way between the floors at x = 0 and put a gate in it, pointing at the lobby
+	var/turf/gate_turf = locate(origin.x, origin.y + 3, origin.z)
+	for(var/dy in 2 to 4)
+		var/turf/tile = locate(origin.x, origin.y + dy, origin.z)
+		tile.ChangeTurf(/turf/open/indestructible)
+	var/turf/inside = locate(origin.x, origin.y + 4, origin.z)
+	var/turf/outside = locate(origin.x, origin.y + 2, origin.z)
+	var/obj/structure/outpost_exit_gate/gate = allocate(/obj/structure/outpost_exit_gate, gate_turf)
+	gate.setDir(SOUTH)
+	var/mob/living/carbon/human/leaving = visitor(inside)
+	TEST_ASSERT(leaving.Move(gate_turf, SOUTH), "The gate stopped someone leaving")
+	sleep(0.5 SECONDS)
+	TEST_ASSERT_EQUAL(get_turf(leaving), outside, "The gate did not carry them through")
+	var/mob/living/carbon/human/sneaking = visitor(outside)
+	TEST_ASSERT(!sneaking.Move(gate_turf, NORTH), "The gate let someone in from the lobby side")
+	var/obj/item/gun/ballistic/automatic/pistol/gun = allocate(/obj/item/gun/ballistic/automatic/pistol, outside)
+	TEST_ASSERT(!gun.Move(gate_turf, NORTH), "The gate let a gun in from the lobby side")
+	TEST_ASSERT(!gate.CanAStarPass(SOUTH, null), "Pathing goes in through the gate")
+	TEST_ASSERT(gate.CanAStarPass(NORTH, null), "Pathing cannot go out through the gate")
+
+/// Checkpoint lockers are free, lock to the first card swiped, one per card per outpost, and are free again once emptied
+/datum/unit_test/voidcrew_trader_checkpoint/lockers/Run()
+	TEST_ASSERT(fixture(FALSE), "Could not prepare the checkpoint")
+	var/turf/origin = host.template_bottom_left
+	var/obj/structure/closet/secure_closet/outpost_rental/checkpoint/first = allocate(/obj/structure/closet/secure_closet/outpost_rental/checkpoint, locate(origin.x, origin.y, origin.z))
+	var/obj/structure/closet/secure_closet/outpost_rental/checkpoint/second = allocate(/obj/structure/closet/secure_closet/outpost_rental/checkpoint, locate(origin.x + 1, origin.y, origin.z))
+	var/mob/living/carbon/human/owner = visitor(locate(origin.x, origin.y + 1, origin.z))
+	var/obj/item/card/id/card = allocate(/obj/item/card/id)
+	card.registered_name = "Locker owner"
+	var/datum/bank_account/account = allocate(/datum/bank_account, "Locker owner", null, 1, FALSE)
+	account.account_balance = 1000
+	card.registered_account = account
+	TEST_ASSERT(owner.put_in_active_hand(card), "The owner could not hold the card")
+	TEST_ASSERT(!first.locked && isnull(first.id_card), "A checkpoint locker started out claimed")
+	first.attackby(card, owner)
+	TEST_ASSERT(first.locked && first.id_card?.resolve() == card, "Swiping did not lock the locker to the card")
+	TEST_ASSERT_EQUAL(account.account_balance, 1000, "A checkpoint locker charged a fee")
+	second.attackby(card, owner)
+	TEST_ASSERT(isnull(second.id_card), "One card claimed two lockers at the same outpost")
+	TEST_ASSERT(!first.emag_act(owner, null), "An emag broke a checkpoint locker")
+	var/mob/living/carbon/human/stranger = visitor(locate(origin.x + 1, origin.y + 1, origin.z))
+	TEST_ASSERT(stranger.put_in_active_hand(allocate(/obj/item/card/id)), "The stranger could not hold a card")
+	first.togglelock(stranger)
+	TEST_ASSERT(first.locked, "Someone else's card opened a claimed locker")
+	first.togglelock(owner)
+	TEST_ASSERT(!first.locked, "The owner's card did not open their locker")
+	TEST_ASSERT(first.open(owner), "The owner could not open their locker")
+	var/obj/item/coin/kept = allocate(/obj/item/coin, get_turf(first))
+	TEST_ASSERT(first.close(owner), "The owner could not close their locker")
+	TEST_ASSERT_EQUAL(kept.loc, first, "The locker did not take what was left in it")
+	TEST_ASSERT(first.id_card?.resolve() == card, "A locker with something in it was freed")
+	TEST_ASSERT(first.open(owner), "The owner could not reopen their locker")
+	kept.forceMove(get_step(first, NORTH))
+	TEST_ASSERT(first.close(owner), "The owner could not close the emptied locker")
+	TEST_ASSERT(isnull(first.id_card) && !first.locked, "An emptied locker stayed claimed")
+	second.attackby(card, owner)
+	TEST_ASSERT(second.id_card?.resolve() == card, "A freed card could not claim another locker")
+
+/// The lobby checkpoints are a way in only (the exit gate is the way out); an exterior hatch cycles both ways
+/datum/unit_test/voidcrew_trader_checkpoint/directions/Run()
+	TEST_ASSERT(fixture(), "Could not prepare the checkpoint")
+	var/mob/living/carbon/human/insider = visitor(secured)
+	TEST_ASSERT(!checkpoint.request_cycle(insider), "A guarded checkpoint cycled outward for someone inside")
+	var/datum/can_pass_info/walker = new(null, list())
+	TEST_ASSERT(!inner.CanAStarPass(get_dir(inner, secured), walker), "Pathing goes out through a guarded checkpoint's inner door")
+	TEST_ASSERT(inner.CanAStarPass(get_dir(inner, chamber[1]), walker), "Pathing cannot come in through a guarded checkpoint's inner door")
+	// Without a guard (an exterior hatch) the chamber cycles outward for someone inside
+	qdel(guard)
+	guard = null
+	TEST_ASSERT_NULL(checkpoint.guard, "The checkpoint kept a deleted guard")
+	TEST_ASSERT(scan_now(insider), "An exterior hatch would not cycle outward")
+	TEST_ASSERT_EQUAL(checkpoint.state, "passing", "An empty chamber did not open for someone leaving") // CHECKPOINT_PASSING
+	sleep(2 SECONDS)
+	TEST_ASSERT(!inner.density, "The inner door did not open for someone leaving")
+	TEST_ASSERT(inner.CanAStarPass(get_dir(inner, secured), walker), "Pathing cannot leave through an exterior hatch")
+
+// ===== NPCS =====
+
+/// NPCs never work the doors, a refusal does not repeat while the chamber cycles, and NPC pathing keeps out of the chamber
+/datum/unit_test/voidcrew_trader_checkpoint/npc_doors/Run()
+	TEST_ASSERT(fixture(), "Could not prepare the checkpoint")
+	var/mob/living/basic/ambient_npc/outpost/customer/npc = allocate(/mob/living/basic/ambient_npc/outpost/customer, lobby)
+	// Walking into the doors again and again does nothing at all
+	for(var/i in 1 to 5)
+		outer.bumpopen(npc)
+		inner.bumpopen(npc)
+		outer.try_to_activate_door(npc)
+	TEST_ASSERT(outer.density && inner.density, "An NPC walking into the doors opened one")
+	TEST_ASSERT_EQUAL(checkpoint.state, "idle", "An NPC walking into the doors started a cycle") // CHECKPOINT_IDLE
+	TEST_ASSERT_NULL(outer.animation, "An NPC walking into the outer door flashed it")
+	TEST_ASSERT_NULL(inner.animation, "An NPC walking into the inner door flashed it")
+	// Mid-scan, a player walking into either door gets nothing at all
+	var/mob/living/carbon/human/person = visitor(chamber[1])
+	var/mob/living/carbon/human/waiting = visitor(lobby)
+	allocate(/obj/item/gun/ballistic/automatic/pistol, person)
+	TEST_ASSERT(checkpoint.request_cycle(person), "Could not start a scan")
+	TEST_ASSERT_EQUAL(sensor.look, "scanning", "The wall scanner did not show the scan")
+	for(var/i in 1 to 5)
+		inner.bumpopen(person)
+		outer.bumpopen(waiting)
+	TEST_ASSERT_NULL(inner.animation, "Walking into the inner door mid-scan flashed it")
+	TEST_ASSERT_NULL(outer.animation, "Walking into the outer door mid-scan flashed it")
+	// Refused: one flash for a walk into the shut inner door, then nothing for a while however often it is walked into
+	checkpoint.finish_scan()
+	TEST_ASSERT_EQUAL(checkpoint.state, "rejecting", "The armed person was let through") // CHECKPOINT_REJECTING
+	sleep(2 SECONDS)
+	inner.bumpopen(person)
+	TEST_ASSERT_EQUAL(inner.animation, "deny", "A refused walk into the inner door showed nothing") // DOOR_DENY_ANIMATION
+	inner.set_animation(null)
+	for(var/i in 1 to 5)
+		inner.bumpopen(person)
+	TEST_ASSERT_NULL(inner.animation, "Walking into the inner door again flashed it again at once")
+	// Pathing: a shut door is a wall to NPCs, and an open one too unless they are going through by the rules
+	var/datum/can_pass_info/npc_walk = new(npc, list())
+	var/datum/can_pass_info/player_walk = new(waiting, list())
+	TEST_ASSERT(!inner.CanAStarPass(get_dir(inner, chamber[1]), npc_walk), "NPC pathing goes through a shut checkpoint door")
+	TEST_ASSERT(!outer.density, "The outer door is not open for the refusal")
+	TEST_ASSERT(!outer.CanAStarPass(get_dir(outer, lobby), npc_walk), "NPC pathing goes through an open checkpoint door")
+	TEST_ASSERT(outer.CanAStarPass(get_dir(outer, lobby), player_walk), "Player pathing cannot go through an open checkpoint door")
+	ADD_TRAIT(npc, "checkpoint_crossing", "unit_test") // TRAIT_CHECKPOINT_CROSSING
+	TEST_ASSERT(outer.CanAStarPass(get_dir(outer, lobby), npc_walk), "An NPC going through by the rules cannot path through the open door")
+	TEST_ASSERT(!inner.CanAStarPass(get_dir(inner, chamber[1]), npc_walk), "An NPC going through by the rules paths through a shut door")
+	REMOVE_TRAIT(npc, "checkpoint_crossing", "unit_test")
+	// The exit gate: out only, and for the outpost's people only when they are leaving
+	var/obj/structure/outpost_exit_gate/gate = allocate(/obj/structure/outpost_exit_gate, locate(host.template_bottom_left.x, host.template_bottom_left.y + 5, host.template_bottom_left.z))
+	gate.setDir(SOUTH)
+	TEST_ASSERT(gate.CanAStarPass(NORTH, player_walk), "Player pathing cannot go out through the gate")
+	TEST_ASSERT(!gate.CanAStarPass(NORTH, npc_walk), "An NPC who is not leaving paths out through the gate")
+	TEST_ASSERT(npc.start_activity(new /datum/ambient_activity/leave(npc)), "Could not send the NPC off")
+	TEST_ASSERT(gate.CanAStarPass(NORTH, npc_walk), "A leaving NPC cannot path out through the gate")
+	TEST_ASSERT(!gate.CanAStarPass(SOUTH, npc_walk), "A leaving NPC paths in through the gate")
+	npc.end_activity()
+
+/// Someone off the lift goes through like a player: one request per door, in once it is open, a wait through the scan, out once it passes
+/datum/unit_test/voidcrew_trader_checkpoint/npc_crossing/Run()
+	TEST_ASSERT(fixture(), "Could not prepare the checkpoint")
+	var/datum/ambient_place/outpost/place = SSambient_npcs.outpost_place(host)
+	var/mob/living/basic/ambient_npc/outpost/customer/npc = allocate(/mob/living/basic/ambient_npc/outpost/customer, lobby)
+	npc.set_place(place)
+	ambient_cross_checkpoint_on_arrival(npc, host)
+	var/datum/ambient_activity/cross_checkpoint/crossing = npc.activity
+	TEST_ASSERT(istype(crossing), "Someone off the lift did not set off through the checkpoint")
+	TEST_ASSERT(HAS_TRAIT(npc, "checkpoint_crossing"), "Someone going through could not path through its doors") // TRAIT_CHECKPOINT_CROSSING
+	// At the outer door: one request, and nothing more however often their routine comes round
+	TEST_ASSERT_EQUAL(npc.activity_step(1), 0, "Someone at the outer door did not wait for it") // AMBIENT_STEP_CONTINUE
+	TEST_ASSERT(crossing.next_ask_at > world.time, "Someone at the outer door did not ask it to open")
+	for(var/i in 1 to 5)
+		npc.activity_step(1)
+	TEST_ASSERT(outer.animation != "deny" && inner.animation != "deny", "Someone going through set off a door's refusal")
+	sleep(2 SECONDS)
+	TEST_ASSERT(!outer.density, "The outer door did not open for someone off the lift")
+	// Open: in they go
+	TEST_ASSERT_EQUAL(npc.activity_step(1), 1, "Someone did not go in through the open outer door") // AMBIENT_STEP_MOVE
+	TEST_ASSERT(crossing.spot in checkpoint.chamber_turfs, "Someone was sent somewhere other than the chamber")
+	npc.forceMove(crossing.spot)
+	TEST_ASSERT_EQUAL(npc.activity_step(1), 0, "Someone in the chamber did not wait") // AMBIENT_STEP_CONTINUE
+	// The outer door shuts on them and the chamber scans; they wait it out
+	for(var/i in 1 to 60)
+		if(checkpoint.state == "scanning") // CHECKPOINT_SCANNING
+			break
+		sleep(0.1 SECONDS)
+	TEST_ASSERT_EQUAL(checkpoint.state, "scanning", "The chamber did not scan someone who walked in") // CHECKPOINT_SCANNING
+	TEST_ASSERT_EQUAL(npc.activity_step(1), 0, "Someone did something mid-scan") // AMBIENT_STEP_CONTINUE
+	checkpoint.finish_scan()
+	TEST_ASSERT_EQUAL(checkpoint.state, "passing", "The chamber refused someone with nothing on them") // CHECKPOINT_PASSING
+	sleep(2 SECONDS)
+	TEST_ASSERT_EQUAL(npc.activity_step(1), 1, "Someone did not go through the open inner door") // AMBIENT_STEP_MOVE
+	TEST_ASSERT_EQUAL(crossing.spot, secured, "Someone was not sent onto the concourse")
+	npc.forceMove(secured)
+	TEST_ASSERT_EQUAL(npc.activity_step(1), 2, "Someone on the concourse kept going through the checkpoint") // AMBIENT_STEP_DONE
+	npc.end_activity()
+	TEST_ASSERT(!HAS_TRAIT(npc, "checkpoint_crossing"), "Someone through the checkpoint could still path through its doors")
+	// Already past it, nobody sets off through it
+	ambient_cross_checkpoint_on_arrival(npc, host)
+	TEST_ASSERT_NULL(npc.activity, "Someone on the concourse set off through the checkpoint")
diff --git a/voidcrew/modules/unit_tests/voidcrew_vestige_ascension.dm b/voidcrew/modules/unit_tests/voidcrew_vestige_ascension.dm
index 6d3d75a38c8..ce2533ec993 100644
--- a/voidcrew/modules/unit_tests/voidcrew_vestige_ascension.dm
+++ b/voidcrew/modules/unit_tests/voidcrew_vestige_ascension.dm
@@ -313,11 +313,12 @@
 	for(var/boss_type in boss_loot)
 		var/loot_type = boss_loot[boss_type]
 		var/mob/living/basic/boss = allocate(boss_type, floor)
+		var/expected_drops = istype(boss, /mob/living/basic/vestige_warframe) ? boss.npc_red_weapon_drop : 1
 		var/before = length(floor.get_all_contents_type(loot_type))
 		TEST_ASSERT(boss.death(), "[boss_type]'s first death failed")
-		TEST_ASSERT_EQUAL(length(floor.get_all_contents_type(loot_type)), before + 1, "[boss_type]'s legitimate kill did not provide its guaranteed loot")
+		TEST_ASSERT_EQUAL(length(floor.get_all_contents_type(loot_type)), before + expected_drops, "[boss_type]'s legitimate kill did not provide its rolled loot")
 		TEST_ASSERT(!boss.death(), "[boss_type] reported another death after already dying")
-		TEST_ASSERT_EQUAL(length(floor.get_all_contents_type(loot_type)), before + 1, "Applying death again to [boss_type] paid another loot roll")
+		TEST_ASSERT_EQUAL(length(floor.get_all_contents_type(loot_type)), before + expected_drops, "Applying death again to [boss_type] paid another loot roll")
 		qdel(boss)
 
 /// The defeated specimen cannot start another attack from an unfinished telegraph.
@@ -521,7 +522,8 @@
 	ship.shuttle = port
 	var/datum/team/voidcrew/crew = allocate(/datum/team/voidcrew)
 	crew.ship = ship
-	user.mind.ship_teams = list(crew)
+	ship.ship_team = crew
+	crew.join_member(user.mind)
 	TEST_ASSERT(!get_ship_from_atom(user), "The keeper must start off the ship for the crew fallback regression")
 	var/datum/vestige_ascension/offer = allocate(/datum/vestige_ascension/oracle)
 	var/datum/vestige_ascension_run/unit_test_disappearance/run = allocate(/datum/vestige_ascension_run/unit_test_disappearance, offer, user)
@@ -1091,14 +1093,15 @@
 	for(var/boss_type in boss_loot)
 		var/loot_type = boss_loot[boss_type]
 		var/mob/living/basic/boss = allocate(boss_type, floor)
+		var/expected_drops = istype(boss, /mob/living/basic/vestige_warframe) ? boss.npc_red_weapon_drop : 1
 		var/before = length(floor.get_all_contents_type(loot_type))
 		TEST_ASSERT(boss.death(), "[boss_type] could not die normally")
-		TEST_ASSERT_EQUAL(length(floor.get_all_contents_type(loot_type)), before + 1, "The first defeated [boss_type] did not pay its ordinary loot")
+		TEST_ASSERT_EQUAL(length(floor.get_all_contents_type(loot_type)), before + expected_drops, "The first defeated [boss_type] did not pay its rolled loot")
 		var/obj/projectile/magic/resurrection/bolt = allocate(/obj/projectile/magic/resurrection, floor)
 		bolt.on_hit(boss)
 		TEST_ASSERT(boss.stat != DEAD, "The real resurrection projectile must still revive [boss_type]")
 		TEST_ASSERT(boss.death(), "The revived [boss_type] could not die a second time")
-		TEST_ASSERT_EQUAL(length(floor.get_all_contents_type(loot_type)), before + 1, "Reviving and killing [boss_type] again printed another equipment payment")
+		TEST_ASSERT_EQUAL(length(floor.get_all_contents_type(loot_type)), before + expected_drops, "Reviving and killing [boss_type] again printed another equipment payment")
 		qdel(boss)
 
 /// The actual bridle may temporarily possess a boss, but cannot permanently strip its attack rotation.
diff --git a/voidcrew/modules/unit_tests/voidcrew_weapon_ladder.dm b/voidcrew/modules/unit_tests/voidcrew_weapon_ladder.dm
new file mode 100644
index 00000000000..dcb0f3fc648
--- /dev/null
+++ b/voidcrew/modules/unit_tests/voidcrew_weapon_ladder.dm
@@ -0,0 +1,369 @@
+/// Ammunition nodes follow the standing of the weapons they feed.
+/datum/unit_test/voidcrew_ammunition_permissions/Run()
+	// ZONE_PERMISSION_PUBLIC / YELLOW / ADVANCED; fork defines follow test includes.
+	var/list/permissions = list(
+		/datum/techweb_node/ballistic_ammunition = 0,
+		/datum/techweb_node/explosive_ammo = 2,
+		/datum/techweb_node/automatic_ammunition = 1,
+		/datum/techweb_node/weapon_ammo_c20r = 1,
+		/datum/techweb_node/weapon_ammo_wt550 = 1,
+		/datum/techweb_node/specialist_ammo = 1,
+		/datum/techweb_node/weapon_ammo_l6_saw = 2,
+		/datum/techweb_node/weapon_ammo_bulldog = 2,
+		/datum/techweb_node/weapon_ammo_sniper_rifle = 2,
+		/datum/techweb_node/experimental_ammo = 2,
+	)
+	for(var/datum/techweb_node/node_type as anything in permissions)
+		var/datum/techweb_node/node = SSresearch.techweb_nodes[initial(node_type.id)]
+		TEST_ASSERT_NOTNULL(node, "Missing ammunition node [node_type].")
+		TEST_ASSERT_EQUAL(node.zone_permission, permissions[node_type], "[node.id] has the wrong ammunition permission.")
+
+/// Exercise actual magazine loading, including full and spent single-shot chambers.
+/datum/unit_test/voidcrew_no_quarter_ammunition/Run()
+	var/obj/item/gun/ballistic/shotgun/musket/no_quarter/cannon = allocate(__IMPLIED_TYPE__)
+	var/obj/item/gun/ballistic/shotgun/pump = allocate(__IMPLIED_TYPE__)
+	var/obj/item/gun/ballistic/shotgun/doublebarrel/double = allocate(__IMPLIED_TYPE__)
+	for(var/obj/item/gun/ballistic/shotgun/gun as anything in list(cannon, pump, double))
+		QDEL_NULL(gun.chambered)
+		for(var/obj/item/ammo_casing/round as anything in gun.magazine.ammo_list())
+			qdel(round)
+		gun.magazine.stored_ammo.Cut()
+		var/obj/item/ammo_casing/shotgun/no_quarter/cartridge = allocate(__IMPLIED_TYPE__)
+		TEST_ASSERT_EQUAL(!!gun.magazine.give_round(cartridge), gun == cannon, "[gun.type] has the wrong heavy cartridge compatibility.")
+	var/obj/item/ammo_casing/shotgun/ordinary = allocate(__IMPLIED_TYPE__)
+	TEST_ASSERT(!cannon.magazine.give_round(ordinary), "An ordinary shell replaced a live heavy cartridge.")
+	var/obj/item/ammo_casing/spent = cannon.magazine.get_round()
+	QDEL_NULL(spent.loaded_projectile)
+	TEST_ASSERT(cannon.magazine.give_round(ordinary), "No Quarter lost ordinary 12g loading or spent-round replacement.")
+	TEST_ASSERT_EQUAL(cannon.magazine.get_round(), ordinary, "No Quarter did not retain the loaded 12g shell.")
+	var/obj/item/ammo_casing/shotgun/no_quarter/next_cartridge = allocate(__IMPLIED_TYPE__)
+	TEST_ASSERT(!cannon.magazine.give_round(next_cartridge), "A heavy cartridge replaced a live 12g shell.")
+	QDEL_NULL(ordinary.loaded_projectile)
+	TEST_ASSERT(cannon.magazine.give_round(next_cartridge), "No Quarter cannot replace a spent 12g shell with its heavy cartridge.")
+	TEST_ASSERT_EQUAL(length(cannon.magazine.stored_ammo), 1, "No Quarter exceeded its single-round capacity.")
+	var/obj/item/storage/belt/bandolier/no_quarter/bandolier = locate() in run_loc_floor_bottom_left
+	TEST_ASSERT_NOTNULL(bandolier, "No Quarter lost its cartridge bandolier.")
+	TEST_ASSERT_EQUAL(length(bandolier.contents), 12, "No Quarter's bandolier lost cartridges.")
+	qdel(bandolier)
+
+/// Test the finished kits, after Workshop pre_equip has replaced inherited lists.
+/datum/unit_test/voidcrew_ladder_outfits/Run()
+	var/list/role_outfits = list(
+		/datum/outfit/job/miner,
+		/datum/outfit/job/miner/equipped,
+		/datum/outfit/job/miner/syndicate,
+		/datum/outfit/job/miner/syndicate_cutter,
+		/datum/outfit/job/miner/western,
+		/datum/outfit/job/security,
+		/datum/outfit/job/security/corporate,
+		/datum/outfit/job/warden,
+		/datum/outfit/job/hos,
+		/datum/outfit/job/workshop_bogatyr_job_12,
+		/datum/outfit/job/workshop_bogatyr_job_14,
+		/datum/outfit/job/workshop_bogatyr_job_3,
+		/datum/outfit/job/workshop_bogatyr_job_29,
+		/datum/outfit/job/workshop_bogatyr_job_34,
+		/datum/outfit/job/workshop_hiryu_class_carrier_job_18,
+		/datum/outfit/job/workshop_hiryu_class_carrier_job_8,
+		/datum/outfit/job/workshop_hiryu_class_carrier_job_5,
+		/datum/outfit/job/workshop_ship_nanobead_job_52,
+		/datum/outfit/job/workshop_ship_nanobead_job_20,
+		/datum/outfit/job/workshop_ship_nanobead_job_68,
+		/datum/outfit/job/workshop_ship_nanobead_job_36,
+		/datum/outfit/job/workshop_squab_job_15,
+		/datum/outfit/job/workshop_squab_job_9,
+		/datum/outfit/job/workshop_squab_job_19,
+	)
+	var/list/other_outfits = list(
+		/datum/outfit/job/captain/syndicate,
+		/datum/outfit/job/assistant/syndicate,
+		/datum/outfit/job/bridge_assistant,
+		/datum/outfit/job/workshop_hiryu_class_carrier_job_20,
+		/datum/outfit/job/workshop_hiryu_class_carrier_job_12,
+		/datum/outfit/job/workshop_hiryu_class_carrier_job_14,
+		/datum/outfit/job/workshop_hiryu_class_carrier_job_21,
+		/datum/outfit/job/workshop_hiryu_class_carrier_job_9,
+		/datum/outfit/job/workshop_hiryu_class_carrier_job_15,
+		/datum/outfit/job/workshop_ship_nanobead_job_5,
+		/datum/outfit/job/workshop_ship_nanobead_job_7,
+	)
+	for(var/outfit_type in role_outfits + other_outfits)
+		var/datum/outfit/job/outfit = allocate(outfit_type)
+		var/mob/living/carbon/human/consistent/wearer = allocate(__IMPLIED_TYPE__)
+		outfit.equip(wearer)
+		var/knives = 0
+		for(var/obj/item/item in wearer.get_all_contents())
+			TEST_ASSERT(!is_ladder_restricted_melee(item.type), "[outfit_type] starts with restricted melee [item.type].")
+			TEST_ASSERT(!istype(item, /obj/item/sharpener), "[outfit_type] starts with a whetstone.")
+			if(item.type == /obj/item/knife/combat/survival)
+				knives++
+		if(outfit_type in role_outfits)
+			TEST_ASSERT_EQUAL(knives, 1, "[outfit_type] must have exactly one survival knife.")
+		if(outfit_type == /datum/outfit/job/workshop_hiryu_class_carrier_job_18)
+			TEST_ASSERT(locate(/obj/item/weldingtool/hugetank) in wearer.get_all_contents(), "The exosuit pilot lost their welder.")
+		if(outfit_type == /datum/outfit/job/security || outfit_type == /datum/outfit/job/warden)
+			TEST_ASSERT(istype(wearer.s_store, /obj/item/gun/energy/disabler), "[outfit_type] lost its disabler.")
+		if(outfit_type == /datum/outfit/job/hos)
+			TEST_ASSERT(locate(/obj/item/melee/baton/security/loaded/hos) in wearer.get_all_contents(), "HoS lost their control baton.")
+
+	var/datum/voucher_set/mining/crusher_kit/voucher = allocate(__IMPLIED_TYPE__)
+	TEST_ASSERT(/obj/item/gun/energy/recharge/kinetic_accelerator in voucher.set_items, "The mining voucher must offer an accelerator.")
+	TEST_ASSERT(!(/obj/item/kinetic_crusher in voucher.set_items), "The starting voucher still offers a crusher.")
+	var/obj/effect/mob_spawn/ghost_role/human/syndicate/battlecruiser/ghost_role = allocate(__IMPLIED_TYPE__)
+	var/mob/living/carbon/human/consistent/ghost_wearer = allocate(__IMPLIED_TYPE__)
+	ghost_role.equip(ghost_wearer)
+	for(var/obj/item/item in ghost_wearer.get_all_contents())
+		TEST_ASSERT(!is_ladder_combat_gun(item.type), "A ghost-role outfit still starts with [item.type].")
+
+/// Ordinary weapon recipes remain available, including learned and stack recipes.
+/datum/unit_test/voidcrew_ladder_recipe_registration/Run()
+	var/list/expected_recipes = list(
+		/datum/crafting_recipe/strobeshield = FALSE,
+		/datum/crafting_recipe/moonflowershield = FALSE,
+		/datum/crafting_recipe/chainsaw = FALSE,
+		/datum/crafting_recipe/boneaxe = FALSE,
+		/datum/crafting_recipe/house_edge = FALSE,
+		/datum/crafting_recipe/giant_wrench = FALSE,
+		/datum/crafting_recipe/singulo_hammer = FALSE,
+		/datum/crafting_recipe/sm_sword = FALSE,
+		/datum/crafting_recipe/boneshovel = FALSE,
+		/datum/crafting_recipe/pipegun = FALSE,
+		/datum/crafting_recipe/receiver = FALSE,
+		/datum/crafting_recipe/pipepistol = FALSE,
+		/datum/crafting_recipe/rebarxbow = FALSE,
+		/datum/crafting_recipe/rebarxbowforced = FALSE,
+		/datum/crafting_recipe/pipe_organ_gun = FALSE,
+		/datum/crafting_recipe/laser_musket = FALSE,
+		/datum/crafting_recipe/shortbow = FALSE,
+		/datum/crafting_recipe/pipegun_prime = FALSE,
+		/datum/crafting_recipe/laser_musket_prime = FALSE,
+		/datum/crafting_recipe/deagle_prime = FALSE,
+		/datum/crafting_recipe/sks = FALSE,
+		/datum/crafting_recipe/hellgun = FALSE,
+		/datum/crafting_recipe/advancedegun = FALSE,
+		/datum/crafting_recipe/tempgun = FALSE,
+		/datum/crafting_recipe/xraylaser = FALSE,
+		/datum/crafting_recipe/ioncarbine = FALSE,
+		/datum/crafting_recipe/teslacannon = FALSE,
+		/datum/crafting_recipe/photoncannon = FALSE,
+		/datum/crafting_recipe/ebow = FALSE,
+		/datum/crafting_recipe/beam_rifle = FALSE,
+		/datum/crafting_recipe/riflestock = FALSE,
+		/datum/crafting_recipe/spear = FALSE,
+		/datum/crafting_recipe/bonespear = FALSE,
+		/datum/crafting_recipe/bonedagger = FALSE,
+		/datum/crafting_recipe/smoothbore_disabler = FALSE,
+		/datum/crafting_recipe/smoothbore_disabler_prime = FALSE,
+	)
+	var/list/expected_stacks = list(
+		/obj/item/shield/buckler = FALSE,
+		/obj/item/gun/syringe/blowgun = FALSE,
+		/obj/structure/closet/crate/coffin = FALSE,
+	)
+	for(var/datum/crafting_recipe/recipe as anything in GLOB.crafting_recipes)
+		if(recipe.type in expected_recipes)
+			TEST_ASSERT_EQUAL(!!recipe.non_craftable, expected_recipes[recipe.type], "[recipe.type] registered with the wrong availability")
+			expected_recipes -= recipe.type
+		if(istype(recipe, /datum/crafting_recipe/stack) && (recipe.result in expected_stacks))
+			TEST_ASSERT_EQUAL(!!recipe.non_craftable, expected_stacks[recipe.result], "Stack result [recipe.result] registered with the wrong availability")
+			expected_stacks -= recipe.result
+	TEST_ASSERT_EQUAL(length(expected_recipes), 0, "Recipe registration missed [english_list(expected_recipes)]")
+	TEST_ASSERT_EQUAL(length(expected_stacks), 0, "Stack recipe registration missed [english_list(expected_stacks)]")
+
+/// Scrap guns, melee weapons and researched conversion kits use real ingredients and tools.
+/datum/unit_test/voidcrew_ladder_manufacture/Run()
+	for(var/recipe_type in list(/datum/crafting_recipe/pipegun, /datum/crafting_recipe/chainsaw, /datum/crafting_recipe/xraylaser))
+		craft_recipe(recipe_type)
+	TEST_ASSERT(!is_ladder_restricted_production(/obj/item/shovel/serrated/dull), "The green dull bone shovel became restricted.")
+	for(var/design_type in list(/datum/design/plasmacutter, /datum/design/plasmacutter_adv, /datum/design/flora_gun, /datum/design/gun_shell))
+		var/datum/design/design_path = design_type
+		var/datum/design/design = SSresearch.techweb_designs[initial(design_path.id)]
+		TEST_ASSERT_NOTNULL(design, "Missing green tool [design_type].")
+		TEST_ASSERT(design.build_type, "Green tool [design_type] lost fabrication.")
+
+/datum/unit_test/voidcrew_ladder_manufacture/proc/craft_recipe(recipe_type)
+	var/atom/movable/crafter = allocate(__IMPLIED_TYPE__)
+	var/datum/component/personal_crafting/crafting = crafter.AddComponent(__IMPLIED_TYPE__)
+	crafting.ignored_flags = CRAFT_IGNORE_DO_AFTER
+	var/datum/crafting_recipe/recipe = allocate(recipe_type)
+	TEST_ASSERT(!recipe.non_craftable, "[recipe_type] is absent from the crafting menu.")
+	TEST_ASSERT_EQUAL(crafting.construct_item(crafter, recipe), ", missing component.", "[recipe_type] bypassed its ingredient requirements.")
+	var/list/ingredients = list()
+	for(var/ingredient_type in recipe.reqs)
+		var/amount = recipe.reqs[ingredient_type]
+		if(ispath(ingredient_type, /obj/item/stack))
+			ingredients += allocate(ingredient_type, crafter.loc, amount, FALSE)
+		else
+			for(var/index in 1 to amount)
+				ingredients += allocate(ingredient_type)
+	var/obj/item/screwdriver/screwdriver = allocate(__IMPLIED_TYPE__)
+	var/obj/item/weldingtool/welder = allocate(__IMPLIED_TYPE__)
+	var/atom/result = crafting.construct_item(crafter, recipe)
+	TEST_ASSERT(istype(result, recipe.result), "[recipe_type] failed to craft its weapon: [result].")
+	for(var/obj/item/ingredient as anything in ingredients)
+		TEST_ASSERT(QDELETED(ingredient), "[recipe_type] did not consume [ingredient.type].")
+	TEST_ASSERT(!QDELETED(screwdriver) && !QDELETED(welder), "[recipe_type] consumed a tool.")
+	qdel(result)
+	qdel(screwdriver)
+	qdel(welder)
+
+/// The original nodes and fabrication channels still grant all ordinary weapon designs.
+/datum/unit_test/voidcrew_ladder_weapon_designs/Run()
+	var/list/node_designs = list(
+		TECHWEB_NODE_ELECTRIC_WEAPONS = list("stunrevolver", "ioncarbine", "temp_gun"),
+		TECHWEB_NODE_BEAM_WEAPONS = list("nuclear_gun", "xray_laser"),
+		TECHWEB_NODE_SYNDICATE_BASIC = list("largecrossbow", "rapidsyringe"),
+		TECHWEB_NODE_UNREGULATED_BLUESPACE = list("beamrifle", "desynchronizer"),
+		TECHWEB_NODE_LIGHT_APPS = list("photon_cannon"),
+		TECHWEB_NODE_ANOMALY_SHELLS = list("gravitygun", "wormholeprojector"),
+		TECHWEB_NODE_RIOT_SUPRESSION = list("tele_shield"),
+	)
+	for(var/node_id in node_designs)
+		var/datum/techweb_node/node = SSresearch.techweb_nodes[node_id]
+		TEST_ASSERT_NOTNULL(node, "Missing weapon research node [node_id].")
+		for(var/design_id in node_designs[node_id])
+			TEST_ASSERT(design_id in node.design_ids, "[node_id] lost weapon design [design_id].")
+			var/datum/design/design = SSresearch.techweb_designs[design_id]
+			TEST_ASSERT_NOTNULL(design, "Missing weapon design [design_id].")
+			var/expected_channels = (design_id in list("wormholeprojector", "desynchronizer")) ? PROTOLATHE : (PROTOLATHE | AWAY_LATHE)
+			TEST_ASSERT_EQUAL(design.build_type, expected_channels, "[design_id] lost its original fabrication channels.")
+	for(var/design_id in list("cleric_mace", "liberator_gun"))
+		var/datum/design/design = SSresearch.techweb_designs[design_id]
+		TEST_ASSERT_NOTNULL(design, "Missing autolathe weapon design [design_id].")
+		TEST_ASSERT_EQUAL(design.build_type, AUTOLATHE, "[design_id] lost autolathe fabrication.")
+	var/datum/design/rapidsyringe/syringe_gun = SSresearch.techweb_designs["rapidsyringe"]
+	TEST_ASSERT_EQUAL(syringe_gun.name, "Rapid Syringe Gun", "The rapid syringe design has the wrong name.")
+	TEST_ASSERT_EQUAL(syringe_gun.build_path, /obj/item/gun/syringe/rapidsyringe, "Rapid syringe research must produce the rapid syringe gun.")
+	var/datum/design/xray/xray_kit = SSresearch.techweb_designs["xray_laser"]
+	TEST_ASSERT_EQUAL(xray_kit.build_path, /obj/item/weaponcrafting/gunkit/xray, "X-ray research must print its conversion kit.")
+	var/datum/design/beamrifle/beam_kit = SSresearch.techweb_designs["beamrifle"]
+	TEST_ASSERT_EQUAL(beam_kit.build_path, /obj/item/weaponcrafting/gunkit/beam_rifle, "Event Horizon research must print its kit.")
+	var/obj/machinery/rnd/production/protolathe/launch_fabrication_test/lathe = allocate(__IMPLIED_TYPE__)
+	var/datum/techweb/web = allocate(__IMPLIED_TYPE__)
+	lathe.connect_techweb(web)
+	lathe.set_machine_stat(NONE)
+	lathe.materials.set_local_size(1000 * SHEET_MATERIAL_AMOUNT)
+	for(var/node_id in list(TECHWEB_NODE_BEAM_WEAPONS, TECHWEB_NODE_SYNDICATE_BASIC))
+		TEST_ASSERT(web.research_node_id(node_id, TRUE, FALSE, FALSE), "Could not unlock [node_id] for fabrication.")
+	lathe.update_designs()
+	for(var/datum/design/design as anything in list(xray_kit, syringe_gun))
+		TEST_ASSERT(design in lathe.cached_designs, "The researched [design.id] is absent from the protolathe.")
+		var/list/stock_before = list()
+		for(var/material in design.materials)
+			lathe.materials.mat_container.insert_amount_mat(10000, material)
+			stock_before[material] = lathe.materials.mat_container.materials[material]
+		lathe.print_test_design(design, 1)
+		var/obj/item/product = locate(design.build_path) in run_loc_floor_bottom_left
+		TEST_ASSERT_NOTNULL(product, "The protolathe failed to print [design.id].")
+		TEST_ASSERT_EQUAL(product.type, design.build_path, "The protolathe printed the wrong [design.id] output.")
+		for(var/material in stock_before)
+			TEST_ASSERT(lathe.materials.mat_container.materials[material] < stock_before[material], "Printing [design.id] did not consume [material].")
+		qdel(product)
+
+/// Parts and convertible guns retain their original slapcraft recipe lists.
+/datum/unit_test/voidcrew_ladder_slapcraft/Run()
+	var/list/expected_recipes = list(
+		/obj/item/weaponcrafting/receiver = list(/datum/crafting_recipe/pipegun),
+		/obj/item/weaponcrafting/stock = list(/datum/crafting_recipe/smoothbore_disabler, /datum/crafting_recipe/laser_musket),
+		/obj/item/weaponcrafting/giant_wrench = list(/datum/crafting_recipe/giant_wrench),
+		/obj/item/gun/energy/laser = list(/datum/crafting_recipe/xraylaser, /datum/crafting_recipe/hellgun, /datum/crafting_recipe/ioncarbine),
+		/obj/item/gun/energy/e_gun = list(/datum/crafting_recipe/advancedegun, /datum/crafting_recipe/tempgun, /datum/crafting_recipe/beam_rifle),
+		/obj/item/gun/energy/recharge/kinetic_accelerator = list(/datum/crafting_recipe/ebow),
+	)
+	for(var/item_type in expected_recipes)
+		var/obj/item/item = allocate(item_type)
+		var/list/actual_recipes = list()
+		var/listeners = item._listen_lookup?[COMSIG_ATOM_ATTACKBY]
+		if(!islist(listeners))
+			listeners = list(listeners)
+		for(var/datum/element/slapcrafting/element in listeners)
+			actual_recipes |= element.slapcraft_recipes
+		var/list/expected = expected_recipes[item_type]
+		TEST_ASSERT_EQUAL(length(actual_recipes), length(expected), "[item_type] has the wrong slapcraft recipes.")
+		TEST_ASSERT_EQUAL(length(expected - actual_recipes), 0, "[item_type] lost an original slapcraft recipe.")
+
+/// Fixed spawners cannot smuggle weapons through nested contraband or maintenance rolls.
+/datum/unit_test/voidcrew_ladder_fixed_sources/Run()
+	var/turf/destination = run_loc_floor_bottom_left
+	for(var/source_type in list(/obj/effect/spawner/random/armory/laser_gun, /obj/effect/spawner/random/contraband/armory, /obj/effect/spawner/random/exotic/antag_gear, /obj/effect/spawner/random/maintenance))
+		var/obj/effect/spawner/random/source = allocate(source_type)
+		for(var/item_type in list(/obj/item/gun/energy/laser, /obj/item/knife/combat, /obj/item/katana, /obj/item/weaponcrafting/receiver, /obj/item/spear/grey_tide, /obj/item/shovel/serrated))
+			var/obj/item/result = source.make_item(destination, item_type)
+			TEST_ASSERT(!is_ladder_restricted_production(result.type), "[source_type] spawned [result.type].")
+			if(item_type == /obj/item/spear/grey_tide || item_type == /obj/item/shovel/serrated)
+				TEST_ASSERT_EQUAL(result.type, /obj/item/knife/combat/survival, "[source_type] did not replace yellow melee [item_type] with a survival knife.")
+			qdel(result)
+		var/obj/item/shovel/serrated/dull/green_shovel = source.make_item(destination, /obj/item/shovel/serrated/dull)
+		TEST_ASSERT(istype(green_shovel), "[source_type] removed the green dull bone shovel.")
+		qdel(green_shovel)
+		var/obj/item/gun/energy/disabler/control = source.make_item(destination, /obj/item/gun/energy/disabler)
+		TEST_ASSERT(istype(control), "[source_type] removed a disabler.")
+		qdel(control)
+	for(var/datum/market_item/entry_type as anything in subtypesof(/datum/market_item))
+		if(is_ladder_restricted_production(initial(entry_type.item)))
+			TEST_ASSERT_EQUAL(initial(entry_type.availability_prob), 0, "[entry_type] can still enter or restock on the cargo market.")
+	var/previous_holy_weapon = GLOB.holy_weapon_type
+	GLOB.holy_weapon_type = null
+	var/obj/item/nullrod/rod = allocate(__IMPLIED_TYPE__)
+	GLOB.holy_weapon_type = previous_holy_weapon
+	var/datum/component/subtype_picker/picker = rod.GetComponent(/datum/component/subtype_picker)
+	TEST_ASSERT_NOTNULL(picker, "The green nullrod picker disappeared.")
+	for(var/choice in picker.subtype2descriptions)
+		TEST_ASSERT(!ispath(choice, /obj/item/nullrod/claymore) && !ispath(choice, /obj/item/nullrod/vibro) && choice != /obj/item/nullrod/hypertool && !ispath(choice, /obj/item/gun), "The free picker offers [choice].")
+
+/// Fresh refills cannot restore a combat gun when a games vendor is built or restocked.
+/datum/unit_test/voidcrew_ladder_games_vendor/Run()
+	var/obj/item/circuitboard/machine/vendor/board = allocate(__IMPLIED_TYPE__)
+	board.set_type(/obj/machinery/vending/games)
+	var/obj/item/vending_refill/games/installed_refill = allocate(__IMPLIED_TYPE__)
+	board.replacement_parts = list(installed_refill)
+	var/obj/machinery/vending/games/vendor = allocate(board.build_path, run_loc_floor_bottom_left, board)
+	TEST_ASSERT(installed_refill in vendor.component_parts, "The games vendor was not built with the supplied refill.")
+	for(var/item_type in vendor.products + vendor.contraband + vendor.premium)
+		TEST_ASSERT(!is_ladder_combat_gun(item_type), "A newly built games vendor offers [item_type].")
+	for(var/restock_pass in 1 to 2)
+		if(restock_pass == 2)
+			for(var/datum/data/vending_product/record in vendor.hidden_records)
+				record.amount = 0
+			var/obj/item/vending_refill/games/fresh_refill = allocate(__IMPLIED_TYPE__)
+			TEST_ASSERT(vendor.restock(fresh_refill) > 0, "The games vendor did not accept a fresh refill.")
+		var/found_bat = FALSE
+		for(var/datum/data/vending_product/record in vendor.product_records + vendor.hidden_records + vendor.coin_records)
+			TEST_ASSERT(!is_ladder_combat_gun(record.product_path), "A built or restocked games vendor stocks [record.product_path].")
+			if(record.product_path == /obj/item/melee/baseball_bat)
+				found_bat = TRUE
+				TEST_ASSERT_EQUAL(record.amount, 1, "The games vendor lost its replacement bat.")
+		TEST_ASSERT(found_bat, "The games vendor's contraband inventory was not populated.")
+
+/// Loan packs bypass ordering, so inspect the actual generated crate as well.
+/datum/unit_test/voidcrew_ladder_loans/Run()
+	var/datum/voidcrew_shuttle_loan/loan = allocate(__IMPLIED_TYPE__)
+	var/datum/supply_pack/imports/specialops/pack = allocate(__IMPLIED_TYPE__)
+	for(var/repeat in 1 to 2)
+		var/obj/structure/closet/crate/delivery = loan.spawn_supply_pack(pack, run_loc_floor_bottom_left)
+		for(var/obj/item/item in delivery.get_all_contents())
+			TEST_ASSERT(!is_ladder_restricted_production(item.type), "A loan delivered [item.type].")
+		TEST_ASSERT(locate(/obj/item/clothing/under/chameleon) in delivery, "Cleaning the loan removed unrelated supplies.")
+		qdel(delivery)
+
+/// Fixed shelf prices stay above maximum salvage even after demand recovers.
+/datum/unit_test/voidcrew_ladder_export_loop/Run()
+	var/list/purchase_prices = list(
+		/datum/export/weapon/laser = 1500,
+		/datum/export/weapon/energy_gun = 2400,
+		/datum/export/weapon/wt550 = 4200,
+	)
+	for(var/export_type in purchase_prices)
+		var/datum/export/export = allocate(export_type)
+		var/purchase_price = purchase_prices[export_type]
+		TEST_ASSERT(export.init_cost <= purchase_price * 0.25, "[export_type] exceeds one quarter of its fixed shelf price.")
+		for(var/recovered_demand in list(FALSE, TRUE))
+			export.cost = export.init_cost
+			var/datum/export_report/report = allocate(__IMPLIED_TYPE__)
+			for(var/cycle in 1 to 100)
+				if(recovered_demand)
+					export.cost = export.init_cost
+				var/obj/item/gun/gun = allocate(export.export_types[1])
+				export.sell_object(gun, report, FALSE)
+				qdel(gun)
+			TEST_ASSERT(report.total_value[export] < purchase_price * 100, "Repeated purchase/export of [export_type] is profitable.")
diff --git a/voidcrew/modules/unit_tests/voidcrew_zone_identity.dm b/voidcrew/modules/unit_tests/voidcrew_zone_identity.dm
new file mode 100644
index 00000000000..870fd6a9320
--- /dev/null
+++ b/voidcrew/modules/unit_tests/voidcrew_zone_identity.dm
@@ -0,0 +1,980 @@
+/// Round identity contracts. Fork defines follow test includes, so bands/permissions use literals.
+/datum/mind/crewlead_test
+	var/accept_new_crew = TRUE
+	var/confirmations = 0
+
+/datum/mind/crewlead_test/confirm_new_ship_crew(datum/voidcrew_crew_record/record)
+	confirmations++
+	return accept_new_crew
+
+/datum/unit_test/voidcrew_zone_identity
+	abstract_type = /datum/unit_test/voidcrew_zone_identity
+	var/list/test_records = list()
+	var/list/test_ports = list()
+
+/datum/unit_test/voidcrew_zone_identity/Destroy()
+	for(var/obj/docking_port/mobile/voidcrew/port in test_ports)
+		port.current_ship = null
+		qdel(port, force = TRUE)
+	QDEL_LIST(test_records)
+	return ..()
+
+/datum/unit_test/voidcrew_zone_identity/proc/record_for(obj/structure/overmap/ship/ship)
+	var/datum/voidcrew_crew_record/record = ship.get_crew_record()
+	test_records |= record
+	return record
+
+/datum/unit_test/voidcrew_zone_identity/proc/make_ship(datum/voidcrew_crew_record/record)
+	var/obj/structure/overmap/ship/ship = allocate(/obj/structure/overmap/ship)
+	ship.ship_team = new
+	ship.ship_team.ship = ship
+	if(record)
+		ship.ship_team.set_crew_record(record)
+	record_for(ship)
+	return ship
+
+/datum/unit_test/voidcrew_zone_identity/proc/make_member(player_key)
+	var/mob/living/carbon/human/consistent/member = allocate(/mob/living/carbon/human/consistent, run_loc_floor_bottom_left)
+	member.mind = allocate(/datum/mind/crewlead_test)
+	member.mind_initialize()
+	if(player_key)
+		member.key = player_key
+	member.mind.key = player_key
+	return member
+
+/datum/unit_test/voidcrew_zone_identity/proc/clear_green(datum/voidcrew_crew_record/record)
+	for(var/family in list("named_kill", "hunt", "capture"))
+		record.claim_zone_work(family, 1, 1, "green_[family]")
+
+/// Fix the roll while exercising the production award and crew-claim transaction.
+/obj/structure/overmap/ship/zone_identity_prize_test
+	var/prize_category = "suit"
+
+/obj/structure/overmap/ship/zone_identity_prize_test/roll_mission_prize(zone)
+	return prize_category
+
+/datum/unit_test/voidcrew_zone_identity/guarded_prizes/Run()
+	var/obj/structure/overmap/ship/zone_identity_prize_test/first = allocate(/obj/structure/overmap/ship/zone_identity_prize_test)
+	first.ship_team = new
+	first.ship_team.ship = first
+	var/datum/voidcrew_crew_record/crew = record_for(first)
+	var/obj/structure/overmap/ship/zone_identity_prize_test/second = allocate(/obj/structure/overmap/ship/zone_identity_prize_test)
+	second.ship_team = new
+	second.ship_team.ship = second
+	second.ship_team.set_crew_record(crew)
+	TEST_ASSERT_EQUAL(first.award_guarded_prize("kill", 3, run_loc_floor_bottom_left), /obj/item/mod/control/pre_equipped/traitor_elite, "The first crew suit was refused")
+	TEST_ASSERT_NULL(second.award_guarded_prize("lair", 3, run_loc_floor_bottom_left), "A second hull's lair bypassed the crew suit cap")
+	second.prize_category = "gadget"
+	TEST_ASSERT_EQUAL(second.award_guarded_prize("capture", 3, run_loc_floor_bottom_left), /obj/item/gun/energy/laser/captain, "The suit claim consumed the crew gadget allowance")
+	first.prize_category = "gadget"
+	TEST_ASSERT_NULL(first.award_guarded_prize("lair", 3, run_loc_floor_bottom_left), "A different hull bypassed the crew gadget cap")
+	TEST_ASSERT(crew.mission_suit_paid && crew.mission_gadget_paid, "Awards were not recorded on the crew")
+	var/datum/voidcrew_crew_record/other_crew = allocate(/datum/voidcrew_crew_record)
+	second.ship_team.set_crew_record(other_crew)
+	TEST_ASSERT_EQUAL(second.award_guarded_prize("kill", 3, run_loc_floor_bottom_left), /obj/item/gun/energy/laser/captain, "A separate crew inherited the old hull's prize claims")
+	qdel(first)
+	TEST_ASSERT(!QDELETED(crew) && (crew in GLOB.voidcrew_crew_records), "Losing the last hull discarded the crew's prize claims")
+
+/// Successful resident registration recovers the saved crew and evicts the previous life.
+/datum/unit_test/voidcrew_zone_identity/resident_arrival/Run()
+	var/obj/structure/overmap/ship/ship = make_ship()
+	var/datum/voidcrew_crew_record/crew = record_for(ship)
+	var/mob/living/carbon/human/old_life = make_member("zoneidentityresident")
+	ship.enlist_crewmember(old_life)
+	ship.claimed_captain = old_life.mind
+	var/mob/living/carbon/human/arrival = make_member("zoneidentityresident")
+	TEST_ASSERT_NULL(arrival.mind.get_reputation_crew(), "The replacement was already affiliated")
+	TEST_ASSERT_EQUAL(arrival.mind.recover_reputation_crew(), crew, "The resident's crew was not saved")
+	var/obj/structure/overmap/dynamic/player_outpost/home = allocate(/obj/structure/overmap/dynamic/player_outpost)
+	home.register_resident_arrival(arrival, "zoneidentityresident")
+	TEST_ASSERT_EQUAL(arrival.mind.get_reputation_crew(), crew, "Resident arrival did not restore crew affiliation")
+	TEST_ASSERT(arrival.mind in crew.minds, "Resident arrival skipped the crew join path")
+	TEST_ASSERT_NULL(old_life.mind.get_reputation_crew(), "Resident arrival retained the previous life's affiliation")
+	TEST_ASSERT(!(old_life.mind in ship.ship_team.members), "Resident arrival retained the previous life's hull roster")
+	TEST_ASSERT_NULL(ship.claimed_captain, "Resident arrival retained the previous life's command")
+	TEST_ASSERT(home.is_resident(arrival), "Crew recovery lost outpost residency")
+	TEST_ASSERT(home.has_resident_clearance("zoneidentityresident"), "Crew recovery lost arrival clearance")
+	var/mob/living/carbon/human/newcomer = make_member("zoneidentityresidentnew")
+	home.register_resident_arrival(newcomer, "zoneidentityresidentnew")
+	TEST_ASSERT_NULL(newcomer.mind.get_reputation_crew(), "An unaffiliated resident inherited another resident's crew")
+	TEST_ASSERT(home.is_resident(newcomer), "An unaffiliated resident was refused")
+
+/// The eight families, lifetime caps, cumulative permissions and once-only claim boundary.
+/datum/unit_test/voidcrew_zone_identity/progression/Run()
+	var/datum/voidcrew_crew_record/record = allocate(/datum/voidcrew_crew_record)
+	TEST_ASSERT_EQUAL(length(record.zone_families), 3, "Missing work bands")
+	for(var/band in record.zone_families)
+		TEST_ASSERT_EQUAL(length(record.zone_families[band]), 8, "A band does not have eight family counters")
+	var/list/qualifying = list(
+		/datum/mission/recovery/kill = "named_kill",
+		/datum/mission/recovery/kill/outpost = "named_kill",
+		/datum/mission/big_game_hunt = "hunt",
+		/datum/mission/live_capture = "capture",
+		/datum/mission/poacher_bust = "poachers",
+		/datum/mission/recovery/survey = "pylons",
+		/datum/mission/research/core_sample = "pylons",
+		/datum/mission/recovery/extraction = "extraction",
+	)
+	for(var/mission_type in subtypesof(/datum/mission))
+		var/expected
+		for(var/family_type in qualifying)
+			if(ispath(mission_type, family_type))
+				expected = qualifying[family_type]
+		TEST_ASSERT_EQUAL(zone_reputation_family(mission_type), expected, "Wrong progression family for [mission_type]")
+	TEST_ASSERT_EQUAL(record.get_zone_permission(), 0, "Fresh crew is not Public")
+	TEST_ASSERT(!record.can_work_in_zone(2) && !record.can_work_in_zone(3), "A new crew can accept dangerous work")
+	TEST_ASSERT_EQUAL(record.claim_zone_work("named_kill", 99, 3, "bad_band"), 0, "Unknown band earned standing")
+	TEST_ASSERT_EQUAL(record.claim_zone_work("waves", 1, 3, "bad_family"), 0, "Prize-family alias earned standing")
+	TEST_ASSERT_EQUAL(record.claim_zone_work("named_kill", 1, 3, "first"), 1, "Green family exceeded its lifetime cap")
+	TEST_ASSERT_EQUAL(record.claim_zone_work("named_kill", 1, 3, "second"), 0, "Repeated family earned more green standing")
+	TEST_ASSERT(record.settlement_claims["second"], "Capped settlement was not claimed")
+	TEST_ASSERT_EQUAL(record.claim_zone_work("hunt", 1, 3, "first"), 0, "Duplicate receipt earned standing")
+	clear_green(record)
+	TEST_ASSERT_EQUAL(record.get_zone_permission(), 1, "Three green families did not open yellow")
+	TEST_ASSERT(record.can_work_in_zone(2) && !record.can_work_in_zone(3), "Yellow admission is wrong")
+	TEST_ASSERT_EQUAL(record.claim_zone_work("hunt", 2, 3, "yellow1"), 3, "Hard work is not worth three")
+	TEST_ASSERT_EQUAL(record.claim_zone_work("hunt", 2, 3, "yellow2"), 2, "Yellow family was not clamped at five")
+	TEST_ASSERT_EQUAL(record.get_zone_permission(), 1, "One yellow family opened advanced")
+	TEST_ASSERT_EQUAL(record.claim_zone_work("capture", 2, 1, "yellow3"), 1, "Easy work is not worth one")
+	TEST_ASSERT_EQUAL(record.get_zone_permission(), 2, "Cumulative yellow threshold did not open advanced")
+	TEST_ASSERT(record.can_work_in_zone(3), "Advanced crew cannot accept red work")
+	for(var/index in 1 to 3)
+		record.claim_zone_work("pylons", 3, 3, "red_pylons_[index]")
+	TEST_ASSERT_EQUAL(record.get_zone_permission(), 2, "One red family opened elite")
+	record.claim_zone_work("extraction", 3, 3, "red_extract1")
+	record.claim_zone_work("extraction", 3, 1, "red_extract2")
+	TEST_ASSERT_EQUAL(record.get_zone_permission(), 3, "Nine red standing did not open elite")
+	TEST_ASSERT_EQUAL(record.zone_totals["1"], 3, "Dangerous work leaked into green")
+	TEST_ASSERT_EQUAL(zone_work_reward(2), 2, "Medium award drifted from board favor")
+	TEST_ASSERT(!record.has_zone_permission(4) && !record.can_work_in_zone(null), "Unknown permission/band passed")
+
+/// Real pad turn-ins with ship interiors and overmap bands; no subsystem fixture is constructed.
+/datum/unit_test/voidcrew_zone_bounties
+	parent_type = /datum/unit_test/voidcrew_zone_teleport
+	abstract_type = /datum/unit_test/voidcrew_zone_bounties
+	var/list/crew_records = list()
+
+/datum/unit_test/voidcrew_zone_bounties/New()
+	. = ..()
+	zones_were_active = SSovermap_zones.zones_active
+	SSovermap_zones.zones_active = TRUE
+	board_test_begin()
+
+/datum/unit_test/voidcrew_zone_bounties/Destroy()
+	board_test_end()
+	QDEL_LIST(crew_records)
+	return ..()
+
+/datum/unit_test/voidcrew_zone_bounties/proc/paid_ship(turf/hull, turf/token, datum/voidcrew_crew_record/crew)
+	var/obj/structure/overmap/ship/ship = make_ship(hull, token)
+	ship.shuttle.width = 1
+	ship.shuttle.height = 1
+	ship.ship_team = new
+	ship.ship_team.ship = ship
+	if(crew)
+		ship.ship_team.set_crew_record(crew)
+	crew_records |= ship.get_crew_record()
+	ship.ship_account = allocate(/datum/bank_account/ship, "Zone Bounty Test", null, 1, FALSE)
+	return ship
+
+/datum/unit_test/voidcrew_zone_bounties/turn_in/Run()
+	var/turf/deck = run_loc_floor_bottom_left
+	var/turf/field = make_zone_turf(get_step(deck, NORTH), 2) // ZONE_YELLOW
+	var/turf/home = make_zone_turf(get_step(field, EAST), 1) // ZONE_GREEN
+	var/obj/structure/overmap/ship/ship = paid_ship(deck, home)
+	var/datum/voidcrew_crew_record/crew = ship.get_crew_record()
+	var/obj/machinery/mission_pad/pad = allocate(/obj/machinery/mission_pad, deck)
+	var/datum/criminal_bounty/posting = board_test_posting(2) // BOUNTY_TIER_WANTED
+	var/datum/bounty_record/record = posting.record
+	var/mob/living/basic/bounty_criminal/criminal = board_test_criminal(posting, field)
+	TEST_ASSERT(istext(posting.turn_in(pad, ship)), "A criminal absent from the pad was accepted")
+	TEST_ASSERT_EQUAL(crew.zone_totals["2"], 0, "A refused turn-in earned standing")
+	criminal.body_go_down()
+	TEST_ASSERT_EQUAL(record.board_work_zone, 2, "Capture did not bind its actual field band")
+	TEST_ASSERT_EQUAL(crew.zone_totals["2"], 0, "Capture earned standing before a paying turn-in")
+	criminal.forceMove(deck)
+	criminal.body_state_changed()
+	TEST_ASSERT_EQUAL(record.board_work_zone, 2, "Transport overwrote the capture band")
+	TEST_ASSERT(islist(posting.turn_in(pad, ship)), "The live criminal was not paid")
+	TEST_ASSERT_EQUAL(crew.zone_families["2"]["criminal_bounty"], 2, "Wanted turn-in did not credit medium in its capture zone")
+	TEST_ASSERT_EQUAL(crew.zone_totals["1"], 0, "The posting/return zone earned the field credit")
+	TEST_ASSERT(crew.settlement_claims["bounty:[record.id]:criminal_bounty"], "Turn-in did not claim its stable receipt")
+	TEST_ASSERT(istext(posting.turn_in(pad, ship)), "A second turn-in was accepted")
+	TEST_ASSERT_EQUAL(crew.zone_totals["2"], 2, "A second turn-in earned more standing")
+	var/obj/structure/overmap/ship/split_ship = paid_ship(get_step(deck, EAST), home, crew)
+	TEST_ASSERT_EQUAL(split_ship.get_crew_record().zone_totals["2"], 2, "A split hull lost its crew's standing")
+	// Reposting the same record under another alias cannot award another crew.
+	var/datum/criminal_bounty/alias_posting = allocate(/datum/criminal_bounty)
+	alias_posting.record = record
+	alias_posting.value = 1000
+	GLOB.criminal_bounties += alias_posting
+	record.status = "wanted" // A repost still carries its spent reputation claim.
+	var/obj/structure/overmap/ship/other = paid_ship(get_step(get_step(deck, EAST), EAST), home)
+	var/obj/machinery/mission_pad/other_pad = allocate(/obj/machinery/mission_pad, get_turf(other.shuttle))
+	var/obj/item/bounty_proof/proof = allocate(/obj/item/bounty_proof, get_turf(other_pad))
+	proof.posting_ref = WEAKREF(alias_posting)
+	proof.record = record
+	alias_posting.board_attach_proof(proof)
+	TEST_ASSERT(islist(alias_posting.turn_in(other_pad, other)), "The repost fixture did not reach the paying path")
+	TEST_ASSERT_EQUAL(other.get_crew_record().zone_totals["2"], 0, "A posting alias awarded a second crew")
+	TEST_ASSERT_EQUAL(crew.zone_totals["2"], 2, "A posting alias changed the original crew's credit")
+
+/datum/unit_test/voidcrew_zone_bounties/caps/Run()
+	var/turf/deck = run_loc_floor_bottom_left
+	var/turf/home = make_zone_turf(get_step(deck, NORTH), 1)
+	var/obj/structure/overmap/ship/ship = paid_ship(deck, home)
+	var/datum/voidcrew_crew_record/crew = ship.get_crew_record()
+	var/obj/machinery/mission_pad/pad = allocate(/obj/machinery/mission_pad, deck)
+	for(var/band in 1 to 3)
+		var/turf/field = make_zone_turf(locate(home.x + band, home.y, home.z), band)
+		for(var/index in 1 to 3)
+			var/datum/criminal_bounty/posting = board_test_posting(3) // BOUNTY_TIER_MOST_WANTED
+			var/mob/living/basic/bounty_criminal/criminal = board_test_criminal(posting, field)
+			criminal.death()
+			TEST_ASSERT_EQUAL(posting.record.board_work_zone, band, "Death did not bind its field band")
+			criminal.forceMove(deck)
+			TEST_ASSERT(islist(posting.turn_in(pad, ship)), "A dead criminal was not paid")
+		TEST_ASSERT_EQUAL(crew.zone_families["[band]"]["criminal_bounty"], band == 1 ? 1 : 5, "Criminal family exceeded its band cap")
+	var/datum/criminal_bounty/tier_posting = board_test_posting(1)
+	TEST_ASSERT_EQUAL(tier_posting.board_reputation_difficulty(), 1, "Petty is not easy")
+	tier_posting.record.tier = 2
+	TEST_ASSERT_EQUAL(tier_posting.board_reputation_difficulty(), 2, "Wanted is not medium")
+	tier_posting.record.tier = 3
+	TEST_ASSERT_EQUAL(tier_posting.board_reputation_difficulty(), 3, "Most Wanted is not hard")
+	tier_posting.record.tier = 1
+	tier_posting.record.archetype = "boss"
+	TEST_ASSERT_EQUAL(tier_posting.board_reputation_difficulty(), 3, "A named boss is not hard")
+	tier_posting.record.board_work_zone = 2
+	tier_posting.record.status = "escaped"
+	TEST_ASSERT_EQUAL(tier_posting.board_claim_zone_work(ship), 0, "An escaped prisoner earned standing")
+	TEST_ASSERT(!tier_posting.record.board_reputation_claimed, "An unpaid escape consumed a reputation claim")
+	var/mob/living/basic/bounty_criminal/admin_spawn = allocate(/mob/living/basic/bounty_criminal, home)
+	admin_spawn.body_go_down()
+	TEST_ASSERT_NULL(admin_spawn.posting(), "An admin spawn acquired a posting")
+	TEST_ASSERT_EQUAL(crew.zone_totals["1"], 1, "An admin spawn earned standing")
+
+/datum/unit_test/voidcrew_zone_bounties/surrender/Run()
+	var/turf/deck = run_loc_floor_bottom_left
+	var/turf/field = make_zone_turf(get_step(deck, NORTH), 2)
+	var/turf/home = make_zone_turf(get_step(field, EAST), 1)
+	var/obj/structure/overmap/ship/ship = paid_ship(deck, home)
+	var/obj/machinery/mission_pad/pad = allocate(/obj/machinery/mission_pad, deck)
+	var/datum/criminal_bounty/posting = board_test_posting(2, null, 1000, 0, "normal")
+	var/mob/living/basic/bounty_criminal/criminal = board_test_criminal(posting, field)
+	criminal.ai_surrender()
+	TEST_ASSERT_EQUAL(posting.record.board_work_zone, 2, "Surrender did not bind the field band")
+	criminal.forceMove(deck)
+	TEST_ASSERT(islist(posting.turn_in(pad, ship)), "An uncuffed surrendered criminal was not paid")
+	TEST_ASSERT_EQUAL(ship.get_crew_record().zone_families["2"]["criminal_bounty"], 2, "A surrendered criminal lost its field credit")
+
+/datum/unit_test/voidcrew_zone_bounties/relist/Run()
+	var/turf/field = make_zone_turf(run_loc_floor_bottom_left, 2)
+	var/datum/criminal_bounty/posting = board_test_posting(2)
+	var/datum/bounty_record/record = posting.record
+	var/mob/living/basic/bounty_criminal/criminal = board_test_criminal(posting, field)
+	criminal.body_go_down()
+	TEST_ASSERT_EQUAL(record.board_work_zone, 2, "The first sighting did not bind its capture band")
+	TEST_ASSERT(posting.relist("slipped away"), "The escape did not start relisting")
+	TEST_ASSERT_NULL(record.board_work_zone, "An escaped sighting kept its old work band")
+	TEST_ASSERT(!record.board_reputation_claimed, "An escape earned reputation")
+
+/datum/unit_test/voidcrew_zone_bounties/lairs/Run()
+	var/turf/deck = run_loc_floor_bottom_left
+	var/turf/home = make_zone_turf(get_step(deck, NORTH), 1)
+	var/obj/structure/overmap/ship/ship = paid_ship(deck, home)
+	var/datum/voidcrew_crew_record/crew = ship.get_crew_record()
+	var/obj/machinery/mission_pad/pad = allocate(/obj/machinery/mission_pad, deck)
+	for(var/band in 1 to 3)
+		var/turf/field = make_zone_turf(locate(home.x + band, home.y, home.z), band)
+		var/obj/structure/overmap/space_ruin/site = allocate(/obj/structure/overmap/space_ruin, field)
+		for(var/index in 1 to 3)
+			var/datum/criminal_bounty/kill_only/lair/posting = allocate(/datum/criminal_bounty/kill_only/lair)
+			posting.record = bounty_kill_record("Test Boss", "testing", MALE, 1000, "test")
+			posting.kill_publish(site, SScriminal_bounties.board_site_zone(site), 0, 60 MINUTES)
+			TEST_ASSERT_EQUAL(posting.board_reputation_difficulty(), 3, "A lair clear is not hard")
+			var/before = crew.zone_totals["[band]"]
+			var/obj/item/bounty_proof/trophy/trophy = posting.kill_drop_trophy(deck)
+			TEST_ASSERT_NOTNULL(trophy, "The cleared lair did not drop its trophy")
+			TEST_ASSERT_EQUAL(crew.zone_totals["[band]"], before, "A lair earned standing before its paying turn-in")
+			TEST_ASSERT(islist(posting.turn_in(pad, ship)), "The lair trophy was not paid")
+			if(index == 1)
+				TEST_ASSERT_EQUAL(crew.zone_families["[band]"]["lair"], band == 1 ? 1 : 3, "A lair did not credit hard in its site zone")
+			TEST_ASSERT(istext(posting.turn_in(pad, ship)), "A lair trophy was accepted twice")
+		TEST_ASSERT_EQUAL(crew.zone_families["[band]"]["lair"], band == 1 ? 1 : 5, "Lair family exceeded its band cap")
+		TEST_ASSERT_EQUAL(crew.zone_families["[band]"]["criminal_bounty"], 0, "A lair also credited the criminal family")
+
+/// Purchases/requisitions, split hulls, abandonment, wrecks, cryo and keyed mind replacement.
+/datum/unit_test/voidcrew_zone_identity/continuation/Run()
+	var/obj/structure/overmap/ship/first = make_ship()
+	var/datum/voidcrew_crew_record/record = record_for(first)
+	var/mob/living/carbon/human/member = make_member("zoneidentitycontinuation")
+	first.enlist_crewmember(member)
+	TEST_ASSERT_EQUAL(record.leader, member.mind, "The founder did not become crew leader")
+	clear_green(record)
+	var/datum/outpost_shop/shop = allocate(/datum/outpost_shop)
+	shop.grant_favor(first, 6)
+	var/obj/structure/overmap/ship/second = make_ship()
+	TEST_ASSERT(second.bind_reputation_crew(member.mind), "Purchase/requisition could not continue its buyer's crew")
+	second.enlist_crewmember(member)
+	TEST_ASSERT_EQUAL(record_for(second), record, "New hull copied or reset the crew")
+	TEST_ASSERT(member.mind in first.ship_team.members, "A second hull removed same-crew membership")
+	TEST_ASSERT_EQUAL(shop.get_favor(second), 6, "New hull lost trader discounts")
+	TEST_ASSERT(record.claim_purchase(/datum/shop_sku/favor/pike_ledger), "First cap claim failed")
+	shop.record_crew_purchase(second, /datum/shop_sku/favor/pike_ledger)
+	TEST_ASSERT_EQUAL(shop.get_crew_purchases(first, /datum/shop_sku/favor/pike_ledger), 2, "Hull teams kept separate purchase histories")
+	var/obj/machinery/cryopod/pod = allocate(/obj/machinery/cryopod)
+	pod.detach_from_crews(member.mind, member.real_name)
+	TEST_ASSERT_EQUAL(length(member.mind.ship_teams), 0, "Cryo left hull rosters")
+	TEST_ASSERT_EQUAL(member.mind.get_reputation_crew(), record, "Cryo erased affiliation")
+	TEST_ASSERT_EQUAL(GLOB.voidcrew_crew_roster["zoneidentitycontinuation"], record, "Cryo lost keyed recovery")
+	first.enlist_crewmember(member)
+	first.abandon_ship(FALSE)
+	TEST_ASSERT_EQUAL(member.mind.get_reputation_crew(), record, "Automated abandonment erased affiliation")
+	qdel(first)
+	qdel(second)
+	TEST_ASSERT(!QDELETED(record) && (record in GLOB.voidcrew_crew_records), "Wreck disposed of the round record")
+	var/datum/mind/old_mind = member.mind
+	qdel(old_mind)
+	TEST_ASSERT_EQUAL(GLOB.voidcrew_crew_roster["zoneidentitycontinuation"], record, "Mind replacement lost recovery")
+	var/mob/living/carbon/human/replacement = make_member("zoneidentitycontinuation")
+	var/obj/structure/overmap/ship/rebuilt = make_ship()
+	TEST_ASSERT(!rebuilt.bind_reputation_crew(replacement.mind), "A new character inherited the old character's leadership")
+	TEST_ASSERT(rebuilt.bind_reputation_crew(replacement.mind, choose_new_reputation_crew(replacement)), "A confirmed replacement could not found a crew")
+	rebuilt.enlist_crewmember(replacement)
+	TEST_ASSERT(record_for(rebuilt) != record, "Respawned buyer recovered the old character's leadership")
+	TEST_ASSERT_EQUAL(record.get_zone_permission(), 1, "Wreck/recovery lost reputation")
+	TEST_ASSERT_EQUAL(shop.get_crew_purchases(rebuilt, /datum/shop_sku/favor/pike_ledger), 0, "A new character inherited old purchase caps")
+	var/obj/structure/overmap/ship/fresh = make_ship()
+	TEST_ASSERT(fresh.bind_reputation_crew(replacement.mind, TRUE), "Could not form a new crew on an empty hull")
+	fresh.enlist_crewmember(replacement)
+	var/datum/voidcrew_crew_record/new_record = record_for(fresh)
+	TEST_ASSERT(new_record != record && new_record.get_zone_permission() == 0, "Independent crew inherited standing")
+	TEST_ASSERT_EQUAL(shop.get_favor(fresh), 0, "Independent crew inherited favor")
+	TEST_ASSERT_EQUAL(shop.get_crew_purchases(fresh, /datum/shop_sku/favor/pike_ledger), 0, "Independent crew inherited purchases")
+	TEST_ASSERT(!fresh.bind_reputation_crew(replacement.mind, TRUE), "Occupied hull could reset its identity")
+
+/// Two successful loads bind before either HUD enrollment; a refused load leaves no affiliation.
+/datum/unit_test/voidcrew_zone_identity/simultaneous_founders/Run()
+	var/mob/living/carbon/human/newcomer = make_member("zoneidentitynewcomer")
+	var/obj/structure/overmap/ship/unloaded = allocate(/obj/structure/overmap/ship)
+	TEST_ASSERT(!unloaded.bind_reputation_crew(newcomer.mind), "An unloaded hull accepted crew binding")
+	TEST_ASSERT_NULL(newcomer.mind.get_reputation_crew(), "A refused load changed affiliation")
+	var/obj/structure/overmap/ship/first = make_ship()
+	var/obj/structure/overmap/ship/second = make_ship()
+	TEST_ASSERT(first.bind_reputation_crew(newcomer.mind), "First commissioning failed")
+	TEST_ASSERT(second.bind_reputation_crew(newcomer.mind), "Concurrent commissioning failed")
+	TEST_ASSERT_EQUAL(record_for(first), record_for(second), "Simultaneous newcomer builds founded separate crews")
+	first.enlist_crewmember(newcomer)
+	second.enlist_crewmember(newcomer)
+	TEST_ASSERT(newcomer.mind in first.ship_team.members, "Concurrent enlistment stripped a same-crew hull")
+	TEST_ASSERT(newcomer.mind in second.ship_team.members, "Concurrent enlistment lost the other hull")
+	// Pin both lobby routes to the tested binding transaction, after successful loading.
+	var/source = file2text("voidcrew/edits/mobs/new_player.dm")
+	var/purchase_start = findtext(source, "/mob/dead/new_player/proc/spawn_ship_with_upgrades(")
+	var/requisition_start = findtext(source, "/mob/dead/new_player/proc/requisition_free_hull()")
+	var/spawn_start = findtext(source, "/mob/dead/new_player/proc/AttemptSpawnOnShip(")
+	TEST_ASSERT(purchase_start && requisition_start && spawn_start, "Lobby route anchors are missing")
+	for(var/route in list(copytext(source, purchase_start, requisition_start), copytext(source, requisition_start, spawn_start)))
+		var/binding = findtext(route, "target.bind_reputation_crew(mind, form_new)")
+		var/enrollment = findtext(route, "if(!AttemptSpawnOnShip(")
+		TEST_ASSERT(binding && enrollment && binding < enrollment, "A lobby hull enrolled before binding its buyer's crew")
+
+/// Every actual enrollment route evicts other crews and every old life of the ckey.
+/datum/unit_test/voidcrew_zone_identity/join_routes/Run()
+	var/obj/structure/overmap/ship/old_ship = make_ship()
+	var/obj/structure/overmap/ship/new_ship = make_ship()
+	var/mob/living/carbon/human/old_life = make_member("zoneidentityrespawn")
+	old_ship.enlist_crewmember(old_life)
+	var/mob/living/carbon/human/new_life = make_member("zoneidentityrespawn")
+	new_ship.register_crewmember(new_life) // Human job/latejoin after character transfer.
+	TEST_ASSERT(!(old_life.mind in old_ship.ship_team.members), "Respawn left the old keyed mind rostered")
+	TEST_ASSERT_NULL(old_life.mind.get_reputation_crew(), "Respawn left the old mind affiliated")
+	TEST_ASSERT_EQUAL(new_life.mind.get_reputation_crew(), new_ship.get_crew_record(), "Latejoin did not switch crews")
+	TEST_ASSERT(!old_ship.is_ship_crew(new_life), "Historical crew access survived the switch")
+	old_ship.password_cleared_ckeys["zoneidentityrespawn"] = TRUE
+	TEST_ASSERT(!old_ship.is_ship_crew(new_life), "Saved join clearance granted old services")
+	TEST_ASSERT_NULL(get_crew_ship(old_life), "Old life retained shop access")
+	TEST_ASSERT_EQUAL(metric_crew_ship(new_life), new_ship, "Metrics chose an obsolete crew")
+	var/datum/admin_crew_panel/admin_panel = allocate(/datum/admin_crew_panel)
+	admin_panel.selected_ship = old_ship
+	admin_panel.add_crew_member(new_life.mind, old_life)
+	TEST_ASSERT_EQUAL(new_life.mind.get_reputation_crew(), old_ship.get_crew_record(), "Admin crew-add did not switch")
+	TEST_ASSERT(!(new_life.mind in new_ship.ship_team.members), "Admin crew-add retained the old roster")
+	new_ship.ship_team.admin_add_member(old_life, new_life.mind)
+	TEST_ASSERT_EQUAL(new_life.mind.get_reputation_crew(), new_ship.get_crew_record(), "Generic team panel did not switch")
+	TEST_ASSERT(!(new_life.mind in old_ship.ship_team.members), "Generic team panel retained the old roster")
+	// A HUD-only add must not silently switch an established affiliation.
+	old_ship.ship_team.add_member(new_life.mind)
+	TEST_ASSERT(!(new_life.mind in old_ship.ship_team.members), "HUD enrollment bypassed authoritative joining")
+	var/mob/living/carbon/human/captain = make_member()
+	old_ship.enlist_crewmember(captain)
+	old_ship.claimed_captain = captain.mind
+	var/datum/captain_management_ui/invitation = allocate(/datum/captain_management_ui)
+	invitation.ship = old_ship
+	invitation.captain = captain
+	TEST_ASSERT(invitation.accept_crew_invite(new_life), "Captain invitation failed")
+	TEST_ASSERT_EQUAL(new_life.mind.get_reputation_crew(), old_ship.get_crew_record(), "Invitation did not switch crews")
+	TEST_ASSERT(!(new_life.mind in new_ship.ship_team.members), "Invitation retained another crew")
+	var/datum/voidcrew_crew_record/unchanged = old_ship.get_crew_record()
+	admin_panel.promote_to_captain(new_life.mind, captain)
+	TEST_ASSERT_EQUAL(old_ship.get_crew_record(), unchanged, "Captain transfer changed hull identity")
+	admin_panel.kick_crew_member(new_life.mind, captain)
+	TEST_ASSERT_NULL(new_life.mind.get_reputation_crew(), "Explicit kick retained affiliation")
+	TEST_ASSERT_NULL(GLOB.voidcrew_crew_roster["zoneidentityrespawn"], "Explicit kick retained keyed recovery")
+
+/// Respawn eviction must finish before the replacement's same-name manifest entry is written.
+/datum/unit_test/voidcrew_zone_identity/same_name_respawn/Run()
+	var/obj/structure/overmap/ship/ship = make_ship()
+	var/mob/living/carbon/human/old_life = make_member("zoneidentitysamename")
+	old_life.real_name = "Same Name"
+	var/datum/job/assistant/old_job = allocate(/datum/job/assistant)
+	ship.manifest_inject(old_life, old_job)
+	TEST_ASSERT_EQUAL(ship.manifest[old_life.real_name], old_job, "Old life was not added to the manifest")
+	var/mob/living/carbon/human/new_life = make_member("zoneidentitysamename")
+	new_life.real_name = old_life.real_name
+	var/datum/job/station_engineer/new_job = allocate(/datum/job/station_engineer)
+	ship.manifest_inject(new_life, new_job)
+	TEST_ASSERT(!(old_life.mind in ship.ship_team.members), "Same-hull respawn retained the old life")
+	TEST_ASSERT_NULL(old_life.mind.get_reputation_crew(), "Same-hull respawn retained the old affiliation")
+	TEST_ASSERT(new_life.mind in ship.ship_team.members, "Same-hull respawn did not enroll the replacement")
+	TEST_ASSERT_EQUAL(length(ship.manifest), 1, "Same-name respawn did not retain exactly one manifest entry")
+	TEST_ASSERT_EQUAL(ship.manifest[new_life.real_name], new_job, "Same-name respawn lost the replacement's manifest job")
+
+/// Silicon spawn takes exactly the same join transaction as human spawning.
+/datum/unit_test/voidcrew_zone_identity/silicon/Run()
+	var/obj/structure/overmap/ship/old_ship = make_ship()
+	var/obj/structure/overmap/ship/new_ship = make_ship()
+	var/mob/living/silicon/robot/borg = allocate(/mob/living/silicon/robot, run_loc_floor_bottom_left)
+	borg.mind_initialize()
+	allocated += borg.mind
+	old_ship.enlist_crewmember(borg)
+	var/obj/docking_port/mobile/voidcrew/port = new(run_loc_floor_bottom_left)
+	port.register()
+	test_ports += port
+	new_ship.shuttle = port
+	port.current_ship = new_ship
+	var/datum/job/cyborg/job = allocate(/datum/job/cyborg)
+	job.ship_role = "cyborg"
+	job.ship_borg_model = /obj/item/robot_model/engineering
+	job.crew_ship_ref = WEAKREF(new_ship)
+	borg.mind.set_assigned_role(job)
+	job.finish_ship_silicon_spawn(borg, new_ship)
+	TEST_ASSERT_EQUAL(borg.mind.get_reputation_crew(), new_ship.get_crew_record(), "Silicon spawn did not switch crews")
+	TEST_ASSERT(!(borg.mind in old_ship.ship_team.members), "Silicon retained its former crew")
+	new_ship.shuttle = null
+
+/// A leader's claims continue their identity, and cannot overwrite occupied hulls.
+/datum/unit_test/voidcrew_zone_identity/claims/Run()
+	var/obj/structure/overmap/ship/home = make_ship()
+	var/mob/living/carbon/human/member = make_member()
+	home.enlist_crewmember(member)
+	var/datum/voidcrew_crew_record/record = record_for(home)
+	clear_green(record)
+	var/obj/structure/overmap/ship/derelict = make_ship()
+	derelict.abandoned = TRUE
+	TEST_ASSERT(derelict.claim_abandoned_ship(member), "Abandoned claim failed")
+	TEST_ASSERT_EQUAL(record_for(derelict), record, "Abandoned claim reset the leader's standing")
+	var/obj/structure/overmap/ship/npc/pirate = allocate(/obj/structure/overmap/ship/npc)
+	var/obj/machinery/computer/helm/helm = allocate(/obj/machinery/computer/helm)
+	TEST_ASSERT(helm.claim_npc_ship(pirate, member), "NPC key-claim transaction failed")
+	TEST_ASSERT_EQUAL(record_for(pirate), record, "NPC claim reset standing")
+	TEST_ASSERT(member.mind in home.ship_team.members, "Claim stripped same-crew membership")
+	TEST_ASSERT(!helm.claim_npc_ship(pirate, member, TRUE), "Occupied NPC hull could reset caps")
+	var/obj/structure/overmap/ship/independent = make_ship()
+	independent.abandoned = TRUE
+	TEST_ASSERT(independent.claim_abandoned_ship(member, TRUE), "Independent claim failed")
+	TEST_ASSERT(record_for(independent) != record, "Independent claim reused the former crew")
+	TEST_ASSERT(!(member.mind in home.ship_team.members), "Independent claim left former memberships")
+
+/// Non-leaders must confirm departure before either purchase registration or hull claim.
+/datum/unit_test/voidcrew_zone_identity/nonleader_registration/Run()
+	var/obj/structure/overmap/ship/home = make_ship()
+	var/mob/living/carbon/human/leader = make_member()
+	var/mob/living/carbon/human/member = make_member("zoneidentitynonleader")
+	home.enlist_crewmember(leader)
+	home.enlist_crewmember(member)
+	var/datum/voidcrew_crew_record/record = record_for(home)
+	clear_green(record)
+	var/datum/mind/crewlead_test/member_mind = member.mind
+	var/obj/structure/overmap/ship/purchased = make_ship()
+	TEST_ASSERT(!purchased.bind_reputation_crew(member.mind), "A non-leader bypassed purchase confirmation")
+	TEST_ASSERT_EQUAL(choose_new_reputation_crew(member), TRUE, "A non-leader was offered continuation")
+	TEST_ASSERT(purchased.bind_reputation_crew(member.mind, TRUE), "A confirmed purchase could not found a crew")
+	purchased.enlist_crewmember(member)
+	var/datum/voidcrew_crew_record/independent = record_for(purchased)
+	TEST_ASSERT(independent != record && independent.leader == member.mind, "A confirmed purchase did not found an independent crew")
+	TEST_ASSERT_EQUAL(independent.get_zone_permission(), 0, "A new crew inherited standing")
+	TEST_ASSERT_EQUAL(GLOB.voidcrew_crew_roster["zoneidentitynonleader"], independent, "A purchase retained the old keyed affiliation")
+	TEST_ASSERT(!(member.mind in home.ship_team.members), "A purchase retained the former HUD roster")
+	TEST_ASSERT_EQUAL(record.leader, leader.mind, "A departing non-leader displaced the old leader")
+
+	home.enlist_crewmember(member)
+	member_mind.accept_new_crew = FALSE
+	var/obj/structure/overmap/ship/derelict = make_ship()
+	derelict.abandoned = TRUE
+	var/datum/voidcrew_crew_record/unclaimed = record_for(derelict)
+	TEST_ASSERT(!derelict.claim_abandoned_ship(member), "A declined claim succeeded")
+	TEST_ASSERT(derelict.abandoned && !derelict.claimed_captain, "A declined claim changed command")
+	TEST_ASSERT_EQUAL(record_for(derelict), unclaimed, "A declined claim rebound the hull")
+	TEST_ASSERT_EQUAL(member.mind.get_reputation_crew(), record, "A declined claim changed affiliation")
+	TEST_ASSERT(member.mind in home.ship_team.members, "A declined claim removed the old HUD roster")
+	member_mind.accept_new_crew = TRUE
+	TEST_ASSERT(derelict.claim_abandoned_ship(member), "A confirmed non-leader claim failed")
+	TEST_ASSERT(record_for(derelict) != record, "A non-leader added a claimed hull to the old crew")
+	TEST_ASSERT_EQUAL(derelict.get_crew_record().leader, member.mind, "A claimant did not lead their new crew")
+	TEST_ASSERT(!(member.mind in home.ship_team.members), "A claim retained the old crew")
+
+	home.enlist_crewmember(member)
+	member_mind.accept_new_crew = FALSE
+	var/obj/structure/overmap/ship/npc/pirate = allocate(/obj/structure/overmap/ship/npc)
+	var/obj/machinery/computer/helm/helm = allocate(/obj/machinery/computer/helm)
+	TEST_ASSERT(!helm.claim_npc_ship(pirate, member), "A declined NPC claim succeeded")
+	TEST_ASSERT(!pirate.player_controlled && !length(pirate.ship_team?.members), "A declined NPC claim changed ownership")
+	TEST_ASSERT_EQUAL(member.mind.get_reputation_crew(), record, "A declined NPC claim changed affiliation")
+	member_mind.accept_new_crew = TRUE
+	TEST_ASSERT(helm.claim_npc_ship(pirate, member), "A confirmed non-leader NPC claim failed")
+	TEST_ASSERT(record_for(pirate) != record, "A non-leader added an NPC hull to the old crew")
+	TEST_ASSERT_EQUAL(pirate.get_crew_record().leader, member.mind, "An NPC claimant did not found their crew")
+	TEST_ASSERT_EQUAL(record.get_zone_permission(), 1, "Departures changed the old crew's standing")
+
+/// Cancellation exercises the actual lobby and credit-order entry points before loading or charge.
+/mob/dead/new_player/crewlead_test/select_ship()
+	return
+
+/datum/ship_checkpoint_ui/crewlead_test
+	var/datum/bank_account/test_payer
+
+/datum/ship_checkpoint_ui/crewlead_test/New()
+	return // No real console or outpost; only the pre-order confirmation is exercised.
+
+/datum/ship_checkpoint_ui/crewlead_test/order_denial(mob/living/user, datum/ship_order/order, choice)
+	return null
+
+/datum/ship_checkpoint_ui/crewlead_test/resolve_payer(mob/living/user, choice)
+	return list(test_payer, null)
+
+/datum/ship_checkpoint_ui/crewlead_test/confirm_order(mob/user, prompt_text)
+	return TRUE
+
+/datum/ship_checkpoint_ui/crewlead_test/Destroy()
+	test_payer = null
+	return ..()
+
+/datum/unit_test/voidcrew_zone_identity/declined_purchase/Run()
+	var/obj/structure/overmap/ship/home = make_ship()
+	var/mob/living/carbon/human/leader = make_member()
+	var/mob/living/carbon/human/member = make_member()
+	home.enlist_crewmember(leader)
+	home.enlist_crewmember(member)
+	var/datum/voidcrew_crew_record/record = record_for(home)
+	var/datum/mind/crewlead_test/member_mind = member.mind
+	member_mind.accept_new_crew = FALSE
+	var/datum/bank_account/account = allocate(/datum/bank_account, "Crew buyer", null, 1, FALSE)
+	account.account_balance = 100000
+	var/datum/map_template/shuttle/voidcrew/commissioned/template = allocate(/datum/map_template/shuttle/voidcrew/commissioned)
+	var/datum/ship_checkpoint_ui/crewlead_test/panel = allocate(/datum/ship_checkpoint_ui/crewlead_test)
+	panel.test_payer = account
+	panel.cart = allocate(/datum/ship_order, template)
+	TEST_ASSERT(!panel.place_order(member), "A declined crew departure placed a paid order")
+	TEST_ASSERT_EQUAL(account.account_balance, 100000, "A declined order charged the buyer")
+	TEST_ASSERT(!panel.working, "A declined order kept the console busy")
+	TEST_ASSERT_EQUAL(member.mind.get_reputation_crew(), record, "A declined order changed affiliation")
+	TEST_ASSERT(member.mind in home.ship_team.members, "A declined order removed the old HUD roster")
+	var/mob/dead/new_player/crewlead_test/lobby = allocate(/mob/dead/new_player/crewlead_test)
+	var/datum/mind/crewlead_test/lobby_mind = allocate(/datum/mind/crewlead_test)
+	lobby.mind = lobby_mind
+	lobby_mind.join_reputation_crew(record)
+	lobby_mind.accept_new_crew = FALSE
+	var/ship_count = length(SSovermap.simulated_ships)
+	lobby.spawn_ship_with_upgrades(template, list(), null)
+	TEST_ASSERT(!lobby.spawning_ship, "A declined lobby registration started loading")
+	TEST_ASSERT_EQUAL(length(SSovermap.simulated_ships), ship_count, "A declined lobby purchase created a hull")
+	TEST_ASSERT_EQUAL(lobby_mind.get_reputation_crew(), record, "A declined lobby registration changed affiliation")
+	TEST_ASSERT_EQUAL(account.account_balance, 100000, "A declined lobby registration charged an account")
+
+/// Succession prefers captains in hull order, then members in original join order.
+/datum/unit_test/voidcrew_zone_identity/leadership_succession/Run()
+	var/obj/structure/overmap/ship/oldest = make_ship()
+	var/datum/voidcrew_crew_record/record = record_for(oldest)
+	var/obj/structure/overmap/ship/newer = make_ship(record)
+	var/mob/living/carbon/human/founder = make_member("zoneidentityfounder")
+	var/mob/living/carbon/human/earliest = make_member()
+	var/mob/living/carbon/human/new_captain = make_member()
+	var/mob/living/carbon/human/old_captain = make_member()
+	oldest.enlist_crewmember(founder)
+	oldest.enlist_crewmember(earliest)
+	newer.enlist_crewmember(new_captain)
+	oldest.enlist_crewmember(old_captain)
+	newer.claimed_captain = new_captain.mind
+	oldest.claimed_captain = old_captain.mind
+	oldest.enlist_crewmember(earliest) // Reenrollment must not reset join order.
+	var/obj/structure/overmap/ship/foreign = make_ship()
+	foreign.enlist_crewmember(founder)
+	TEST_ASSERT_EQUAL(record.leader, old_captain.mind, "Leaving did not promote the oldest hull's captain")
+	old_captain.real_name = "Old Hull Captain"
+	var/datum/captain_management_ui/panel = allocate(/datum/captain_management_ui, newer, new_captain)
+	var/list/data = panel.ui_data(new_captain)
+	TEST_ASSERT_EQUAL(data["crew_leader"], old_captain.real_name, "Management did not name the crew leader on another hull")
+	qdel(oldest)
+	old_captain.mind.leave_reputation_crew()
+	TEST_ASSERT_EQUAL(record.leader, new_captain.mind, "Succession selected a destroyed hull's captain")
+	data = panel.ui_data(new_captain)
+	TEST_ASSERT_EQUAL(data["crew_leader"], new_captain.real_name, "Management retained the previous leader's name")
+	var/obj/machinery/cryopod/pod = allocate(/obj/machinery/cryopod)
+	pod.detach_from_crews(new_captain.mind, new_captain.real_name)
+	TEST_ASSERT_EQUAL(record.leader, earliest.mind, "Cryo did not promote the earliest remaining member")
+	TEST_ASSERT_EQUAL(new_captain.mind.get_reputation_crew(), record, "Cryo succession erased Z1 affiliation")
+	qdel(earliest.mind)
+	TEST_ASSERT_NULL(record.leader, "A deleted leader or sleeping character retained leadership")
+	newer.enlist_crewmember(new_captain)
+	TEST_ASSERT_EQUAL(record.leader, new_captain.mind, "A returning sole member could not lead")
+	var/mob/living/carbon/human/backup = make_member()
+	newer.enlist_crewmember(backup)
+	var/mob/living/carbon/human/replacement = make_member("zoneidentityfounder")
+	foreign.enlist_crewmember(backup)
+	foreign.enlist_crewmember(replacement)
+	TEST_ASSERT_EQUAL(foreign.get_crew_record().leader, backup.mind, "Respawn inherited leadership instead of promoting a surviving member")
+
+/// A captainless oldest hull falls back to join order, rather than a newer ship's command.
+/datum/unit_test/voidcrew_zone_identity/captainless_succession/Run()
+	var/obj/structure/overmap/ship/oldest = make_ship()
+	var/datum/voidcrew_crew_record/record = record_for(oldest)
+	var/obj/structure/overmap/ship/newer = make_ship(record)
+	var/mob/living/carbon/human/founder = make_member()
+	var/mob/living/carbon/human/earliest = make_member()
+	var/mob/living/carbon/human/captain = make_member()
+	oldest.enlist_crewmember(founder)
+	oldest.enlist_crewmember(earliest)
+	newer.enlist_crewmember(captain)
+	newer.claimed_captain = captain.mind
+	founder.mind.leave_reputation_crew()
+	TEST_ASSERT_EQUAL(record.leader, earliest.mind, "A newer hull's captain displaced the earliest member")
+
+/// Admin enrollment is an override, even for a non-leader of an established crew.
+/datum/unit_test/voidcrew_zone_identity/admin_enrollment/Run()
+	var/obj/structure/overmap/ship/source = make_ship()
+	var/obj/structure/overmap/ship/destination = make_ship()
+	var/mob/living/carbon/human/source_leader = make_member()
+	var/mob/living/carbon/human/destination_leader = make_member()
+	var/mob/living/carbon/human/member = make_member()
+	source.enlist_crewmember(source_leader)
+	source.enlist_crewmember(member)
+	destination.enlist_crewmember(destination_leader)
+	var/datum/admin_crew_panel/panel = allocate(/datum/admin_crew_panel)
+	panel.selected_ship = destination
+	panel.add_crew_member(member.mind, destination_leader)
+	TEST_ASSERT_EQUAL(member.mind.get_reputation_crew(), destination.get_crew_record(), "Admin enrollment did not override a non-leader's affiliation")
+	TEST_ASSERT_EQUAL(destination.get_crew_record().leader, destination_leader.mind, "Admin enrollment displaced the destination's leader")
+	source.ship_team.admin_add_member(source_leader, member.mind)
+	TEST_ASSERT_EQUAL(member.mind.get_reputation_crew(), source.get_crew_record(), "Team panel enrollment did not override affiliation")
+	var/datum/mind/crewlead_test/member_mind = member.mind
+	TEST_ASSERT_EQUAL(member_mind.confirmations, 0, "An admin enrollment prompted for ship registration")
+	panel.add_crew_member(member.mind, destination_leader)
+	panel.kick_crew_member(destination_leader.mind, source_leader)
+	TEST_ASSERT_EQUAL(destination.get_crew_record().leader, member.mind, "Admin removal did not replace the departing leader")
+
+/// Ambiguous fleets need a hull selection; it never selects another crew or survives a switch.
+/datum/unit_test/voidcrew_zone_identity/service_selection/Run()
+	var/obj/structure/overmap/ship/first = make_ship()
+	var/datum/voidcrew_crew_record/record = record_for(first)
+	var/obj/structure/overmap/ship/second = make_ship(record)
+	var/obj/structure/overmap/ship/foreign = make_ship()
+	var/mob/living/carbon/human/member = make_member()
+	first.enlist_crewmember(member)
+	TEST_ASSERT_NULL(get_crew_ship(member), "Fleet roster order silently chose an account")
+	TEST_ASSERT(member.mind.select_crew_service_ship(second), "Explicit same-crew hull selection failed")
+	TEST_ASSERT_EQUAL(get_crew_ship(member), second, "Service ignored the selected hull")
+	TEST_ASSERT(!member.mind.select_crew_service_ship(foreign), "Could select a foreign hull")
+	TEST_ASSERT(record.claim_purchase(/datum/shop_sku/favor/pike_ledger), "First shared-cap reservation failed")
+	TEST_ASSERT(second.get_crew_record().claim_purchase(/datum/shop_sku/favor/pike_ledger), "Second hull could not share the cap")
+	TEST_ASSERT(record.claim_purchase(/datum/shop_sku/favor/pike_ledger), "Third shared-cap reservation failed")
+	TEST_ASSERT(!second.get_crew_record().claim_purchase(/datum/shop_sku/favor/pike_ledger), "Concurrent hulls exceeded the shared cap")
+	record.release_purchase(/datum/shop_sku/favor/pike_ledger)
+	TEST_ASSERT(record.claim_purchase(/datum/shop_sku/favor/pike_ledger), "Failed-sale release did not restore its reservation")
+	var/obj/structure/overmap/trader_outpost/outpost = allocate(/obj/structure/overmap/trader_outpost)
+	outpost.embargo_ship(first)
+	TEST_ASSERT(outpost.is_user_barred(member), "Selecting a second crew hull bypassed the embargo")
+	foreign.enlist_crewmember(member)
+	TEST_ASSERT_NULL(member.mind.crew_service_ship_ref, "Crew switch kept stale hull selection")
+	TEST_ASSERT_EQUAL(get_crew_ship(member), foreign, "Service used a former crew after switching")
+	TEST_ASSERT_EQUAL(metric_crew_ship(member), foreign, "Metrics used a former crew after switching")
+	TEST_ASSERT(!outpost.is_user_barred(member), "An old crew's embargo followed a departing member")
+
+/// A construction fixture executes real create_vessel()/enlist_captain() without placing a map.
+/datum/checkpoint_construction/zone_identity_test
+	var/datum/mind/test_command
+
+/datum/checkpoint_construction/zone_identity_test/New()
+	state = "complete"
+
+/datum/checkpoint_construction/zone_identity_test/captain_mind()
+	return test_command
+
+/datum/checkpoint_construction/zone_identity_test/Destroy(force)
+	test_command = null
+	return ..()
+
+/datum/checkpoint_construction/order/zone_identity_test/New()
+	state = "complete"
+
+/// A departure confirmation cannot authorize leaving a different crew joined while building.
+/datum/unit_test/voidcrew_zone_identity/stale_order/Run()
+	var/obj/structure/overmap/ship/home = make_ship()
+	var/obj/structure/overmap/ship/foreign = make_ship()
+	var/mob/living/carbon/human/home_leader = make_member()
+	var/mob/living/carbon/human/foreign_leader = make_member()
+	var/mob/living/carbon/human/buyer = make_member()
+	home.enlist_crewmember(home_leader)
+	foreign.enlist_crewmember(foreign_leader)
+	home.enlist_crewmember(buyer)
+	var/datum/checkpoint_construction/order/zone_identity_test/order = allocate(/datum/checkpoint_construction/order/zone_identity_test)
+	order.buyer_mind_ref = WEAKREF(buyer.mind)
+	TEST_ASSERT(order.confirm_crew_registration(), "The initial departure was not confirmed")
+	TEST_ASSERT(order.crew_registration_valid(), "The confirmation did not authorize its own crew")
+	foreign.enlist_crewmember(buyer)
+	TEST_ASSERT(!order.crew_registration_valid(), "An old confirmation authorized departure from a different crew")
+	foreign_leader.mind.leave_reputation_crew()
+	TEST_ASSERT_EQUAL(foreign.get_crew_record().leader, buyer.mind, "The buyer did not succeed their new crew's leader")
+	TEST_ASSERT(!order.crew_registration_valid(), "New leadership reused a departure confirmation from another crew")
+	TEST_ASSERT(!order.consume_source(), "A stale registration charged an order")
+	TEST_ASSERT_EQUAL(order.charged, 0, "A stale registration charged credits")
+	TEST_ASSERT(!order.committed, "A stale registration committed the build")
+	TEST_ASSERT_EQUAL(buyer.mind.get_reputation_crew(), foreign.get_crew_record(), "A stale order changed affiliation")
+
+/// A live checkpoint reference includes post-save gains; departed captains cannot recover it.
+/datum/unit_test/voidcrew_zone_identity/checkpoints_and_orders/Run()
+	var/mob/living/carbon/human/captain = make_member("zoneidentitycheckpoint")
+	var/mob/living/carbon/human/leader = make_member()
+	var/obj/structure/overmap/ship/original = make_ship()
+	original.enlist_crewmember(leader)
+	original.enlist_crewmember(captain)
+	original.claimed_captain = captain.mind
+	var/datum/voidcrew_crew_record/record = record_for(original)
+	var/datum/ship_checkpoint/snapshot = allocate(/datum/ship_checkpoint)
+	snapshot.crew_record_ref = WEAKREF(record)
+	snapshot.captain_ckey = "zoneidentitycheckpoint"
+	clear_green(record) // Earned after capture.
+	var/datum/map_template/shuttle/voidcrew/commissioned/template = allocate(/datum/map_template/shuttle/voidcrew/commissioned)
+	var/datum/checkpoint_construction/zone_identity_test/job = allocate(/datum/checkpoint_construction/zone_identity_test)
+	job.template = template
+	job.crew_record_ref = snapshot.crew_record_ref
+	job.captain_ckey = snapshot.captain_ckey
+	job.test_command = captain.mind
+	TEST_ASSERT(record.leader != captain.mind, "The saved captain must be a non-leader for this regression")
+	TEST_ASSERT(job.confirm_crew_registration(), "Saved captain could not restore the crew's own hull")
+	var/datum/mind/crewlead_test/captain_mind = captain.mind
+	TEST_ASSERT_EQUAL(captain_mind.confirmations, 0, "Restoring the crew's own hull prompted for departure")
+	job.vessel = job.create_vessel()
+	allocated += job.vessel
+	TEST_ASSERT_EQUAL(record_for(job.vessel), record, "Checkpoint copied or reset the live crew record")
+	TEST_ASSERT(job.enlist_captain(captain.mind), "Checkpoint handover failed")
+	TEST_ASSERT_EQUAL(job.vessel.get_crew_record().get_zone_permission(), 1, "Checkpoint lost post-save gains")
+	var/datum/checkpoint_construction/order/zone_identity_test/order = allocate(/datum/checkpoint_construction/order/zone_identity_test)
+	order.order = allocate(/datum/ship_order, template)
+	order.template = template
+	order.buyer_mind_ref = WEAKREF(leader.mind)
+	order.vessel = order.create_vessel()
+	allocated += order.vessel
+	TEST_ASSERT_EQUAL(record_for(order.vessel), record, "Simultaneous order commissioned a copied crew")
+	TEST_ASSERT(order.enlist_captain(leader.mind), "Outpost order handover failed")
+	TEST_ASSERT_EQUAL(order.vessel.claimed_captain, leader.mind, "Outpost order did not give its buyer command")
+	TEST_ASSERT(leader.mind in order.vessel.ship_team.members, "Outpost order did not enroll its buyer")
+	var/datum/checkpoint_construction/order/zone_identity_test/independent = allocate(/datum/checkpoint_construction/order/zone_identity_test)
+	independent.order = order.order
+	independent.template = template
+	independent.buyer_mind_ref = WEAKREF(captain.mind)
+	TEST_ASSERT(independent.confirm_crew_registration(), "A non-leader's confirmed ship order was refused")
+	TEST_ASSERT(independent.form_new_crew, "A non-leader's order did not require a new crew")
+	independent.vessel = independent.create_vessel()
+	allocated += independent.vessel
+	var/datum/voidcrew_crew_record/new_crew = record_for(independent.vessel)
+	TEST_ASSERT(new_crew != record, "Independent shipyard order continued the buyer's former crew")
+	TEST_ASSERT_EQUAL(new_crew.get_zone_permission(), 0, "Independent shipyard order inherited standing")
+	TEST_ASSERT_EQUAL(captain.mind.get_reputation_crew(), new_crew, "Independent shipyard order did not bind its buyer")
+	TEST_ASSERT(independent.enlist_captain(captain.mind), "Independent shipyard order handover failed")
+	TEST_ASSERT_EQUAL(independent.vessel.claimed_captain, captain.mind, "Independent shipyard order did not give its buyer command")
+	TEST_ASSERT(captain.mind in independent.vessel.ship_team.members, "Independent shipyard order did not enroll its buyer")
+	var/obj/structure/overmap/ship/other = make_ship()
+	other.enlist_crewmember(captain)
+	var/datum/voidcrew_crew_record/current = record_for(other)
+	var/obj/structure/overmap/ship/later = job.create_vessel()
+	allocated += later
+	TEST_ASSERT_EQUAL(record_for(later), current, "Old checkpoint reclaimed a former crew's standing")
+	TEST_ASSERT_EQUAL(later.get_crew_record().get_zone_permission(), 0, "Old checkpoint transferred reputation")
+	// The shared template belongs to this fixture, not the construction job teardown.
+	job.template = null
+	order.template = null
+	independent.template = null
+
+/// Deleting an unclaimed NPC hull must discard its unused provisional identity.
+/datum/unit_test/voidcrew_zone_identity/npc_cleanup/Run()
+	var/registry_size = length(GLOB.voidcrew_crew_records)
+	var/datum/map_template/shuttle/voidcrew/commissioned/template = allocate(/datum/map_template/shuttle/voidcrew/commissioned)
+	var/obj/structure/overmap/ship/npc/ship = allocate(/obj/structure/overmap/ship/npc)
+	TEST_ASSERT(ship.setup_from_template(template), "NPC identity fixture could not set up its hull")
+	var/datum/voidcrew_crew_record/record = record_for(ship)
+	TEST_ASSERT_EQUAL(length(GLOB.voidcrew_crew_records), registry_size + 1, "NPC hull did not create one provisional record")
+	qdel(ship)
+	TEST_ASSERT(QDELETED(record), "Deleted NPC hull retained its provisional record")
+	TEST_ASSERT_EQUAL(length(GLOB.voidcrew_crew_records), registry_size, "Deleting an NPC hull grew the crew registry")
+
+/// Registry/admin disposal drops hull, mind and ckey references without deleting the hulls.
+/datum/unit_test/voidcrew_zone_identity/cleanup/Run()
+	var/obj/structure/overmap/ship/ship = make_ship()
+	var/mob/living/carbon/human/member = make_member("zoneidentitycleanup")
+	ship.enlist_crewmember(member)
+	var/datum/voidcrew_crew_record/record = record_for(ship)
+	qdel(record)
+	TEST_ASSERT(!(record in GLOB.voidcrew_crew_records), "Disposed record remains registered")
+	TEST_ASSERT_NULL(GLOB.voidcrew_crew_roster["zoneidentitycleanup"], "Disposed record remains rostered")
+	TEST_ASSERT_NULL(member.mind.reputation_crew, "Disposed record retained a mind backlink")
+	TEST_ASSERT_NULL(ship.ship_team.crew_record, "Disposed record retained a hull backlink")
+	TEST_ASSERT_EQUAL(length(ship.ship_team.members), 0, "Disposed record retained a HUD roster")
+	TEST_ASSERT(!QDELETED(ship), "Disposing a record deleted its hull")
+
+/// The real survey/commissioning route must bind the surveyor before enlisting occupants.
+/datum/unit_test/voidcrew_zone_identity_scratch
+	parent_type = /datum/unit_test/voidcrew_hull_survey
+	var/obj/structure/overmap/ship/commissioned
+	var/list/crew_records = list()
+	var/nonleader = FALSE
+
+/datum/unit_test/voidcrew_zone_identity_scratch/nonleader
+	nonleader = TRUE
+
+/datum/unit_test/voidcrew_zone_identity_scratch/Destroy()
+	qdel(commissioned)
+	QDEL_LIST(crew_records)
+	return ..()
+
+/datum/unit_test/voidcrew_zone_identity_scratch/Run()
+	TEST_ASSERT(reserved, "Scratch commissioning could not reserve a fixture")
+	reset_block()
+	build_walled_room()
+	var/turf/door_turf = spot(4, 2)
+	door_turf.ChangeTurf(/turf/open/floor/plating, /turf/open/space)
+	new /obj/machinery/door/airlock(door_turf)
+	settle()
+	var/datum/hull_claim/claim = survey_enclosure(spot(4, 4))
+	TEST_ASSERT_NULL(validate_hull_claim(claim, null), "Scratch fixture is not a valid enclosure")
+	var/mob/living/carbon/human/consistent/surveyor = allocate(/mob/living/carbon/human/consistent, spot(4, 4))
+	var/mob/living/carbon/human/consistent/occupant = allocate(/mob/living/carbon/human/consistent, spot(4, 5))
+	surveyor.mind = allocate(/datum/mind/crewlead_test)
+	surveyor.mind_initialize()
+	occupant.mind_initialize()
+	allocated += occupant.mind
+	occupant.mock_client = allocate(/datum/client_interface)
+	var/mob/living/carbon/human/consistent/unaffiliated = allocate(/mob/living/carbon/human/consistent, spot(3, 4))
+	unaffiliated.mind_initialize()
+	allocated += unaffiliated.mind
+	unaffiliated.mock_client = allocate(/datum/client_interface)
+	var/mob/living/carbon/human/consistent/crewmate = allocate(/mob/living/carbon/human/consistent, spot(5, 4))
+	crewmate.mind_initialize()
+	allocated += crewmate.mind
+	crewmate.mock_client = allocate(/datum/client_interface)
+	var/obj/structure/overmap/ship/original = allocate(/obj/structure/overmap/ship)
+	original.ship_team = new
+	original.ship_team.ship = original
+	if(nonleader)
+		var/mob/living/carbon/human/leader = allocate(/mob/living/carbon/human/consistent, spot(4, 4))
+		leader.mind_initialize()
+		allocated += leader.mind
+		original.enlist_crewmember(leader)
+	original.enlist_crewmember(surveyor)
+	original.enlist_crewmember(crewmate)
+	var/datum/voidcrew_crew_record/record = original.get_crew_record()
+	crew_records += record
+	record.claim_zone_work("hunt", 1, 1, "before_build")
+	var/obj/structure/overmap/ship/occupant_home = allocate(/obj/structure/overmap/ship)
+	occupant_home.ship_team = new
+	occupant_home.ship_team.ship = occupant_home
+	occupant_home.enlist_crewmember(occupant)
+	occupant_home.claimed_captain = occupant.mind
+	crew_records += occupant_home.get_crew_record()
+	if(nonleader)
+		var/datum/mind/crewlead_test/surveyor_mind = surveyor.mind
+		surveyor_mind.accept_new_crew = FALSE
+		TEST_ASSERT_NULL(commission_vessel(surveyor, spot(4, 4), claim.turfs, "Declined fixture"), "Declined scratch commissioning changed the hull")
+		TEST_ASSERT_EQUAL(surveyor.mind.get_reputation_crew(), record, "Declined scratch commissioning changed affiliation")
+		surveyor_mind.accept_new_crew = TRUE
+	commissioned = commission_vessel(surveyor, spot(4, 4), claim.turfs, "Identity fixture")
+	TEST_ASSERT_NOTNULL(commissioned, "Scratch commissioning failed")
+	var/datum/voidcrew_crew_record/commissioned_crew = commissioned.get_crew_record()
+	crew_records |= commissioned_crew
+	if(nonleader)
+		TEST_ASSERT(commissioned_crew != record, "A non-leader added a scratch hull to the old crew")
+		TEST_ASSERT_EQUAL(commissioned_crew.leader, surveyor.mind, "The surveyor did not lead their new crew")
+		TEST_ASSERT(!(surveyor.mind in original.ship_team.members), "Commissioning retained the former crew")
+	else
+		TEST_ASSERT_EQUAL(commissioned_crew, record, "First occupant replaced the surveyor's crew identity")
+		TEST_ASSERT(surveyor.mind in original.ship_team.members, "Commissioning removed the leader from their own crew")
+	TEST_ASSERT(!(occupant.mind in commissioned.ship_team.members), "Commissioning drafted another crew's occupant")
+	TEST_ASSERT(occupant.mind in occupant_home.ship_team.members, "Commissioning evicted an occupant from their own hull")
+	TEST_ASSERT_EQUAL(occupant.mind.get_reputation_crew(), occupant_home.get_crew_record(), "Commissioning changed another crew's affiliation")
+	TEST_ASSERT_EQUAL(occupant_home.claimed_captain, occupant.mind, "Commissioning removed another crew's command")
+	TEST_ASSERT(unaffiliated.mind in commissioned.ship_team.members, "Commissioning did not enroll an unaffiliated builder")
+	TEST_ASSERT_EQUAL(unaffiliated.mind.get_reputation_crew(), commissioned_crew, "An unaffiliated builder did not join the new hull's crew")
+	TEST_ASSERT(crewmate.mind in original.ship_team.members, "Commissioning removed a crewmate's original hull membership")
+	TEST_ASSERT_EQUAL((crewmate.mind in commissioned.ship_team.members), !nonleader, "Commissioning did not respect the crewmate's continuing affiliation")
+	TEST_ASSERT_EQUAL(record.zone_totals["1"], 1, "Commissioning changed standing")
+
+/datum/mission_target/zone_identity_test
+	var/band = 1
+	var/valid = TRUE
+
+/datum/mission_target/zone_identity_test/get_zone_type()
+	return band
+
+/datum/mission_target/zone_identity_test/is_valid()
+	return valid
+
+/datum/mission/zone_identity_test
+	var/starts = 0
+
+/datum/mission/zone_identity_test/New()
+	return // Admission fixture: no generated targets or rewards.
+
+/datum/mission/zone_identity_test/start_mission(obj/structure/overmap/ship/ship)
+	starts++
+	return TRUE
+
+/// ship.accept_mission is the common enforcement point for console and trader callers.
+/datum/unit_test/voidcrew_zone_identity/admission/Run()
+	var/obj/structure/overmap/ship/ship = make_ship()
+	var/datum/voidcrew_crew_record/record = record_for(ship)
+	var/datum/mission/zone_identity_test/mission = allocate(/datum/mission/zone_identity_test)
+	var/datum/mission_target/zone_identity_test/target = allocate(/datum/mission_target/zone_identity_test, mission)
+	mission.target = target
+	ship.available_missions += mission
+	for(var/band in list(2, 3))
+		target.band = band
+		mission.quote_zone = band
+		TEST_ASSERT(ship.accept_mission(mission) != TRUE, "Public crew bypassed band [band] through accept_mission")
+	TEST_ASSERT_EQUAL(mission.starts, 0, "Denied work reached start_mission")
+	target.band = 1
+	mission.quote_zone = 2
+	TEST_ASSERT(ship.accept_mission(mission) != TRUE, "Mismatched target/quote was admitted")
+	mission.quote_zone = 1
+	TEST_ASSERT_EQUAL(ship.accept_mission(mission), TRUE, "Public green work was denied")
+	clear_green(record)
+	target.band = 2
+	mission.quote_zone = 2
+	TEST_ASSERT_EQUAL(ship.accept_mission(mission), TRUE, "Newly permitted yellow work stayed denied")
+	target.band = 3
+	mission.quote_zone = 3
+	TEST_ASSERT(ship.accept_mission(mission) != TRUE, "Yellow crew accepted red work")
+	record.claim_zone_work("hunt", 2, 3, "yellow_hunt")
+	record.claim_zone_work("capture", 2, 3, "yellow_capture")
+	TEST_ASSERT_EQUAL(ship.accept_mission(mission), TRUE, "Newly permitted red work stayed denied")
+	target.band = 99
+	mission.quote_zone = 99
+	TEST_ASSERT(ship.accept_mission(mission) != TRUE, "Unknown work band was admitted")
+	target.band = 1
+	mission.quote_zone = 1
+	target.valid = FALSE
+	TEST_ASSERT(ship.accept_mission(mission) != TRUE, "Lost target was admitted before resolution")
+	var/obj/structure/overmap/ship/public_ship = make_ship()
+	mission.target = null
+	mission.quote_zone = 3 // Targetless asks stay Public regardless of posting band.
+	public_ship.available_missions += mission
+	TEST_ASSERT_EQUAL(public_ship.accept_mission(mission), TRUE, "Targetless routine ask was gated by posting band")
diff --git a/voidcrew/modules/unit_tests/voidcrew_zone_missions.dm b/voidcrew/modules/unit_tests/voidcrew_zone_missions.dm
new file mode 100644
index 00000000000..887c04fea8a
--- /dev/null
+++ b/voidcrew/modules/unit_tests/voidcrew_zone_missions.dm
@@ -0,0 +1,901 @@
+#ifndef VOIDCREW_ZONE_MISSIONS_TESTS
+#define VOIDCREW_ZONE_MISSIONS_TESTS
+
+// Fork defines are included later than the test harness. Bands and permissions use literals.
+/datum/mission_target/zone_missions_test
+	var/band = 1
+	var/valid = TRUE
+	var/resolve_calls = 0
+
+/datum/mission_target/zone_missions_test/get_zone_type()
+	return band
+
+/datum/mission_target/zone_missions_test/is_valid()
+	return valid
+
+/datum/mission_target/zone_missions_test/resolve()
+	resolve_calls++
+	return valid
+
+/datum/mission_objective/zone_missions_test
+	completed = TRUE
+	var/claim_seen = FALSE
+	var/reentrant_result
+
+/datum/mission_objective/zone_missions_test/on_turn_in_finalized(atom/reward_anchor)
+	claim_seen = mission.work_receipt?.claimed
+	reentrant_result = mission.turn_in(reward_anchor, null, TRUE)
+
+/datum/mission/proc/zone_missions_fixture()
+	var/datum/mission_target/zone_missions_test/site = new(src)
+	site.band = preferred_zone || 1
+	target = site
+	quote_zone = site.band
+	difficulty = quote_zone
+	value = 100
+	requires_item = FALSE
+	add_objective(new /datum/mission_objective/zone_missions_test())
+	prepare_work_receipt()
+
+/datum/mission/zone_missions_test/generate_mission_details()
+	zone_missions_fixture()
+
+/datum/mission/zone_missions_test/update_text()
+
+/datum/mission/zone_missions_test/routine/generate_mission_details()
+	value = 100
+	add_objective(new /datum/mission_objective/zone_missions_test())
+
+/datum/mission/recovery/kill/zone_missions_test
+	weight = 0
+	mission_limit = 0
+
+/datum/mission/recovery/kill/zone_missions_test/generate_mission_details()
+	zone_missions_fixture()
+
+/datum/mission/recovery/kill/zone_missions_test/update_text()
+
+/datum/mission/recovery/kill/zone_missions_test/on_mission_started()
+
+/datum/mission/recovery/kill/outpost/zone_missions_test
+	weight = 0
+	mission_limit = 0
+
+/datum/mission/recovery/kill/outpost/zone_missions_test/generate_mission_details()
+	zone_missions_fixture()
+
+/datum/mission/recovery/kill/outpost/zone_missions_test/update_text()
+
+/datum/mission/recovery/kill/outpost/zone_missions_test/on_mission_started()
+
+/datum/mission/big_game_hunt/zone_missions_test
+	weight = 0
+	mission_limit = 0
+
+/datum/mission/big_game_hunt/zone_missions_test/generate_mission_details()
+	zone_missions_fixture()
+
+/datum/mission/big_game_hunt/zone_missions_test/update_text()
+
+/datum/mission/big_game_hunt/zone_missions_test/on_mission_started()
+
+/datum/mission/big_game_hunt/zone_missions_test/capped
+	mission_limit = 1
+
+/datum/mission/live_capture/zone_missions_test
+	weight = 0
+	mission_limit = 0
+
+/datum/mission/live_capture/zone_missions_test/generate_mission_details()
+	zone_missions_fixture()
+
+/datum/mission/live_capture/zone_missions_test/update_text()
+
+/datum/mission/live_capture/zone_missions_test/on_mission_started()
+
+/datum/mission/live_capture/zone_missions_test/capped
+	mission_limit = 1
+
+/datum/mission/poacher_bust/zone_missions_test
+	weight = 0
+	mission_limit = 0
+
+/datum/mission/poacher_bust/zone_missions_test/generate_mission_details()
+	zone_missions_fixture()
+
+/datum/mission/poacher_bust/zone_missions_test/update_text()
+
+/datum/mission/poacher_bust/zone_missions_test/on_mission_started()
+
+/datum/mission/poacher_bust/zone_missions_test/capped
+	mission_limit = 1
+
+/datum/mission/recovery/survey/zone_missions_test
+	weight = 0
+	mission_limit = 0
+
+/datum/mission/recovery/survey/zone_missions_test/generate_mission_details()
+	zone_missions_fixture()
+
+/datum/mission/recovery/survey/zone_missions_test/update_text()
+
+/datum/mission/recovery/survey/zone_missions_test/on_mission_started()
+
+/datum/mission/research/core_sample/zone_missions_test
+	weight = 0
+	mission_limit = 0
+
+/datum/mission/research/core_sample/zone_missions_test/generate_mission_details()
+	zone_missions_fixture()
+
+/datum/mission/research/core_sample/zone_missions_test/update_text()
+
+/datum/mission/research/core_sample/zone_missions_test/on_mission_started()
+
+/datum/mission/recovery/extraction/zone_missions_test
+	weight = 0
+	mission_limit = 0
+
+/datum/mission/recovery/extraction/zone_missions_test/generate_mission_details()
+	zone_missions_fixture()
+
+/datum/mission/recovery/extraction/zone_missions_test/update_text()
+
+/datum/mission/recovery/extraction/zone_missions_test/on_mission_started()
+
+/datum/mission/prospect_stake/zone_missions_test
+	weight = 0
+	mission_limit = 0
+
+/datum/mission/prospect_stake/zone_missions_test/generate_mission_details()
+	zone_missions_fixture()
+
+/datum/mission/prospect_stake/zone_missions_test/update_text()
+
+/datum/mission/prospect_stake/zone_missions_test/on_mission_started()
+
+/datum/mission/suppression/zone_missions_test
+	weight = 0
+	mission_limit = 0
+
+/datum/mission/suppression/zone_missions_test/generate_mission_details()
+	zone_missions_fixture()
+
+/datum/mission/suppression/zone_missions_test/update_text()
+
+/datum/mission/suppression/zone_missions_test/on_mission_started()
+
+/datum/mission/recovery/zone_missions_test
+	weight = 0
+	mission_limit = 0
+
+/datum/mission/recovery/zone_missions_test/generate_mission_details()
+	zone_missions_fixture()
+
+/datum/mission/recovery/zone_missions_test/update_text()
+
+/datum/mission/recovery/zone_missions_test/on_mission_started()
+
+/datum/mission/rescue/zone_missions_test
+	weight = 0
+	mission_limit = 0
+
+/datum/mission/rescue/zone_missions_test/generate_mission_details()
+	zone_missions_fixture()
+
+/datum/mission/rescue/zone_missions_test/update_text()
+
+/datum/mission/rescue/zone_missions_test/on_mission_started()
+
+/datum/mission/outpost_courier/zone_missions_test
+	weight = 0
+	mission_limit = 0
+
+/datum/mission/outpost_courier/zone_missions_test/generate_mission_details()
+	zone_missions_fixture()
+
+/datum/mission/outpost_courier/zone_missions_test/update_text()
+
+/datum/mission/outpost_courier/zone_missions_test/on_mission_started()
+
+/datum/mission/outpost_courier/zone_missions_test/can_turn_in_at(atom/reward_anchor)
+	return TRUE
+
+/datum/mission/survey/zone_missions_test
+	weight = 0
+	mission_limit = 0
+
+/datum/mission/survey/zone_missions_test/generate_mission_details()
+	zone_missions_fixture()
+
+/datum/mission/survey/zone_missions_test/update_text()
+
+/datum/mission/survey/zone_missions_test/on_mission_started()
+
+/datum/mission/research/telemetry/zone_missions_test
+	weight = 0
+	mission_limit = 0
+
+/datum/mission/research/telemetry/zone_missions_test/generate_mission_details()
+	zone_missions_fixture()
+
+/datum/mission/research/telemetry/zone_missions_test/update_text()
+
+/datum/mission/research/telemetry/zone_missions_test/on_mission_started()
+
+/datum/mission/gas_harvest/zone_missions_test
+	weight = 0
+	mission_limit = 0
+
+/datum/mission/gas_harvest/zone_missions_test/generate_mission_details()
+	zone_missions_fixture()
+
+/datum/mission/gas_harvest/zone_missions_test/update_text()
+
+/datum/mission/gas_harvest/zone_missions_test/on_mission_started()
+
+/datum/mission/outpost_supply/zone_missions_test
+	weight = 0
+	mission_limit = 0
+
+/datum/mission/outpost_supply/zone_missions_test/generate_mission_details()
+	zone_missions_fixture()
+
+/datum/mission/outpost_supply/zone_missions_test/update_text()
+
+/datum/mission/outpost_supply/zone_missions_test/on_mission_started()
+
+/datum/mission/outpost_supply/cook/zone_missions_test
+	weight = 0
+	mission_limit = 0
+
+/datum/mission/outpost_supply/cook/zone_missions_test/generate_mission_details()
+	zone_missions_fixture()
+
+/datum/mission/outpost_supply/cook/zone_missions_test/update_text()
+
+/datum/mission/outpost_supply/cook/zone_missions_test/on_mission_started()
+
+/datum/mission/outpost_supply/angler/zone_missions_test
+	weight = 0
+	mission_limit = 0
+
+/datum/mission/outpost_supply/angler/zone_missions_test/generate_mission_details()
+	zone_missions_fixture()
+
+/datum/mission/outpost_supply/angler/zone_missions_test/update_text()
+
+/datum/mission/outpost_supply/angler/zone_missions_test/on_mission_started()
+
+/datum/mission/delivery/zone_missions_test
+	weight = 0
+	mission_limit = 0
+
+/datum/mission/delivery/zone_missions_test/generate_mission_details()
+	zone_missions_fixture()
+
+/datum/mission/delivery/zone_missions_test/update_text()
+
+/datum/mission/delivery/zone_missions_test/on_mission_started()
+
+/obj/structure/overmap/ship/zone_missions_test/roll_mission_prize(zone)
+	return null
+
+/datum/controller/subsystem/missions/zone_missions_test
+	flags = SS_NO_INIT | SS_NO_FIRE
+	var/fail_work = FALSE
+	var/work_attempts = 0
+	var/fail_first_families = 0
+	var/list/failed_families = list()
+
+/datum/controller/subsystem/missions/zone_missions_test/New()
+	// The MC constructs every subtype. Skip singleton registration and parent PreInit.
+	return
+
+/datum/controller/subsystem/missions/zone_missions_test/create_mission(mission_type, preferred_zone, posting_zone, list/eligible_zones, create_field_contact = FALSE)
+	var/family = zone_reputation_family(mission_type)
+	if(family)
+		work_attempts++
+		if(length(failed_families) < fail_first_families)
+			failed_families |= family
+		if(fail_work || (family in failed_families))
+			return null
+	return ..()
+
+/datum/controller/subsystem/missions/zone_missions_test/get_weighted_mission_type()
+	return /datum/mission/zone_missions_test/routine
+
+/datum/controller/subsystem/missions/zone_missions_test/ensure_safe_exploration_offer(obj/structure/overmap/ship/ship)
+	ship.available_missions += new /datum/mission/zone_missions_test(null, 1)
+	return TRUE
+
+/datum/controller/subsystem/overmap/zone_missions_test
+	flags = SS_NO_INIT | SS_NO_FIRE
+	var/capacity = FALSE
+	var/any_band_calls = 0
+	var/turf/destination
+
+/datum/controller/subsystem/overmap/zone_missions_test/New()
+	// The MC constructs every subtype. Skip singleton registration and parent PreInit.
+	return
+
+/datum/controller/subsystem/overmap/zone_missions_test/mission_contact_capacity(tenant_class)
+	return capacity
+
+/datum/controller/subsystem/overmap/zone_missions_test/get_unused_overmap_square_in_zone_band(band, thing_not_to_have = /obj/structure/overmap, tries = 40)
+	return destination
+
+/datum/controller/subsystem/overmap/zone_missions_test/get_unused_overmap_square(thing_not_to_have = /obj/structure/overmap, tries = 40, force = FALSE)
+	any_band_calls++
+	return null
+
+/datum/unit_test/voidcrew_zone_missions
+	abstract_type = /datum/unit_test/voidcrew_zone_missions
+	var/list/records = list()
+	var/list/old_types
+	var/old_metrics
+	var/list/old_tallies
+
+/datum/unit_test/voidcrew_zone_missions/New()
+	. = ..()
+	old_types = SSmissions.mission_types
+	old_metrics = SSmetrics.accepting
+	old_tallies = SSmetrics.tallies
+	SSmetrics.accepting = FALSE
+	SSmetrics.tallies = list()
+
+/datum/unit_test/voidcrew_zone_missions/Destroy()
+	SSmissions.mission_types = old_types
+	SSmetrics.accepting = old_metrics
+	SSmetrics.tallies = old_tallies
+	QDEL_LIST(records)
+	return ..()
+
+/datum/unit_test/voidcrew_zone_missions/proc/make_ship(permission = 0, crewed = TRUE)
+	var/obj/structure/overmap/ship/ship = allocate(/obj/structure/overmap/ship/zone_missions_test)
+	ship.ship_team = new
+	ship.ship_team.ship = ship
+	var/datum/voidcrew_crew_record/record = ship.get_crew_record()
+	records += record
+	ship.ship_account = allocate(/datum/bank_account)
+	if(crewed)
+		var/mob/living/carbon/human/member = allocate(/mob/living/carbon/human/consistent)
+		member.mind_initialize()
+		allocated += member.mind
+		ship.enlist_crewmember(member)
+	if(permission >= 1)
+		for(var/family in list("named_kill", "hunt", "capture"))
+			record.claim_zone_work(family, 1, 1, "setup_green_[family]")
+	if(permission >= 2)
+		for(var/family in list("named_kill", "hunt", "capture"))
+			record.claim_zone_work(family, 2, 2, "setup_yellow_[family]")
+	if(permission >= 3)
+		for(var/family in list("named_kill", "hunt", "capture"))
+			record.claim_zone_work(family, 3, 3, "setup_red_[family]")
+	return ship
+
+/// Boot and manually allocated fixtures leave the real subsystems and dependency graph intact.
+/datum/unit_test/voidcrew_zone_missions/subsystem_isolation/Run()
+	var/datum/controller/subsystem/missions/real_missions = SSmissions
+	var/datum/controller/subsystem/overmap/real_overmap = SSovermap
+	TEST_ASSERT_EQUAL(real_missions.type, /datum/controller/subsystem/missions, "The missions global is a test fixture")
+	TEST_ASSERT_EQUAL(real_overmap.type, /datum/controller/subsystem/overmap, "The overmap global is a test fixture")
+	var/list/type_to_subsystem = list()
+	for(var/datum/controller/subsystem/subsystem as anything in Master.subsystems)
+		type_to_subsystem[subsystem.type] = subsystem
+	TEST_ASSERT_EQUAL(type_to_subsystem[/datum/controller/subsystem/missions], real_missions, "The MC lost the exact missions type")
+	TEST_ASSERT_EQUAL(type_to_subsystem[/datum/controller/subsystem/overmap], real_overmap, "The MC lost the exact overmap type")
+	for(var/fixture_type in list(/datum/controller/subsystem/missions/zone_missions_test, /datum/controller/subsystem/overmap/zone_missions_test))
+		var/datum/controller/subsystem/boot_fixture = type_to_subsystem[fixture_type]
+		TEST_ASSERT_NOTNULL(boot_fixture, "The MC did not construct [fixture_type]")
+		TEST_ASSERT_EQUAL(boot_fixture.flags & (SS_NO_INIT | SS_NO_FIRE), SS_NO_INIT | SS_NO_FIRE, "A boot fixture can initialize or fire")
+		TEST_ASSERT_EQUAL(boot_fixture.times_fired, 0, "The MC fired a test fixture")
+		for(var/dependency_type in boot_fixture.dependencies)
+			var/datum/controller/subsystem/dependency = type_to_subsystem[dependency_type]
+			TEST_ASSERT_NOTNULL(dependency, "A fixture's inherited dependency [dependency_type] does not resolve")
+			TEST_ASSERT(!QDELETED(dependency), "A fixture's inherited dependency was deleted")
+			TEST_ASSERT(boot_fixture.init_stage >= dependency.init_stage, "A fixture precedes an inherited dependency's init stage")
+		var/datum/controller/subsystem/fixture = allocate(fixture_type)
+		TEST_ASSERT_EQUAL(SSmissions, real_missions, "Constructing a fixture replaced SSmissions")
+		TEST_ASSERT_EQUAL(SSovermap, real_overmap, "Constructing a fixture replaced SSovermap")
+		TEST_ASSERT(!QDELETED(real_missions) && !QDELETED(real_overmap), "Constructing a fixture deleted a real subsystem")
+		TEST_ASSERT(real_missions in Master.subsystems, "Constructing a fixture removed missions from the MC")
+		TEST_ASSERT(real_overmap in Master.subsystems, "Constructing a fixture removed overmap from the MC")
+		TEST_ASSERT_EQUAL(fixture.flags & (SS_NO_INIT | SS_NO_FIRE), SS_NO_INIT | SS_NO_FIRE, "An allocated fixture can initialize or fire")
+		Master.init_subsystem(fixture)
+		TEST_ASSERT(fixture.initialized, "The MC did not mark the inert fixture ready")
+		qdel(fixture)
+		TEST_ASSERT_EQUAL(SSmissions, real_missions, "Deleting a fixture changed SSmissions")
+		TEST_ASSERT_EQUAL(SSovermap, real_overmap, "Deleting a fixture changed SSovermap")
+	var/datum/controller/subsystem/missions/zone_missions_test/boot_missions = type_to_subsystem[/datum/controller/subsystem/missions/zone_missions_test]
+	var/datum/controller/subsystem/overmap/zone_missions_test/boot_overmap = type_to_subsystem[/datum/controller/subsystem/overmap/zone_missions_test]
+	TEST_ASSERT_EQUAL(length(boot_missions.mission_types), 0, "The MC initialized the missions fixture")
+	TEST_ASSERT_NULL(boot_overmap.overmap_centre, "The MC initialized a second overmap")
+
+/// Console and board variants all settle through the real shell, with claims before finalizers.
+/datum/unit_test/voidcrew_zone_missions/families/Run()
+	var/list/types = list(
+		/datum/mission/recovery/kill/zone_missions_test = "named_kill",
+		/datum/mission/recovery/kill/outpost/zone_missions_test = "named_kill",
+		/datum/mission/big_game_hunt/zone_missions_test = "hunt",
+		/datum/mission/live_capture/zone_missions_test = "capture",
+		/datum/mission/poacher_bust/zone_missions_test = "poachers",
+		/datum/mission/recovery/survey/zone_missions_test = "pylons",
+		/datum/mission/research/core_sample/zone_missions_test = "pylons",
+		/datum/mission/recovery/extraction/zone_missions_test = "extraction",
+	)
+	for(var/mission_type in types)
+		for(var/band in 1 to 3)
+			var/obj/structure/overmap/ship/ship = make_ship(band - 1)
+			var/datum/voidcrew_crew_record/record = ship.get_crew_record()
+			var/datum/mission/mission = allocate(mission_type, null, band)
+			var/datum/mission_work_receipt/receipt = mission.work_receipt
+			var/datum/mission_objective/zone_missions_test/finalizer = mission.objectives[1]
+			ship.available_missions += mission
+			TEST_ASSERT_EQUAL(receipt.family, types[mission_type], "Wrong family for [mission_type]")
+			TEST_ASSERT_EQUAL(ship.accept_mission(mission), TRUE, "Eligible work was denied")
+			TEST_ASSERT_EQUAL(receipt.crew, record, "Acceptance did not bind the crew")
+			TEST_ASSERT(mission.turn_in(run_loc_floor_bottom_left, null), "Successful work did not settle")
+			TEST_ASSERT_EQUAL(record.zone_totals["[band]"], band, "Wrong band gain")
+			TEST_ASSERT(finalizer.claim_seen, "A finalizer ran before the claim")
+			TEST_ASSERT(!finalizer.reentrant_result, "A finalizer settled the mission twice")
+			TEST_ASSERT(!mission.turn_in(run_loc_floor_bottom_left, null, TRUE), "Stale completion settled again")
+
+/// Renaming and buying difficult routine asks cannot invent guarded work.
+/datum/unit_test/voidcrew_zone_missions/exclusions/Run()
+	var/list/types = list(
+		/datum/mission/prospect_stake/zone_missions_test,
+		/datum/mission/suppression/zone_missions_test,
+		/datum/mission/recovery/zone_missions_test,
+		/datum/mission/rescue/zone_missions_test,
+		/datum/mission/outpost_courier/zone_missions_test,
+		/datum/mission/survey/zone_missions_test,
+		/datum/mission/research/telemetry/zone_missions_test,
+		/datum/mission/gas_harvest/zone_missions_test,
+		/datum/mission/outpost_supply/zone_missions_test,
+		/datum/mission/outpost_supply/cook/zone_missions_test,
+		/datum/mission/outpost_supply/angler/zone_missions_test,
+		/datum/mission/delivery/zone_missions_test,
+	)
+	var/obj/structure/overmap/ship/ship = make_ship(2)
+	var/datum/voidcrew_crew_record/record = ship.get_crew_record()
+	for(var/mission_type in types)
+		var/datum/mission/mission = allocate(mission_type, null, 3)
+		mission.name = "Kill Contract"
+		mission.difficulty = 3
+		TEST_ASSERT_NULL(mission.work_receipt, "Excluded work obtained a receipt")
+		TEST_ASSERT(mission.start_mission(ship), "Existing nonqualifying work was denied")
+		TEST_ASSERT(mission.turn_in(run_loc_floor_bottom_left, null), "Existing reward path stopped settling")
+	TEST_ASSERT_EQUAL(record.zone_totals["3"], 0, "Routine work earned red progression")
+	var/obj/structure/overmap/ship/public_ship = make_ship()
+	var/datum/mission/routine = allocate(/datum/mission/zone_missions_test/routine, null, null, 3)
+	routine.difficulty = 3
+	TEST_ASSERT(routine.start_mission(public_ship), "Targetless ask was gated by the posting zone")
+	TEST_ASSERT(routine.turn_in(run_loc_floor_bottom_left, null), "Targetless routine work did not pay")
+
+/// Aliases, capped claims and crew changes retain one encounter's original recipient.
+/datum/unit_test/voidcrew_zone_missions/receipts/Run()
+	var/obj/structure/overmap/ship/ship = make_ship()
+	var/obj/structure/overmap/ship/other = make_ship()
+	var/datum/voidcrew_crew_record/original = ship.get_crew_record()
+	var/datum/voidcrew_crew_record/different = other.get_crew_record()
+	var/datum/outpost_shop/shop = allocate(/datum/outpost_shop)
+	var/datum/mission/first = allocate(/datum/mission/recovery/kill/zone_missions_test, shop)
+	var/datum/mission/alias = allocate(/datum/mission/recovery/kill/outpost/zone_missions_test)
+	var/datum/mission_work_receipt/receipt = first.work_receipt
+	alias.work_receipt = receipt
+	TEST_ASSERT(first.start_mission(ship), "Original receipt did not bind")
+	TEST_ASSERT(!alias.start_mission(other), "An alias redirected the receipt to another crew")
+	TEST_ASSERT(alias.start_mission(ship), "Same-crew alias could not bind")
+	ship.ship_team.set_crew_record(different)
+	TEST_ASSERT(first.turn_in(run_loc_floor_bottom_left, null), "Crew change prevented the original settlement")
+	TEST_ASSERT_EQUAL(original.zone_totals["1"], 1, "Original crew did not receive its work")
+	TEST_ASSERT_EQUAL(different.zone_totals["1"], 0, "Current hull affiliation stole an accepted receipt")
+	TEST_ASSERT_EQUAL(original.trader_favor[shop.favor_key()], 1, "Board favor left the accepting crew")
+	TEST_ASSERT_EQUAL(different.trader_favor[shop.favor_key()] || 0, 0, "Current hull affiliation stole trader favor")
+	TEST_ASSERT(alias.turn_in(run_loc_floor_bottom_left, null), "Alias lost its ordinary reward")
+	TEST_ASSERT_EQUAL(original.zone_totals["1"], 1, "Alias credited the encounter twice")
+	var/datum/mission/next = allocate(/datum/mission/recovery/kill/zone_missions_test)
+	TEST_ASSERT(next.work_receipt.serial != receipt.serial, "New encounter reused an old serial")
+	ship.ship_team.set_crew_record(original)
+	TEST_ASSERT(next.start_mission(ship), "A capped family stopped ordinary work")
+	var/datum/mission_work_receipt/capped = next.work_receipt
+	TEST_ASSERT(next.turn_in(run_loc_floor_bottom_left, null), "Capped encounter did not settle")
+	TEST_ASSERT(capped.claimed && original.settlement_claims["[capped.serial]:named_kill"], "Capped work was not claimed")
+	TEST_ASSERT_EQUAL(original.zone_totals["1"], 1, "Capped encounter exceeded the family cap")
+
+/// Retargeting cannot change the work band or mint a new objective receipt.
+/datum/unit_test/voidcrew_zone_missions/retarget/Run()
+	var/obj/structure/overmap/ship/ship = make_ship()
+	var/datum/mission/mission = allocate(/datum/mission/recovery/kill/zone_missions_test)
+	var/datum/mission_target/zone_missions_test/target = mission.target
+	var/datum/mission_work_receipt/receipt = mission.work_receipt
+	target.band = 99
+	TEST_ASSERT(!mission.can_accept_work(ship), "Unknown band passed admission")
+	target.band = 2
+	TEST_ASSERT(!mission.resolve_quoted_target(), "Retarget escaped its pinned band")
+	TEST_ASSERT(!mission.start_mission(ship), "Mismatched quote was accepted")
+	target.band = 1
+	TEST_ASSERT(mission.start_mission(ship), "Original band was refused")
+	mission.named_kill_completed = TRUE
+	mission.boss_cash_issued = TRUE
+	mission.retarget()
+	TEST_ASSERT_EQUAL(mission.work_receipt, receipt, "Retarget replaced the encounter receipt")
+	TEST_ASSERT(mission.named_kill_completed && mission.boss_cash_issued, "Retarget reset S06 lifetime flags")
+	TEST_ASSERT(!mission.create_field_contact, "Active work retained permission to mint contacts")
+	target.band = 2
+	TEST_ASSERT(!mission.turn_in(run_loc_floor_bottom_left, null), "Moving work laundered its band")
+
+/// Viewer projections never consume the shared offer or mutate another crew's package.
+/datum/unit_test/voidcrew_zone_missions/shared_offers/Run()
+	var/obj/structure/overmap/trader_outpost/outpost = allocate(/obj/structure/overmap/trader_outpost)
+	var/obj/structure/overmap/ship/public_ship = make_ship()
+	var/obj/structure/overmap/ship/advanced_ship = make_ship(2)
+	var/datum/mission/offer = allocate(/datum/mission/zone_missions_test, outpost.shop, 3)
+	outpost.shop_offers += offer
+	TEST_ASSERT_EQUAL(length(outpost.get_contract_offers_for(public_ship)), 0, "Public crew saw denied work")
+	TEST_ASSERT_EQUAL(length(outpost.get_contract_offers_for(advanced_ship)), 1, "Eligible crew lost the shared offer")
+	TEST_ASSERT(offer in outpost.shop_offers, "Filtering deleted a shared offer")
+	public_ship.available_missions += offer
+	TEST_ASSERT(public_ship.accept_mission(offer) != TRUE, "Stale action bypassed authoritative admission")
+	public_ship.available_missions -= offer
+	TEST_ASSERT(offer in outpost.shop_offers, "Denied acceptance consumed the shared offer")
+
+/datum/unit_test/voidcrew_zone_missions/proc/package_offer(datum/shop_sku/sku)
+	var/datum/mission/mission = allocate(/datum/mission/zone_missions_test/routine)
+	mission.contract_quote = 2400
+	mission.contract_stock = list()
+	mission.contract_item_values = list()
+	mission.contract_stock[sku.item_path] = sku
+	mission.contract_item_values[sku.item_path] = 900
+	mission.mission_rewards = list(sku.item_path)
+	mission.reward_amounts = list()
+	mission.reward_amounts[sku.item_path] = 1
+	mission.set_contract_currency(1500)
+	return mission
+
+/// Permission/stock loss uses M1's exact remainder, with original-crew cap reservation/release.
+/datum/unit_test/voidcrew_zone_missions/packages/Run()
+	var/obj/structure/overmap/ship/public_ship = make_ship()
+	var/obj/structure/overmap/ship/advanced_ship = make_ship(2)
+	var/datum/voidcrew_crew_record/record = advanced_ship.get_crew_record()
+	var/datum/shop_sku/sku = allocate(/datum/shop_sku/general/beans)
+	sku.zone_permission = 2
+	sku.stock = 2
+	sku.crew_limit = 1
+	var/datum/mission/offer = package_offer(sku)
+	var/list/low = offer.get_effective_contract_package(public_ship.get_crew_record())
+	var/list/high = offer.get_effective_contract_package(record)
+	TEST_ASSERT_EQUAL(length(low["items"]), 0, "Public package included denied goods")
+	TEST_ASSERT_EQUAL(length(high["items"]), 1, "Permitted package lost available goods")
+	TEST_ASSERT_EQUAL(low["credits"] + low["vouchers"] * 1200, 2400, "Public fallback changed total value")
+	TEST_ASSERT_EQUAL(length(offer.mission_rewards), 1, "Viewing rewrote the shared package")
+	TEST_ASSERT_EQUAL(sku.stock, 2, "Viewing reserved stock")
+	TEST_ASSERT(offer.start_mission(advanced_ship), "Permitted package did not reserve")
+	TEST_ASSERT_EQUAL(sku.reserved_stock, 1, "Acceptance lost its stock hold")
+	TEST_ASSERT_EQUAL(record.favor_unique_purchases[sku.type], 1, "Acceptance did not claim the crew cap")
+	var/datum/mission/racing = package_offer(sku)
+	TEST_ASSERT(racing.start_mission(advanced_ship), "A capped package should still accept currency")
+	TEST_ASSERT_EQUAL(length(racing.get_reward_types()), 0, "Two packages charged the same crew cap")
+	TEST_ASSERT_EQUAL(racing.value + racing.voucher_count * 1200, 2400, "Cap fallback lost value")
+	offer.fail("Cancelled.")
+	TEST_ASSERT_EQUAL(sku.stock, 2, "Cancellation lost held stock")
+	TEST_ASSERT_EQUAL(record.favor_unique_purchases[sku.type], 0, "Cancellation lost the crew's purchase slot")
+	var/datum/mission/settlement = package_offer(sku)
+	TEST_ASSERT(settlement.start_mission(advanced_ship), "Second reservation failed")
+	record.zone_totals["1"] = 0
+	TEST_ASSERT(settlement.turn_in(run_loc_floor_bottom_left, null), "Permission loss blocked currency settlement")
+	TEST_ASSERT_EQUAL(sku.stock, 2, "Denied settlement consumed the restricted goods")
+	TEST_ASSERT_EQUAL(sku.reserved_stock, 0, "Denied settlement retained its hold")
+	TEST_ASSERT_EQUAL(record.favor_unique_purchases[sku.type], 0, "Denied settlement consumed the original cap")
+	TEST_ASSERT_EQUAL(public_ship.get_crew_record().favor_unique_purchases[sku.type] || 0, 0, "Another crew's cap was charged")
+	var/datum/mission/drained = package_offer(sku)
+	sku.stock = 0
+	TEST_ASSERT(drained.start_mission(public_ship), "Empty shelf prevented currency settlement")
+	TEST_ASSERT_EQUAL(length(drained.get_reward_types()), 0, "Unavailable stock remained in the bound package")
+	TEST_ASSERT_EQUAL(drained.value + drained.voucher_count * 1200, 2400, "Empty shelf lost quoted value")
+
+/// Original crew disposal releases stock and references without granting restricted goods later.
+/datum/unit_test/voidcrew_zone_missions/cleanup/Run()
+	var/obj/structure/overmap/ship/ship = make_ship(2)
+	var/datum/voidcrew_crew_record/record = ship.get_crew_record()
+	var/datum/shop_sku/sku = allocate(/datum/shop_sku/general/beans)
+	sku.zone_permission = 2
+	sku.stock = 1
+	sku.crew_limit = 1
+	var/datum/mission/mission = package_offer(sku)
+	TEST_ASSERT(mission.start_mission(ship), "Cleanup fixture could not reserve")
+	qdel(record)
+	TEST_ASSERT_NULL(mission.accepting_crew, "Accepted work retained a disposed crew record")
+	TEST_ASSERT_EQUAL(sku.stock, 1, "Crew disposal lost held stock")
+	TEST_ASSERT_EQUAL(sku.reserved_stock, 0, "Crew disposal retained held stock")
+	TEST_ASSERT_EQUAL(length(mission.get_reward_types()), 0, "Disposed crew retained restricted package goods")
+	TEST_ASSERT_EQUAL(mission.value + mission.voucher_count * 1200, 2400, "Crew disposal changed the fixed quote")
+	TEST_ASSERT(mission.turn_in(run_loc_floor_bottom_left, null), "Crew disposal prevented ordinary currency settlement")
+
+/// Five slots, useful distinct families, partial supply, bounded vacancies and a fixed hull clock.
+/datum/unit_test/voidcrew_zone_missions/opportunities/Run()
+	var/datum/controller/subsystem/missions/zone_missions_test/controller = allocate(__IMPLIED_TYPE__)
+	controller.mission_types = list(
+		/datum/mission/recovery/kill/zone_missions_test,
+		/datum/mission/big_game_hunt/zone_missions_test,
+		/datum/mission/live_capture/zone_missions_test,
+		/datum/mission/poacher_bust/zone_missions_test,
+		/datum/mission/recovery/survey/zone_missions_test,
+		/datum/mission/recovery/extraction/zone_missions_test,
+	)
+	var/obj/structure/overmap/ship/ship = make_ship()
+	TEST_ASSERT(controller.refresh_ship_missions(ship), "Scheduled board generation failed")
+	TEST_ASSERT_EQUAL(length(ship.available_missions), 5, "Board did not preserve five slots")
+	var/list/families = list()
+	for(var/datum/mission/offer in ship.available_missions)
+		if(offer.work_receipt)
+			families |= offer.work_receipt.family
+			TEST_ASSERT_EQUAL(offer.quote_zone, 1, "New crew received higher-band useful work")
+	TEST_ASSERT_EQUAL(length(families), 3, "Reserved work did not offer three distinct families")
+	TEST_ASSERT_EQUAL(ship.next_mission_refresh, world.time + 20 MINUTES, "Scheduled interval changed")
+	var/refresh_at = ship.next_mission_refresh
+	var/datum/mission/accepted = ship.available_missions[1]
+	TEST_ASSERT_EQUAL(ship.accept_mission(accepted), TRUE, "Reserved green travel fixture did not accept")
+	var/datum/mission/deleted = ship.available_missions[1]
+	ship.available_missions -= deleted
+	qdel(deleted)
+	var/attempts_before = controller.work_attempts
+	TEST_ASSERT(!controller.force_refresh_ship_missions(ship), "Vacancies triggered a reroll")
+	TEST_ASSERT_EQUAL(controller.work_attempts, attempts_before, "A premature refresh attempted generation")
+	TEST_ASSERT_EQUAL(ship.next_mission_refresh, refresh_at, "A vacancy reset the hull's clock")
+	controller.fail_work = TRUE
+	ship.next_mission_refresh = world.time
+	TEST_ASSERT(controller.refresh_ship_missions(ship), "Scheduled shortage did not refresh")
+	TEST_ASSERT_EQUAL(length(ship.available_missions), 2, "Failed useful slots were silently filled with unrelated work")
+	TEST_ASSERT(controller.work_attempts - attempts_before <= 48, "Shortage retries exceeded eight attempts for each of six useful families")
+	TEST_ASSERT(accepted in ship.active_missions, "Refresh removed accepted work")
+	var/obj/structure/overmap/ship/partial = make_ship()
+	var/datum/voidcrew_crew_record/record = partial.get_crew_record()
+	var/list/contributions = record.zone_families["1"]
+	for(var/family in zone_reputation_families())
+		contributions[family] = 1
+	contributions["capture"] = 0
+	contributions["poachers"] = 0
+	controller.fail_work = FALSE
+	var/missing = controller.reserve_useful_family_offers(partial)
+	TEST_ASSERT_EQUAL(missing, 0, "Available uncapped work left a vacancy")
+	TEST_ASSERT_EQUAL(length(partial.available_missions), 2, "A partial useful pool reserved unrelated families")
+	record.zone_totals["1"] = 3
+	TEST_ASSERT_EQUAL(controller.next_work_band(record), 2, "Next unmet band was not yellow")
+	record.zone_totals["2"] = 6
+	TEST_ASSERT_EQUAL(controller.next_work_band(record), 3, "Next unmet band was not red")
+	record.zone_totals["3"] = 9
+	TEST_ASSERT_NULL(controller.next_work_band(record), "Elite crew retained reserved progression work")
+
+/// Globally held families cannot reserve failed slots ahead of available work.
+/datum/unit_test/voidcrew_zone_missions/globally_capped_opportunities/Run()
+	var/datum/controller/subsystem/missions/zone_missions_test/controller = allocate(__IMPLIED_TYPE__)
+	var/obj/structure/overmap/ship/holder = make_ship()
+	SSovermap.simulated_ships |= holder
+	var/list/capped_types = list(
+		/datum/mission/big_game_hunt/zone_missions_test/capped,
+		/datum/mission/live_capture/zone_missions_test/capped,
+		/datum/mission/poacher_bust/zone_missions_test/capped,
+	)
+	for(var/mission_type in capped_types)
+		var/datum/mission/held = allocate(mission_type)
+		holder.available_missions += held
+		TEST_ASSERT(mission_type_within_limit(mission_type), "An unaccepted private offer occupied global capacity")
+	controller.mission_types = capped_types
+	var/obj/structure/overmap/ship/second_crew = make_ship()
+	TEST_ASSERT_EQUAL(controller.reserve_useful_family_offers(second_crew), 0, "Private offers left useful-family vacancies for another crew")
+	TEST_ASSERT_EQUAL(length(second_crew.available_missions), 3, "Another crew could not obtain the held families")
+	for(var/datum/mission/held in holder.available_missions.Copy())
+		TEST_ASSERT_EQUAL(holder.accept_mission(held), TRUE, "A private offer blocked acceptance before any mission was running")
+		TEST_ASSERT(!mission_type_within_limit(held.type), "Accepted work failed to occupy its global cap")
+	for(var/datum/mission/racing in second_crew.available_missions)
+		TEST_ASSERT_EQUAL(second_crew.accept_mission(racing), "That contract is already taken.", "Acceptance bypassed running-work capacity")
+	TEST_ASSERT_EQUAL(length(second_crew.active_missions), 0, "Refused acceptance started a mission")
+	controller.work_attempts = 0
+	controller.mission_types = capped_types + list(/datum/mission/recovery/kill/zone_missions_test)
+	var/obj/structure/overmap/ship/partial = make_ship()
+	TEST_ASSERT(controller.refresh_ship_missions(partial), "Partial useful supply did not refresh")
+	TEST_ASSERT_EQUAL(length(partial.available_missions), 5, "Globally capped families consumed otherwise available board slots")
+	TEST_ASSERT_EQUAL(controller.work_attempts, 1, "Partial supply did not reserve exactly its one available family")
+
+	controller.mission_types += /datum/mission/recovery/survey/zone_missions_test
+	controller.mission_types += /datum/mission/recovery/extraction/zone_missions_test
+	var/obj/structure/overmap/ship/ship = make_ship()
+	TEST_ASSERT(controller.refresh_ship_missions(ship), "Globally capped supply did not refresh")
+	var/list/families = list()
+	for(var/datum/mission/offer in ship.available_missions)
+		if(offer.work_receipt)
+			families |= offer.work_receipt.family
+			TEST_ASSERT_EQUAL(offer.quote_zone, 1, "Zero-standing crew received higher-band work")
+	TEST_ASSERT_EQUAL(length(families), 3, "Held hunt, capture and poacher jobs hid available useful families")
+	for(var/family in list("named_kill", "pylons", "extraction"))
+		TEST_ASSERT(family in families, "Available [family] work was not reserved")
+	TEST_ASSERT_EQUAL(length(ship.available_missions), 5, "Global caps left a board vacancy despite useful supply")
+
+/// Empty, dead and abandoned rosters do not roll offers or advance the hull clock.
+/datum/unit_test/voidcrew_zone_missions/idle_hulls/Run()
+	var/datum/controller/subsystem/missions/zone_missions_test/controller = allocate(__IMPLIED_TYPE__)
+	controller.mission_types = list(/datum/mission/recovery/kill/zone_missions_test)
+	var/obj/structure/overmap/ship/ship = make_ship(0, FALSE)
+	TEST_ASSERT(!controller.refresh_ship_missions(ship), "A crewless hull generated offers")
+	TEST_ASSERT_EQUAL(ship.next_mission_refresh, 0, "Crewless refresh advanced the hull clock")
+	var/mob/living/carbon/human/member = allocate(/mob/living/carbon/human/consistent)
+	member.mind_initialize()
+	allocated += member.mind
+	ship.enlist_crewmember(member)
+	member.stat = DEAD
+	TEST_ASSERT(!controller.refresh_ship_missions(ship), "A dead crew generated offers")
+	member.stat = CONSCIOUS
+	ship.abandoned = TRUE
+	TEST_ASSERT(!controller.refresh_ship_missions(ship), "An abandoned hull generated offers")
+	TEST_ASSERT_EQUAL(length(ship.available_missions), 0, "An idle hull retained generated offers")
+	ship.abandoned = FALSE
+	TEST_ASSERT(controller.refresh_ship_missions(ship), "A living crew could not receive its first batch")
+
+/// Failures use bounded retries, then the remaining useful families in the same scheduled batch.
+/datum/unit_test/voidcrew_zone_missions/remaining_families/Run()
+	var/datum/controller/subsystem/missions/zone_missions_test/controller = allocate(__IMPLIED_TYPE__)
+	controller.mission_types = list(
+		/datum/mission/recovery/kill/zone_missions_test,
+		/datum/mission/big_game_hunt/zone_missions_test,
+		/datum/mission/live_capture/zone_missions_test,
+		/datum/mission/poacher_bust/zone_missions_test,
+		/datum/mission/recovery/survey/zone_missions_test,
+		/datum/mission/recovery/extraction/zone_missions_test,
+	)
+	controller.fail_first_families = 3
+	var/obj/structure/overmap/ship/ship = make_ship()
+	TEST_ASSERT(controller.refresh_ship_missions(ship), "Scheduled fallback did not refresh")
+	TEST_ASSERT_EQUAL(length(controller.failed_families), 3, "Fixture did not exhaust the first three chosen families")
+	TEST_ASSERT_EQUAL(controller.work_attempts, 27, "Fallback did not bound retries and try all remaining families")
+	var/list/families = list()
+	for(var/datum/mission/offer in ship.available_missions)
+		if(offer.work_receipt)
+			families |= offer.work_receipt.family
+			TEST_ASSERT(!(offer.work_receipt.family in controller.failed_families), "A failed family produced an offer")
+	TEST_ASSERT_EQUAL(length(families), 3, "Remaining useful families did not fill the reserved slots")
+	TEST_ASSERT_EQUAL(length(ship.available_missions), 5, "Family fallback lost a board slot")
+	var/attempts_before = controller.work_attempts
+	var/refresh_at = ship.next_mission_refresh
+	TEST_ASSERT(!controller.force_refresh_ship_missions(ship), "Family fallback allowed an immediate reroll")
+	TEST_ASSERT_EQUAL(controller.work_attempts, attempts_before, "An immediate refresh retried useful families")
+	TEST_ASSERT_EQUAL(ship.next_mission_refresh, refresh_at, "Family fallback changed the fixed refresh clock")
+
+/// Actual contact entry points fail closed at capacity and never fall back across bands.
+/datum/unit_test/voidcrew_zone_missions/capacity/Run()
+	var/datum/controller/subsystem/overmap/zone_missions_test/controller = allocate(__IMPLIED_TYPE__)
+	var/planets_before = length(GLOB.overmap_planets)
+	var/ruins_before = length(GLOB.space_ruin_signals)
+	TEST_ASSERT_NULL(controller.spawn_mission_planet(1), "Full world created a planet contact")
+	TEST_ASSERT_NULL(controller.spawn_mission_ruin(1), "Full world created a ruin contact")
+	TEST_ASSERT_EQUAL(length(GLOB.overmap_planets), planets_before, "Capacity refusal leaked a planet")
+	TEST_ASSERT_EQUAL(length(GLOB.space_ruin_signals), ruins_before, "Capacity refusal leaked a ruin")
+	controller.capacity = TRUE
+	TEST_ASSERT_NULL(controller.spawn_mission_planet(1), "Empty overmap created an invalid contact")
+	TEST_ASSERT_NULL(controller.spawn_dynamic_planet(/obj/structure/overmap/planet/lava, 1, 1, null, TRUE), "Strict contact creation invented a destination")
+	TEST_ASSERT_EQUAL(controller.any_band_calls, 0, "A strict contact fell back outside its band")
+
+/// Mixed occupancy, unknown zones and absent coordinate bands never trigger a higher-band fallback.
+/datum/unit_test/voidcrew_zone_missions/strict_targets
+	var/list/saved_planets
+	var/list/saved_ruins
+	var/list/saved_outposts
+	var/turf/green
+	var/turf/red
+	var/green_type
+	var/red_type
+
+/datum/unit_test/voidcrew_zone_missions/strict_targets/Destroy()
+	. = ..()
+	if(green)
+		green.ChangeTurf(green_type)
+	if(red)
+		red.ChangeTurf(red_type)
+	if(saved_planets)
+		GLOB.overmap_planets = saved_planets
+	if(saved_ruins)
+		GLOB.space_ruin_signals = saved_ruins
+	if(saved_outposts)
+		GLOB.trader_outposts = saved_outposts
+
+/datum/unit_test/voidcrew_zone_missions/strict_targets/Run()
+	saved_planets = GLOB.overmap_planets
+	saved_ruins = GLOB.space_ruin_signals
+	saved_outposts = GLOB.trader_outposts
+	GLOB.overmap_planets = list()
+	GLOB.space_ruin_signals = list()
+	GLOB.trader_outposts = list()
+	green_type = run_loc_floor_bottom_left.type
+	red_type = run_loc_floor_top_right.type
+	green = run_loc_floor_bottom_left.ChangeTurf(/turf/open/overmap)
+	red = run_loc_floor_top_right.ChangeTurf(/turf/open/overmap)
+	var/turf/open/overmap/green_tile = green
+	var/turf/open/overmap/red_tile = red
+	green_tile.current_zone = allocate(/datum/overmap_zone, 1)
+	red_tile.current_zone = allocate(/datum/overmap_zone, 3)
+	var/obj/structure/overmap/space_ruin/green_ruin = allocate(__IMPLIED_TYPE__, green)
+	var/obj/structure/overmap/space_ruin/red_ruin = allocate(__IMPLIED_TYPE__, red)
+	green_ruin.loaded = TRUE
+	var/datum/mission/mission = allocate(/datum/mission/zone_missions_test, null, 1)
+	var/datum/mission_target/space_ruin/ruin_target = allocate(__IMPLIED_TYPE__, mission)
+	TEST_ASSERT(ruin_target.resolve(), "An eligible loaded site was hidden by a cold site in another band")
+	TEST_ASSERT_EQUAL(ruin_target.ruin, green_ruin, "Ruin preference escaped its band")
+	ruin_target.unhook()
+	TEST_ASSERT_EQUAL(green_ruin.mission_claims, 0, "Unhook retained the ruin claim")
+	mission.exclusive_site = TRUE
+	TEST_ASSERT(!ruin_target.resolve(), "Exclusive work fell back to an ineligible cold ruin")
+	mission.exclusive_site = FALSE
+	var/obj/structure/overmap/planet/lava/green_planet = allocate(__IMPLIED_TYPE__, green)
+	var/obj/structure/overmap/planet/lava/red_planet = allocate(__IMPLIED_TYPE__, red)
+	var/datum/mission_target/planet/planet_target = allocate(__IMPLIED_TYPE__, mission)
+	TEST_ASSERT(planet_target.resolve(), "Eligible planet was not selected")
+	TEST_ASSERT_EQUAL(planet_target.planet, green_planet, "Planet resolution escaped its band")
+	planet_target.unhook()
+	green_planet.mission_exclusive = TRUE
+	TEST_ASSERT(!planet_target.resolve(), "Planet selection ignored site exclusivity")
+	green_planet.mission_exclusive = FALSE
+	var/list/tables = list(/datum/overmap/planet/lava = TRUE)
+	TEST_ASSERT_EQUAL(length(mission.get_work_biomes(tables)), 1, "Eligible biome pool was empty")
+	green_tile.current_zone = null
+	TEST_ASSERT(!planet_target.resolve(), "Unknown planet band was accepted")
+	TEST_ASSERT(!ruin_target.resolve(), "Unknown ruin band was accepted")
+	TEST_ASSERT_EQUAL(length(mission.get_work_biomes(tables)), 0, "Biome preselection included unknown or denied sites")
+	mission.create_field_contact = TRUE
+	TEST_ASSERT_EQUAL(length(mission.get_work_biomes(tables)), 1, "Scheduled empty-site generation lost the repeatable biome pool")
+	mission.create_field_contact = FALSE
+	var/datum/mission_target/coords/coords = allocate(__IMPLIED_TYPE__, mission)
+	coords.zone_weights = list("2" = 1, "3" = 1)
+	TEST_ASSERT_NULL(coords.pick_zone_band(), "Coordinate target fell back from an unavailable band")
+	var/obj/structure/overmap/trader_outpost/post = allocate(__IMPLIED_TYPE__, red)
+	var/datum/mission_target/outpost/courier = allocate(__IMPLIED_TYPE__, mission)
+	TEST_ASSERT(!courier.resolve(), "Courier destination fell back to a denied band")
+	// Keep fixture locals alive through the assertions; cleanup must not touch real sites.
+	TEST_ASSERT(red_ruin && red_planet && post, "Mixed-band fixtures disappeared")
+
+/// Factory output stays unloaded and uses only ordinary repeatable content in the pinned band.
+/datum/unit_test/voidcrew_zone_missions/field_contacts
+	var/turf/destination
+	var/original_type
+
+/datum/unit_test/voidcrew_zone_missions/field_contacts/Destroy()
+	. = ..()
+	if(destination)
+		destination.ChangeTurf(original_type)
+
+/datum/unit_test/voidcrew_zone_missions/field_contacts/Run()
+	original_type = run_loc_floor_bottom_left.type
+	destination = run_loc_floor_bottom_left.ChangeTurf(/turf/open/overmap)
+	var/turf/open/overmap/tile = destination
+	tile.current_zone = allocate(/datum/overmap_zone, 2)
+	var/datum/controller/subsystem/overmap/zone_missions_test/controller = allocate(__IMPLIED_TYPE__)
+	controller.capacity = TRUE
+	controller.destination = destination
+	var/obj/structure/overmap/planet/planet = controller.spawn_mission_planet(2, /datum/overmap/planet/lava)
+	TEST_ASSERT_NOTNULL(planet, "An empty eligible planet pool could not create a contact")
+	allocated += planet
+	TEST_ASSERT_EQUAL(planet.zone_band, 2, "Field planet escaped its band")
+	TEST_ASSERT(!planet.loaded && !planet.mapzone && !planet.footprint, "Offer generation loaded a planet interior")
+	// Use the production registry: the old synthetic duplicate-enabled template hid an empty pool.
+	var/list/approved = list()
+	TEST_ASSERT_EQUAL(length(controller.mission_ruin_templates), 3, "The approved ordinary combat ruin list changed")
+	for(var/datum/map_template/ruin/space/template_type as anything in controller.mission_ruin_templates)
+		var/datum/map_template/ruin/space/template = SSmapping.space_ruins_templates[initial(template_type.name)]
+		TEST_ASSERT_NOTNULL(template, "Approved ruin [template_type] is absent from the production registry")
+		TEST_ASSERT_EQUAL(template.type, template_type, "Approved ruin resolved to a different template")
+		TEST_ASSERT(!template.unpickable && !template.allow_duplicates, "Mission approval changed natural seeding or selected unique content")
+		TEST_ASSERT(template.width > 0 && template.height > 0 && fexists(template.mappath), "Approved ruin has no production map")
+		TEST_ASSERT(controller.ruin_fits_in_level(template), "Approved ruin cannot be docked")
+		approved += template
+		// Every approved template is already in use; mission replacement must still be allowed.
+		var/obj/structure/overmap/space_ruin/existing = allocate(__IMPLIED_TYPE__, destination)
+		existing.set_ruin_template(template)
+		existing.mission_claims = 1
+	var/obj/structure/overmap/space_ruin/ruin = controller.spawn_mission_ruin(2)
+	TEST_ASSERT_NOTNULL(ruin, "An empty eligible ruin pool could not create a contact")
+	allocated += ruin
+	TEST_ASSERT(ruin.ruin_template in approved, "A field contact reused unapproved, chart or unique content")
+	TEST_ASSERT(!ruin.loaded && !ruin.mapzone && !ruin.footprint, "Offer generation loaded a ruin interior")
+	TEST_ASSERT_EQUAL(SSovermap_zones.get_zone_type(get_turf(ruin)), 2, "Field ruin escaped its pinned band")
+
+#endif
diff --git a/voidcrew/modules/unit_tests/voidcrew_zone_research.dm b/voidcrew/modules/unit_tests/voidcrew_zone_research.dm
new file mode 100644
index 00000000000..aaedfb3cdc2
--- /dev/null
+++ b/voidcrew/modules/unit_tests/voidcrew_zone_research.dm
@@ -0,0 +1,445 @@
+/// Fork defines follow test includes: permissions 0/1/2/3 are Public/Yellow/Advanced/Elite.
+/datum/unit_test/voidcrew_zone_research
+	parent_type = /datum/unit_test/voidcrew_experiment_reward_fixture
+	abstract_type = /datum/unit_test/voidcrew_zone_research
+	var/list/zone_records = list()
+
+/datum/unit_test/voidcrew_zone_research/Destroy()
+	QDEL_LIST(zone_records)
+	return ..()
+
+/datum/unit_test/voidcrew_zone_research/proc/zone_ship(turf/tile)
+	var/obj/structure/overmap/ship/ship = make_reward_ship(tile)
+	zone_records |= ship.get_crew_record()
+	return ship
+
+/// Use production capped awards rather than replacing the permission lookup.
+/datum/unit_test/voidcrew_zone_research/proc/grant_permission(datum/voidcrew_crew_record/record, permission)
+	for(var/band in 1 to permission)
+		for(var/family in list("named_kill", "hunt", "capture"))
+			record.claim_zone_work(family, band, band, "research_[band]_[family]")
+
+/datum/unit_test/voidcrew_zone_research/proc/prepare_node(datum/techweb/web, datum/techweb_node/node)
+	for(var/prereq in node.prereq_ids)
+		web.research_node_id(prereq, TRUE, FALSE, FALSE)
+	web.unhide_node(node)
+	web.add_points_all(100000)
+
+/datum/unit_test/voidcrew_zone_research/proc/console_node_data(obj/machinery/computer/rdconsole/console, mob/user, node_id)
+	var/list/data = console.ui_data(user)
+	for(var/list/entry as anything in data["nodes"])
+		if(entry["id"] == node_id)
+			return entry
+	TEST_FAIL("The console omitted node [node_id]")
+	return list()
+
+/// Fresh disks on separate hulls restore knowledge, but share the crew's completion grants.
+/datum/unit_test/voidcrew_zone_research/shared_entitlement/Run()
+	var/obj/structure/overmap/ship/first = zone_ship(run_loc_floor_bottom_left)
+	var/datum/voidcrew_crew_record/crew = first.get_crew_record()
+	var/obj/structure/overmap/ship/second = zone_ship(run_loc_floor_top_right)
+	TEST_ASSERT(second.ship_team.set_crew_record(crew), "The second hull could not continue its crew")
+	var/mob/living/carbon/human/user = make_player(run_loc_floor_bottom_left, "zoneresearchentitlement")
+	var/obj/machinery/rnd/server/ship/first_server = allocate(/obj/machinery/rnd/server/ship)
+	var/obj/machinery/rnd/server/ship/second_server = allocate(/obj/machinery/rnd/server/ship, run_loc_floor_top_right)
+	var/datum/techweb/first_web = install_reward_disk(first_server, user)
+	var/datum/techweb/second_web = install_reward_disk(second_server, user)
+	TEST_ASSERT_EQUAL(first_web.experiment_reward_ledger(), second_web.experiment_reward_ledger(), "Two hulls in one crew have separate grant ledgers")
+	complete_arcade(first_web, run_loc_floor_bottom_left)
+	publish_reward_paper(first_web)
+	TEST_ASSERT_EQUAL(first_web.research_points[TECHWEB_POINT_TYPE_GENERIC], 474, "The first hull did not earn both grants")
+	complete_arcade(second_web, run_loc_floor_top_right)
+	publish_reward_paper(second_web)
+	TEST_ASSERT_EQUAL(second_web.research_points[TECHWEB_POINT_TYPE_GENERIC] || 0, 0, "A second hull repaid its crew's flat or intrinsic experiment rewards")
+	TEST_ASSERT(second_web.completed_experiments[/datum/experiment/physical/arcade_winner], "An unpaid repeat did not restore experiment completion")
+	TEST_ASSERT(second_web.completed_experiments[/datum/experiment/ordnance/explosive/lowyieldbomb], "An unpaid publication did not restore experiment completion")
+
+/// The returned announcement is used by both scanners and ordnance publications.
+/datum/unit_test/voidcrew_zone_research/grant_receipt/Run()
+	zone_ship(run_loc_floor_bottom_left)
+	var/mob/living/carbon/human/user = make_player(run_loc_floor_bottom_left, "zoneresearchreceipt")
+	var/obj/machinery/rnd/server/ship/server = allocate(/obj/machinery/rnd/server/ship)
+	var/datum/techweb/web = install_reward_disk(server, user)
+	var/datum/experiment/experiment = allocate(/datum/experiment/physical/arcade_winner)
+	web.available_experiments |= experiment
+	var/announcement = web.complete_experiment(experiment)
+	TEST_ASSERT(findtext(announcement, "has been completed!"), "A paid experiment lost its completion announcement")
+	TEST_ASSERT(!findtext(announcement, "Research grant already claimed."), "A paid experiment reported a duplicate grant")
+	server.source_code_hdd.forceMove(run_loc_floor_bottom_left)
+	web = install_reward_disk(server, user)
+	experiment = allocate(/datum/experiment/physical/arcade_winner)
+	web.available_experiments |= experiment
+	announcement = web.complete_experiment(experiment)
+	TEST_ASSERT(findtext(announcement, "has been completed!"), "An unpaid repeat lost its completion announcement")
+	TEST_ASSERT(findtext(announcement, "Research grant already claimed."), "An unpaid repeat did not report its claimed grant")
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC] || 0, 0, "An unpaid receipt still paid a grant")
+	TEST_ASSERT_NULL(web.complete_experiment(experiment), "A duplicate callback announced the same completion twice")
+
+/// Check the entire tree, including public industrial/medical nodes and nanite siblings.
+/datum/unit_test/voidcrew_zone_research/tags/Run()
+	var/list/expected = list(
+		/datum/techweb_node/automatic_ammunition = 1,
+		/datum/techweb_node/weapon_ammo_c20r = 1,
+		/datum/techweb_node/weapon_ammo_wt550 = 1,
+		/datum/techweb_node/weapon_ammo_l6_saw = 2,
+		/datum/techweb_node/weapon_ammo_bulldog = 2,
+		/datum/techweb_node/weapon_ammo_sniper_rifle = 2,
+		/datum/techweb_node/specialist_ammo = 1,
+		/datum/techweb_node/experimental_ammo = 2,
+		/datum/techweb_node/explosive_ammo = 2,
+		/datum/techweb_node/nanite_combat = 3,
+		/datum/techweb_node/electric_weapons = 1,
+		/datum/techweb_node/beam_weapons = 2,
+		/datum/techweb_node/syndicate_basic = 3,
+		/datum/techweb_node/unregulated_bluespace = 3,
+	)
+	var/gated = 0
+	for(var/node_id in SSresearch.techweb_nodes)
+		var/datum/techweb_node/node = SSresearch.techweb_nodes[node_id]
+		TEST_ASSERT_EQUAL(node.zone_permission, expected[node.type] || 0, "Unexpected standing requirement on [node_id]")
+		if(node.zone_permission)
+			gated++
+	TEST_ASSERT_EQUAL(gated, 14, "The direct-research gate must cover exactly fourteen nodes")
+	TEST_ASSERT_EQUAL(SSresearch.techweb_node_by_id("nanite_military").type, /datum/techweb_node/nanite_combat, "Military nanites changed id")
+
+/datum/unit_test/voidcrew_zone_research/direct/Run()
+	var/obj/structure/overmap/ship/ship = zone_ship(run_loc_floor_bottom_left)
+	var/datum/voidcrew_crew_record/record = ship.get_crew_record()
+	var/mob/living/carbon/human/user = make_player(run_loc_floor_bottom_left, "zoneresearchdirect")
+	var/obj/machinery/rnd/server/ship/server = allocate(/obj/machinery/rnd/server/ship)
+	var/list/node_ids = list("specialist_ammo", "experimental_ammo", "nanite_military")
+	for(var/permission in 1 to 3)
+		server.source_code_hdd?.forceMove(run_loc_floor_bottom_left)
+		var/datum/techweb/web = install_reward_disk(server, user)
+		var/datum/techweb_node/node = SSresearch.techweb_node_by_id(node_ids[permission])
+		prepare_node(web, node)
+		var/before = web.research_points[TECHWEB_POINT_TYPE_GENERIC]
+		TEST_ASSERT_EQUAL(web.get_research_zone_permission(), permission - 1, "Source standing did not resolve its ship")
+		TEST_ASSERT(!web.can_unlock_node(node), "An underqualified crew can unlock [node.id]")
+		TEST_ASSERT(!web.enqueue_node(node.id, user), "An underqualified crew queued [node.id]")
+		TEST_ASSERT(!length(web.research_queue_nodes), "Denied enqueue changed the queue")
+		TEST_ASSERT(!web.research_node(node, FALSE, TRUE, FALSE), "Direct research bypassed standing for [node.id]")
+		TEST_ASSERT(!web.research_node(node, FALSE, FALSE, FALSE), "Skipping point adjustment bypassed standing")
+		TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC], before, "Denied research spent points")
+		TEST_ASSERT(!web.researched_nodes[node.id], "Denied research acquired knowledge")
+		TEST_ASSERT(!length(web.experiment_payment_receipts), "Denied research created a refund receipt")
+		grant_permission(record, permission)
+		TEST_ASSERT(web.can_unlock_node(node), "New standing did not permit [node.id]")
+		TEST_ASSERT(web.enqueue_node(node.id, user), "New standing did not permit queueing")
+		var/cost = node.get_price(web)[TECHWEB_POINT_TYPE_GENERIC]
+		// SSresearch.fire() executes the first queued id through this same entry point.
+		TEST_ASSERT(web.research_node_id(web.research_queue_nodes[1], FALSE, TRUE, FALSE), "Eligible queued research failed")
+		TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC], before - cost, "Eligible queued research charged the wrong amount")
+		TEST_ASSERT(web.researched_nodes[node.id], "Eligible queued research did not unlock the node")
+		TEST_ASSERT(!length(web.research_queue_nodes), "Successful research remained queued")
+
+/// The console must disable a gated node and refresh availability when standing changes.
+/datum/unit_test/voidcrew_zone_research/console_availability/Run()
+	var/obj/structure/overmap/ship/ship = zone_ship(run_loc_floor_bottom_left)
+	var/mob/living/carbon/human/user = make_player(run_loc_floor_bottom_left, "zoneresearchconsole")
+	var/obj/machinery/rnd/server/ship/server = allocate(/obj/machinery/rnd/server/ship)
+	var/datum/techweb/web = install_reward_disk(server, user)
+	var/obj/machinery/computer/rdconsole/console = allocate(/obj/machinery/computer/rdconsole)
+	var/obj/item/multitool/tool = allocate(/obj/item/multitool)
+	tool.buffer = web
+	TEST_ASSERT(console.multitool_act(user, tool), "Console could not link its local web")
+	var/datum/techweb_node/node = SSresearch.techweb_node_by_id("specialist_ammo")
+	prepare_node(web, node)
+	for(var/permission in 0 to 1)
+		if(permission)
+			grant_permission(ship.get_crew_record(), permission)
+		var/list/entry = console_node_data(console, user, node.id)
+		TEST_ASSERT_EQUAL(entry["tier"], 1, "The fixture has unresolved research prerequisites")
+		TEST_ASSERT_EQUAL(entry["can_unlock"], permission, "Console availability did not follow live crew standing")
+		TEST_ASSERT_EQUAL(entry["zone_permission_blocked"], !permission, "The console misidentified a standing-only research block")
+
+/// Missing points, experiments, surveys or prerequisites must not report an authorization denial.
+/datum/unit_test/voidcrew_zone_research/console_blockers/Run()
+	var/obj/structure/overmap/ship/ship = zone_ship(run_loc_floor_bottom_left)
+	var/mob/living/carbon/human/user = make_player(run_loc_floor_bottom_left, "zoneresearchblockers")
+	var/obj/machinery/rnd/server/ship/server = allocate(/obj/machinery/rnd/server/ship)
+	var/datum/techweb/web = install_reward_disk(server, user)
+	var/obj/machinery/computer/rdconsole/console = allocate(/obj/machinery/computer/rdconsole)
+	var/obj/item/multitool/tool = allocate(/obj/item/multitool)
+	tool.buffer = web
+	TEST_ASSERT(console.multitool_act(user, tool), "Console could not link its local web")
+	var/datum/techweb_node/node = allocate(/datum/techweb_node)
+	node.id = "rndfix_console_blockers"
+	node.zone_permission = 1 // ZONE_PERMISSION_YELLOW
+	node.prereq_ids = list("specialist_ammo")
+	node.research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 100)
+	node.required_experiments = list(/datum/experiment/physical/arcade_winner)
+	node.required_surveyed_objects = list("planets" = 1)
+	SSresearch.techweb_nodes[node.id] = node
+	prepare_node(web, node)
+	web.survey_data = allocate(/datum/survey_research)
+	web.survey_data.survey_objects_by_type["planets"] = list(allocate(/datum/surveyed_celestial_object/planet))
+	var/list/entry = console_node_data(console, user, node.id)
+	TEST_ASSERT(!entry["zone_permission_blocked"], "A missing experiment was reported as an authorization denial")
+	var/datum/experiment/experiment = allocate(/datum/experiment/physical/arcade_winner)
+	web.completed_experiments[experiment.type] = experiment
+	web.survey_data.survey_objects_by_type["planets"] = list()
+	entry = console_node_data(console, user, node.id)
+	TEST_ASSERT(!entry["zone_permission_blocked"], "A missing survey was reported as an authorization denial")
+	web.survey_data.survey_objects_by_type["planets"] = list(allocate(/datum/surveyed_celestial_object/planet))
+	web.unresearch_node_id("specialist_ammo")
+	web.update_node_status(node)
+	entry = console_node_data(console, user, node.id)
+	TEST_ASSERT(!entry["zone_permission_blocked"], "A missing prerequisite was reported as an authorization denial")
+	web.research_node_id("specialist_ammo", TRUE, FALSE, FALSE)
+	web.update_node_status(node)
+	entry = console_node_data(console, user, node.id)
+	TEST_ASSERT(entry["zone_permission_blocked"], "A standing-only blocker was not reported")
+	web.remove_points_all(100000)
+	entry = console_node_data(console, user, node.id)
+	TEST_ASSERT(!entry["zone_permission_blocked"], "Missing points and standing were reported as a standing-only block")
+	grant_permission(ship.get_crew_record(), 1)
+	entry = console_node_data(console, user, node.id)
+	TEST_ASSERT(!entry["can_unlock"], "A node without points became researchable")
+	TEST_ASSERT(!entry["zone_permission_blocked"], "A points-only blocker was reported as an authorization denial")
+	web.add_points_all(100)
+	entry = console_node_data(console, user, node.id)
+	TEST_ASSERT(entry["can_unlock"], "The node remained disabled after every requirement was met")
+	TEST_ASSERT(!entry["zone_permission_blocked"], "An unlockable node reported an authorization denial")
+
+/// A queued request retains knowledge only if it succeeds against the live source crew.
+/datum/unit_test/voidcrew_zone_research/queue_recheck/Run()
+	var/obj/structure/overmap/ship/ship = zone_ship(run_loc_floor_bottom_left)
+	var/datum/voidcrew_crew_record/qualified = ship.get_crew_record()
+	grant_permission(qualified, 1)
+	var/datum/voidcrew_crew_record/public_crew = allocate(/datum/voidcrew_crew_record)
+	var/mob/living/carbon/human/user = make_player(run_loc_floor_bottom_left, "zoneresearchqueue")
+	var/obj/machinery/rnd/server/ship/server = allocate(/obj/machinery/rnd/server/ship)
+	var/datum/techweb/web = install_reward_disk(server, user)
+	var/datum/techweb_node/node = SSresearch.techweb_node_by_id("specialist_ammo")
+	prepare_node(web, node)
+	TEST_ASSERT(web.enqueue_node(node.id, user), "Qualified source could not queue research")
+	ship.ship_team.set_crew_record(public_crew)
+	var/before = web.research_points[TECHWEB_POINT_TYPE_GENERIC]
+	TEST_ASSERT(!web.research_node_id(web.research_queue_nodes[1], FALSE, TRUE, FALSE), "Queue execution used stale standing")
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC], before, "Denied queue execution debited points")
+	TEST_ASSERT(node.id in web.research_queue_nodes, "Denied execution discarded the accepted queue entry")
+	// Free-node processing in SSresearch must not bypass the same gate.
+	web.boost_techweb_node(node, node.research_costs.Copy())
+	TEST_ASSERT(node.is_free(web), "The free-queue fixture is not free")
+	TEST_ASSERT(!web.research_node(node), "A free queued node bypassed live standing")
+	ship.ship_team.set_crew_record(qualified)
+	TEST_ASSERT(web.research_node_id(web.research_queue_nodes[1], FALSE, TRUE, FALSE), "Restored standing did not resume queued work")
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC], before, "A free qualified node consumed points")
+
+/// Standing supplements the existing point, experiment and survey checks.
+/datum/unit_test/voidcrew_zone_research/other_requirements/Run()
+	var/obj/structure/overmap/ship/ship = zone_ship(run_loc_floor_bottom_left)
+	grant_permission(ship.get_crew_record(), 3)
+	var/mob/living/carbon/human/user = make_player(run_loc_floor_bottom_left, "zoneresearchrequirements")
+	var/obj/machinery/rnd/server/ship/server = allocate(/obj/machinery/rnd/server/ship)
+	var/datum/techweb/web = install_reward_disk(server, user)
+	var/datum/techweb_node/node = allocate(/datum/techweb_node)
+	node.id = "zone_research_requirements"
+	node.zone_permission = 1
+	node.research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 100)
+	node.required_experiments = list(/datum/experiment/physical/arcade_winner)
+	node.required_surveyed_objects = list("planets" = 1)
+	SSresearch.techweb_nodes[node.id] = node
+	web.unhide_node(node)
+	web.add_points_all(100)
+	TEST_ASSERT(!web.can_unlock_node(node), "Standing replaced experiment/survey requirements")
+	TEST_ASSERT(!web.research_node(node, FALSE, TRUE, FALSE), "Direct research ignored missing requirements")
+	var/datum/experiment/experiment = allocate(/datum/experiment/physical/arcade_winner)
+	web.completed_experiments[experiment.type] = experiment
+	TEST_ASSERT(!web.can_unlock_node(node), "A missing survey was accepted")
+	TEST_ASSERT(!web.research_node(node, FALSE, TRUE, FALSE), "Direct research ignored a missing survey")
+	web.survey_data = allocate(/datum/survey_research)
+	web.survey_data.survey_objects_by_type["planets"] = list(allocate(/datum/surveyed_celestial_object/planet))
+	web.completed_experiments.Cut()
+	TEST_ASSERT(!web.research_node(node, FALSE, TRUE, FALSE), "A surveyed node ignored its experiment")
+	web.completed_experiments[experiment.type] = experiment
+	web.remove_points_all(100)
+	TEST_ASSERT(!web.can_unlock_node(node), "Standing replaced the point requirement")
+	TEST_ASSERT(!web.research_node(node, FALSE, TRUE, FALSE), "Direct research ignored missing points")
+	web.add_points_all(100)
+	TEST_ASSERT(web.can_unlock_node(node), "All requirements met but research is still locked")
+	TEST_ASSERT(web.research_node(node, FALSE, TRUE, FALSE), "Research with every requirement met failed")
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC], 0, "Research did not charge its actual cost")
+
+/// Missing source context is Public; public science continues to work without standing.
+/datum/unit_test/voidcrew_zone_research/public_science/Run()
+	var/datum/techweb/web = allocate(/datum/techweb)
+	TEST_ASSERT_EQUAL(web.get_research_zone_permission(), 0, "An uninstalled web has standing")
+	var/list/public_types = list(/datum/techweb_node/parts_upg, /datum/techweb_node/parts_adv, /datum/techweb_node/chem_synthesis, /datum/techweb_node/medbay_equip_adv)
+	for(var/datum/techweb_node/node_type as anything in public_types)
+		var/datum/techweb_node/node = SSresearch.techweb_node_by_id(initial(node_type.id))
+		TEST_ASSERT_NOTEQUAL(node, SSresearch.error_node, "Missing public science node [node_type]")
+		prepare_node(web, node)
+		for(var/experiment_type in node.required_experiments)
+			web.completed_experiments[experiment_type] = allocate(experiment_type)
+		TEST_ASSERT(web.can_unlock_node(node), "Public science acquired a standing gate: [node.id]")
+		TEST_ASSERT(web.research_node(node, FALSE, TRUE, FALSE), "Public industrial/medical research failed: [node.id]")
+	var/datum/techweb_node/gated = SSresearch.techweb_node_by_id("specialist_ammo")
+	prepare_node(web, gated)
+	TEST_ASSERT(!web.research_node(gated, FALSE, TRUE, FALSE), "An uninstalled web bypassed the gate")
+
+/// Positive acceptance: imported nodes and individual designs can be used by a Public crew.
+/datum/unit_test/voidcrew_zone_research/imports/Run()
+	zone_ship(run_loc_floor_bottom_left)
+	var/mob/living/carbon/human/user = make_player(run_loc_floor_bottom_left, "zoneresearchimports")
+	var/obj/machinery/rnd/server/ship/server = allocate(/obj/machinery/rnd/server/ship)
+	var/datum/techweb/receiver = install_reward_disk(server, user)
+	var/datum/techweb/donor = allocate(/datum/techweb)
+	var/list/node_ids = list("specialist_ammo", "experimental_ammo", "nanite_military")
+	for(var/node_id in node_ids)
+		TEST_ASSERT(donor.research_node_id(node_id, TRUE, FALSE, FALSE), "Forced import was denied at Public standing")
+	var/before = receiver.research_points[TECHWEB_POINT_TYPE_GENERIC] || 0
+	donor.copy_research_to(receiver)
+	for(var/node_id in node_ids)
+		TEST_ASSERT(receiver.isNodeResearchedID(node_id), "Copying research lost imported knowledge: [node_id]")
+		var/datum/techweb_node/node = SSresearch.techweb_node_by_id(node_id)
+		for(var/design_id in node.design_ids)
+			TEST_ASSERT(receiver.isDesignResearchedID(design_id), "Imported node lost an acquired design: [design_id]")
+	TEST_ASSERT_EQUAL(receiver.get_research_zone_permission(), 0, "Importing knowledge granted standing")
+	TEST_ASSERT_EQUAL(receiver.research_points[TECHWEB_POINT_TYPE_GENERIC] || 0, before, "Forced imports charged points")
+	TEST_ASSERT(!length(receiver.experiment_payment_receipts), "Imports created paid-discount receipts")
+	var/datum/design/design = SSresearch.techweb_design_by_id("vc_ammo_m9mm_ap")
+	TEST_ASSERT(receiver.isDesignResearched(design), "Imported ammunition is unusable")
+	var/datum/techweb/design_receiver = allocate(/datum/techweb)
+	TEST_ASSERT(design_receiver.add_design(design, TRUE), "Public standing rejected a design copy")
+	TEST_ASSERT(design_receiver.isDesignResearched(design), "Copied design is unusable")
+	var/obj/machinery/rnd/production/protolathe/launch_fabrication_test/lathe = allocate(/obj/machinery/rnd/production/protolathe/launch_fabrication_test)
+	lathe.connect_techweb(receiver)
+	lathe.update_designs()
+	TEST_ASSERT(design in lathe.cached_designs, "Public lathe did not receive imported designs")
+	lathe.set_machine_stat(NONE)
+	lathe.materials.set_local_size(1000 * SHEET_MATERIAL_AMOUNT)
+	var/list/stock_before = list()
+	for(var/material in design.materials)
+		lathe.materials.mat_container.insert_amount_mat(10000, material)
+		stock_before[material] = lathe.materials.mat_container.materials[material]
+	lathe.print_test_design(design, 1)
+	var/obj/item/product = locate(design.build_path) in run_loc_floor_bottom_left
+	TEST_ASSERT_NOTNULL(product, "Public standing blocked fabrication of imported ammunition")
+	for(var/material in stock_before)
+		TEST_ASSERT(lathe.materials.mat_container.materials[material] < stock_before[material], "Imported ammunition did not consume its materials")
+	var/obj/machinery/computer/nanite_cloud_controller/programmer = allocate(/obj/machinery/computer/nanite_cloud_controller)
+	var/obj/item/multitool/tool = allocate(/obj/item/multitool)
+	tool.buffer = receiver
+	programmer.multitool_act(user, tool)
+	var/datum/tgui/ui = allocate(/datum/tgui, user, programmer, "NaniteCloudControl")
+	programmer.ui_act("download", list("program_id" = "pyro_nanites"), ui)
+	var/datum/design/nanites/military_design = SSresearch.techweb_design_by_id("pyro_nanites")
+	TEST_ASSERT(istype(programmer.current_program, military_design.program_type), "Public standing blocked use of imported military nanite research")
+
+/// A source disk carries knowledge, while direct research follows its new physical host.
+/datum/unit_test/voidcrew_zone_research/disk_move/Run()
+	var/obj/structure/overmap/ship/rich_ship = zone_ship(run_loc_floor_bottom_left)
+	grant_permission(rich_ship.get_crew_record(), 3)
+	zone_ship(run_loc_floor_top_right)
+	var/mob/living/carbon/human/user = make_player(run_loc_floor_bottom_left, "zoneresearchmove")
+	var/obj/machinery/rnd/server/ship/server = allocate(/obj/machinery/rnd/server/ship)
+	var/datum/techweb/web = install_reward_disk(server, user)
+	var/obj/item/computer_disk/ship_disk/disk = server.source_code_hdd
+	var/datum/techweb_node/known = SSresearch.techweb_node_by_id("specialist_ammo")
+	prepare_node(web, known)
+	TEST_ASSERT(web.research_node(known, FALSE, TRUE, FALSE), "Qualified source could not research ammunition")
+	disk.forceMove(run_loc_floor_bottom_left)
+	TEST_ASSERT_EQUAL(web.get_research_zone_permission(), 0, "Removed source disk retained standing")
+	var/obj/machinery/rnd/server/ship/replacement = allocate(/obj/machinery/rnd/server/ship, run_loc_floor_top_right)
+	replacement.attacked_by(disk, user)
+	TEST_ASSERT_EQUAL(replacement.stored_research, web, "Moving the source disk replaced its web")
+	TEST_ASSERT(web.isNodeResearched(known), "Moving the source disk erased acquired knowledge")
+	TEST_ASSERT_EQUAL(web.get_research_zone_permission(), 0, "Source disk stored its former host's permission")
+	var/datum/techweb_node/next_node = SSresearch.techweb_node_by_id("experimental_ammo")
+	prepare_node(web, next_node)
+	var/before = web.research_points[TECHWEB_POINT_TYPE_GENERIC]
+	TEST_ASSERT(!web.research_node(next_node, FALSE, TRUE, FALSE), "Public replacement inherited direct-research access")
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC], before, "Denied moved-disk research spent points")
+	// Moving the physical server also changes context without moving or recreating its disk.
+	replacement.forceMove(run_loc_floor_bottom_left)
+	TEST_ASSERT_EQUAL(web.get_research_zone_permission(), 3, "Server movement did not resolve the new physical site")
+	TEST_ASSERT(web.research_node(next_node, FALSE, TRUE, FALSE), "Qualified physical source could not resume direct research")
+	qdel(replacement)
+	TEST_ASSERT_EQUAL(web.get_research_zone_permission(), 0, "Destroyed physical server retained standing")
+	TEST_ASSERT(web.isNodeResearched(next_node), "Server destruction erased the surviving disk's knowledge")
+
+/// Outpost standing follows its current founder's round roster, including offline founders.
+/datum/unit_test/voidcrew_zone_research/outpost_and_relay/Run()
+	var/obj/structure/overmap/dynamic/player_outpost/home = allocate(/obj/structure/overmap/dynamic/player_outpost)
+	home.shell_template = allocate(/datum/map_template/player_outpost/test_fixture)
+	home.founder_ckey = "zoneresearchowner"
+	TEST_ASSERT(home.load_level(), "The research outpost fixture could not load")
+	var/mob/living/carbon/human/owner = make_player(home.arrival_turf, home.founder_ckey)
+	home.founder_mind = WEAKREF(owner.mind)
+	var/datum/voidcrew_crew_record/source_crew = allocate(/datum/voidcrew_crew_record)
+	owner.mind.join_reputation_crew(source_crew)
+	grant_permission(source_crew, 3)
+	var/obj/machinery/rnd/server/ship/server = allocate(/obj/machinery/rnd/server/ship, home.arrival_turf)
+	server.set_machine_stat(NONE)
+	var/datum/techweb/web = install_reward_disk(server, owner)
+	var/obj/structure/overmap/ship/visitor = zone_ship(run_loc_floor_bottom_left)
+	visitor.docked = home
+	var/mob/living/carbon/human/crew = make_player(run_loc_floor_bottom_left, "zoneresearchvisitor")
+	visitor.ship_team.add_member(crew.mind)
+	var/obj/machinery/rnd/server/relay/relay = allocate(/obj/machinery/rnd/server/relay)
+	relay.set_machine_stat(NONE)
+	var/datum/outpost_research_link/link = home.propose_research_link(owner, server, visitor, server.source_code_hdd)
+	TEST_ASSERT_NOTNULL(link, "Could not propose the research relay")
+	TEST_ASSERT(link.approve(crew, relay), "Could not approve the research relay")
+	TEST_ASSERT_EQUAL(relay.stored_research, web, "Relay did not expose the physical source web")
+	TEST_ASSERT_EQUAL(visitor.get_crew_record().get_zone_permission(), 0, "Visitor fixture is not Public")
+	TEST_ASSERT_EQUAL(relay.stored_research.get_research_zone_permission(), 3, "Relay used the visitor's standing")
+	var/datum/techweb_node/node = SSresearch.techweb_node_by_id("specialist_ammo")
+	prepare_node(web, node)
+	TEST_ASSERT(relay.stored_research.research_node(node, FALSE, TRUE, FALSE), "Public visitor could not use a qualified source's research service")
+	var/datum/voidcrew_crew_record/public_crew = allocate(/datum/voidcrew_crew_record)
+	owner.mind.join_reputation_crew(public_crew)
+	TEST_ASSERT_EQUAL(web.get_research_zone_permission(), 0, "Outpost retained the founder's former standing")
+	TEST_ASSERT(relay.stored_research.isNodeResearched(node), "Founder crew change removed shared acquired knowledge")
+	grant_permission(visitor.get_crew_record(), 3)
+	var/datum/techweb_node/next_node = SSresearch.techweb_node_by_id("experimental_ammo")
+	prepare_node(web, next_node)
+	var/before = web.research_points[TECHWEB_POINT_TYPE_GENERIC]
+	TEST_ASSERT(!relay.stored_research.research_node(next_node, FALSE, TRUE, FALSE), "A wealthy relay consumer authorized a Public physical source")
+	TEST_ASSERT_EQUAL(web.research_points[TECHWEB_POINT_TYPE_GENERIC], before, "Denied relay research debited the source")
+	owner.mind.join_reputation_crew(source_crew)
+	home.founder_mind = null
+	TEST_ASSERT_EQUAL(web.get_research_zone_permission(), 3, "Offline founder lost the round roster's standing")
+	owner.mind.leave_reputation_crew()
+	TEST_ASSERT_EQUAL(web.get_research_zone_permission(), 0, "Explicit founder departure retained standing")
+	home.founder_ckey = null
+	TEST_ASSERT_EQUAL(web.get_research_zone_permission(), 0, "Unowned outpost gained standing")
+
+/datum/unit_test/voidcrew_zone_research/green_resources/Run()
+	var/list/expected = list(
+		/datum/gas/plasma = 55,
+		/datum/gas/nitrogen = 30,
+		/datum/gas/water_vapor = 15,
+		/datum/gas/miasma = 1,
+		/datum/gas/tritium = 1,
+		/datum/gas/pluoxium = 1,
+		/datum/gas/nitrium = 1,
+		/datum/gas/hypernoblium = 1,
+	)
+	var/list/green = GLOB.nebula_gas_tables_by_band["1"]
+	TEST_ASSERT_EQUAL(length(green), length(expected), "Green nebulas do not offer all eight gases")
+	for(var/gas_type in expected)
+		TEST_ASSERT_EQUAL(green[gas_type], expected[gas_type], "Wrong green nebula weight for [gas_type]")
+		TEST_ASSERT(GLOB.nebula_gas_scoop_rates[gas_type] > 0, "A green gas cannot be harvested")
+	// Every gas present in any other band must be accessible in green.
+	for(var/band in GLOB.nebula_gas_tables_by_band)
+		var/list/weights = GLOB.nebula_gas_tables_by_band[band]
+		for(var/gas_type in weights)
+			TEST_ASSERT(green[gas_type] > 0, "A raw nebula gas remains zone-exclusive")
+	var/list/ores = ordinary_ore_weights(1)
+	var/list/expected_ores = list(
+		/obj/item/stack/ore/iron = 110,
+		/obj/item/stack/ore/plasma = 40,
+		/obj/item/stack/ore/silver = 16,
+		/obj/item/stack/ore/titanium = 16,
+		/obj/item/stack/ore/gold = 8,
+		/obj/item/stack/ore/uranium = 5,
+		/obj/item/stack/ore/diamond = 2,
+		/obj/item/stack/ore/bluespace_crystal = 2,
+		/obj/item/stack/ore/bananium = 1,
+	)
+	TEST_ASSERT_EQUAL(length(ores), length(expected_ores), "Green ore coverage changed")
+	for(var/ore_type in expected_ores)
+		TEST_ASSERT_EQUAL(ores[ore_type], expected_ores[ore_type], "Existing green ore weight changed")
diff --git a/voidcrew/modules/unit_tests/voidcrew_zone_shops.dm b/voidcrew/modules/unit_tests/voidcrew_zone_shops.dm
new file mode 100644
index 00000000000..f2c0c2defd3
--- /dev/null
+++ b/voidcrew/modules/unit_tests/voidcrew_zone_shops.dm
@@ -0,0 +1,553 @@
+#ifndef VOIDCREW_ZONE_SHOPS_TESTS
+#define VOIDCREW_ZONE_SHOPS_TESTS
+
+/// Fork permission defines compile later; Public/Yellow/Advanced/Elite are 0/1/2/3.
+/datum/unit_test/voidcrew_zone_shops
+	parent_type = /datum/unit_test/voidcrew_zone_identity
+	abstract_type = /datum/unit_test/voidcrew_zone_shops
+
+/datum/unit_test/voidcrew_zone_shops/proc/set_permission(datum/voidcrew_crew_record/record, permission)
+	record.zone_totals["1"] = permission >= 1 ? 3 : 0
+	record.zone_totals["2"] = permission >= 2 ? 6 : 0
+	record.zone_totals["3"] = permission >= 3 ? 9 : 0
+
+/datum/unit_test/voidcrew_zone_shops/proc/fund(mob/living/carbon/human/buyer, credits = 10000, vouchers = 20)
+	var/datum/bank_account/account = allocate(/datum/bank_account, "Shop test", null, 1, FALSE)
+	account.account_balance = credits
+	var/obj/structure/overmap/ship/ship = get_crew_ship(buyer)
+	TEST_ASSERT_NOTNULL(ship, "Shop funding requires a selected ship")
+	ship.ship_account = account
+	var/obj/item/card/id/advanced/card = allocate(/obj/item/card/id/advanced)
+	qdel(card.registered_account)
+	card.registered_account = account
+	buyer.put_in_hands(card)
+	allocate(/obj/item/stack/trade_voucher, buyer, vouchers)
+	return account
+
+/// Exhaustive exact-path map: everything outside this list remains Public.
+/datum/unit_test/voidcrew_zone_shops/proc/expected_tags()
+	return list(
+		/datum/shop_sku/fitter/rotating/suit_security = 1,
+		/datum/shop_sku/fitter/rotating/plating_security = 1,
+		/datum/shop_sku/outfitter/energy_gun = 1,
+		/datum/shop_sku/outfitter/riot_shotgun = 1,
+		/datum/shop_sku/black_market/rotating/mateba = 1,
+		/datum/shop_sku/black_market/c20r = 1,
+		/datum/shop_sku/black_market/wt550 = 1,
+		/datum/shop_sku/outfitter/rotating/riot_suit = 1,
+		/datum/shop_sku/outfitter/rare/ablative_vest = 1,
+		/datum/shop_sku/skunk/rotating/thermal_glasses = 1,
+		/datum/shop_sku/black_market/thermals = 1,
+		/datum/shop_sku/fitter/rare/mod_visor_thermal = 1,
+		/datum/shop_sku/fitter/rotating/mod_active_sonar = 1,
+		/datum/shop_sku/favor/pike_ledger = 1,
+		/datum/shop_sku/favor/field_contract_pad = 1,
+		/datum/shop_sku/favor/freight_beacon = 1,
+		/datum/shop_sku/favor/fitter_gauntlets = 1,
+		/datum/shop_sku/fitter/rare/suit_advanced = 2,
+		/datum/shop_sku/fitter/rare/mod_jetpack_advanced = 2,
+		/datum/shop_sku/fitter/rare/mod_jump_jet = 2,
+		/datum/shop_sku/fitter/rare/mod_emp_shield_advanced = 2,
+		/datum/shop_sku/fitter/rare/mod_projectile_dampener = 2,
+		/datum/shop_sku/black_market/mod_chassis_syndicate = 2,
+		/datum/shop_sku/black_market/mod_interdyne = 2,
+		/datum/shop_sku/black_market/mod_energy_shield = 2,
+		/datum/shop_sku/black_market/shield_generator_board = 2,
+		/datum/shop_sku/black_market/interdictor_board = 2,
+		/datum/shop_sku/black_market/data_siphon_board = 2,
+		/datum/shop_sku/black_market/ew_suite_board = 2,
+		/datum/shop_sku/favor/skunkworks_cell = 2,
+		/datum/shop_sku/favor/maneuvering_harness = 2,
+		/datum/shop_sku/black_market/mod_chassis_elite = 3,
+		/datum/shop_sku/black_market/mod_infiltrator = 3,
+		/datum/shop_sku/black_market/mod_traitor = 3,
+		/datum/shop_sku/black_market/mod_storage = 3,
+		/datum/shop_sku/black_market/mod_plate_compression = 3,
+		/datum/shop_sku/black_market/mod_wraith_cloak = 3,
+		/datum/shop_sku/black_market/rotating/mod_flamethrower = 3,
+		/datum/shop_sku/black_market/rotating/mod_chameleon = 3,
+		/datum/shop_sku/black_market/rare/mod_adrenaline = 3,
+		/datum/shop_sku/black_market/rare/energy_sword = 3,
+		/datum/shop_sku/favor/vex_insurance = 3,
+		/datum/shop_sku/ripperdoc/atlas = 3,
+		/datum/shop_sku/ripperdoc/gorilla = 3,
+		/datum/shop_sku/ripperdoc/monowire = 3,
+		/datum/shop_sku/ripperdoc/ronin = 3,
+		/datum/shop_sku/ripperdoc/rigger = 3,
+		/datum/shop_sku/ripperdoc/slabskin = 3,
+		/datum/shop_sku/ripperdoc/mantis = 3,
+		/datum/shop_sku/ripperdoc/bunker_buster = 3,
+		/datum/shop_sku/ripperdoc/ghostskin = 3,
+		/datum/shop_sku/ripperdoc/lazarus = 3,
+		/datum/shop_sku/ripperdoc/governor_delete = 3,
+		/datum/shop_sku/ripperdoc/redline = 3,
+		/datum/shop_sku/ripperdoc/cascade = 3,
+		/datum/shop_sku/ripperdoc/ronin_mag = 3,
+		/datum/shop_sku/ripperdoc/buster_rockets = 3,
+	)
+
+/datum/unit_test/voidcrew_zone_shops/catalog/Run()
+	var/list/expected = expected_tags()
+	TEST_ASSERT_EQUAL(length(expected), 57, "The retained permission catalog is incomplete")
+	var/datum/voidcrew_crew_record/crew = allocate(/datum/voidcrew_crew_record)
+	for(var/datum/shop_sku/sku_type as anything in subtypesof(/datum/shop_sku))
+		var/permission = expected[sku_type] || 0
+		TEST_ASSERT_EQUAL(initial(sku_type.zone_permission), permission, "[sku_type] has the wrong permission or lost its Public default")
+		if(!permission)
+			continue
+		var/datum/shop_sku/sku = allocate(sku_type)
+		TEST_ASSERT(!sku.has_zone_permission(null), "Missing context admitted [sku_type]")
+		for(var/level in 0 to 3)
+			set_permission(crew, level)
+			TEST_ASSERT_EQUAL(!!sku.has_zone_permission(crew), level >= permission, "[sku_type] admitted the wrong crew permission")
+
+	// Include undealt and weighted shelves so a random rotation cannot hide an omission.
+	for(var/shop_type in subtypesof(/datum/outpost_shop))
+		var/datum/outpost_shop/shop = allocate(shop_type)
+		var/list/occurrences = shop.sku_types + shop.rotating_pool + shop.rare_pool + shop.favor_sku_types + shop.chart_pool
+		for(var/datum/shop_rotation/rotation as anything in shop.live_rotations)
+			occurrences |= rotation.pool
+		for(var/datum/shop_sku/sku_type as anything in occurrences)
+			TEST_ASSERT_EQUAL(initial(sku_type.zone_permission), expected[sku_type] || 0, "[shop_type] changed [sku_type]'s permission")
+		for(var/datum/shop_sku/sku as anything in shop.skus)
+			TEST_ASSERT_EQUAL(sku.zone_permission, expected[sku.type] || 0, "[shop_type] lost a tag while dealing stock")
+		qdel(shop)
+
+/// Trader favor never opens stock; zone reputation never changes credit/voucher prices.
+/datum/unit_test/voidcrew_zone_shops/favor_and_prices/Run()
+	var/obj/structure/overmap/ship/ship = make_ship()
+	var/datum/voidcrew_crew_record/crew = record_for(ship)
+	var/mob/living/carbon/human/buyer = make_member()
+	ship.enlist_crewmember(buyer)
+	var/datum/bank_account/account = fund(buyer)
+	var/datum/outpost_shop/shop = allocate(/datum/outpost_shop)
+	shop.add_sku(/datum/shop_sku/favor/pike_ledger, "favor")
+	var/datum/shop_sku/sku = shop.skus[1]
+	shop.grant_favor(ship, 1000)
+	TEST_ASSERT(!sku.can_afford(buyer) && !sku.try_purchase(buyer, null), "Old favor bypassed zone permission")
+	TEST_ASSERT_EQUAL(account.account_balance, 10000, "Denied order took credits")
+	TEST_ASSERT_EQUAL(count_trade_vouchers(buyer), 20, "Denied order took vouchers")
+	TEST_ASSERT_EQUAL(shop.get_crew_purchases(ship, sku.type), 0, "Denied order claimed the crew cap")
+	crew.trader_favor.Cut()
+	set_permission(crew, 1)
+	TEST_ASSERT_NULL(sku.get_favor_denial(buyer), "Zero trader favor blocked a qualified crew")
+	TEST_ASSERT(sku.try_purchase(buyer, null), "Zone permission did not open the back room")
+	TEST_ASSERT_EQUAL(account.account_balance, 6800, "Back-room credits changed")
+	TEST_ASSERT_EQUAL(count_trade_vouchers(buyer), 18, "Back-room vouchers changed")
+
+	shop.add_sku(/datum/shop_sku/general/toolbelt, "core")
+	var/datum/shop_sku/ordinary = shop.skus[2]
+	var/list/thresholds = list(0, 2, 4, 6)
+	var/list/prices = list(500, 475, 450, 425)
+	for(var/index in 1 to 4)
+		crew.trader_favor[shop.favor_key()] = thresholds[index]
+		TEST_ASSERT_EQUAL(ordinary.get_credit_price(buyer), prices[index], "Favor discount thresholds drifted")
+	ordinary.discount_pct = 20
+	TEST_ASSERT_EQUAL(ordinary.get_credit_price(buyer), 400, "Special and favor stacked")
+	TEST_ASSERT_EQUAL(sku.price_vouchers, 2, "A discount changed vouchers")
+	account.siphon_lock_until = world.time + 100
+	TEST_ASSERT(!sku.try_purchase(buyer, null), "Frozen account purchased a back-room item")
+	TEST_ASSERT_EQUAL(count_trade_vouchers(buyer), 18, "Failed debit consumed vouchers")
+	TEST_ASSERT_EQUAL(shop.get_crew_purchases(ship, sku.type), 1, "Failed debit consumed a cap slot")
+
+/// A nested buyer reaches the counter during item creation, after the final shared cap claim.
+/datum/shop_sku/zone_shop_probe
+	item_path = /obj/item/soap
+	var/datum/callback/at_dispense
+	var/grants = 0
+	var/nested_result
+
+/datum/shop_sku/zone_shop_probe/dispense(mob/living/user, mob/living/basic/outpost_trader/vendor)
+	grants++
+	if(at_dispense)
+		nested_result = at_dispense.Invoke()
+
+/datum/shop_sku/zone_shop_probe/Destroy()
+	QDEL_NULL(at_dispense)
+	return ..()
+
+/datum/unit_test/voidcrew_zone_shops/shared_caps/Run()
+	var/obj/structure/overmap/ship/first = make_ship()
+	var/datum/voidcrew_crew_record/crew = record_for(first)
+	var/obj/structure/overmap/ship/second = make_ship(crew)
+	var/mob/living/carbon/human/one = make_member()
+	var/mob/living/carbon/human/two = make_member()
+	first.enlist_crewmember(one)
+	second.enlist_crewmember(two)
+	one.mind.select_crew_service_ship(first)
+	two.mind.select_crew_service_ship(second)
+	set_permission(crew, 1)
+	var/datum/bank_account/account_one = fund(one)
+	var/datum/bank_account/account_two = fund(two)
+	var/datum/outpost_shop/shop_one = allocate(/datum/outpost_shop)
+	var/datum/outpost_shop/shop_two = allocate(/datum/outpost_shop)
+	shop_one.add_sku(/datum/shop_sku/zone_shop_probe, "favor")
+	shop_two.add_sku(/datum/shop_sku/zone_shop_probe, "favor")
+	var/datum/shop_sku/zone_shop_probe/sku_one = shop_one.skus[1]
+	var/datum/shop_sku/zone_shop_probe/sku_two = shop_two.skus[1]
+	for(var/datum/shop_sku/sku as anything in list(sku_one, sku_two))
+		sku.zone_permission = 1
+		sku.crew_limit = 3
+		sku.price_credits = 1000
+	crew.claim_purchase(sku_one.type, 3)
+	crew.claim_purchase(sku_one.type, 3)
+	sku_one.at_dispense = CALLBACK(sku_two, TYPE_PROC_REF(/datum/shop_sku, try_purchase), two, null)
+	TEST_ASSERT(sku_one.try_purchase(one, null), "Final shared cap slot was refused")
+	TEST_ASSERT(!sku_one.nested_result, "Concurrent hull bought past the shared cap")
+	TEST_ASSERT_EQUAL(sku_one.grants, 1, "Last permitted unit was not dispensed")
+	TEST_ASSERT_EQUAL(sku_two.grants, 0, "Capped buyer received goods")
+	TEST_ASSERT_EQUAL(account_one.account_balance, 9000, "Permitted buyer paid the wrong account")
+	TEST_ASSERT_EQUAL(account_two.account_balance, 10000, "Denied buyer was charged")
+	TEST_ASSERT_EQUAL(shop_one.get_crew_purchases(first, sku_one.type), 3, "Shared cap changed during the nested sale")
+	TEST_ASSERT_EQUAL(sku_one.stock, 3, "Back-room orders depleted shared shelf stock")
+
+/// Barter has the same permission/cap checks before consuming the offered stack.
+/datum/unit_test/voidcrew_zone_shops/barter/Run()
+	var/obj/structure/overmap/ship/ship = make_ship()
+	var/datum/voidcrew_crew_record/crew = record_for(ship)
+	var/mob/living/carbon/human/buyer = make_member()
+	ship.enlist_crewmember(buyer)
+	var/datum/outpost_shop/shop = allocate(/datum/outpost_shop)
+	shop.add_sku(/datum/shop_sku/barter/plasma_for_medkit, "core")
+	var/datum/shop_sku/barter/sku = shop.skus[1]
+	sku.zone_permission = 1
+	sku.crew_limit = 1
+	sku.barter_path = /obj/item/stack/sheet/iron
+	sku.barter_amount = 2
+	sku.item_path = /obj/item/soap
+	var/obj/item/stack/sheet/iron/offered = allocate(/obj/item/stack/sheet/iron, buyer, 5)
+	buyer.put_in_hands(offered)
+	shop.grant_favor(ship, 1000)
+	var/stock = sku.stock
+	TEST_ASSERT(!sku.can_afford(buyer) && !sku.try_purchase(buyer, null), "Barter bypassed permission")
+	TEST_ASSERT_EQUAL(offered.amount, 5, "Denied barter consumed its stack")
+	TEST_ASSERT_EQUAL(sku.stock, stock, "Denied barter consumed stock")
+	set_permission(crew, 1)
+	TEST_ASSERT(sku.try_purchase(buyer, null), "Qualified barter failed")
+	TEST_ASSERT_EQUAL(offered.amount, 3, "Barter consumed the wrong quantity")
+	TEST_ASSERT(!sku.try_purchase(buyer, null), "A core-shelf barter bypassed the crew cap")
+	TEST_ASSERT_EQUAL(offered.amount, 3, "Capped barter consumed its stack")
+
+/// The case itself carries the gate, so buying a pair cannot buy ungated implants.
+/datum/unit_test/voidcrew_zone_shops/cases/Run()
+	var/obj/structure/overmap/ship/ship = make_ship()
+	var/datum/voidcrew_crew_record/crew = record_for(ship)
+	var/mob/living/carbon/human/buyer = make_member()
+	ship.enlist_crewmember(buyer)
+	fund(buyer)
+	var/datum/outpost_shop/shop = allocate(/datum/outpost_shop)
+	for(var/sku_type in list(/datum/shop_sku/ripperdoc/gorilla, /datum/shop_sku/ripperdoc/mantis))
+		shop.add_sku(sku_type, "core")
+		var/datum/shop_sku/sku = shop.skus[length(shop.skus)]
+		set_permission(crew, 2)
+		var/before = count_trade_vouchers(buyer)
+		TEST_ASSERT(!sku.try_purchase(buyer, null), "Advanced crew bought military chrome through a case")
+		TEST_ASSERT_EQUAL(count_trade_vouchers(buyer), before, "Denied case consumed vouchers")
+		set_permission(crew, 3)
+		TEST_ASSERT(sku.try_purchase(buyer, null), "Elite crew could not buy its military case")
+		var/turf/buyer_turf = get_turf(buyer)
+		var/obj/item/cyberware_pair_case/case = locate(sku.item_path) in (buyer.contents + buyer_turf.contents)
+		TEST_ASSERT_NOTNULL(case, "The military pair case was not dispensed")
+		allocated += case
+		TEST_ASSERT_EQUAL(length(case.contents), 2, "A military case changed its pair of implants")
+		for(var/ware_type in case.ware_types)
+			TEST_ASSERT(locate(ware_type) in case, "A military case lost an implant")
+
+/// Re-querying after a crew switch, withdrawal, retirement or embargo refuses stale orders.
+/datum/unit_test/voidcrew_zone_shops/stale_context/Run()
+	var/obj/structure/overmap/ship/ship = make_ship()
+	var/datum/voidcrew_crew_record/crew = record_for(ship)
+	set_permission(crew, 3)
+	var/mob/living/carbon/human/buyer = make_member()
+	ship.enlist_crewmember(buyer)
+	var/datum/bank_account/account = fund(buyer)
+	var/datum/outpost_shop/shop = allocate(/datum/outpost_shop)
+	shop.add_sku(/datum/shop_sku/favor/pike_ledger, "favor")
+	var/datum/shop_sku/sku = shop.skus[1]
+	TEST_ASSERT_NULL(sku.get_denial_reason(buyer), "Eligible buyer was denied")
+	var/obj/structure/overmap/ship/other = make_ship()
+	other.enlist_crewmember(buyer)
+	TEST_ASSERT(!sku.try_purchase(buyer, null), "Stale UI bought using its former crew")
+	TEST_ASSERT_NOTNULL(sku.get_favor_denial(buyer, ship), "Explicit stale hull bypassed membership")
+	TEST_ASSERT_EQUAL(account.account_balance, 10000, "Stale order charged its buyer")
+	TEST_ASSERT_EQUAL(shop.get_crew_purchases(ship, sku.type), 0, "Stale order charged its old crew cap")
+	ship.enlist_crewmember(buyer)
+	ship.retired_by_checkpoint = TRUE
+	TEST_ASSERT(!sku.try_purchase(buyer, null), "Retired hull retained service access")
+	ship.retired_by_checkpoint = FALSE
+	var/obj/structure/overmap/trader_outpost/outpost = allocate(/obj/structure/overmap/trader_outpost)
+	shop.outpost = outpost
+	outpost.embargo_ship(ship)
+	TEST_ASSERT(!sku.try_purchase(buyer, null), "Direct purchase bypassed an embargo")
+	outpost.embargoed_ships.Cut()
+	shop.skus -= sku
+	TEST_ASSERT(!sku.try_purchase(buyer, null), "Removed stock remained purchasable")
+	qdel(sku)
+	TEST_ASSERT(!sku.try_purchase(buyer, null), "Deleted stock remained purchasable")
+
+/// UI payloads never publish favor totals or admission numbers, and a stall with no outpost names no standing.
+/datum/unit_test/voidcrew_zone_shops/presentation/Run()
+	var/mob/living/carbon/human/buyer = make_member()
+	var/obj/structure/overmap/ship/first = make_ship()
+	first.enlist_crewmember(buyer)
+	var/datum/voidcrew_crew_record/crew = record_for(first)
+	var/obj/structure/overmap/ship/second = make_ship(crew)
+	var/datum/outpost_shop/shop = allocate(/datum/outpost_shop/general)
+	var/mob/living/basic/outpost_trader/npc = allocate(/mob/living/basic/outpost_trader, run_loc_floor_bottom_left)
+	npc.shop = shop
+	var/datum/outpost_trader_ui/shop/facet = npc.shop_ui
+	var/list/data = facet.ui_data(buyer)
+	TEST_ASSERT_NULL(data["favor"], "Storefront named a standing with no outpost or chosen ship")
+	TEST_ASSERT_EQUAL(length(data["crew_ships"]), 2, "Ship selector did not enumerate the continuing crew's hulls")
+	TEST_ASSERT_NULL(data["crew_ship_ref"], "Ambiguous fleet silently chose an account")
+	TEST_ASSERT(facet.select_service_ship(buyer, REF(second)), "Counter refused an explicit own-crew hull")
+	TEST_ASSERT_EQUAL(get_crew_ship(buyer), second, "Counter did not preserve the selection")
+	var/obj/structure/overmap/ship/foreign = make_ship()
+	TEST_ASSERT(!facet.select_service_ship(buyer, REF(foreign)), "Ship selector admitted another crew's account")
+	var/list/catalog_data = facet.ui_static_data(buyer)
+	for(var/list/row as anything in catalog_data["catalog"])
+		TEST_ASSERT(!("favor_required" in row), "Catalog exposed an internal admission number")
+	TEST_ASSERT_NULL(shop.get_back_room_line(buyer), "Public crew received back-room clearance")
+	set_permission(crew, 1)
+	TEST_ASSERT_EQUAL(shop.get_back_room_line(buyer), "I'll put a word in at the depot.", "Barnaby's clearance line changed")
+	var/list/contracts = npc.contracts_ui.ui_data(buyer)
+	TEST_ASSERT_NULL(contracts["favor"], "Contract counter named a standing with no outpost")
+	var/datum/shop_sku/sku = shop.skus[1]
+	TEST_ASSERT(sku.can_trade(buyer, npc), "The live counter rejected its own stock")
+	npc.forceMove(run_loc_floor_top_right)
+	TEST_ASSERT(!sku.can_trade(buyer, npc), "Moving the counter left a stale live context")
+	TEST_ASSERT(!sku.try_purchase(buyer, npc), "A stale action purchased beyond counter range")
+
+/// Both outpost windows name the selected crew's standing and nothing behind it; the catalog names today's special.
+/datum/unit_test/voidcrew_zone_shops/reputation/Run()
+	var/mob/living/carbon/human/buyer = make_member()
+	var/obj/structure/overmap/ship/ship = make_ship()
+	ship.enlist_crewmember(buyer)
+	var/obj/structure/overmap/trader_outpost/outpost = allocate(/obj/structure/overmap/trader_outpost)
+	var/datum/outpost_shop/shop = outpost.shop
+	TEST_ASSERT_NOTNULL(shop, "Outpost fixture has no main shop")
+	TEST_ASSERT(length(shop.skus), "Outpost fixture has no stock")
+	var/mob/living/basic/outpost_trader/npc = allocate(/mob/living/basic/outpost_trader, run_loc_floor_bottom_left)
+	npc.shop = shop
+	npc.outpost = outpost
+	var/datum/outpost_trader_ui/shop/facet = npc.shop_ui
+
+	var/list/data = facet.ui_data(buyer)
+	var/list/favor = data["favor"]
+	TEST_ASSERT_NOTNULL(favor, "Storefront hid the selected crew's standing")
+	TEST_ASSERT_EQUAL(favor["tier_name"], "Stranger", "A crew with no standing was not a stranger")
+
+	// Regular is 2 points (fork defines compile after the tests)
+	shop.grant_favor(ship, 2)
+	data = facet.ui_data(buyer)
+	favor = data["favor"]
+	TEST_ASSERT_EQUAL(favor["tier"], 1, "Storefront sent the wrong tier")
+	TEST_ASSERT_EQUAL(favor["tier_name"], "Regular", "Storefront did not name the crew's standing")
+	TEST_ASSERT_EQUAL(length(favor), 2, "Storefront sent more than the tier and its name")
+	var/list/contracts = npc.contracts_ui.ui_data(buyer)
+	var/list/board_favor = contracts["favor"]
+	TEST_ASSERT_NOTNULL(board_favor, "Contract board hid the selected crew's standing")
+	TEST_ASSERT_EQUAL(board_favor["tier_name"], "Regular", "Contract board named a different standing")
+	TEST_ASSERT_EQUAL(length(board_favor), 2, "Contract board sent more than the tier and its name")
+
+	var/mob/living/carbon/human/drifter = make_member()
+	TEST_ASSERT_NULL(get_crew_ship(drifter), "The drifter unexpectedly has a crew ship")
+	data = facet.ui_data(drifter)
+	TEST_ASSERT_NULL(data["favor"], "Storefront named a standing for someone with no crew ship")
+
+	var/datum/shop_sku/special = shop.skus[1]
+	special.discount_pct = 20
+	var/list/catalog_data = facet.ui_static_data(buyer)
+	var/list/special_row
+	for(var/list/row as anything in catalog_data["catalog"])
+		if(row["ref"] == REF(special))
+			special_row = row
+	TEST_ASSERT_NOTNULL(special_row, "Catalog lost a stocked item")
+	TEST_ASSERT_EQUAL(special_row["discount_pct"], 20, "Catalog did not carry today's special")
+
+/// An ID for one hull cannot redirect the selected hull's balance or payment.
+/datum/unit_test/voidcrew_zone_shops/selected_account/Run()
+	var/mob/living/carbon/human/buyer = make_member()
+	var/obj/structure/overmap/ship/first = make_ship()
+	first.enlist_crewmember(buyer)
+	var/datum/bank_account/first_account = fund(buyer, 0)
+	var/datum/voidcrew_crew_record/crew = record_for(first)
+	set_permission(crew, 1)
+	var/obj/structure/overmap/ship/second = make_ship(crew)
+	var/datum/bank_account/second_account = allocate(/datum/bank_account, "Selected ship", null, 1, FALSE)
+	second_account.account_balance = 10000
+	second.ship_account = second_account
+	var/datum/outpost_shop/shop = allocate(/datum/outpost_shop)
+	shop.add_sku(/datum/shop_sku/favor/pike_ledger, "favor")
+	var/datum/shop_sku/sku = shop.skus[1]
+	var/mob/living/basic/outpost_trader/npc = allocate(/mob/living/basic/outpost_trader, run_loc_floor_bottom_left)
+	npc.shop = shop
+	var/datum/outpost_trader_ui/shop/facet = npc.shop_ui
+	var/list/data = facet.ui_data(buyer)
+	TEST_ASSERT_NULL(data["account_credits"], "Ambiguous fleet displayed the ID's account")
+	TEST_ASSERT_EQUAL(data["sell_account_credits"], 0, "Unselected sale did not display the ID's balance")
+	TEST_ASSERT_NULL(sku.get_account(buyer), "Ambiguous fleet fell back to the ID's account")
+	var/obj/structure/overmap/trader_outpost/outpost = allocate(/obj/structure/overmap/trader_outpost)
+	// Bounds only: no turfs are claimed or released by this reservation fixture.
+	outpost.reservation = allocate(/datum/turf_reservation)
+	outpost.reservation.bottom_left_turfs = list(run_loc_floor_bottom_left)
+	outpost.reservation.width = 1
+	outpost.reservation.height = 1
+	first.docked = outpost
+	TEST_ASSERT_EQUAL(get_crew_ship(buyer), first, "Fixture did not exercise the sole-berthed-hull fallback")
+	TEST_ASSERT(facet.select_service_ship(buyer, REF(second)), "Could not select the second ship")
+	TEST_ASSERT_EQUAL(get_crew_ship(buyer), second, "The sole berthed hull overrode an explicit account selection")
+	TEST_ASSERT_EQUAL(buyer.get_idcard(TRUE).registered_account, first_account, "Selecting a ship rewrote the carried ID")
+	data = facet.ui_data(buyer)
+	TEST_ASSERT_EQUAL(data["account_credits"], 10000, "Storefront did not display the selected ship's balance")
+	TEST_ASSERT(sku.can_afford(buyer), "An empty ID account blocked the funded selected ship")
+	TEST_ASSERT_NULL(sku.get_denial_reason(buyer), "The selected ship's funds were denied")
+	var/list/stock_state = data["stock_states"][1]
+	TEST_ASSERT(stock_state["can_buy"], "Storefront refused the funded selected ship")
+	TEST_ASSERT(sku.try_purchase(buyer, npc), "The selected ship could not pay")
+	TEST_ASSERT_EQUAL(first_account.account_balance, 0, "Purchase charged the ID's ship")
+	TEST_ASSERT_EQUAL(second_account.account_balance, 6800, "Purchase did not charge the selected ship")
+	data = facet.ui_data(buyer)
+	TEST_ASSERT_EQUAL(data["account_credits"], 6800, "Storefront did not refresh the selected ship's balance")
+	TEST_ASSERT_EQUAL(shop.get_crew_purchases(second, sku.type), 1, "Purchase did not use the selected ship's crew cap")
+	var/datum/shop_buyback/buyback = allocate(/datum/shop_buyback)
+	buyback.item_path = /obj/item/sea_crystal
+	buyback.pay_credits = 300
+	allocate(/obj/item/sea_crystal, buyer)
+	TEST_ASSERT_NULL(buyback.get_denial_reason(buyer), "An empty ID account blocked a sale to the selected ship")
+	TEST_ASSERT(buyback.try_sell(buyer, null), "The selected ship could not receive a sale")
+	TEST_ASSERT_EQUAL(first_account.account_balance, 0, "Sale paid the ID's ship")
+	TEST_ASSERT_EQUAL(second_account.account_balance, 7100, "Sale did not pay the selected ship")
+	data = facet.ui_data(buyer)
+	TEST_ASSERT_EQUAL(data["sell_account_credits"], 7100, "Sell balance did not reflect the account paid")
+
+	first_account.account_balance = 10000
+	second_account.account_balance = 0
+	TEST_ASSERT(!sku.can_afford(buyer), "The ID's funds bypassed the selected ship's empty account")
+	TEST_ASSERT_NOTNULL(sku.get_denial_reason(buyer), "Empty selected account had no denial")
+	TEST_ASSERT(!sku.try_purchase(buyer, npc), "Purchase fell back to the funded ID account")
+	TEST_ASSERT_EQUAL(first_account.account_balance, 10000, "Refused purchase charged the ID's ship")
+	TEST_ASSERT_EQUAL(count_trade_vouchers(buyer), 18, "Refused purchase consumed vouchers")
+	TEST_ASSERT_EQUAL(shop.get_crew_purchases(second, sku.type), 1, "Refused purchase consumed a cap slot")
+	data = facet.ui_data(buyer)
+	TEST_ASSERT_EQUAL(data["account_credits"], 0, "Storefront hid an empty selected account")
+	stock_state = data["stock_states"][1]
+	TEST_ASSERT(!stock_state["can_buy"], "Storefront offered an unaffordable purchase")
+	second.ship_account = null
+	allocate(/obj/item/sea_crystal, buyer)
+	TEST_ASSERT_NULL(buyback.get_denial_reason(buyer), "A missing ship account blocked the ID fallback")
+	TEST_ASSERT(buyback.try_sell(buyer, null), "A missing ship account did not fall back to the ID")
+	TEST_ASSERT_EQUAL(first_account.account_balance, 10300, "The ID fallback did not receive the sale")
+	TEST_ASSERT_EQUAL(second_account.account_balance, 0, "The sale paid the detached ship account")
+	TEST_ASSERT_EQUAL(buyback.count_carried_units(buyer), 0, "The ID fallback did not consume the goods")
+	data = facet.ui_data(buyer)
+	TEST_ASSERT_NULL(data["account_credits"], "Purchases displayed the fallback ID account")
+	TEST_ASSERT_EQUAL(data["sell_account_credits"], 10300, "Sell balance did not refresh the ID fallback")
+	TEST_ASSERT_NULL(sku.get_account(buyer), "Missing selected account fell back to the ID")
+	TEST_ASSERT(!sku.try_purchase(buyer, npc), "Missing selected account charged the ID")
+	var/obj/structure/overmap/ship/foreign = make_ship()
+	foreign.ship_account = first_account
+	TEST_ASSERT_NULL(sku.get_account(buyer, foreign), "Explicit foreign ship supplied a payment account")
+	foreign.ship_account = null
+	second.ship_account = second_account
+
+/// A seller without a crew ship can sell into the account on their ID.
+/datum/unit_test/voidcrew_zone_shops/crewless_sale/Run()
+	var/mob/living/carbon/human/seller = make_member()
+	TEST_ASSERT_NULL(get_crew_ship(seller), "The seller unexpectedly has a crew ship")
+	var/datum/bank_account/account = allocate(/datum/bank_account, "Crewless seller", null, 1, FALSE)
+	account.account_balance = 200
+	var/obj/item/card/id/advanced/card = allocate(/obj/item/card/id/advanced)
+	qdel(card.registered_account)
+	card.registered_account = account
+	TEST_ASSERT(seller.put_in_hands(card), "The seller could not carry their ID")
+	var/datum/outpost_shop/shop = allocate(/datum/outpost_shop)
+	var/datum/shop_buyback/buyback = allocate(/datum/shop_buyback)
+	buyback.item_path = /obj/item/sea_crystal
+	buyback.name = "sea crystal"
+	buyback.pay_credits = 300
+	buyback.demand = 3
+	shop.buybacks += buyback
+	var/mob/living/basic/outpost_trader/npc = allocate(/mob/living/basic/outpost_trader, run_loc_floor_bottom_left)
+	npc.shop = shop
+	var/datum/outpost_trader_ui/shop/facet = npc.shop_ui
+	allocate(/obj/item/sea_crystal, seller)
+	var/list/data = facet.ui_data(seller)
+	TEST_ASSERT_NULL(data["account_credits"], "Crewless purchases displayed the ID account")
+	TEST_ASSERT_EQUAL(data["sell_account_credits"], 200, "Crewless sale did not display the ID balance")
+	var/list/ledger_state = data["ledger_states"][1]
+	TEST_ASSERT(ledger_state["can_sell"], "The Sell tab denied the crewless ID account")
+	TEST_ASSERT_NULL(buyback.get_denial_reason(seller), "The crewless ID account was denied")
+	TEST_ASSERT(buyback.try_sell(seller, npc), "The crewless seller could not sell for credits")
+	TEST_ASSERT_EQUAL(account.account_balance, 500, "The crewless seller's ID account was not paid")
+	TEST_ASSERT_EQUAL(buyback.count_carried_units(seller), 0, "The sale did not consume the goods")
+	TEST_ASSERT_EQUAL(buyback.demand, 2, "The sale did not consume one demand")
+	data = facet.ui_data(seller)
+	TEST_ASSERT_EQUAL(data["sell_account_credits"], 500, "Sell balance did not refresh the paid ID account")
+	allocate(/obj/item/sea_crystal, seller)
+	TEST_ASSERT_EQUAL(buyback.try_sell_bulk(seller, npc), 1, "Crewless bulk sale could not use the ID account")
+	TEST_ASSERT_EQUAL(account.account_balance, 800, "Bulk sale did not pay the ID account")
+	card.registered_account = null
+	allocate(/obj/item/sea_crystal, seller)
+	TEST_ASSERT_EQUAL(buyback.get_denial_reason(seller), "No bank account on your ID.", "Missing accounts had the wrong refusal")
+	TEST_ASSERT(!buyback.try_sell(seller, npc), "A seller without either account could sell for credits")
+	TEST_ASSERT_EQUAL(buyback.count_carried_units(seller), 1, "An accountless sale consumed the goods")
+	TEST_ASSERT_EQUAL(buyback.demand, 1, "An accountless sale consumed demand")
+	TEST_ASSERT_EQUAL(account.account_balance, 800, "An accountless sale paid the former ID account")
+	data = facet.ui_data(seller)
+	TEST_ASSERT_NULL(data["sell_account_credits"], "Sell balance retained a removed ID account")
+	ledger_state = data["ledger_states"][1]
+	TEST_ASSERT(!ledger_state["can_sell"], "The Sell tab offered a sale without either account")
+
+/// A quote retains the tagged SKU, including through its stock reservation.
+/// Z2 uses this same permission predicate for the viewer's effective package.
+/datum/unit_test/voidcrew_zone_shops/packages/Run()
+	var/datum/outpost_shop/shop = allocate(/datum/outpost_shop)
+	shop.add_sku(/datum/shop_sku/fitter/rotating/suit_security, "core")
+	var/datum/shop_sku/sku = shop.skus[1]
+	// A cheap fixture makes the package deterministic, independent of random quote value.
+	sku.price_credits = 300
+	sku.price_vouchers = 0
+	var/datum/mission/mission = allocate(/datum/mission)
+	mission.difficulty = 3
+	TEST_ASSERT(shop.roll_contract_reward(mission), "Could not build the package fixture")
+	TEST_ASSERT_EQUAL(mission.contract_stock[sku.item_path], sku, "Package lost the tagged shelf occurrence")
+	var/quoted_value = mission.contract_quote
+	var/datum/voidcrew_crew_record/crew = allocate(/datum/voidcrew_crew_record)
+	TEST_ASSERT(!sku.has_zone_permission(crew), "A package SKU lost its permission")
+	set_permission(crew, 1)
+	TEST_ASSERT(sku.has_zone_permission(crew), "Qualified package was denied")
+	mission.reserve_contract_stock()
+	TEST_ASSERT_EQUAL(sku.reserved_stock, 1, "Package did not reserve its tagged SKU")
+	TEST_ASSERT_EQUAL(sku.zone_permission, 1, "Reservation discarded the SKU permission")
+	TEST_ASSERT_EQUAL(mission.contract_quote, quoted_value, "Reservation rerolled the quote")
+	mission.release_contract_stock()
+	TEST_ASSERT_EQUAL(sku.reserved_stock, 0, "Package release leaked a stock hold")
+
+/datum/bank_account/zone_shop_refuse/adjust_money(amount, reason)
+	if(amount < 0)
+		return FALSE
+	return ..()
+
+/// Failure at the actual debit must release a previously claimed cap slot.
+/datum/unit_test/voidcrew_zone_shops/failed_payment/Run()
+	var/obj/structure/overmap/ship/ship = make_ship()
+	var/datum/voidcrew_crew_record/crew = record_for(ship)
+	set_permission(crew, 1)
+	var/mob/living/carbon/human/buyer = make_member()
+	ship.enlist_crewmember(buyer)
+	fund(buyer)
+	var/datum/bank_account/refusing = allocate(/datum/bank_account/zone_shop_refuse, "Refusing bank", null, 1, FALSE)
+	refusing.account_balance = 10000
+	var/obj/item/card/id/card = buyer.get_idcard(TRUE)
+	card.registered_account = refusing
+	ship.ship_account = refusing
+	var/datum/outpost_shop/shop = allocate(/datum/outpost_shop)
+	shop.add_sku(/datum/shop_sku/favor/pike_ledger, "favor")
+	var/datum/shop_sku/sku = shop.skus[1]
+	TEST_ASSERT(!sku.try_purchase(buyer, null), "Refused debit granted stock")
+	TEST_ASSERT_EQUAL(count_trade_vouchers(buyer), 20, "Refused debit consumed vouchers")
+	TEST_ASSERT_EQUAL(refusing.account_balance, 10000, "Refused debit changed credits")
+	TEST_ASSERT_EQUAL(shop.get_crew_purchases(ship, sku.type), 0, "Refused debit retained a shared cap claim")
+
+#endif
diff --git a/voidcrew/modules/vending/security.dm b/voidcrew/modules/vending/security.dm
index 122df04adbc..5a8ff8df930 100644
--- a/voidcrew/modules/vending/security.dm
+++ b/voidcrew/modules/vending/security.dm
@@ -1,7 +1,7 @@
 /obj/machinery/vending/security/marine
 	name = "\improper marine vendor"
 	desc = "A marine equipment vendor."
-	product_ads = "Please insert your marine voucher in the bottom slot."
+	product_ads = "Marine surplus."
 	icon = 'voidcrew/icons/obj/vending2.dmi'
 	icon_state = "syndicate-marine"
 	icon_deny = "syndicate-marine-deny"
@@ -20,7 +20,6 @@
 		/obj/item/ammo_box/magazine/m12g = 3,
 		/obj/item/grenade/c4 = 1,
 		/obj/item/grenade/frag = 1,
-		/obj/item/melee/energy/sword/saber/red = 1,
 		)
 	contraband = list()
 	premium = list()
@@ -50,13 +49,9 @@
 		/obj/item/grenade/frag = 5,
 		/obj/item/grenade/flashbang = 5,
 		/obj/item/grenade/barrier = 10,
-		/obj/item/melee/energy/sword/saber/blue = 1,
 		)
 	voucher_items = list(
 		"Tactical Energy Gun" = /obj/item/gun/energy/e_gun/stun,
-		/*
-		"SGV \"Solar\" Assault Rifle" = /obj/item/gun/ballistic/automatic/solar,
-		"TGV \"Edison\" Energy Rifle" = /obj/item/gun/energy/laser/terra,*/
 		"Inferno Pistol" = /obj/item/gun/energy/laser/thermal/inferno,
 		"Cryo Pistol" = /obj/item/gun/energy/laser/thermal/cryo
 		)
@@ -82,17 +77,17 @@
 
 /obj/item/gun_voucher
 	name = "security weapon voucher"
-	desc = "A token used to redeem guns from the SecTech vendor."
+	desc = "A stamped security requisition token."
 	icon = 'voidcrew/icons/obj/vending2.dmi'
 	icon_state = "sec-voucher"
 	w_class = WEIGHT_CLASS_TINY
 
 /obj/item/gun_voucher/solgov
 	name = "solgov weapon voucher"
-	desc = "A token used to redeem equipment from your nearest marine vendor."
+	desc = "A stamped marine requisition token."
 	icon_state = "solgov-voucher"
 
 /obj/item/gun_voucher/syndicate
 	name = "syndicate weapon voucher"
-	desc = "A token used to redeem equipment from your nearest marine vendor."
+	desc = "A stamped marine requisition token."
 	icon_state = "syndie-voucher"
diff --git a/voidcrew/modules/weapons_bench/ammunition.dm b/voidcrew/modules/weapons_bench/ammunition.dm
new file mode 100644
index 00000000000..bf038724036
--- /dev/null
+++ b/voidcrew/modules/weapons_bench/ammunition.dm
@@ -0,0 +1,140 @@
+/datum/design/ammo_m12g
+	name = "Shotgun Drum Magazine (12g buckshot)"
+	desc = "A buckshot drum for a Bulldog shotgun."
+	id = "vc_ammo_m12g"
+	build_type = PROTOLATHE | AWAY_LATHE
+	materials = list(
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 6,
+		/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT * 4,
+	)
+	build_path = /obj/item/ammo_box/magazine/m12g
+	category = list(
+		RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_SECURITY
+
+/datum/design/ammo_m12g_slug
+	name = "Shotgun Drum Magazine (12g slug)"
+	desc = "A slug drum for a Bulldog shotgun."
+	id = "vc_ammo_m12g_slug"
+	build_type = PROTOLATHE | AWAY_LATHE
+	materials = list(
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 6,
+		/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT * 4,
+	)
+	build_path = /obj/item/ammo_box/magazine/m12g/slug
+	category = list(
+		RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_SECURITY
+
+/datum/techweb_node/weapon_ammo_bulldog
+	id = TECHWEB_NODE_WEAPON_AMMO_BULLDOG
+	zone_permission = ZONE_PERMISSION_ADVANCED
+	display_name = "12g Drum Production"
+	description = "Bulk buckshot and slug drums for the Bulldog."
+	prereq_ids = list(TECHWEB_NODE_EXOTIC_AMMO)
+	design_ids = list("vc_ammo_m12g", "vc_ammo_m12g_slug")
+	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
+
+/datum/design/ammo_smgm45
+	name = "SMG Magazine (.45)"
+	desc = "A .45 box magazine for a C-20r SMG."
+	id = "vc_ammo_smgm45"
+	build_type = PROTOLATHE | AWAY_LATHE
+	materials = list(
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 4,
+		/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT * 3,
+	)
+	build_path = /obj/item/ammo_box/magazine/smgm45
+	category = list(
+		RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_SECURITY
+
+/datum/techweb_node/weapon_ammo_c20r
+	id = TECHWEB_NODE_WEAPON_AMMO_C20R
+	zone_permission = ZONE_PERMISSION_YELLOW
+	display_name = ".45 SMG Ammunition"
+	description = "Bulk .45 production for the C-20r."
+	prereq_ids = list(TECHWEB_NODE_RIOT_SUPRESSION)
+	design_ids = list("vc_ammo_smgm45")
+	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
+
+/datum/design/ammo_m7mm
+	name = "Machine Gun Magazine (7mm)"
+	desc = "A box magazine of 7mm ammunition for an L6 SAW."
+	id = "vc_ammo_m7mm"
+	build_type = PROTOLATHE | AWAY_LATHE
+	// Sustained SAW fire consumes mining resources on every reload. At full
+	// efficiency this still costs 20 iron, 4 titanium, 4 plasma and 2 plastic.
+	materials = list(
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 50,
+		/datum/material/titanium = SHEET_MATERIAL_AMOUNT * 10,
+		/datum/material/plasma = SHEET_MATERIAL_AMOUNT * 10,
+		/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 5,
+	)
+	build_path = /obj/item/ammo_box/magazine/m7mm
+	category = list(
+		RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_SECURITY
+
+// --- Techweb nodes -----------------------------------------------------------
+
+/datum/techweb_node/weapon_ammo_l6_saw
+	id = TECHWEB_NODE_WEAPON_AMMO_L6_SAW
+	zone_permission = ZONE_PERMISSION_ADVANCED
+	display_name = "7mm Machine Gun Ammunition"
+	description = "Belt-fed 7mm production for the L6 SAW."
+	prereq_ids = list(TECHWEB_NODE_EXOTIC_AMMO, TECHWEB_NODE_AUTOMATIC_AMMO)
+	design_ids = list("vc_ammo_m7mm")
+	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
+
+/datum/design/ammo_sniper_rounds
+	name = "Sniper Magazine (.50 BMG)"
+	desc = "A magazine of .50 BMG cartridges for an anti-materiel rifle."
+	id = "vc_ammo_sniper_rounds"
+	build_type = PROTOLATHE | AWAY_LATHE
+	materials = list(
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 8,
+		/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT * 4,
+	)
+	build_path = /obj/item/ammo_box/magazine/sniper_rounds
+	category = list(
+		RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_SECURITY
+
+/datum/techweb_node/weapon_ammo_sniper_rifle
+	id = TECHWEB_NODE_WEAPON_AMMO_SNIPER
+	zone_permission = ZONE_PERMISSION_ADVANCED
+	display_name = ".50 BMG Ammunition"
+	description = "Bulk .50 BMG production for the anti-materiel rifle."
+	prereq_ids = list(TECHWEB_NODE_EXOTIC_AMMO)
+	design_ids = list("vc_ammo_sniper_rounds")
+	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
+
+/datum/design/ammo_wt550
+	name = "Autorifle Magazine (4.6x30mm)"
+	desc = "A 4.6x30mm magazine for a WT-550 autorifle."
+	id = "vc_ammo_wt550"
+	build_type = PROTOLATHE | AWAY_LATHE
+	materials = list(
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 4,
+		/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT * 3,
+	)
+	build_path = /obj/item/ammo_box/magazine/wt550m9
+	category = list(
+		RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_SECURITY
+
+/datum/techweb_node/weapon_ammo_wt550
+	id = TECHWEB_NODE_WEAPON_AMMO_WT550
+	zone_permission = ZONE_PERMISSION_YELLOW
+	display_name = "4.6x30mm Ammunition"
+	description = "Bulk 4.6x30mm production for the WT-550."
+	prereq_ids = list(TECHWEB_NODE_RIOT_SUPRESSION)
+	design_ids = list("vc_ammo_wt550")
+	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
diff --git a/voidcrew/modules/weapons_bench/blueprint.dm b/voidcrew/modules/weapons_bench/blueprint.dm
deleted file mode 100644
index 717f5a20be2..00000000000
--- a/voidcrew/modules/weapons_bench/blueprint.dm
+++ /dev/null
@@ -1,174 +0,0 @@
-/**
- * Weapon schematics: blueprint-gated crafting-menu recipes
- *
- * A blueprint is a physical schematic scroll. Its recipe appears in the
- * ordinary tg crafting menu when EITHER:
- *   1. the crafter is carrying the physical blueprint anywhere on them, or
- *   2. the crafter's ckey holds a neural imprint of it for the round
- *      (bought at an outpost's neural schematic imprinter, destroying the
- *      physical copy, see voidcrew/modules/trade/blueprint_imprinter.dm).
- *
- * The availability gate lives in a //VOID EDIT inside
- * /datum/component/personal_crafting/is_recipe_available().
- *
- * The tension is deliberate: keep the physical copy and it's shareable,
- * resellable and stealable; imprint it and it's theft-proof but gone.
- *
- * Machined gun parts stay the R&D clock: each gun's part design prints at
- * the protolathe behind its techweb part node (see the per-gun files), and the
- * crafting recipes consume that part. Gun recipes also want a firing pin.
- * Crafted guns get a clean standard pin installed in place of any
- * faction-locked default (see on_craft_completion below). No bench or other
- * machinery is required; the recipe and its reqs are the whole gate, so
- * crafting can happen anywhere. Ballistic guns arrive unloaded; ammunition
- * must be manufactured or acquired separately.
- */
-
-/// ckey -> list of /datum/crafting_recipe/blueprint types imprinted this round
-GLOBAL_LIST_EMPTY(blueprint_imprints)
-
-/**
- * The blueprint-recipe availability gate, called from the VOID EDIT in
- * personal_crafting/is_recipe_available(): carrying the schematic or holding
- * its neural imprint unlocks the recipe.
- */
-/proc/is_blueprint_recipe_available(datum/crafting_recipe/blueprint/recipe, mob/user)
-	if(!istype(user))
-		return FALSE
-	if(user.ckey)
-		var/list/imprints = GLOB.blueprint_imprints[user.ckey]
-		if(imprints && (recipe.type in imprints))
-			return TRUE
-	for(var/obj/item/blueprint/print in user.get_all_contents())
-		if(print.recipe_type == recipe.type)
-			return TRUE
-	return FALSE
-
-/**
- * # Blueprint (schematic scroll)
- */
-/obj/item/blueprint
-	name = "schematic"
-	desc = "A rolled-up fabrication schematic. Carry it and its recipe shows up in your crafting menu."
-	icon = 'icons/obj/scrolls.dmi'
-	icon_state = "blueprints"
-	inhand_icon_state = "blueprints"
-	w_class = WEIGHT_CLASS_SMALL
-	/// The /datum/crafting_recipe/blueprint this schematic unlocks
-	var/recipe_type
-	/// Display name of the thing it builds
-	var/schematic_name = "something"
-	/// BLUEPRINT_TIER_*: drives the imprinter fee and the scroll's tint
-	var/tier = BLUEPRINT_TIER_YELLOW
-
-/obj/item/blueprint/Initialize(mapload)
-	. = ..()
-	switch(tier)
-		if(BLUEPRINT_TIER_GREEN)
-			add_atom_colour("#a8d8b0", FIXED_COLOUR_PRIORITY)
-		if(BLUEPRINT_TIER_YELLOW)
-			add_atom_colour("#d8cc90", FIXED_COLOUR_PRIORITY)
-		if(BLUEPRINT_TIER_RED)
-			add_atom_colour("#d89a90", FIXED_COLOUR_PRIORITY)
-
-/**
- * The live recipe instance this schematic corresponds to (from the global
- * crafting recipe list), cached per recipe type.
- */
-/obj/item/blueprint/proc/get_recipe()
-	var/static/list/recipe_cache = list()
-	if(!recipe_type)
-		return null
-	var/datum/crafting_recipe/cached = recipe_cache[recipe_type]
-	if(cached)
-		return cached
-	for(var/datum/crafting_recipe/recipe as anything in GLOB.crafting_recipes)
-		if(recipe.type == recipe_type)
-			recipe_cache[recipe_type] = recipe
-			return recipe
-	return null
-
-/obj/item/blueprint/examine(mob/user)
-	. = ..()
-	. += span_notice("Schematic: <b>[schematic_name]</b>.")
-	var/datum/crafting_recipe/recipe = get_recipe()
-	if(recipe)
-		var/list/req_names = list()
-		for(var/req_path in recipe.reqs)
-			var/atom/req_cast = req_path
-			var/req_amount = recipe.reqs[req_path]
-			req_names += "[req_amount > 1 ? "[req_amount]x " : ""][initial(req_cast.name)]"
-		if(length(req_names))
-			. += span_notice("Requires: [req_names.Join(", ")].")
-		if(ispath(recipe.result, /obj/item/gun/ballistic))
-			. += span_notice("Builds an unloaded weapon. Ammunition and detachable magazines must be acquired separately.")
-		if(length(recipe.machinery))
-			var/list/machine_names = list()
-			for(var/machine_path in recipe.machinery)
-				var/atom/machine_cast = machine_path
-				machine_names += initial(machine_cast.name)
-			. += span_notice("Needs a [machine_names.Join(" or ")] nearby.")
-	. += span_notice("While you're carrying this, the recipe is in your crafting menu. An outpost <b>neural imprinter</b> can burn it into your memory for the rest of the round, but the scroll is destroyed doing it.")
-
-/**
- * # Blueprint recipes
- *
- * Availability of the whole /blueprint subtree is gated in
- * is_recipe_available (VOID EDIT), no CRAFT_MUST_BE_LEARNED involved.
- */
-/datum/crafting_recipe/blueprint
-	time = 10 SECONDS
-	category = CAT_WEAPON_RANGED
-
-/// Gun schematics: consume the techweb-gated machined part plus a firing pin.
-/// No machinery requirement: craftable anywhere the schematic is available.
-/datum/crafting_recipe/blueprint/gun
-	tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WRENCH)
-
-/**
- * Blueprint-crafted guns swap any faction-locked default pin (syndicate
- * implant pins on the C-20r, SAW, Bulldog...) for a clean standard pin, the
- * recipe consumed one as a requirement. Without this the crafted gun would
- * refuse its own crew.
- */
-/obj/item/gun/on_craft_completion(list/components, datum/crafting_recipe/current_recipe, atom/crafter)
-	. = ..()
-	if(!istype(current_recipe, /datum/crafting_recipe/blueprint))
-		return
-	if(pin && pin.type != /obj/item/firing_pin)
-		QDEL_NULL(pin)
-	if(!pin)
-		pin = new /obj/item/firing_pin(src)
-
-/// Schematics manufacture the gun, not its default magazine or ammunition.
-/obj/item/gun/ballistic/on_craft_completion(list/components, datum/crafting_recipe/current_recipe, atom/crafter)
-	. = ..()
-	if(!istype(current_recipe, /datum/crafting_recipe/blueprint/gun))
-		return
-	QDEL_NULL(chambered)
-	if(internal_magazine && magazine)
-		// Keep integral feed mechanisms, including the empty slots in revolver
-		// cylinders. ammo_list() also resolves ammunition that is still lazy-loaded.
-		for(var/obj/item/ammo_casing/casing in magazine.ammo_list())
-			qdel(casing)
-		magazine.update_appearance()
-	else
-		QDEL_NULL(magazine)
-	if(bolt_type == BOLT_TYPE_OPEN || bolt_type == BOLT_TYPE_LOCKING)
-		bolt_locked = TRUE
-	update_appearance()
-
-/**
- * # Machined gun part
- *
- * The R&D clock made physical: prints at the protolathe once its techweb
- * part node is researched, then feeds the gun's crafting recipe.
- */
-/obj/item/gun_part
-	name = "weapon component"
-	desc = "A machined firearm component. You'll need the matching schematic to build it into a working gun."
-	icon = 'voidcrew/modules/weapons_bench/icons/gun_parts.dmi'
-	icon_state = "gun_part"
-	lefthand_file = 'voidcrew/modules/weapons_bench/icons/gun_parts_lefthand.dmi'
-	righthand_file = 'voidcrew/modules/weapons_bench/icons/gun_parts_righthand.dmi'
-	w_class = WEIGHT_CLASS_NORMAL
diff --git a/voidcrew/modules/weapons_bench/guns/bulldog.dm b/voidcrew/modules/weapons_bench/guns/bulldog.dm
deleted file mode 100644
index 5e0314658c7..00000000000
--- a/voidcrew/modules/weapons_bench/guns/bulldog.dm
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Bulldog shotgun -- red-tier blueprint gun.
- *
- * Boarding-party drum shotgun. Part node sits deep (prereq Exotic Ammunition,
- * tier 4); see guns/l6_saw.dm for the annotated pipeline walkthrough.
- */
-
-/obj/item/blueprint/gun/bulldog
-	name = "weapon schematic (Bulldog shotgun)"
-	schematic_name = "Bulldog shotgun"
-	recipe_type = /datum/crafting_recipe/blueprint/gun/bulldog
-	tier = BLUEPRINT_TIER_RED
-
-/datum/crafting_recipe/blueprint/gun/bulldog
-	name = "Bulldog Shotgun"
-	result = /obj/item/gun/ballistic/shotgun/bulldog
-	reqs = list(
-		/obj/item/gun_part/bulldog = 1,
-		/obj/item/firing_pin = 1,
-		/obj/item/stack/sheet/iron = 6,
-	)
-
-/obj/item/gun_part/bulldog
-	name = "Bulldog receiver"
-	desc = "The machined receiver and drum-feed assembly for a Bulldog shotgun. You'll need the matching schematic to build it into a working gun."
-	icon_state = "bulldog"
-
-/datum/design/gun_part_bulldog
-	name = "Bulldog Receiver"
-	desc = "A machined receiver and drum-feed assembly for a Bulldog shotgun. Not a working gun on its own."
-	id = "vc_gun_part_bulldog"
-	build_type = PROTOLATHE | AWAY_LATHE
-	materials = list(
-		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 12,
-		/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 4,
-		/datum/material/silver = SHEET_MATERIAL_AMOUNT * 1,
-	)
-	build_path = /obj/item/gun_part/bulldog
-	category = list(
-		RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_PARTS,
-	)
-	departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/design/ammo_m12g
-	name = "Shotgun Drum Magazine (12g buckshot)"
-	desc = "An 8-round buckshot drum for a Bulldog shotgun."
-	id = "vc_ammo_m12g"
-	build_type = PROTOLATHE | AWAY_LATHE
-	materials = list(
-		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 6,
-		/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT * 4,
-	)
-	build_path = /obj/item/ammo_box/magazine/m12g
-	category = list(
-		RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
-	)
-	departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/design/ammo_m12g_slug
-	name = "Shotgun Drum Magazine (12g slug)"
-	desc = "An 8-round slug drum for a Bulldog shotgun."
-	id = "vc_ammo_m12g_slug"
-	build_type = PROTOLATHE | AWAY_LATHE
-	materials = list(
-		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 6,
-		/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT * 4,
-	)
-	build_path = /obj/item/ammo_box/magazine/m12g/slug
-	category = list(
-		RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
-	)
-	departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/techweb_node/weapon_part_bulldog
-	id = TECHWEB_NODE_WEAPON_PART_BULLDOG
-	display_name = "Bulldog Schematics"
-	description = "Reverse-engineered receiver schematics for the Bulldog shotgun. Unlocks protolathe production of its receiver assembly."
-	prereq_ids = list(TECHWEB_NODE_EXOTIC_AMMO)
-	design_ids = list("vc_gun_part_bulldog")
-	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS)
-
-/datum/techweb_node/weapon_ammo_bulldog
-	id = TECHWEB_NODE_WEAPON_AMMO_BULLDOG
-	display_name = "12g Drum Production"
-	description = "Bulk 12-gauge drum production for the Bulldog. Prints buckshot and slug drums at the lathe."
-	prereq_ids = list(TECHWEB_NODE_WEAPON_PART_BULLDOG)
-	design_ids = list("vc_ammo_m12g", "vc_ammo_m12g_slug")
-	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
diff --git a/voidcrew/modules/weapons_bench/guns/c20r.dm b/voidcrew/modules/weapons_bench/guns/c20r.dm
deleted file mode 100644
index d4142e78abc..00000000000
--- a/voidcrew/modules/weapons_bench/guns/c20r.dm
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * C-20r SMG -- yellow/mid-tier blueprint gun.
- *
- * Part node sits mid-depth (prereq Riot Suppression, tier 3). Same pipeline as
- * the L6 SAW; see guns/l6_saw.dm for the annotated walkthrough.
- */
-
-/obj/item/blueprint/gun/c20r
-	name = "weapon schematic (C-20r SMG)"
-	schematic_name = "C-20r SMG"
-	recipe_type = /datum/crafting_recipe/blueprint/gun/c20r
-	tier = BLUEPRINT_TIER_YELLOW
-
-/datum/crafting_recipe/blueprint/gun/c20r
-	name = "C-20r SMG"
-	result = /obj/item/gun/ballistic/automatic/c20r
-	reqs = list(
-		/obj/item/gun_part/c20r = 1,
-		/obj/item/firing_pin = 1,
-		/obj/item/stack/sheet/iron = 5,
-	)
-
-/obj/item/gun_part/c20r
-	name = "C-20r receiver"
-	desc = "The machined receiver assembly for a C-20r submachine gun. You'll need the matching schematic to build it into a working gun."
-	icon_state = "c20r"
-
-/datum/design/gun_part_c20r
-	name = "C-20r Receiver"
-	desc = "A machined receiver assembly for a C-20r SMG. Not a working gun on its own."
-	id = "vc_gun_part_c20r"
-	build_type = PROTOLATHE | AWAY_LATHE
-	materials = list(
-		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 10,
-		/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 4,
-	)
-	build_path = /obj/item/gun_part/c20r
-	category = list(
-		RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_PARTS,
-	)
-	departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/design/ammo_smgm45
-	name = "SMG Magazine (.45)"
-	desc = "A .45 box magazine for a C-20r SMG."
-	id = "vc_ammo_smgm45"
-	build_type = PROTOLATHE | AWAY_LATHE
-	materials = list(
-		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 4,
-		/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT * 3,
-	)
-	build_path = /obj/item/ammo_box/magazine/smgm45
-	category = list(
-		RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
-	)
-	departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/techweb_node/weapon_part_c20r
-	id = TECHWEB_NODE_WEAPON_PART_C20R
-	display_name = "C-20r Schematics"
-	description = "Reverse-engineered receiver schematics for the C-20r SMG. Unlocks protolathe production of its receiver assembly."
-	prereq_ids = list(TECHWEB_NODE_RIOT_SUPRESSION)
-	design_ids = list("vc_gun_part_c20r")
-	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
-
-/datum/techweb_node/weapon_ammo_c20r
-	id = TECHWEB_NODE_WEAPON_AMMO_C20R
-	display_name = ".45 SMG Ammunition"
-	description = "Bulk .45 production for the C-20r. Prints magazines at the lathe."
-	prereq_ids = list(TECHWEB_NODE_WEAPON_PART_C20R)
-	design_ids = list("vc_ammo_smgm45")
-	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
diff --git a/voidcrew/modules/weapons_bench/guns/l6_saw.dm b/voidcrew/modules/weapons_bench/guns/l6_saw.dm
deleted file mode 100644
index 838026f9037..00000000000
--- a/voidcrew/modules/weapons_bench/guns/l6_saw.dm
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * L6 SAW -- red-tier blueprint gun (the design doc's running example).
- *
- * Pipeline, all in one place:
- *   1. Schematic (below)            -- ruin loot / black-market SKU; carrying it (or a neural imprint) puts the recipe in your crafting menu
- *   2. Part node -> part design     -- tier 4 after Exotic Ammunition; part prints at the protolathe
- *   3. Ammo node -> ammo design     -- tier 2 after Exotic and Automatic Ammunition, independent of the receiver
- *   4. Crafting menu, anywhere -- part + firing pin + plasteel => the unloaded gun
- */
-
-// --- Schematic + recipe + part -----------------------------------------------
-
-/obj/item/blueprint/gun/l6_saw
-	name = "weapon schematic (L6 SAW)"
-	schematic_name = "L6 SAW"
-	recipe_type = /datum/crafting_recipe/blueprint/gun/l6_saw
-	tier = BLUEPRINT_TIER_RED
-
-/datum/crafting_recipe/blueprint/gun/l6_saw
-	name = "L6 SAW"
-	result = /obj/item/gun/ballistic/automatic/l6_saw
-	time = 45 SECONDS
-	reqs = list(
-		/obj/item/gun_part/l6_saw = 1,
-		/obj/item/firing_pin = 1,
-		/obj/item/stack/sheet/plasteel = 20,
-	)
-
-/obj/item/gun_part/l6_saw
-	name = "L6 SAW receiver"
-	desc = "The machined receiver assembly for an L6 SAW light machine gun. You'll need the matching schematic to build it into a working gun."
-	icon_state = "l6"
-
-// --- Protolathe part design --------------------------------------------------
-
-/datum/design/gun_part_l6_saw
-	name = "L6 SAW Receiver"
-	desc = "A machined receiver assembly for an L6 SAW. Not a working gun on its own."
-	id = "vc_gun_part_l6_saw"
-	build_type = PROTOLATHE | AWAY_LATHE
-	// A crew investment comparable to combat mech body parts, even with the
-	// protolathe's 60% maximum discount. Assembly's plasteel is paid separately.
-	materials = list(
-		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 100,
-		/datum/material/titanium = SHEET_MATERIAL_AMOUNT * 30,
-		/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 20,
-		/datum/material/silver = SHEET_MATERIAL_AMOUNT * 10,
-		/datum/material/diamond = SHEET_MATERIAL_AMOUNT * 10,
-	)
-	build_path = /obj/item/gun_part/l6_saw
-	category = list(
-		RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_PARTS,
-	)
-	departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-// --- Lathe ammo design -------------------------------------------------------
-
-/datum/design/ammo_m7mm
-	name = "Machine Gun Magazine (7mm)"
-	desc = "A 50-round box magazine of 7mm ammunition for an L6 SAW."
-	id = "vc_ammo_m7mm"
-	build_type = PROTOLATHE | AWAY_LATHE
-	// Sustained SAW fire consumes mining resources on every reload. At full
-	// efficiency this still costs 20 iron, 4 titanium, 4 plasma and 2 plastic.
-	materials = list(
-		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 50,
-		/datum/material/titanium = SHEET_MATERIAL_AMOUNT * 10,
-		/datum/material/plasma = SHEET_MATERIAL_AMOUNT * 10,
-		/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 5,
-	)
-	build_path = /obj/item/ammo_box/magazine/m7mm
-	category = list(
-		RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
-	)
-	departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-// --- Techweb nodes -----------------------------------------------------------
-
-/datum/techweb_node/weapon_part_l6_saw
-	id = TECHWEB_NODE_WEAPON_PART_L6_SAW
-	display_name = "L6 SAW Schematics"
-	description = "Reverse-engineered receiver schematics for the L6 SAW. Unlocks protolathe production of its receiver assembly, the hard half of the gun."
-	prereq_ids = list(TECHWEB_NODE_EXOTIC_AMMO)
-	design_ids = list("vc_gun_part_l6_saw")
-	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS)
-
-/datum/techweb_node/weapon_ammo_l6_saw
-	id = TECHWEB_NODE_WEAPON_AMMO_L6_SAW
-	display_name = "7mm Machine Gun Ammunition"
-	description = "Belt-fed 7mm production for the L6 SAW. Prints magazines at the lathe, including for salvaged weapons without receiver research."
-	prereq_ids = list(TECHWEB_NODE_EXOTIC_AMMO, TECHWEB_NODE_AUTOMATIC_AMMO)
-	design_ids = list("vc_ammo_m7mm")
-	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
diff --git a/voidcrew/modules/weapons_bench/guns/laser_carbine.dm b/voidcrew/modules/weapons_bench/guns/laser_carbine.dm
deleted file mode 100644
index 7b3f47f0ef2..00000000000
--- a/voidcrew/modules/weapons_bench/guns/laser_carbine.dm
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Laser carbine -- yellow/mid-tier blueprint gun, the first energy schematic.
- *
- * Energy weapons skip the ammo node entirely: the cell recharges at any
- * recharger, which is the point of the carbine. Sustained cheap fire, low
- * per-shot punch. Part node sits mid-depth (prereq Riot Suppression, tier 3).
- */
-
-/obj/item/blueprint/gun/laser_carbine
-	name = "weapon schematic (laser carbine)"
-	schematic_name = "laser carbine"
-	recipe_type = /datum/crafting_recipe/blueprint/gun/laser_carbine
-	tier = BLUEPRINT_TIER_YELLOW
-
-/datum/crafting_recipe/blueprint/gun/laser_carbine
-	name = "Laser Carbine"
-	result = /obj/item/gun/energy/laser/carbine
-	reqs = list(
-		/obj/item/gun_part/laser_carbine = 1,
-		/obj/item/firing_pin = 1,
-		/obj/item/stack/sheet/glass = 5,
-	)
-
-/obj/item/gun_part/laser_carbine
-	name = "laser carbine emitter assembly"
-	desc = "The machined emitter and focusing assembly for a laser carbine. You'll need the matching schematic to build it into a working gun."
-	icon_state = "laser_carbine"
-
-/datum/design/gun_part_laser_carbine
-	name = "Laser Carbine Emitter Assembly"
-	desc = "A machined emitter and focusing assembly for a laser carbine. Not a working gun on its own."
-	id = "vc_gun_part_laser_carbine"
-	build_type = PROTOLATHE | AWAY_LATHE
-	materials = list(
-		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 8,
-		/datum/material/glass = SHEET_MATERIAL_AMOUNT * 4,
-		/datum/material/gold = SHEET_MATERIAL_AMOUNT * 1,
-	)
-	build_path = /obj/item/gun_part/laser_carbine
-	category = list(
-		RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_PARTS,
-	)
-	departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/techweb_node/weapon_part_laser_carbine
-	id = TECHWEB_NODE_WEAPON_PART_CARBINE
-	display_name = "Laser Carbine Schematics"
-	description = "Emitter schematics for a rapid-cycling laser carbine. Unlocks protolathe production of its emitter assembly. There's no ammunition to research; the cell tops up at any recharger."
-	prereq_ids = list(TECHWEB_NODE_RIOT_SUPRESSION)
-	design_ids = list("vc_gun_part_laser_carbine")
-	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
diff --git a/voidcrew/modules/weapons_bench/guns/sniper.dm b/voidcrew/modules/weapons_bench/guns/sniper.dm
deleted file mode 100644
index f36f88ff055..00000000000
--- a/voidcrew/modules/weapons_bench/guns/sniper.dm
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Anti-materiel sniper rifle -- red/deep-tier blueprint gun.
- *
- * Part node sits deep (prereq Exotic Ammunition, tier 4). Same pipeline as the
- * L6 SAW; see guns/l6_saw.dm for the annotated walkthrough.
- */
-
-/obj/item/blueprint/gun/sniper_rifle
-	name = "weapon schematic (anti-materiel rifle)"
-	schematic_name = "anti-materiel sniper rifle"
-	recipe_type = /datum/crafting_recipe/blueprint/gun/sniper_rifle
-	tier = BLUEPRINT_TIER_RED
-
-/datum/crafting_recipe/blueprint/gun/sniper_rifle
-	name = "Anti-Materiel Sniper Rifle"
-	result = /obj/item/gun/ballistic/rifle/sniper_rifle
-	reqs = list(
-		/obj/item/gun_part/sniper_rifle = 1,
-		/obj/item/firing_pin = 1,
-		/obj/item/stack/sheet/iron = 8,
-	)
-
-/obj/item/gun_part/sniper_rifle
-	name = "anti-materiel rifle receiver"
-	desc = "The machined receiver and bolt assembly for an anti-materiel sniper rifle. You'll need the matching schematic to build it into a working gun."
-	icon_state = "sniper"
-
-/datum/design/gun_part_sniper_rifle
-	name = "Anti-Materiel Rifle Receiver"
-	desc = "A machined receiver and bolt assembly for an anti-materiel sniper rifle. Not a working gun on its own."
-	id = "vc_gun_part_sniper_rifle"
-	build_type = PROTOLATHE | AWAY_LATHE
-	materials = list(
-		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 18,
-		/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 4,
-		/datum/material/silver = SHEET_MATERIAL_AMOUNT * 3,
-	)
-	build_path = /obj/item/gun_part/sniper_rifle
-	category = list(
-		RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_PARTS,
-	)
-	departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/design/ammo_sniper_rounds
-	name = "Sniper Magazine (.50 BMG)"
-	desc = "A magazine of .50 BMG cartridges for an anti-materiel rifle."
-	id = "vc_ammo_sniper_rounds"
-	build_type = PROTOLATHE | AWAY_LATHE
-	materials = list(
-		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 8,
-		/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT * 4,
-	)
-	build_path = /obj/item/ammo_box/magazine/sniper_rounds
-	category = list(
-		RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
-	)
-	departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/techweb_node/weapon_part_sniper_rifle
-	id = TECHWEB_NODE_WEAPON_PART_SNIPER
-	display_name = "Anti-Materiel Rifle Schematics"
-	description = "Reverse-engineered receiver schematics for an anti-materiel sniper rifle. Unlocks protolathe production of its receiver assembly."
-	prereq_ids = list(TECHWEB_NODE_EXOTIC_AMMO)
-	design_ids = list("vc_gun_part_sniper_rifle")
-	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS)
-
-/datum/techweb_node/weapon_ammo_sniper_rifle
-	id = TECHWEB_NODE_WEAPON_AMMO_SNIPER
-	display_name = ".50 BMG Ammunition"
-	description = "Bulk .50 BMG production for the anti-materiel rifle. Prints magazines at the lathe."
-	prereq_ids = list(TECHWEB_NODE_WEAPON_PART_SNIPER)
-	design_ids = list("vc_ammo_sniper_rounds")
-	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
diff --git a/voidcrew/modules/weapons_bench/guns/wt550.dm b/voidcrew/modules/weapons_bench/guns/wt550.dm
deleted file mode 100644
index b57884a8ff0..00000000000
--- a/voidcrew/modules/weapons_bench/guns/wt550.dm
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * WT-550 autorifle -- yellow/mid-tier blueprint gun.
- *
- * The lawful counterpart to the C-20r. Part node sits mid-depth (prereq Riot
- * Suppression, tier 3); see guns/l6_saw.dm for the annotated walkthrough.
- */
-
-/obj/item/blueprint/gun/wt550
-	name = "weapon schematic (WT-550 autorifle)"
-	schematic_name = "WT-550 autorifle"
-	recipe_type = /datum/crafting_recipe/blueprint/gun/wt550
-	tier = BLUEPRINT_TIER_YELLOW
-
-/datum/crafting_recipe/blueprint/gun/wt550
-	name = "WT-550 Autorifle"
-	result = /obj/item/gun/ballistic/automatic/wt550
-	reqs = list(
-		/obj/item/gun_part/wt550 = 1,
-		/obj/item/firing_pin = 1,
-		/obj/item/stack/sheet/iron = 5,
-	)
-
-/obj/item/gun_part/wt550
-	name = "WT-550 receiver"
-	desc = "The machined receiver assembly for a WT-550 autorifle. You'll need the matching schematic to build it into a working gun."
-	icon_state = "wt550"
-
-/datum/design/gun_part_wt550
-	name = "WT-550 Receiver"
-	desc = "A machined receiver assembly for a WT-550 autorifle. Not a working gun on its own."
-	id = "vc_gun_part_wt550"
-	build_type = PROTOLATHE | AWAY_LATHE
-	materials = list(
-		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 10,
-		/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 4,
-	)
-	build_path = /obj/item/gun_part/wt550
-	category = list(
-		RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_PARTS,
-	)
-	departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/design/ammo_wt550
-	name = "Autorifle Magazine (4.6x30mm)"
-	desc = "A 20-round 4.6x30mm magazine for a WT-550 autorifle."
-	id = "vc_ammo_wt550"
-	build_type = PROTOLATHE | AWAY_LATHE
-	materials = list(
-		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 4,
-		/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT * 3,
-	)
-	build_path = /obj/item/ammo_box/magazine/wt550m9
-	category = list(
-		RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
-	)
-	departmental_flags = DEPARTMENT_BITFLAG_SECURITY
-
-/datum/techweb_node/weapon_part_wt550
-	id = TECHWEB_NODE_WEAPON_PART_WT550
-	display_name = "WT-550 Schematics"
-	description = "Licensed receiver schematics for the WT-550 autorifle. Unlocks protolathe production of its receiver assembly."
-	prereq_ids = list(TECHWEB_NODE_RIOT_SUPRESSION)
-	design_ids = list("vc_gun_part_wt550")
-	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
-
-/datum/techweb_node/weapon_ammo_wt550
-	id = TECHWEB_NODE_WEAPON_AMMO_WT550
-	display_name = "4.6x30mm Ammunition"
-	description = "Bulk 4.6x30mm production for the WT-550. Prints magazines at the lathe."
-	prereq_ids = list(TECHWEB_NODE_WEAPON_PART_WT550)
-	design_ids = list("vc_ammo_wt550")
-	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
diff --git a/voidcrew/modules/weapons_bench/icons/gun_parts.dmi b/voidcrew/modules/weapons_bench/icons/gun_parts.dmi
deleted file mode 100644
index fb2fa2020ca..00000000000
Binary files a/voidcrew/modules/weapons_bench/icons/gun_parts.dmi and /dev/null differ
diff --git a/voidcrew/modules/weapons_bench/icons/gun_parts_lefthand.dmi b/voidcrew/modules/weapons_bench/icons/gun_parts_lefthand.dmi
deleted file mode 100644
index 48bc15b9ed8..00000000000
Binary files a/voidcrew/modules/weapons_bench/icons/gun_parts_lefthand.dmi and /dev/null differ
diff --git a/voidcrew/modules/weapons_bench/icons/gun_parts_righthand.dmi b/voidcrew/modules/weapons_bench/icons/gun_parts_righthand.dmi
deleted file mode 100644
index 9178406f2b4..00000000000
Binary files a/voidcrew/modules/weapons_bench/icons/gun_parts_righthand.dmi and /dev/null differ
diff --git a/voidcrew/objects/structures/spawner.dm b/voidcrew/objects/structures/spawner.dm
index bad86ccc5f6..603eb2311f4 100644
--- a/voidcrew/objects/structures/spawner.dm
+++ b/voidcrew/objects/structures/spawner.dm
@@ -1,6 +1,6 @@
 /obj/structure/spawner/cave
 	name = "cave"
-	desc = "You spot something glimmering from within. Maybe you can reach in and try to grab it?"
+	desc = "Something glimmers in the depths."
 	icon = 'voidcrew/icons/obj/animal_spawner.dmi'
 	icon_state = "cave_den"
 	mob_types = list(/mob/living/basic/bear/cave)
@@ -20,25 +20,14 @@
 		/obj/item/research_notes/loot/genius = 1,
 		/obj/item/stack/ore/diamond = 10,
 		/obj/item/stack/telecrystal/five = 1,
-		/obj/item/gun/ballistic/bow = 10,
-		///obj/item/gun/ballistic/shotgun/doublebarrel/improvised/sawn = 10,
-		///obj/item/gun/ballistic/automatic/zip_pistol = 10,
-		///obj/item/gun/ballistic/rifle/boltaction/polymer = 9,
-		///obj/item/gun/ballistic/shotgun/winchester = 5,
-		/obj/item/gun/ballistic/revolver/nagant = 3,
-		/obj/item/gun/ballistic/rifle/boltaction = 2,
-		///obj/item/gun/ballistic/automatic/aks74u = 1,
-		///obj/item/gun/ballistic/shotgun/doublebarrel/hook = 1,
+		"green_melee" = 38,
 		/obj/item/pickaxe/diamond = 10,
-		/obj/item/kinetic_crusher = 6,
-		/obj/item/gun/energy/recharge/kinetic_accelerator = 5,
 		/obj/item/binoculars = 10,
 		/obj/item/grenade/frag/mega = 6,
 		///obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 10,
 		///obj/item/reagent_containers/food/snacks/breadslice/moldy = 10,
 		/obj/item/instrument/guitar = 10,
 		///obj/item/storage/fancy/cigarettes/derringer/gold = 3,
-		/obj/item/spear/explosive = 10,
 		///obj/item/ammo_casing/caseless/arrow/wood = 10,
 		///obj/item/ammo_casing/caseless/arrow/bone = 6,
 		/obj/item/survivalcapsule = 7,
@@ -61,7 +50,6 @@
 		/obj/item/reagent_containers/cup/bottle/romerol = 1,
 		//obj/item/implanter/adrenalin = 3,
 		/obj/item/implanter/stealth = 1,
-		/obj/item/melee/greykingsword = 2
 	)
 
 /obj/structure/spawner/cave/Initialize()
@@ -87,6 +75,8 @@
 			if(prob(85))
 				to_chat(user, "<span class='alert'>You found something!</span>")
 				var/picked_loot = pickweight(caveloot)
+				if(picked_loot == "green_melee")
+					picked_loot = pick(/obj/item/knife/combat/survival, /obj/item/spear, /obj/item/hatchet, /obj/item/melee/baseball_bat)
 				new picked_loot(loc)
 				uses -= 1
 				if (uses == 0)
@@ -94,14 +84,14 @@
 					qdel(src)
 					return
 			else
-				to_chat(user, "<span class='warning'>You didn't find anything, maybe try looking again?</span>")
+				to_chat(user, "<span class='warning'>You didn't find anything.</span>")
 	else
 		to_chat(user, "<span class='warning'><b>Your search was interrupted!</b></span>")
 	in_use = FALSE
 
 /obj/structure/spawner/cave/beach
 	name = "oak barrel"
-	desc = "A musty barrel. Reach in and unlock its mold-covered mysteries!"
+	desc = "A musty, mold-covered barrel."
 	icon = 'icons/obj/structures.dmi'
 	icon_state = "barrel"
 	mob_types = list(/mob/living/basic/trooper/pirate/melee/beach, /mob/living/basic/trooper/pirate/ranged/beach)
@@ -130,11 +120,6 @@
 		/obj/item/slimecross/chilling/gold = 10,
 		/obj/item/slimecross/chilling/adamantine = 10,
 		/obj/item/instrument/banjo = 10,
-		/obj/item/gun/ballistic/automatic/mini_uzi = 10,
-		/obj/item/gun/ballistic/automatic/pistol/deagle/gold = 10,
-		/obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted = 10,
-		/obj/item/melee/energy/sword/pirate = 5,
-		///obj/item/melee/transforming/energy/ctf/solgov = 2,
+		"green_melee" = 35,
 
 	)
-
diff --git a/voidcrew/turfs/closed/minerals.dm b/voidcrew/turfs/closed/minerals.dm
index c9ae8a7ae0a..4b5027d0137 100644
--- a/voidcrew/turfs/closed/minerals.dm
+++ b/voidcrew/turfs/closed/minerals.dm
@@ -1,213 +1,3 @@
-/**
- * Zone ore scaling: planets in deeper overmap zone bands yield MORE ore per
- * mineral wall (same ore tables; kinds are never zone-gated, only amounts).
- *
- * Called from the one-line VOIDCREW EDIT in the base gets_drilled()
- * (code/game/turfs/closed/minerals.dm), the single payout choke point every
- * mining path funnels through (picks, drills, KA/plasma projectiles, ex_act,
- * blob). Scaling at payout instead of Initialize means spread-vein walls
- * (which keep the default mineralAmt of 3, never touched by
- * scale_ore_to_vent()) and mapper-placed ore walls inside planet ruins get
- * scaled too, and it costs nothing at planet init. Walls created after init
- * are equally covered, and on non-planet z-levels (space ruins,
- * asteroid-field reservations, outposts, transit) the band lookup returns
- * null, so behavior there is byte-identical to upstream.
- *
- * Deliberately NOT scaled:
- * * telecrystal + glacial core veins: the planetary trade goods
- *   (voidcrew/modules/trade/planetary_goods.dm); their supply is
- *   economy-tuned, so a richer red-band spigot would distort the
- *   voucher/credit ladder
- * * gibtonite and "very strong rock": their gets_drilled() overrides never
- *   call the base proc, so they never reach this hook; gibtonite's
- *   mineralAmt is detonation bookkeeping, not an ore payout
- * * gulag boulder walls: they use spawned_boulder, not mineralType, so the
- *   base proc's mineralType guard already skips them
- */
-/turf/closed/mineral/proc/zone_scaled_ore_amount(amount)
-	if(amount <= 0)
-		return amount
-	// trade-good veins keep their tuned yields (see block comment)
-	if(istype(src, /turf/closed/mineral/telecrystal) || istype(src, /turf/closed/mineral/glacial))
-		return amount
-	// Resolved live, from THIS wall's turf. SSmapping.get_planet_zone_band_for_z() alone
-	// only answers for pre-generated roundstart planets, and every planet this round is
-	// dynamic, so it always came back null; planet_zone_type_for_turf() asks the overmap
-	// first and falls back to it. Turf-scoped, not z-scoped: a z-level can carry more than
-	// one planet and they can sit in different bands, so the wall has to speak for itself.
-	// Not cached per z either - dynamic planet z-levels are recycled, so a cached band
-	// would follow the z-level onto the next planet to inherit it.
-	switch(SSovermap_zones?.planet_zone_type_for_turf(src))
-		if(ZONE_YELLOW)
-			return round(amount * ZONE_PLANET_ORE_MULT_YELLOW)
-		if(ZONE_RED)
-			return round(amount * ZONE_PLANET_ORE_MULT_RED)
-	return amount
-
-/**
- * Per-z index of the ore vents that count for a wall, grouped by the loaded interior each
- * vent sits in.
- *
- * `"[z]"` -> `list("stamp" = <vent count>, "built" = <world.time>, "zones" = list(entries))`,
- * where an entry is `list(low_x, low_y, high_x, high_y, list/vent_coords)` and `vent_coords`
- * is a flat run of x, y pairs.
- *
- * Mineral walls are the hottest code on a planet - a 123x123 surface initializes tens of
- * thousands of them in one burst - so the per-wall question has to be four integer
- * comparisons, not an overmap lookup. All the expensive work (resolving which planet, ruin
- * or outpost each vent belongs to) happens once per z per rebuild, over the handful of
- * vents that exist, and every wall then reads the answer out of a rect test.
- *
- * Coordinates rather than vent references on purpose. A cached ref to a vent that has since
- * been qdeleted is a hard-delete blocker for as long as nothing re-queries that z, and a
- * torn-down planet's z is exactly the one nothing re-queries. Numbers can't hold anything
- * alive, and distance is all this is ever asked for.
- *
- * Invalidated on the vent count changing, plus a short time expiry so a z-level that was
- * recycled onto a different planet while the count happened to land back on its old value
- * can't serve a stale rectangle. Both are cheap enough to check per wall.
- */
-GLOBAL_LIST_EMPTY(ore_vent_index_by_z)
-
-/// How long a built vent index stays trusted without the vent count changing under it.
-#define ORE_VENT_INDEX_LIFESPAN (10 SECONDS)
-
-/// Builds (or reuses) the vent index for a z-level. Returns the list of zone entries.
-/proc/get_ore_vent_index_for_z(z_value)
-	if(!z_value || isnull(SSore_generation))
-		return null
-	var/list/all_vents = SSore_generation.possible_vents
-	var/stamp = length(all_vents)
-	var/list/cached = GLOB.ore_vent_index_by_z["[z_value]"]
-	if(cached && cached["stamp"] == stamp && (world.time - cached["built"]) < ORE_VENT_INDEX_LIFESPAN)
-		return cached["zones"]
-
-	var/list/zones = list()
-	for(var/obj/structure/ore_vent/vent as anything in all_vents)
-		if(vent.z != z_value)
-			continue
-		var/list/rect = SSovermap_zones?.get_interior_rect_for_turf(get_turf(vent))
-		// No resolvable interior (lavaland proper, an unregistered site): the vent belongs
-		// to the whole level, which is exactly what the old `vent.z == z` test said about
-		// every vent. Same shape, so these merge into one entry.
-		if(!rect)
-			rect = list(1, 1, world.maxx, world.maxy)
-		var/list/zone_entry
-		for(var/list/existing as anything in zones)
-			if(existing[1] == rect[1] && existing[2] == rect[2] && existing[3] == rect[3] && existing[4] == rect[4])
-				zone_entry = existing
-				break
-		if(!zone_entry)
-			zone_entry = list(rect[1], rect[2], rect[3], rect[4], list())
-			zones += list(zone_entry)
-		var/list/entry_coords = zone_entry[5]
-		entry_coords += vent.x
-		entry_coords += vent.y
-
-	GLOB.ore_vent_index_by_z["[z_value]"] = list("stamp" = stamp, "built" = world.time, "zones" = zones)
-	return zones
-
-/**
- * Coordinates of the ore vents that count for this wall - the ones inside the same loaded
- * interior - as a flat run of x, y pairs. Null when nothing local qualifies.
- *
- * A vent 130 tiles away used to be "on my z-level, so mine". On a packed level it is on the
- * planet next door, behind a cordon, and letting it speak for this wall is what flips one
- * planet's entire mineral generation onto a gradient it has no vents for.
- *
- * Entries whose rectangle is the whole level (vents nothing owns) still match everything on
- * the level, so a single-tenant z behaves exactly as it did. When both a footprint entry and
- * a whole-level entry match, the wall gets the union - a vent nobody could place is still a
- * vent that could be anywhere.
- */
-/turf/closed/mineral/proc/local_ore_vent_coords()
-	var/list/zones = get_ore_vent_index_for_z(z)
-	if(!length(zones))
-		return null
-	var/list/matching
-	for(var/list/zone_entry as anything in zones)
-		if(x < zone_entry[1] || x > zone_entry[3] || y < zone_entry[2] || y > zone_entry[4])
-			continue
-		// Copy only on the second match, so the overwhelmingly common single-match path
-		// allocates nothing.
-		matching = isnull(matching) ? zone_entry[5] : (matching + zone_entry[5])
-	return matching
-
-/**
- * Vent-proximity ore, in a place that has no vents yet.
- *
- * Upstream ties both "does this wall carry ore" and "how much" to the distance
- * to the nearest ore vent, and gets away with it because lavaland/icemoon seed
- * their ruins (vents included) BEFORE the world-wide terrain sweep runs. A
- * planet is built the other way round - build_planet() lays terrain down first
- * and only then seeds ruins (see planet.dm) - so every mineral wall initializes
- * while SSore_generation.possible_vents holds nothing for it.
- *
- * Upstream's "no vent found" answer is its 128 sentinel, which is past every
- * VENT_PROX_ band, so both procs returned 0: proximity_based walls (volcanic,
- * snow) never got an ore type at all, and every other random wall got its ore
- * type with mineralAmt 0, which gets_drilled()'s `mineralAmt > 0` guard then
- * silently ate. Planets shipped no minable ore of any kind, and the trade-good
- * veins seeded from those same tables (telecrystal on lava, glacial cores on
- * ice) never appeared either.
- *
- * So when there are no vents here, fall back to the flat, vent-independent
- * behaviour these turfs used before upstream's vent rework: the type's own
- * mineralChance, and upstream's own no-vent amount fallback. Gated on the vent
- * lookup rather than on being a planet, so a place that does have vents (lavaland
- * proper, and any wall created after a planet's ruins have landed) keeps
- * upstream's proximity gradient untouched.
- *
- * "Here" is the wall's own footprint, not its z-level. A z-level that carries two planets
- * carries two separate mineral economies, and the neighbour having seeded its ruins first
- * must not decide that this planet's rock is on a gradient - it has no vents to grade
- * against, so every wall would come out empty and the planet would ship no ore at all.
- */
-/turf/closed/mineral/proc/has_local_ore_vent()
-	return length(local_ore_vent_coords()) > 0
-
-/// DEPRECATED alias for has_local_ore_vent(). The answer stopped being about the z-level.
-/turf/closed/mineral/proc/z_has_ore_vent()
-	return has_local_ore_vent()
-
-/**
- * Distance to the nearest ore vent that counts for this wall, or upstream's 128 "none"
- * sentinel.
- *
- * Reimplements the base proc against local_ore_vent_coords() rather than chaining to it: the
- * upstream body scans every vent on the z with `vent.z != src.z`, and slots are only 128
- * apart on a packed level, so a neighbouring planet's vent lands well inside get_dist()'s
- * 127-tile reach and would grade this wall against rock it cannot see. The is_mining_level()
- * guard and the 128 sentinel are kept verbatim so the numbers this feeds are unchanged.
- *
- * max(|dx|, |dy|) is what get_dist() returns for two turfs on one z-level, which every vent
- * in the index is by construction.
- */
-/turf/closed/mineral/prox_to_vent()
-	if(!is_mining_level(z))
-		return 0
-	var/distance = 128 // Max distance for a get_dist is 127
-	var/list/vent_coords = local_ore_vent_coords()
-	for(var/index in 1 to round(length(vent_coords) / 2))
-		var/delta_x = abs(x - vent_coords[index * 2 - 1])
-		var/delta_y = abs(y - vent_coords[index * 2])
-		var/temp_distance = max(delta_x, delta_y)
-		if(temp_distance < distance)
-			distance = temp_distance
-	return distance
-
-/turf/closed/mineral/random/proximity_ore_chance()
-	if(!has_local_ore_vent())
-		return mineralChance
-	return ..()
-
-/turf/closed/mineral/scale_ore_to_vent()
-	if(!has_local_ore_vent())
-		return rand(1, 5) // upstream's own off-lavaland fallback, see the base proc
-	return ..()
-
-#undef ORE_VENT_INDEX_LIFESPAN
-
 /turf/closed/mineral/random/high_chance/wasteland
 	baseturfs = /turf/open/misc/dust
 
diff --git a/wiki/content/bitrunning.md b/wiki/content/bitrunning.md
index eaaf26fe174..bd93f2083c3 100644
--- a/wiki/content/bitrunning.md
+++ b/wiki/content/bitrunning.md
@@ -31,6 +31,18 @@ The decrypted cache pays in ore: iron and glass at every tier, then silver and t
 
 Rewards scale up with the number of runners connected, with a randomly-selected domain instead of a chosen one, and with the number of hostile intrusions the server threw at you on the way.
 
+## Buying supplies
+
+The **bitrunning supplies order console** spends the bitrunning points on your ID account, separate from the quantum server's domain points. Orders arrive by pod at the buyer.
+
+| Supply | Points |
+|---|---|
+| Corn chips or Space Mountain Wind | 50 |
+| Grey Bull or Pwr Game | 100 |
+| Jackboots, brute kit or burn kit | 200 |
+| Trenchcoat | 300 |
+| Oval sunglasses | 400 |
+
 ## Dying
 
 This is the part that catches people.
diff --git a/wiki/content/bounty-hunting.md b/wiki/content/bounty-hunting.md
index 63a8b0ff12b..70498eee262 100644
--- a/wiki/content/bounty-hunting.md
+++ b/wiki/content/bounty-hunting.md
@@ -47,6 +47,8 @@ The reward is fixed when the bounty is posted. It depends on the tier and the zo
 | Public bounty | 45 minutes. The clock stops while a crew hunts it, for up to 30 minutes of each crew's hunt. |
 | Private offer | 20 minutes to accept it, then 30 minutes to bring them in. |
 
+Successful paid criminal turn-ins earn [zone reputation](zone-reputation.md): Petty counts as easy, Wanted as medium, and Most Wanted or a boss as hard. Alive, downed and dead settlements count. The criminal's first capture or death fixes the zone; moving them to another pad does not change it. Lair and other kill-only trophies form a separate kind of reputation work.
+
 ## Taking a bounty
 
 Press **Hunt** on a public bounty, or **Accept Offer** on a private offer. This puts a waypoint on your helm chart (for a pirate ship, the waypoint follows the ship), lets you link GPS units to the criminal's last sighting, and sends your ship notices when anything changes. It doesn't use a mission slot.
@@ -83,7 +85,7 @@ About 70% of Petty criminals and 30% of Wanted ones are meek. They never start a
 - They hide in a locker or crate, pose as a potted plant, or stand still on a dark tile. Opening the locker, bumping into them, examining them from the next tile, hurting them, or lighting up their dark spot finds them. They shove you back a tile and run again.
 - After a minute and a half in hiding they start to fidget: a rustle or a shake every 20 seconds. If nobody is around for a few minutes, they come out.
 - Cornered, they shout and aim a small pistol for half a second, then fire eight quick shots. A stamina hit during the aim makes them fumble it.
-- 120 health. Three disabler shots stun one.
+- 120 base health before [zone scaling](threats-and-elites.md). Three disabler shots stun one.
 
 **Bring:** a disabler or other ranged stun, a flashlight, cuffs, and someone to block the exits.
 
@@ -95,7 +97,7 @@ About 70% of Petty criminals and 30% of Wanted ones are meek. They never start a
 About 70% of Wanted criminals and 30% of Petty ones are normal. A Wanted criminal on a pirate ship is always normal.
 
 - They notice anyone holding a weapon, cuffs or a warrant within 6 tiles. Cuffs or a warrant and they stop and watch you. A weapon out and they fight.
-- Each has one fighting style: fists (tougher, and harder to stun), a knife (cuts that bleed), a pistol (keeps its distance and empties a 15-round magazine before reloading), a shotgun loaded with buckshot (close range, reloads after four shells), a baseball bat (knocks you back) or thrown bottles. Wanted criminals carry a combat knife, a metal bat or a combat shotgun instead. Their weapons hit like the real thing.
+- Each has one fighting style: fists (tougher, and harder to stun), a knife (cuts that bleed), a pistol (keeps its distance and empties a 15-round magazine before reloading), a shotgun loaded with buckshot (close range, reloads after four shells), a baseball bat (knocks you back) or thrown bottles. Wanted criminals carry a combat knife, a metal bat or a combat shotgun instead. Their weapons use the real item's damage, increased by the spawn zone. Their displayed weapon does not guarantee a loot drop.
 - They may have up to two companions who fight beside them. Companions pay nothing. They may run when badly hurt or when their criminal goes down, and give up for good once stunned.
 - Below 40% health, with two hunters nearby who can see them, they may give up and put their hands up. Someone who has given up counts as stunned: cuff them for full pay. Stop hitting them, because they can still be downed.
 - Badly hurt with nobody around, they break off and retreat. They never heal.
@@ -104,7 +106,7 @@ About 70% of Wanted criminals and 30% of Petty ones are normal. A Wanted crimina
 
 ### Mini-bosses
 
-Every Most Wanted criminal is a mini-boss with one of five kits.
+Every Most Wanted criminal is a mini-boss with one of five kits. Bosses and their companions also use the [zone health and damage profile](threats-and-elites.md). The board's **Other crews hunting** line excludes your own active hunt.
 
 - Their health grows with the number of hunters who can see them when the fight starts, and with anyone who hurts them later.
 - Every ability winds up first, with a sound and a mark on the floor. Move out of the mark.
@@ -164,6 +166,8 @@ A dead criminal can't be revived. If the body is destroyed (gibbed, dusted, or l
 
 Petty and Wanted criminals can hide among the patrons at a trader outpost. Most Wanted never do. There's no GPS beacon here. You have to work out which patron it is.
 
+Guns, disablers included, don't get past the outpost's checkpoint unless you buy a weapons permit from the guard. Batons and cuffs are fine. See [the checkpoint](trader-outposts.md#the-checkpoint).
+
 - The fugitive and three **look-alikes** wear the same clothes and go by the same name: "patron" at Waystation Halcyon, "dockhand" at Quartermain Depot and "spacer" at the Undertow Exchange. They have the same species, sex, skin and eyes.
 - The mugshot on the card is old. Their hair has changed since, and the old hair doesn't match anyone there now.
 - Examine a patron to see their distinguishing features: hair, a scar, a tattoo, a scarf, a limp, glasses, a missing ear. Each look-alike shares one or two of the fugitive's features, never all of them. The warrant lists all of them but one.
diff --git a/wiki/content/colosseum.md b/wiki/content/colosseum.md
index 82d9e736afb..ee19b69a6cc 100644
--- a/wiki/content/colosseum.md
+++ b/wiki/content/colosseum.md
@@ -75,7 +75,7 @@ For five minutes after the match the vault and its chamber answer only to the wi
 
 ## Around the venue
 
-**The Lanista's Rack** is a gear stall on the concourse selling nine bespoke pieces of arena kit: gladiator armour, pit weapons and corner-man tools. The stock restocks after every settled match. The gear cannot be duplicated; the only source is the venue.
+**The Lanista's Rack** is a gear stall on the concourse selling nine bespoke pieces of arena kit: gladiator armour, pit weapons and corner-man tools. The stock restocks after every settled match. The gear cannot be duplicated; the only source is the venue. The pit doctor's satchel costs **1,000 credits**, sandstrider sandals **800**, and the laurel crown **2,000 credits with no voucher charge**, when stocked.
 
 **The bookmaker's console** in the wagering hall takes bets on contestants. Bets are cash in (hard-light holochips only) and pay out as physical betting slips, which means they can be stolen, traded and held to ransom like any other object. The book opens when the roster locks and closes when the gates open. Winning bets return the stake plus a share of the losing pool, minus a ten percent house rake taken from the losing side only, so a won bet never pays less than it cost. In team modes, a bet on any member of the winning side pays. Draws and cancelled matches refund at face value, and settled slips stay redeemable for the rest of the round.
 
diff --git a/wiki/content/coming-from-tg.md b/wiki/content/coming-from-tg.md
index 04afa9f1222..0dba14b7c6a 100644
--- a/wiki/content/coming-from-tg.md
+++ b/wiki/content/coming-from-tg.md
@@ -31,9 +31,9 @@ The other source of antagonism is other players. Whether you are allowed to shoo
 
 ## Research and cargo
 
-Research is not a department you either have or do not have. Any ship with an autolathe (which is very nearly all of them) can print a **Research & Development Kit** for twenty iron and forty glass sheets, with no research needed, and that box contains the R&D console, protolathe, destructive analyzer, ship R&D server and (importantly) a circuit imprinter, which is the only machine that prints machine boards. Any hull can therefore bootstrap the whole suite. What a ship can build is a question of how far up the techweb it has climbed, not which rooms it launched with.
+Research is not a department you either have or do not have. Any ship with an autolathe (which is very nearly all of them) can print a **Research & Development Kit** for 50 iron and 50 glass sheets at a basic autolathe, with no research needed, and deploy its flat-packed protolathe, destructive analyzer, server and circuit imprinter with a multitool. The kit also includes the console board, construction materials and source disk. The circuit imprinter prints machine boards. Any hull can therefore bootstrap the whole suite. What a ship can build is a question of how far up the techweb it has climbed, not which rooms it launched with.
 
-Research points come from a **survey scanner**, a machine that converts power into points while parked somewhere new, rather than from standing around holding an experiment. There is also a radar research tree that extends how far your sensors reach and what they can identify. See [The Overmap](overmap.md).
+Research points come from experiments, salvaged notes, orbital surveys, field scanners, dissection and some missions. Orbital surveys pay no cash. A battery-powered **survey scanner** works on natural ground and exhausts a site for the round. See [Research](research.md). There is also a radar research tree that extends how far your sensors reach and what they can identify. See [The Overmap](overmap.md).
 
 Cargo is smaller and ship-shaped. Your ship has its own bank machine holding the ship's account, and a cargo console that orders against it; the supply shuttle flies out and docks alongside your ship rather than landing in a station bay. Most real money comes from [traders](trader-outposts.md) and [missions](missions.md) instead. See [Money and Trade](money-and-trade.md).
 
diff --git a/wiki/content/cyberware.md b/wiki/content/cyberware.md
index c0163cbe369..7ad78afd104 100644
--- a/wiki/content/cyberware.md
+++ b/wiki/content/cyberware.md
@@ -19,15 +19,15 @@ Outside the parlor, ordinary organ-manipulation surgery at any operating table i
 
 ## Neural load
 
-Your body carries **20 points** of chrome. Every installed piece sums its load against that, and the Cradle refuses any install that would take you over, though swapping within a ladder only costs the difference, since the piece being replaced comes out first. If you somehow end up over capacity anyway, everything browns out: **every** piece of chrome on your body goes offline until the load drops back under, and getting under is always as simple as pulling a piece out.
+Your body has **20 capacity** shared by chrome, ordinary implants, cybernetic organs, surgical enhancements and installed nanite programs. Ordinary implants, robotic organs and surgical enhancements cost **1 each**; prosthetic limbs cost **0**, but implants inside them still count. Chrome uses the catalogue loads below. Nanite costs depend on the program and count even when switched off. See [Nanites & Revival](nanites-and-revival.md). Every installed upgrade sums its load against capacity, and the Cradle refuses any install that would take you over, though swapping within a ladder only costs the difference, since the piece being replaced comes out first. If you somehow end up over capacity anyway, everything browns out: **every** piece of chrome goes offline and beneficial nanite programs pause until the load drops back under, Remove enough installed load to restore capacity.
 
-Same-slot ware is mutually exclusive, one operating system, one dermal layer, one leg rig, one piece of hardware per arm, which makes most slots either a ladder (Shock Coils into Hopper Pistons, Dermal Mesh into Slabskin) or a straight choice (Cascade Lattice *or* Redline Core). Arm chrome always claims the whole arm: installing Mantis Blades evicts whatever that arm already carried. Chrome optics replace your natural eyes outright. The one piece that raises the ceiling is the Governor Delete, worth +6 capacity.
+Same-slot ware is mutually exclusive, one operating system, one dermal layer, one leg rig, one piece of hardware per arm, which makes most slots either a ladder (Shock Coils into Hopper Pistons, Dermal Mesh into Slabskin) or a straight choice (Cascade Lattice *or* Redline Core). Arm chrome always claims the whole arm: installing Mantis Blades evicts whatever that arm already carried. Chrome optics replace your natural eyes outright. The Governor Delete raises capacity by **15**, to **35**. It occupies the chest operating-system slot, so it competes with the Cascade lattice and Redline core.
 
 Much of it shows. Plated arms, leg rigs, dermal weaves and spine lattices draw on your body under your clothes, and stacking enough chrome genuinely stops you looking human.
 
 ## The catalog
 
-Prices are Splice's, stock is limited per round, and load is the neural cost. "Pair" ware is sold as a cased set and installed one organ per arm.
+Prices are Splice's, stock is limited per round, and load is the neural cost. Military and legend stock also requires elite [zone reputation](zone-reputation.md). "Pair" ware is sold as a cased set and installed one organ per arm.
 
 ### Tier 1: Street chrome (credits)
 
@@ -70,11 +70,11 @@ Prices are Splice's, stock is limited per round, and load is the neural cost. "P
 | Atlas frame | 2 | 4 | Bones cannot break and limbs cannot come off; knockback against you is halved |
 | Gorilla Arms (pair) | 3 | 3/arm | 20-damage punches with knockback, fists that break rock, and bare-handed airlock prying |
 | Widowline monowire | 3 | 5 | A two-tile whip that ignores armor entirely and cleaves bystanders for 75% |
-| Popup Ronin housing | 3 | 5 | Deployable full-auto machine pistol in 10x24mm caseless. Reloads are parlor-only |
+| Popup Ronin housing | *loot only* | 5 | Deployable full-auto machine pistol in 10x24mm caseless. Reloads are sold at the parlor or printed with Experimental Ammunition |
 | Rigger socket | 3 | 4 | Jack into your own ship's helm from anywhere aboard and fly it from a corridor |
 | Slabskin plate | 3 | 6 | Heavy built-in armor in every damage type. Solid hits visibly spark off you. Everyone can see you are plated |
 | Mantis Blades (pair) | 4 | 3/arm | Deployable hardlight blades, plus a five-tile lunge that knocks the target down |
-| Bunker Buster housing | 4 | 5 | Two shaped micro-rockets: 60 damage, no splash, will never breach a hull. Reloads are parlor-only |
+| Bunker Buster housing | *loot only* | 5 | Two shaped micro-rockets: 60 damage, no splash, will never breach a hull. Reloads are sold at the parlor or printed with Experimental Ammunition |
 | Ghostskin weave | 4 | 5 | Ten seconds of optical camo. NPCs will not target you, and Chrome Reads scatter. Attacking, taking a hit or an EMP drops it |
 | Lazarus node | 4 | 5 | The moment you drop into crit, it charges for a second and shocks you back to your feet at 30% health. Once per six minutes |
 
@@ -82,20 +82,20 @@ Prices are Splice's, stock is limited per round, and load is the neural cost. "P
 
 | Piece | Price | Load | What it does |
 |---|---|---|---|
-| Governor Delete | 5 | 0 | +6 neural capacity. Nothing else, and everything else on this shelf needs it |
+| Governor Delete | 5 | 0 | +15 capacity. Occupies the chest OS slot, competing with Cascade and Redline |
 | Redline core | 6 | 10 | Twelve seconds of stun immunity, 40% less brute and burn taken, +8 unarmed damage and a roar that staggers everyone nearby, then the crash |
 | Cascade lattice | 8 | 12 | The sandevistan: eight seconds at double time with halved melee cooldowns and 40% projectile dodge while moving, then the crash. An EMP mid-window ends it early and eats the cooldown |
-| Meteor Piledriver frame | *never sold* | 8 | An eight-tile leap that crushes whoever is standing on the landing tile and hurls everyone around them. The exclusive top reward from Vex's own contract board |
+| Meteor Piledriver frame | *never sold* | 8 | An eight-tile leap that crushes whoever is standing on the landing tile and hurls everyone around them. A rare guarded-mission completion prize; see [Missions](missions.md) |
 
 The **ammunition shelf** is the return-visit hook: Ronin magazines at 250 credits, Buster rocket pairs at 600. Splice also buys back *removed* street chrome at about half list price; military chrome is never bought back.
 
 ## Finding chrome in the wild
 
-Most of the roster also drops from zone loot caches at the band matching its price, street chrome in common caches, military chrome in prime ones. The exceptions: Legend chrome and ammunition never drop, the Skyhook drops *only* in expedition caches, and the Meteor Piledriver comes only from Vex's hardest contracts.
+Most of the roster also appears in zone loot caches. Street and utility chrome appears among themed supplies. Weapon chrome uses the cache's weapon roll; Popup Ronin and Bunker Buster housings are plunder-cache loot rather than trader stock. Higher zones improve the odds of stronger chrome. The exceptions: Legend chrome and ammunition never drop, the Skyhook drops *only* in expedition caches, and the Meteor Piledriver comes from eligible guarded mission prizes, including hunts and lair trophies.
 
 ## Living with chrome
 
-- **EMP is the hard counter.** A pulse downs every piece you carry (nine seconds on a heavy blast, four and a half on a light one) then it reboots on its own. Gecko Grips spasm and throw whatever you are holding, Ghostskin camo collapses, and a Cascade window crashes on the spot. A Cradle tune-up cancels the reboot early.
+- **EMP is the hard counter.** A pulse downs every piece you carry (nine seconds on a heavy blast, four and a half on a light one) then it reboots on its own. Gecko Grips spasm and throw whatever you are holding, Ghostskin camo collapses, and a Cascade window crashes on the spot. A Cradle tune-up cancels the reboot early. Actions and arm weapons stay unavailable while the chrome is offline. An EMP interrupting Lazarus during its charge does not spend the revival charge.
 - **Detection cuts both ways.** Chrome optics carry the Chrome Read, a scan that names a target's ware (street optics only count it), and the subject always feels the handshake. The Cargo Cavity never resolves on any scan, and Ghostskin scatters reads entirely.
 - **Death does not keep it.** Gibbing, dusting or destroying a limb ejects every piece onto the floor, and killers absolutely loot a chromed corpse. Cloning leaves the chrome on the body.
 - **Nothing is subtle.** Slabskin sparks on every hit, the Chromatic Dermis flares whenever your chrome fires, and the heavy installs change how you look. Chromed is a fashion statement whether you want it or not.
diff --git a/wiki/content/dynamic-events.md b/wiki/content/dynamic-events.md
index d8e10d96657..1b6b819f913 100644
--- a/wiki/content/dynamic-events.md
+++ b/wiki/content/dynamic-events.md
@@ -15,8 +15,8 @@ Selection is not uniform. Every ship in play is checked against the event's own
 
 The requirements are where most of the safety lives:
 
-- **Zone.** Most dangerous events refuse to fire outside the Contested and Lawless bands. A handful: the meteor storm, the immovable rod, pyroclastic and vortex anomalies, the advanced disease: are Lawless-only. See [the overmap](overmap.md) for the bands.
-- **Hull size.** Destructive events set a minimum ship size. A three-tile hull with no airlock and no medbay does not get a vortex anomaly or a portal storm dropped on it, because that is not an event, it is the end of the round for everyone aboard.
+- **Zone.** Most dangerous events refuse to fire outside the Contested and Lawless bands. A handful: the meteor storm, the immovable rod and the advanced disease: are Lawless-only. See [the overmap](overmap.md) for the bands.
+- **Hull size.** Destructive events set a minimum ship size. A three-tile hull with no airlock and no medbay does not get a portal storm dropped on it, because that is not an event, it is the end of the round for everyone aboard.
 - **Crew count.** Some events need two or three people aboard to make any sense.
 - **Flying.** The meteor family and the carp migration only fire at ships out on the overmap. A landed ship shares its ground with whatever it landed on, and cratering a ruin because one crew rolled a meteor wave is not the intent.
 - **Safe harbour.** Ships docked at a [trader outpost](trader-outposts.md) are skipped entirely.
@@ -44,9 +44,9 @@ A sample of the roster, roughly from routine to serious:
 | Immovable rod | A rod passes clean through the ship. |
 | Portal storm | Syndicate shocktroops pour out of portals on your deck. |
 
-There are anomalies too (gravitational, bluespace, dimensional, hallucination, pyroclastic, vortex) and a long tail of small stuff: mice, a cow that tells you wise things, a random animal becoming sentient, spontaneous brain trauma, a fake virus, a market crash that raises vending prices sector-wide.
+Anomalies form on [planets](planets.md#anomalies) rather than appearing as ordinary ship events. There is also a long tail of small stuff: mice, a cow that tells you wise things, a random animal becoming sentient, spontaneous brain trauma, a fake virus, a market crash that raises vending prices sector-wide.
 
-Not everything is bad. The stray cargo pod, at least, is a gift.
+Portal-storm attackers use the health and damage profile of the zone where they appear. See [Hostile Fauna & Elites](threats-and-elites.md).
 
 ## Reducing your exposure
 
diff --git a/wiki/content/gas-economy.md b/wiki/content/gas-economy.md
index b4d88519ad7..3a4f0d0fcae 100644
--- a/wiki/content/gas-economy.md
+++ b/wiki/content/gas-economy.md
@@ -22,7 +22,7 @@ Heavier ships burn proportionally more per burn, so a big hull with a small fuel
 
 ## Nebulas
 
-Nebulas are common features on the [overmap](overmap.md), and in Voidcrew every one of them **carries a specific gas**. Which gas depends on which ring the nebula is in: the safe inner ring holds plasma, nitrogen and water vapour; the contested band adds tritium and miasma; and the lawless deep is where hypernoblium, pluoxium and nitrium pool.
+Nebulas are common features on the [overmap](overmap.md), and in Voidcrew every one of them **carries a specific gas**. Green nebulas mostly hold plasma, nitrogen and water vapour, with a small chance of miasma, tritium, hypernoblium, pluoxium or nitrium. Yellow nebulas hold plasma, tritium, nitrogen, water vapour or miasma. Red nebulas hold tritium, hypernoblium, pluoxium, nitrium, plasma or miasma. Check the chart for the gas you need; a particular cloud is not guaranteed.
 
 Your helm names each nebula after its gas and tints it on the chart, so you can pick a tritium cloud out of a bank of them without flying into each one.
 
@@ -34,7 +34,7 @@ A **nebula ram scoop** is an external intake you build on your hull and wrench o
 
 Harvested gas feeds straight into the connected pipes. Run those pipes to an engine heater in pipe mode and your engines refuel themselves; run them to a connector port instead and you can fill canisters and tanks to sell or carry.
 
-Scoop rate depends on the gas. The common fuels come in fast; the valuable ones come in slowly on top of only existing in dangerous space. Better micro-lasers in the scoop multiply the rate, a full set of top-tier lasers roughly quadruples it.
+Scoop rate depends on the gas. The common fuels come in fast; tritium and the rare gases come in more slowly. Better micro-lasers in the scoop multiply the rate, a full set of top-tier lasers roughly quadruples it.
 
 !!! danger "Scooping is loud"
     Running the scoop **cancels nebula concealment and rips away any concealment you already had**, and keeps you visible for ten seconds after the last harvest tick. You cannot refuel and hide at the same time. Every crew in the galaxy knows the fuel stop is also the ambush spot.
@@ -47,7 +47,7 @@ The **plasma sublimation chamber** is the other half of the loop, for crews who
 
 Micro-lasers set the output rate here too. Since planets and asteroids hand out plasma ore fairly freely, a mining crew with a sublimator effectively never buys fuel again.
 
-Both machines are unlocked by the same early research node as the engine heater, so any ship that can research at all can print both boards. Waystation Halcyon also sells the **ram scoop board** over the counter for 600 credits, which is the route for crews with no research bay.
+Both machines are unlocked by the same early research node as the engine heater, so any ship that can research at all can print both boards. Waystation Halcyon also sells the **ram scoop board** over the counter for 250 credits, which is the route for crews with no research bay.
 
 ## Buying fuel
 
@@ -55,12 +55,12 @@ If you would rather just buy it, both the general waystation and the outfitter d
 
 | Item | Waystation Halcyon | Quartermain Depot |
 |---|---|---|
-| Full plasma canister | 1800 cr | 1100 cr |
+| Full plasma canister | 1100 cr | 1100 cr |
 | Welding fuel tank | 400 cr | 400 cr |
-| Full oxygen tank | 150 cr | 120 cr |
-| Nebula ram scoop board | 600 cr | - |
+| Full oxygen tank | 120 cr | 120 cr |
+| Nebula ram scoop board | 250 cr | - |
 
-Quartermain is cheaper on plasma because it sits further out; Halcyon's markup is the haul to the safe ring.
+These are base prices before standing discounts or specials.
 
 ## Selling gas
 
@@ -72,15 +72,30 @@ Exotic gas is worth real money, and there is exactly one buyer: **Vex at the Und
 | Pluoxium | 300 cr | 200 mol |
 | Nitrium | 300 cr | 200 mol |
 
-All three only pool in deep-band nebulas, and all three scoop slowly, so the payout is gated by how long you are willing to sit still in the most dangerous space in the galaxy with your position broadcast. See [Trader Outposts](trader-outposts.md) for getting to Vex.
+These gases are commonest in red nebulas, but can also appear rarely in green. All three scoop slowly, and Vex has limited demand shared by every crew. See [Trader Outposts](trader-outposts.md) for getting to Vex.
 
-**Gas Harvest contracts** on your ship's mission board are the other sink. Each asks for a tank holding a required quantity of one specific gas, and the board only ever asks for a gas that a nebula somewhere in this round's galaxy actually carries. The common gases pay 700–1200 credits for 600–900 moles; tritium pays 1500–2200 and a voucher; the deep-band exotics pay 2000–3200 and a voucher for as little as 150 moles. Any tank works, and the contract keeps the tank. See [Missions](missions.md).
+**Gas Harvest contracts** on the ship's mission board ask for one tank containing a named gas. Offers normally draw from gases present in the sector's nebulas. Gas already aboard qualifies, and the pad keeps the tank. Excess gas earns no extra pay.
+
+| Gas | Required in one tank | Base credits | Vouchers |
+|---|---|---|---|
+| Plasma | 600-900 mol | 250-350 | 0 |
+| Nitrogen or water vapour | 600-900 mol | 220-320 | 0 |
+| Miasma | 400-700 mol | 300-450 | 0 |
+| Tritium | 250-450 mol | 450-650 | 1 |
+| Pluoxium or nitrium | 200-350 mol | 650-850 | 1 |
+| Hypernoblium | 150-300 mol | 750-950 | 1 |
+
+The quote uses the posting zone: base credits in green, 1.5 times in yellow, 2.2 times in red, rounded to the nearest ten. Read the offer for the final amount. See [Missions](missions.md).
+
+Handheld tanks can leak or rupture under excessive pressure. Cool large samples before filling and transporting them.
+
+**Cargo exports pay for the canister shell only.** Gas inside adds nothing, including exotic gas. Sell to Vex or complete a gas contract instead.
 
 ## Practical advice for a new crew
 
 - **Build the scoop early.** It is one board, it costs less than three canisters, and it removes your largest recurring expense.
 - **Put the heater in pipe mode.** A heater on a tank has to be hand-fed. A heater on the pipe network refuels itself off the scoop or sublimator while you do something else.
-- **Scoop plasma in green space first.** Most nebulas in the inner ring are plasma, they scoop fast, and nobody is going to jump you there.
+- **Scoop plasma in green space first.** Plasma is the most common gas in the inner ring and scoops quickly.
 - **Don't scoop while running.** If you are being hunted, close the intake and hide. Fuel is replaceable; the ship is not.
 - **Overfill before a deep run.** Filling spare canisters while parked in a safe nebula is far better than discovering you are dry in the lawless deep.
 - **Sell the exotics, burn the common stuff.** Hypernoblium is worth 1200 credits a tank at Vex's counter and does nothing useful in a thruster. Plasma gets you home.
diff --git a/wiki/content/glossary.md b/wiki/content/glossary.md
index f1f1d48cb94..d2a228aaa71 100644
--- a/wiki/content/glossary.md
+++ b/wiki/content/glossary.md
@@ -41,11 +41,12 @@ Voidcrew adds a vocabulary that /tg/station does not have, and most of it turns
 | **Bank machine** | Holds the ship's shared account. Cargo and traders draw on it. See [Money and Trade](money-and-trade.md). |
 | **Mission board** | The console that offers and tracks contracts. See [Missions](missions.md). |
 | **Mission pad** | The pad that sits beside the board. Put mission items on it to hand them in, and rewards appear on it. |
-| **Techweb** | Your ship's research tree. It lives on the source code disk inside your own R&D server, starts empty, and is not shared with any other crew. See [Research](research.md). |
+| **Zone reputation** | Crew standing earned through varied dangerous field work. Opens contracts, trader stock and some research; survives losing a hull. See [Crews & Zone Reputation](zone-reputation.md). |
+| **Techweb** | Your ship's research tree. It lives on the source code disk in its R&D server and can be copied or shared. See [Research](research.md). |
 | **Research points** | The currency of the techweb, earned by experiments, surveys and salvaged documents rather than handed out over time. See [Research](research.md). |
-| **Research notes** | A physical document with a point value printed on it. Press it against an R&D console to bank the points, or sell it to cargo for half a credit per point. |
-| **Survey scanner** | A machine that turns power into research points while parked somewhere new. See [Research](research.md). |
-| **Orbital survey console** | The console that surveys whatever your ship is orbiting, paying points and credits and recording the object against research that requires it. |
+| **Research notes** | A physical document with a point value printed on it. Press it against an R&D console to bank the points. Loot notes, including orbital survey printouts, also export for half a credit per point. |
+| **Survey scanner** | A cell-powered machine that earns research on natural ground and exhausts that site for the round. See [Research](research.md). |
+| **Orbital survey console** | The console that surveys whatever your ship is orbiting, paying research points only and recording the object against research that requires it. |
 | **Transporter** | A pad-and-console pair that beams people and cargo between the ship and a surface. See [Transporters](transporters.md). |
 | **Transponder** | The palm-sized beacon you carry that pairs to one transporter pad, letting the ship see you and pull you home. |
 | **Drop pod** | A one-shot pod that drops you onto whatever the ship is parked over, or gets fired through an enemy hull out of an assault pod tube. See [Drop Pods](drop-pods.md). |
@@ -59,7 +60,7 @@ Voidcrew adds a vocabulary that /tg/station does not have, and most of it turns
 | **Extraction case** | The secure case parts must be sitting in, on your person, for them to survive the round. Request one with the **Request Extraction Case** verb. Only the first standard case counts. |
 | **Voucher** | A trade voucher: a physical chit earned from dangerous work, never bought with credits, and spent at any trader for restricted goods. Being an item, it can be stolen off you. |
 | **Chrome** | Cyberware, implantable robotic organs sold at the Chop Shop on the Undertow Exchange. See [Cyberware](cyberware.md). |
-| **Neural load** | What each piece of chrome costs against your 20-point capacity. Going over capacity browns every piece out at once. |
+| **Neural load** | The shared cost of chrome, implants, robotic organs, surgical enhancements and installed nanite programs against 20 capacity. Overload disables chrome and beneficial nanite programs. |
 | **Trader outpost** | One of three permanent markets, one per zone: general store in green, outfitter in yellow, black market in red. Turrets shoot people who keep starting fights. See [Trader Outposts](trader-outposts.md). |
 | **Player outpost** | A base a crew plants for itself using an outpost deed. See [Player Outposts](player-outposts.md). |
 | **Custom slot** | A saved spawn loadout tied to your account, swapped onto a ship's job at the cryogenic oversight console. The first is free; the second and third are bought with your persistent account credits. |
diff --git a/wiki/content/index.md b/wiki/content/index.md
index 0721b3ea758..81302851367 100644
--- a/wiki/content/index.md
+++ b/wiki/content/index.md
@@ -10,3 +10,5 @@ blurb: The Voidcrew wiki front page.
 This wiki covers what's *different* about Voidcrew: flying and fighting your ship, the overmap, planets and ruins, the economy, and the threats waiting out in the dark. For base-game skills that work the same here (medicine, chemistry, botany, engineering) use the [/tg/station wiki](https://wiki.tgstation13.org/).
 
 New to the server? Start with the [New Player Guide](new-player-guide.md). Coming from /tg/station? Read [Coming from /tg/](coming-from-tg.md) first.
+
+Read [Crews & Zone Reputation](zone-reputation.md) for progression, [Weapons & Gear](weapons-and-gear.md) for equipment sources, and [Nanites & Revival](nanites-and-revival.md) for implant capacity and medical limits.
diff --git a/wiki/content/mining.md b/wiki/content/mining.md
index dace1e1f3e0..5cfe6dde227 100644
--- a/wiki/content/mining.md
+++ b/wiki/content/mining.md
@@ -13,11 +13,15 @@ There is no station mining outpost here and no shuttle that goes to it. Ore come
 
 **Asteroid storms.** These are the dedicated mining sites. They appear on the chart as storm hazards in three severities, and there are always at least three somewhere in the galaxy. Fly onto one and press Dock. The button reads "(mining anchorage)", and you are put inside the field, a scatter of rock blobs with hard vacuum between them.
 
-| Storm | Ore | Guarded cache |
-|---|---|---|
-| Minor | Iron, plasma, silver, titanium, a little gold | Occasionally |
-| Moderate | The above plus uranium, diamond and bluespace in the tail | Often |
-| Major | Same list, far richer, and the densest rock of the three | Usually, and often the rare kind |
+| Storm | Ore density |
+|---|---|
+| Minor | Lowest |
+| Moderate | Higher |
+| Major | Highest |
+
+Every field can contain every ordinary ore, including uranium, diamond, bluespace crystal and bananium. Each wall rolls its ore separately. The field's zone improves the odds of valuable ore and the yield per mineral wall. Guarded caches can appear too.
+
+Asteroid fields are finite. Once a field unloads, it is spent and cannot generate another interior. Returning does not reroll its ore.
 
 The toll is paid on the way in: crossing a storm tile throws a rock at your hull, and the worse the storm, the bigger the rock. Every field also carries roaming packs of hostiles, and any cache in it is guarded.
 
@@ -25,14 +29,16 @@ The toll is paid on the way in: crossing a storm tile throws a rock at your hull
 
 ## Ore vents
 
-Volcanic and frozen worlds put ore vents out in their terrain. A vent is a permanent ore supply, but it has to be taken first:
+Volcanic and frozen worlds put ore vents out in their terrain. A vent is a finite ore supply. It has to be taken first:
 
 1. Hit it with a mining scanner to survey it. That tells you which minerals it carries and pays mining points to your ID.
 2. Scan it a second time to start the excavation. A node drone attaches itself to the vent and the ground opens up: goliaths, legions, watchers, lobstrosities, brimdemons and bileworms come out and go for the drone. Keep it alive and in place until the wave ends.
-3. Win, and the vent is tapped for the rest of the round. It produces boulders; break them with a pickaxe to get the ore out.
+3. Win, and the vent produces boulders until its stock or the planet's shared reserve runs out. Break the boulders with a pickaxe to get the ore out.
 
 Lose the drone and the vent seals up. You can try again.
 
+Green vents produce at most 20 boulders each, yellow 30 and red 40. All vents on a planet share a reserve of 3,000, 6,000 or 10,000 sheets of material respectively, before refinery bonuses. An exhausted vent's remaining boulders can still be collected.
+
 !!! tip "Bring the scanner"
     A vent cannot be surveyed or tapped without a mining scanner, and it will not tell you what is inside until it is surveyed. Waystation Halcyon sells one.
 
@@ -55,9 +61,14 @@ A welder will smelt ore straight into sheets, one unit of welder fuel per chunk:
 Three ways out of that, cheapest first:
 
 1. **Buy sheets.** The general store's fuel counter stocks solid plasma in twenties. Raw plasma ore is also on the shelf and works out cheaper per sheet, but only buy that if you have a machine to run it through.
-2. **Sell the ore.** Traders take plasma ore on their supply contracts, so it is never worthless even if you cannot use it.
-3. **Build a redemption machine.** Any ship with an autolathe can get there. The autolathe prints a Research & Development Kit from the start with no research needed: 20 iron and 40 glass sheets, both of which a welder can make from ore you dug yourself. That box holds the circuit imprinter, which is the only machine that prints circuit boards. From there, Mining Technology is one cheap step off a free starting node, and it unlocks the redemption machine board. It is a long detour, but it is the permanent fix.
-- **Mining points** ride on your ID, and vent work pays them out directly: you are credited for surveying a vent and again for tapping it. A mining equipment order console spends them, and orders through it are delivered immediately by pod where you stand rather than riding a shuttle. Only a few hulls carry one: Delta's Mining Bay is the one you can buy.
+2. **Sell the ore through cargo.** Trader supply contracts do not ask for ore or sheets.
+3. **Build a redemption machine.** Any ship with an autolathe can get there. The autolathe prints a Research & Development Kit from the start with no research needed: 50 iron and 50 glass sheets at a basic autolathe, both of which a welder can make from ore you dug yourself. That box holds a flat-packed circuit imprinter, along with the other research machines and console materials. Deploy the flatpacks with a multitool. The circuit imprinter prints circuit boards. From there, Mining Technology is one cheap step off a free starting node, and it unlocks the redemption machine board. It is a long detour, but it is the permanent fix.
+
+## Mining points
+
+**Mining points** ride on your ID, and vent work pays them out directly: you are credited for surveying a vent and again for tapping it. A mining equipment order console spends them, and orders through it are delivered immediately by pod where you stand rather than riding a shuttle. Only a few hulls carry one: Delta's Mining Bay is one you can buy.
+
+The console sells a **500-credit bill for 2,000 mining points** and a mining MODsuit for **7,200 points**. Titanium in boulders pays the ordinary material rate. The redemption machine displays the rates it actually pays.
 
 ## Selling it
 
@@ -77,10 +88,10 @@ Traders at [outposts](trader-outposts.md) run a wanted ledger: a list of things
 
 Each entry only takes so many sales before the trader stops wanting it, and it recovers slowly. Vouchers are deliberately reserved for things nobody can print aboard a ship, which is why hostile planet crust pays them and your lathe never will. The full picture is in [Money & Trade](money-and-trade.md).
 
-Traders also post supply contracts for ore and forage (iron, plasma, spice pods, hides, glacial cores) and the hardest of those pay in equipment that is never on the shelves, including an ore bag of holding and a jackhammer.
+Trader supply contracts ask for field goods such as spice pods, hides, glacial cores and recovered salvage. They do not ask for ore or sheets. Read each offer for its goods, credits and vouchers; routine supply work does not guarantee an exclusive tool.
 
 ## Kit worth buying
 
-Waystation Halcyon stocks the prospecting counter: pickaxe (200 cr), ore bag (200 cr), mesons (400 cr), mining scanner (450 cr), diamond pickaxe (1200 cr), and a mining drill (1800 cr) when the rare shelf has one. A pickaxe and a scanner are enough to start; the drill and the bag of holding are what turn a two-hour dig into a twenty-minute one.
+Waystation Halcyon's prospecting counter sells an ore bag for 100 credits, an advanced automatic mining scanner for 300, and a diamond pickaxe for 1,200. Stock is shared with other crews.
 
 Suits matter as much as tools. Volcanic worlds need sealed gear and internals, frozen worlds need insulation, and asteroid fields are vacuum. See [Planets](planets.md) for what each destination demands.
diff --git a/wiki/content/missions.md b/wiki/content/missions.md
index 4d34d22b6c8..39b07b43252 100644
--- a/wiki/content/missions.md
+++ b/wiki/content/missions.md
@@ -2,90 +2,124 @@
 title: Missions
 category: Economy
 order: 2
-blurb: The contract board every ship carries, the mission pad, what the contracts ask for, and what they pay.
+blurb: Ship missions, outpost contracts, the mission pad, and the rewards crews can earn.
 ---
 
-Missions are the reliable way to make money in Voidcrew. Every standard hull carries a mission board that posts fresh contracts all round, and a mission pad next to it where you hand things in and rewards appear. Contracts pay credits into the ship account and, on the dangerous ones, trade vouchers into your hand.
+Missions give your crew work across the sector: deliver supplies, chart a route, retrieve salvage, or hunt a wanted target. Your ship's **mission board** lists jobs and tracks accepted work. Its **mission pad** handles deliveries and physical rewards. Traders at outposts have their own contract boards.
 
 ## The board and the pad
 
-The **mission board** is a console. It links itself to any **mission pad** within a few tiles, and the two work as a unit: the board is where you accept, track, and turn in, and the pad is where physical objects change hands.
+The mission board links to a nearby mission pad. Open **Available** to browse work and **Active** to see what your crew has taken on. Your ship can have **three missions active at once**, including jobs accepted from traders.
 
-The board keeps **five offers** posted at a time and tops itself back up as you take them. An offer nobody accepts rotates off after 20 minutes and is replaced. A **refresh** button wipes all five and deals a new hand, on a 5-minute cooldown. Use it when the board has nothing your crew can do, not to fish for the top-paying contract.
+The console posts a set of **five offers every 20 minutes**, including a green-zone exploration job when one is available. Up to three slots are reserved for different kinds of work that can still advance your crew's [zone reputation](zone-reputation.md). Taking or losing a job leaves a vacancy until the next set arrives. **Refresh** becomes available when the next set is due; it does not give an early replacement. Reopening or rebuilding the console keeps the ship's offers and schedule.
 
-For a simple starting job, look for a green-band **Exploration Contract**. Fly to its marked coordinates and return to the board to collect 400–700 credits. The board reserves an offer for one when available.
+For a starting job, look for an **Exploration Contract** in green space. Fly to its marked coordinates, then collect the listed fee at the board.
 
-Your ship can run **three missions at once**. Each has its own clock, usually 30 minutes, longer on the planet-side contracts.
+Each offer shows its task, pay, and allowed time. Accepting starts its deadline and adds a helm waypoint when there is a destination. Some jobs also leave equipment on the mission pad: collect it before leaving. Tap a handheld GPS on the board to copy active mission beacons, or use **Link Mission Beacons** with a fitted MOD GPS.
 
-Accepting a contract does three things: it starts the timer, it drops a waypoint on the helm chart so the pilot can find the target, and for some contracts it dispenses equipment onto your mission pad. Tapping a **handheld GPS unit** on the board uploads the objective beacons of every active mission to that unit, which is how you find a small object inside a large ruin.
+## Turning in
 
-Contracts with more than one step show a checklist on the board, and only one step is live at a time. The board tells you which.
+For a physical delivery, put the requested goods on the mission pad and choose **Turn In** on the active contract. You do not need to select individual pad items. Jobs without a delivery, such as exploration or a survey, can be completed once their objectives are met.
 
-## Turning in
+Credits go into the ship's bank account. Vouchers, named item rewards, and research notes appear at the turn-in point. Research notes are physical papers to take to an R&D console. See [Research](research.md).
 
-Contracts finish one of two ways. If there is nothing to hand over (exploration, surveying, a kill sweep) the turn-in button goes live once the objectives are satisfied. If the contract wants something physical, **put it on the pad first**, then pick it from the item list on the board and turn in.
+A trader can also receive item contracts. Hold the goods in hand and open their contract board to turn them in. **Courier pods must reach the destination trader.** Keep a working ship account for contract payments.
 
-Rewards arrive in two places: credits go straight into the ship's bank account, while vouchers and item rewards materialise on the pad.
+A missed deadline fails the mission. Some jobs also fail if their creature, cargo, or equipment is destroyed. Check the active contract's progress and deadline before setting out.
 
-!!! warning "Missions fail on the clock"
-    A contract that times out is a failure, and the ship is told about it. If it is going badly, **abandon** it from the board instead. Abandoning costs nothing and frees the slot.
+## Outpost contract boards
 
-Some contracts also fail if the thing they are about is destroyed. Recovery-family contracts will quietly re-pick a target twice before giving up; contracts built around one specific creature, beacon, or batch just void.
+Talk to a main trader and choose **Contracts** to see their postings. Each board has **four shared offers**: another crew can take an offer before you do. Vacancies fill on an **11-minute schedule**, and unaccepted offers close after **22 minutes**. Taking or losing a contract does not immediately post another one.
 
-## Pay and zones
+Outpost jobs include supply requests, salvage recoveries, kill contracts, and courier runs. Halcyon also posts kitchen orders and fishing requests. Quartermain's board asks for recovered MOD cores, salvaged MOD control units, and certain recovered modules. Take a control unit off before handing it over.
 
-Every contract that points somewhere on the overmap is priced by the zone band its target sits in. Farther out is worth more: a contract in the contested middle band pays roughly 1.7× the inner-ring rate, and one in the lawless deep pays about 2.6×. Contracts in the deep also add an extra trade voucher on top of whatever they already paid.
+Supply requests mainly ask for fauna harvests, ruin finds, and salvage. Kitchen orders, fish, and bear hides are also accepted. Qualifying goods already in your hold can be delivered. Legion cores must still be fresh or stabilized when you hand them in. Kitchen orders require player-cooked dishes, rather than factory food or meals bought from an outpost kitchen.
 
-The board labels each offer Easy, Medium, or Hard, and that label is just the zone band restated. A "hard" contract is not a harder puzzle. It is the same job somewhere that will shoot at you.
+Contracts can pay a mix of **credits, trade vouchers, and named goods from trader stock**. Some pay entirely in currency. Listed goods are set aside when your crew accepts; if an item is unavailable then, currency replaces it. Read the pay line again after accepting.
 
-## The contract types
+Completing a trader's contracts also improves your crew's favor with that trader and can reduce credit prices. Back rooms and higher-zone contracts require [zone reputation](zone-reputation.md), earned from qualifying field work. Counter sales and board contracts are separate: selling goods over the counter does not complete an accepted contract. See [Trader Outposts](trader-outposts.md).
 
-| Contract | What it asks |
+## Pay and rare gear
+
+Read each offer's pay line before accepting. It shows the quoted credits, vouchers, and goods. Jobs farther into dangerous space generally pay more, while routine supply work pays modest fees. Taking a quoted job into a different zone does not raise its listed pay.
+
+Survey contracts can include useful field equipment, such as scanners, extraction packs, jetpacks, or survival capsules. Rescues pay a 25% bonus when the survivor returns at 80% health or better and has never needed revival. Prospect stakes pay their listed credits and voucher.
+
+Most ship-console credit rewards use the target zone: base pay in green, 1.5 times in yellow and 2.2 times in red, rounded to the nearest ten. Targetless asks use the posting zone. Delivery and suppression have their own pay rules. Research rewards use 1, 1.4 and 1.8 times instead. Trader-board offers quote their own complete package.
+
+| Ship-console job | Green base credits |
 |---|---|
-| Delivery Contract | Bring a listed quantity of ore, sheets, or crystals to the pad. No travel required if you already have the goods. |
-| Exploration Contract | Fly the ship to marked coordinates, then come home and collect. |
-| Survey Contract | Scan a number of celestial objects (nebulas, asteroid fields, planets, stars, storms) with the orbital survey console. |
-| Recovery Contract | Retrieve a named object from inside a space ruin and carry it back to the pad. |
-| Kill Contract | Hunt down a named pirate captain holed up in a ruin and bring back their identification tag. Harder targets keep bodyguards. |
-| Survey Contract (pylons) | Calibrate three survey pylons inside a ruin, one at a time. Each calibration is loud and draws a wave of defenders. The last pylon prints the core you carry home. |
-| Extraction Contract | Unbolt a fixed piece of cargo inside a ruin. Wrenching it loose takes time and trips an alarm that answers in two waves. |
-| Rescue Contract | A survivor is alive inside a wreck. Get them out and back to the pad breathing. The fee doubles if they are unharmed. |
-| Suppression Sweep | Confirm a number of pirate kills anywhere in the contested band or deeper. No item turn-in; it settles at the board. |
-| Gas Harvest Contract | Deliver a tank holding a required quantity of a specific gas. See [Fuel & Gas](gas-economy.md). |
-| Field Expedition | A probe went down on a planet. Find the wreck, pull its core, and be ready for whatever lifting it wakes up. |
-| Big Game Hunt | Stake a supplied lure on a planet surface, kill the apex predator it draws out, and carry back a trophy. |
-| Live Capture | Track a survey-marked animal on a planet, wear it down without killing it, and seal it in the supplied crate. It has to arrive alive. |
-| Poacher Bust | Raid an illegal hunting camp on a planet, wipe the squad, and recover their tagged evidence cache. |
-| Prospect Stake | Fly to marked coordinates in the contested band or deeper, deploy the supplied claim beacon aboard your ship, and keep it intact for eight minutes while holding station. The filing goes out on Wideband, so the whole sector knows. Top of the pay curve, and the deep-band version sometimes pays a crate of ship parts instead of vouchers. |
-
-Not every type is available at once. Several are capped so the galaxy only ever has one or two running, and the planet contracts only appear when a planet of the right kind is actually in this round's sector.
-
-!!! tip "Read the description before you accept"
-    Each offer's text names its coordinates, its zone band, its beacon tag, and whether it dispenses equipment. The planet contracts in particular hand you a lure, a crate, or a claim kit at accept, if you launch without collecting it off the pad, you have wasted the run.
+| Exploration | 150-250 |
+| Recovery | 450-650 |
+| Named kill or guarded extraction | 500-700 |
+| Guarded survey pylons | 550-750 |
+| Live capture or poacher bust | 600-800 |
+| Big game hunt or rescue | 650-850 |
 
-## Bounties
+A named kill target and its payment only count once. Leaving and returning does not restore a completed kill.
 
-Everything the board has on offer sits in one mixed list: contracts, **wanted criminals** to find and bring to your pad, alive for full pay (see [Bounty Hunting](bounty-hunting.md)), **pirate bounties** and jobs other crews have posted. Whatever your crew has taken on moves to the **Active** tab.
+### Rare completion prizes
 
-**Pirate bounties** are competitive: a named pirate captain is posted galaxy-wide (only some pirates carry one at a time, and they move around), several crews can hunt the same one, and it goes to whoever kills them and puts their **ship key** on the mission pad. Paying a fee out of the ship account tracks the target on your chart, deducted from the reward.
+Named kills, big game hunts, live captures, poacher busts, guarded pylons, guarded extractions and core samples can award a rare prize. Prospect stakes and lair trophies qualify in yellow or red only.
 
-**Player bounties** let you post a job for other crews yourself with **Post Bounty**, funded from your account. A crew that takes it puts what you asked for on their pad and submits it as an offer. You approve or reject each offer from your board, and approving completes the exchange.
+| Zone | Suit chance | Gadget chance |
+|---|---|---|
+| Green | 3% | 1.5% |
+| Yellow | 4% | 2% |
+| Red | 20% | 10% |
 
-Trader outposts also run their own boards, separate from your ship's. You take those by talking to the trader in person, and they pay in **goods off that trader's shelves** rather than money. See [Trader Outposts](trader-outposts.md).
+A completion gives at most one of these. Each **ship** can receive **one suit and one gadget per round** across all eligible jobs. A roll against an already-paid category gives nothing further.
 
-## Street Chemistry
+| Work | Possible suit | Possible gadget |
+|---|---|---|
+| Named kill | Elite Syndicate | Captain's laser |
+| Big game hunt | Safeguard | Meteor Piledriver |
+| Capture or poachers | Empty ninja | Captain's laser for capture; cloak-device board for poachers |
+| Guarded pylons, extraction or core sample | Magnate or safeguard | Captain's laser, Meteor Piledriver or cloak-device board |
+| Prospect stake | Safeguard | Any of the three gadgets above |
+| Lair trophy | Elite Syndicate or safeguard | Any of the three gadgets above |
 
-One contract type is never posted on any board and never rolls at random. The **kingpin**, the crime boss in the lounge at the Undertow Exchange in the lawless deep, is the only person in the galaxy who gives out a **Drug Run**. Fly out there and ask him for work (see [the kingpin](bounty-hunting.md#the-kingpin)). **Vex**, the fence at the Undertow's counter, is the only one who will buy the product. Only one crew can run it at a time, and a crew that takes it can't hunt the kingpin or turn him in for the rest of the round.
+These prizes are separate from the offer's ordinary credits, vouchers and goods. See [Weapons & Gear](weapons-and-gear.md).
 
-The run has three stages and a one-hour clock.
+## The contract types
+
+| Contract | What it asks |
+|---|---|
+| Delivery Contract | Bring the listed goods to the pad: spice pods, sinew, goliath hides, glacial cores, raw telecrystals, a sea crystal, or Syndicate documents. Stored goods qualify. |
+| Exploration Contract | Fly the ship to marked coordinates, then collect the fee. |
+| Survey Contract | Scan the requested celestial objects with the orbital survey console. |
+| Telemetry Contract | Gather the requested survey scans and return for credits and research notes. |
+| Recovery Contract | Retrieve a named object from inside a space ruin. |
+| Kill Contract | Hunt a named pirate captain in a ruin and bring back their identification tag. |
+| Survey Contract (pylons) | Calibrate the ruin's survey pylons, survive their defenders, and bring back the printed core. |
+| Extraction Contract | Unbolt cargo inside a ruin, deal with the defenders, and bring it home. |
+| Rescue Contract | Escort a survivor out of a wreck and bring them back alive. |
+| Suppression Sweep | Confirm the requested pirate kills in the required area, then collect at the board. |
+| Gas Harvest Contract | Deliver a tank containing the requested gas and amount. Gas already aboard qualifies. See [Fuel & Gas](gas-economy.md). |
+| Field Expedition | Find a fallen probe on a planet and recover its core. |
+| Big Game Hunt | Deploy the supplied lure, kill the named beast, and return its trophy. |
+| Live Capture | Find the marked specimen, weaken it without killing it, and deliver it alive in the supplied capture crate. |
+| Poacher Bust | Clear a poacher camp and recover its evidence cache. |
+| Prospect Stake | Deploy a claim beacon aboard your ship at the marked coordinates, hold station through its defense, and deliver the deed. |
+| Containment Contract | Find and neutralize the named anomaly, then deliver its core. |
+| Core Sample Contract | Complete a planet's sampling work and return the sample. |
+
+The available jobs depend on the planets, ruins, and targets in the sector, and on your crew's zone reputation. Collect any supplied kit from the pad before departure.
+
+## Bounties
+
+The board mixes missions with **wanted criminals**, **pirate bounties**, and **jobs posted by other crews**. Accepted work appears under **Active**.
+
+Wanted posters state who to find, where they were last seen, and whether they are wanted alive or dead. Bring them to your pad under the poster's terms. See [Bounty Hunting](bounty-hunting.md).
 
-**Gather.** A formula chip lands on your mission pad naming three wild ingredients, each growing on a different kind of planet. Each has a fixed harvest site on its planet's surface, marked on your chart and on the mission's beacon. The contract only gets offered when enough of the right planets are in this round's sector.
+Pirate bounties are competitive. Several crews can hunt the same captain; the reward goes to the crew that turns in the pirate's **ship key**. Paid tracking marks the target on your chart, and the displayed reward reflects that charge.
 
-**Cook.** Accepting also raises a hidden laboratory out in space, marked as a signal on your helm. Inside is a three-station chain: a mixer that flashes hopper sequences at you, a catalyst rig running a timing chart, and a crystallizer you catch output from. Each station gives you attempts and lets you commit or retry a score. How well you play sets the batch's purity, 0.7× the fee at street grade, the full fee at pure, 1.4× plus an extra voucher at primo.
+Use **Post Bounty** to fund a job for other crews from your ship account. A contractor puts the requested goods on their own pad and submits an offer. You approve or reject it at your board.
+
+## Street Chemistry
 
-**Deliver.** The finished batch can only be handed to Vex, at the Undertow, in person. Nobody else fences it, and losing it after the cook voids the contract.
+The **kingpin** at the Undertow Exchange offers a **Drug Run** in person. It does not appear among the ship console's random offers. Only one crew can run it at a time, and accepting closes that crew's hunt for the kingpin for the round. See [the kingpin](bounty-hunting.md#the-kingpin).
 
-Base pay is 4000–5000 credits before zone scaling, plus three trade vouchers, the largest single payout on any contract.
+Collect the formula chip from your mission pad and gather its wild ingredients from the marked planetary sites. The contract also marks a laboratory in space. Work through its mixer, catalyst rig, and crystallizer to produce the batch, then deliver it to **Vex** at the Undertow counter in person. The batch's quality affects the fee.
 
-!!! danger "The cook lights you up"
-    There is a coin-flip chance that finishing the batch trips somebody's sensor net. If it does, an NT customs corvette spawns near your ship and runs a full shakedown: a hail, a fine, and interdiction and boarding if you refuse. The fine scales with the contract's value. You can also surrender the shipment instead of paying, which ends the run.
+Watch the deadline and keep the shipment intact. The cook can attract an NT customs patrol, so be prepared for a hail on the way out.
diff --git a/wiki/content/money-and-trade.md b/wiki/content/money-and-trade.md
index 7aad59c615f..d0c13b15c27 100644
--- a/wiki/content/money-and-trade.md
+++ b/wiki/content/money-and-trade.md
@@ -2,19 +2,19 @@
 title: Money & Trade
 category: Economy
 order: 1
-blurb: Credits, trade vouchers, the ship bank, the cargo console, and the schematics that unlock new gear.
+blurb: Credits, trade vouchers, the ship bank, and the cargo console.
 ---
 
-Voidcrew has no station budget and no paychecks. Every credit your crew spends is one you earned by selling something, finishing a contract, or taking it off somebody else. There are two in-round currencies. Credits, which live in your ship's shared bank account, and trade vouchers, which are physical chits you carry, and they buy different things on purpose.
+Voidcrew has no station budget and no paychecks. Earn credits by selling salvage, finishing contracts or taking them from another crew. The two in-round currencies are credits in a ship account and physical trade vouchers. They buy different goods.
 
 ## The two currencies
 
-**Credits** are the everyday money. They sit in one bank account shared by the whole crew: when you spawn, your ID is bound to the ship's account rather than a personal one, so anything anyone earns goes into the same pot and anything anyone spends comes out of it. The account starts empty. Credits pay for cargo orders, most trader stock, neural imprint fees, outpost deeds, and bounties you post yourself.
+**Credits** are the everyday money. They sit in one bank account shared by the whole crew: when you spawn, your ID is bound to the ship's account rather than a personal one, so anything anyone earns goes into the same pot and anything anyone spends comes out of it. Each ship keeps its own account even when its crew runs several ships. A newly commissioned player ship starts with **1,000 credits**; checkpoint rebuilds do not grant another starting payment. Credits pay for cargo orders, most trader stock, outpost deeds, and bounties you post yourself.
 
-**Trade vouchers** are tamper-sealed chits that stack in your pocket like cash. They cannot be bought with credits, ever. You earn them by finishing dangerous contracts and by selling traders loot that can't be manufactured aboard a ship. Planet minerals, fauna harvests, ruin finds, deep-band gases. Any trader outpost honours them. Being a physical item, they can also be dropped, stolen and demanded as pirate tribute, so carrying a large stack into the deep is a real decision.
+**Trade vouchers** are tamper-sealed chits that stack in your pocket like cash. They cannot be bought with credits, ever. You earn them by finishing dangerous contracts and by selling traders loot that can't be manufactured aboard a ship. Raw telecrystals, fresh legion cores and Syndicate documents. Any trader outpost honours them. Being a physical item, they can also be dropped, stolen and demanded as pirate tribute, so carrying a large stack into the deep is a real decision.
 
 !!! tip "What vouchers are for"
-    Vouchers buy the tier of gear no shop will sell for money: weapon schematics, syndicate MODsuit hardware, ship shield and interdiction boards, military-grade [cyberware](cyberware.md), top-tier [exploit software](ship-hacking.md), and the charts that reveal rare ruins. If you want any of that, you have to go somewhere dangerous.
+    Vouchers buy the tier of gear no shop will sell for money: syndicate MODsuit hardware, ship shield and interdiction boards, military-grade [cyberware](cyberware.md), top-tier [exploit software](ship-hacking.md), and the charts that reveal rare ruins. If you want any of that, you have to go somewhere dangerous.
 
 There is also a persistent currency, [ship parts](ship-parts.md), banked through an extraction case when you bluespace jump or the round ends. Spend banked parts on permanent hull, theme and module unlocks in the [shipyard](ship-upgrades.md). Your parts balance is separate from the credits in your ship's bank.
 
@@ -26,7 +26,7 @@ If the machine ever loses its link (you built a new one, or the ship changed han
 
 The bank machine is also where **physical money** turns into spendable credits. Loose cash and holochips looted out of a ruin do nothing sitting in your bag; feed them to the machine and the value lands in the ship's account. It refuses cash while it has no account connected, so nobody wastes a holochip on an unlinked machine.
 
-Your own ID is what pays at trader counters, at the neural imprinter, and for outpost broadcasts. If your ID has no account on it, those machines will refuse you.
+Your own ID is what pays at trader counters and for outpost broadcasts. If your ID has no account on it, those services will refuse you.
 
 ## The cargo console
 
@@ -47,58 +47,50 @@ The console announces what sold and for how much, and keeps a scrollable transac
 
 Export values are roughly a quarter of what the same item costs to buy, so you cannot make money by cycling crates. Cargo turns salvage, ore and unwanted loot into credits; it is not an arbitrage machine.
 
-Two extras: coupons found in loot slot into the console for a discount on a matching pack, and supply companies occasionally offer a **loan**, free credits now in exchange for a crate of their goods riding along on the next delivery.
+Coupons found in loot slot into the console for a discount on a matching pack. Supply companies also offer cargo **loans**; each loan pays its completion bonus once.
 
-## Selling to traders
+Cargo does not sell the security catalogue, individual combat guns or gun conversion kits. See [Weapons & Gear](weapons-and-gear.md) for weapon sources. Nanite program disks export for no credits. Gas canisters pay for the shell only, whatever gas they contain.
 
-The cargo console is not the only buyer. Every trader outpost keeps a **wanted ledger**: a short list of things that trader is buying this round, with a fixed payout each. See [Trader Outposts](trader-outposts.md) for where to find them.
+## The materials market
 
-Selling at a counter differs from cargo in three ways:
+Solid materials sell at a changing market bid. Base prices are per sheet:
 
-- The trader takes goods from anywhere on you: hands first, then bags and pockets. Anything you are **wearing** is skipped, so you cannot accidentally sell the suit off your back.
-- Credit payouts go to your ID's account. Voucher payouts appear in your hand.
-- Each ledger entry has limited demand for the round. Once the trader has bought all they want, that line closes until a supply convoy comes through.
-
-Sample lines: Barnaby at the waystation pays 300 credits per five gold ore, 500 per two diamonds, 150 for any fresh fish. Roux at the waystation diner pays 60 per home-cooked meal, 120 per hand-made pie and 180 per whole cake, real cooking only, never vending-machine food or her own plates. Sarge at the depot pays 250 per two goliath hide plates, 400 per three glacial cores. Vex at the black market is the only trader who pays in vouchers, one per five raw telecrystals, one per legion core, two per set of syndicate documents. Traders also buy **gas** by the tank; see [Fuel & Gas](gas-economy.md).
-
-## Blueprints and the imprinter
+| Material | Base credits |
+|---|---|
+| Diamond | 120 |
+| Bluespace crystal | 80 |
+| Gold or titanium | 40 |
+| Uranium | 30 |
+| Silver | 15 |
+| Iron or glass | 2 |
 
-Some weapons cannot be researched, bought assembled, or printed. They exist only as **schematics**: rolled-up paper you find in ruin loot or buy from a trader.
+Iron and glass never fall below 1 credit per sheet. Market booms top out at 1.5 times the base price. Plasma exports are capped at 10 credits per sheet. A stack sells whole at the current bid.
 
-While you are carrying a schematic anywhere on your person, its recipe appears in your ordinary crafting menu. No workbench is involved; you can build it wherever you are standing. Gun recipes still consume a machined weapon component (printed at a protolathe behind its research node) plus a firing pin, so the schematic is the permission, not the whole cost.
+Buying materials has a minimum price per sheet: diamond 230 credits, bluespace 160, gold and titanium 80, uranium 60, silver 30, plasma 15, iron and glass 5. A higher market price still applies. Selling uses the market bid.
 
-**Crafted ballistic weapons arrive unloaded**, with no detachable magazine or chambered round. Manufacture or find ammunition separately.
+## Selling to traders
 
-The **L6 SAW** is a major manufacturing investment. Material quantities below are in sheets, before lathe discounts:
+The cargo console is not the only buyer. Every trader outpost keeps a **wanted ledger**: a short list of things that trader is buying this round, with a fixed payout each. See [Trader Outposts](trader-outposts.md) for where to find them.
 
-| Step | Materials |
-|---|---|
-| Print the receiver | 100 iron, 30 titanium, 20 plastic, 10 silver, 10 diamond |
-| Assemble the gun (45 seconds) | Receiver, 20 plasteel, one firing pin |
-| Print a 50-round 7mm magazine | 50 iron, 10 titanium, 10 plasma, 5 plastic |
+Traders and cargo won't buy back goods bought from a trader, an order console or the black market uplink, including the contents of boxes and crates and goods from contract rewards. Splitting or mixing stacks keeps that restriction. New things you cook, craft or smelt from bought supplies can still be sold.
 
-Receiver research costs **160 points** after Exotic Ammunition. Ammunition research costs **80 points** after Exotic Ammunition and Automatic Ammunition, independently of receiver research, so it can supply a salvaged L6.
+The Patch-Up Clinic buys natural donor organs and monster glands. Monster glands, including legion cores, must be fresh or stabilized, the same as at Vex's counter. It does not buy artificial or printed organs, or defibrillators.
 
-The receiver exceeds a basic protolathe's local storage, so upgrade its matter bins or supply it through a material silo. Fully upgraded lathes reduce printed material costs to 40%; the assembly's plasteel requirement stays at 20 sheets.
+Selling at a counter differs from cargo in three ways:
 
-Firing pins cost 250 credits at Quartermain Depot. Fit one to a crafted or salvaged gun that has no pin. You cannot reuse a pin from another gun: prying one out destroys it.
+- The trader takes goods from anywhere on you: hands first, then bags and pockets. Anything you are **wearing** is skipped, so you cannot accidentally sell the suit off your back.
+- Credit payouts go to your ID's account. Voucher payouts appear in your hand.
+- Each ledger entry has limited demand for the round. Once the trader has bought all they want, that line closes until a supply convoy comes through.
 
-Six schematics exist:
+Sample lines: Barnaby at the waystation pays 300 credits per five gold ore, 500 per two diamonds, 150 for any fresh fish. Roux at the waystation diner pays 60 per home-cooked meal, 120 per hand-made pie and 180 per whole cake, real cooking only, never vending-machine food or her own plates. Sarge at the depot pays 250 per two goliath hide plates, 400 per three glacial cores. Vex at the black market is the only trader who pays in vouchers, one per five raw telecrystals, one per fresh legion core, two per set of syndicate documents. A legion core rots about four minutes after the legion dies, and Vex won't take a rotten one. To keep cores for later, inject them with stabilizing serum from a mining equipment order console; a stabilized core counts as fresh. Traders also buy **gas** by the tank; see [Fuel & Gas](gas-economy.md).
 
-| Schematic | Tier | Sold at |
-|---|---|---|
-| C-20r SMG | Yellow | Quartermain Depot, 3 vouchers |
-| WT-550 autorifle | Yellow | Quartermain Depot, 3 vouchers |
-| Laser carbine | Yellow | Quartermain Depot, 2 vouchers + 3000 cr |
-| L6 SAW | Red | Undertow Exchange, 5 vouchers |
-| Anti-materiel sniper rifle | Red | Undertow Exchange, 5 vouchers |
-| Bulldog shotgun | Red | Undertow Exchange, 5 vouchers |
+## Ammunition
 
-All six also turn up as ruin loot, so a schematic you can't afford this round may still be sitting in a derelict.
+No Quarter's heavy cartridges can be crafted, and fit only No Quarter.
 
-The **neural schematic imprinter** is a machine at a trader outpost that converts a schematic into knowledge. Slot the scroll into the open cradle, climb in, seal yourself shut, and pay the fee. The posted rates are 750 credits at green tier, 1500 at yellow and 3000 at red, so a gun schematic costs you either 1500 or 3000. The fee comes out of cash you loaded into the cradle first, then your ID's account for the remainder.
+A 50-round 7mm magazine for the **L6 SAW** costs 50 iron, 10 titanium, 10 plasma and 5 plastic sheets before lathe discounts. Its research costs **80 points** after Exotic Ammunition and Automatic Ammunition and needs advanced [zone reputation](zone-reputation.md). Fully upgraded lathes reduce printed material costs to 40%. See [Weapons & Gear](weapons-and-gear.md) for the other ammunition.
 
-What you get is the recipe bound to you for the rest of the round: theft-proof, and nothing to carry. What you lose is the paper. A physical schematic is shareable, resellable and stealable; an imprint is none of those things. The imprinter refuses if you already know a recipe, so no scroll gets wasted twice on the same gun.
+Firing pins cost 250 credits at Quartermain Depot. Fit one to a salvaged gun that has no pin. You cannot reuse a pin from another gun: prying one out destroys it.
 
 ## Job packs
 
diff --git a/wiki/content/nanites-and-revival.md b/wiki/content/nanites-and-revival.md
new file mode 100644
index 00000000000..33a5ee1ca6c
--- /dev/null
+++ b/wiki/content/nanites-and-revival.md
@@ -0,0 +1,56 @@
+---
+title: Nanites & Revival
+category: Your Ship
+order: 6
+blurb: Nanite research, shared implant capacity, armour upkeep and the limits of automatic revival.
+---
+
+Nanites are programmable swarms carried inside a body. They can monitor, heal and protect their host, but their programs share capacity with implants and cyberware. Automatic revival still needs a body that can be revived and medical care afterwards.
+
+## Research and backups
+
+**Basic Nanite Programming** costs **120 research points** and unlocks the basic machinery and programs. Link the machinery to your ship's R&D server with a multitool. Further branches unlock stronger healing, neural and military programs. Military Nanite Programming also requires elite [zone reputation](zone-reputation.md).
+
+Nanite cloud backups belong to the local research setup. Restoring a backup requires every program in it to be researched on the receiving ship. A backup cannot supply programs that ship has not unlocked. Nanite program disks have no cargo export value.
+
+## Shared capacity
+
+A body normally has **20 capacity** for all installed upgrades. [Chrome](cyberware.md), ordinary implants, robotic organs, surgical enhancements and installed nanite programs all use it. Prosthetic limbs cost nothing; implants inside them still count.
+
+Programs count even while switched off. Remove programs to free capacity. Stronger programs generally cost more:
+
+| Program or group | Load |
+|---|---|
+| Advanced Regeneration or Defibrillation | 6 each |
+| Regeneration, mechanical repair, either armour program, Nerve Support or Adrenaline Burst | 3 each |
+| Purging, advanced brain healing, Rapid Coagulation or access programs | 2 each |
+| Basic brain healing, blood restoration, temperature control and several utility programs | 1 each |
+| Sensors and Monitoring | 0 |
+
+Infective Exo-Locomotion costs 2; Nanite Sting costs 1. Other programs have their own costs.
+
+If the body exceeds capacity, its chrome goes offline and beneficial nanite programs pause. Hostile payloads are not disabled by overload. Turning a program off does not clear its load.
+
+## Armour and monitoring
+
+**Dermal Hardening** adds 30 melee and bullet armour. **Dermal Refractive Surface** adds 30 laser and energy armour. Both spend nanites on upkeep and on the damage their added protection absorbs: one nanite per point absorbed.
+
+The programs share the swarm's reserve. Reaching the safety threshold disables both armour effects until the swarm recovers. Armour does not give unlimited protection just because its upkeep is affordable.
+
+**Monitoring** makes the host visible to the crew monitor within its normal scope. **Infective Exo-Locomotion** spreads the swarm to nearby eligible bodies. **Nanite Sting** transfers it to an adjacent eligible target when triggered. Those transfers still obey capacity limits.
+
+## Defibrillation
+
+Nanite **Defibrillation** follows the same eligibility rules as ordinary defibrillator paddles. Missing or badly damaged vital organs, an unsuitable corpse or an unavailable patient can prevent revival. The program rechecks the body after its wind-up.
+
+A successful shock brings the patient back at **-50 health**, like paddles. It does not fully heal them or repair unrelated injuries. Keep treating the patient immediately after revival; the success sound means the revival actually happened.
+
+## The reviver implant
+
+The **reviver implant** heals an unconscious owner over time. It waits until a dead owner is above the hard-critical threshold and eligible for defibrillation before trying to revive them.
+
+A successful revival starts a cooldown of **ten minutes plus the healing cost already accumulated**. The implant does not repeatedly revive someone into hard critical condition. It is still an implant, not a substitute for replacing organs, stopping bleeding or treating severe damage.
+
+## Chrome during failure
+
+EMP, organ failure or capacity overload can take chrome offline. Implant actions and arm weapons stay unavailable while it is down. A powered **voltaic combat cyberheart** can absorb an EMP pulse. An EMP interrupting a Lazarus node's charge does not spend its revival charge. See [Cyberware](cyberware.md) for the catalogue and repairs.
diff --git a/wiki/content/new-player-guide.md b/wiki/content/new-player-guide.md
index 54b0dda41cd..15765b9368d 100644
--- a/wiki/content/new-player-guide.md
+++ b/wiki/content/new-player-guide.md
@@ -7,6 +7,8 @@ blurb: Your first shift. How you get a ship and a crew, what is already aboard,
 
 There is no station in Voidcrew. When the round starts you are dropped onto a small ship with a handful of other players, somewhere on the safe edge of a galaxy map called the [overmap](overmap.md), and everything you do that round happens on that ship or somewhere you flew it to. This page covers your first hour.
 
+Rounds last six hours.
+
 ## Joining a round
 
 Ready up in the lobby like normal. When the round starts, the server counts how many people readied and builds a fleet to match: one hull per six ready players, up to four hulls. Everyone who readied is dealt out evenly across those hulls, so a full server is several separate crews flying separate ships, not one big crew.
@@ -30,7 +32,9 @@ Every hull with real rooms launches with the same core kit, wherever the mapper
 | Cryogenic oversight console and cryopods | Where latejoiners arrive. Adjusts how many slots each job has, up to six, on a two-minute cooldown. Also where the captain can shut joining off. |
 | Autolathe | Prints the Research & Development Kit. |
 
-That last one matters more than it looks. The R&D Kit is a box the autolathe prints for twenty sheets of iron and forty of glass, with no research required, and it contains the R&D console, protolathe, circuit imprinter, destructive analyzer, ship R&D server and the server's source disk. Any ship, however cheap, can build a full research suite on day one. You start with zero research points and no income, so [Research](research.md) is worth reading before someone wastes an hour looking for the machine that generates them.
+That last one matters more than it looks. The R&D Kit costs 50 iron and 50 glass sheets at a basic autolathe, with no research required. Deploy its flat-packed protolathe, circuit imprinter, destructive analyzer and server with a multitool. It also contains the R&D console board, its construction materials and the server's source disk. Any ship, however cheap, can build a full research suite on day one. You start with zero research points and no income, so [Research](research.md) is worth reading before someone wastes an hour looking for the machine that generates them.
+
+Starting guns and ammunition depend on your ship, rooms and job. Check the lockers and your kit before leaving. See [Weapons & Gear](weapons-and-gear.md) for equipment sources.
 
 Everything past that core kit comes from your hull's theme and modules: an engine type, a medbay or a chem lab, a mining bay, a galley, a bunkroom. Read [Ship Systems](ship-systems.md) for the parts you have to keep running.
 
@@ -40,6 +44,8 @@ Fly out, find something worth money, bring it home, spend it, go further out.
 
 In practice that means picking a contact off the helm chart and going to look at it. [Planets](planets.md) have ore, ruins and fauna; [space ruins](ruins.md) have loot and usually something guarding it; [asteroid fields](mining.md) are the reliable mining stop; [trader outposts](trader-outposts.md) buy what you dug up and sell what you cannot make. The [mission board](missions.md) hands out contracts that point you at all of the above and pays for finishing them.
 
+Completing varied dangerous work builds [crew reputation](zone-reputation.md), which opens higher-zone contracts, trader stock and some research. It stays with your crew if the ship is lost. A crew can run several ships, but only its leader can add one.
+
 Danger and reward both scale with how far from the star you fly. The safe inner ring around the star is where you start; the rings farther out have better ore yields, nastier wildlife and no rules about shooting each other. [The Overmap](overmap.md) explains the three zones, and it is the first page you should read after this one.
 
 ## Keeping what you earn
diff --git a/wiki/content/overmap.md b/wiki/content/overmap.md
index 8aceb3679ce..b47b4f891aa 100644
--- a/wiki/content/overmap.md
+++ b/wiki/content/overmap.md
@@ -66,12 +66,14 @@ Crossing a boundary is a deliberate act. Thrusting at a tile in a different zone
 
 ## Why anyone flies further out
 
-Everything worth having is farther from the star, because the rings scale rewards as well as danger.
+The rings scale rewards as well as danger. Every raw resource is still available in green.
 
-Rock on planets yields half again as much ore in the Contested Zone and double in the Lawless Zone. Planet wildlife spawns thirty percent denser in yellow and sixty percent denser in red, and each spawn has a twenty or forty percent chance of upgrading to the biome's genuinely dangerous list instead of its ordinary one. Weather comes more often, gives less warning and lasts longer the farther out you go. Loot caches roll from a per-ring table and lock in their contents where they spawned, so a cache found in the deep is a better cache.
+Each mineral wall rolls its own ore. Valuable ores become more likely in deeper zones, and asteroid mineral walls yield more there. Every ordinary ore remains possible in green. Hostile NPCs gain health and damage in yellow and red; wildlife and nest limits stay the same. Some fauna rolls upgrade to a more dangerous creature. Weather comes more often, gives less warning and lasts longer the farther out you go. Loot caches roll from a per-ring table and lock in their contents where they spawned, so a cache found in the deep is a better cache.
 
 The markets follow the same gradient: the general store sits in the neutral ring, the outfitter in the contested lanes and the black market in the lawless deep, so the best goods are behind the worst neighbourhood. Planets are placed into a specific ring when the round is built and generated to match it, which means a jungle world in the red is a meaningfully harder jungle world. The safe ring always gets one planet of each type, so a new crew has every kind of world close to home. The rest of the planets, like the ruins, are spread by area, so most of them are out in the lawless ring.
 
+Your crew also earns [zone reputation](zone-reputation.md) from varied field work. It opens higher-zone contracts, better trader stock and some research. It does not stop you travelling before you qualify.
+
 ## Docking
 
 To land on anything, bring the ship to a **full stop** on its tile and press Dock, or use the Interact button on that contact in your chart list. A moving ship will refuse. Docking into an empty tile parks you in open space, which is also how two ships end up alongside each other; a docking request sent to another ship expires after thirty seconds.
diff --git a/wiki/content/piloting.md b/wiki/content/piloting.md
index 675e46a4d4b..42f2cfc6e1d 100644
--- a/wiki/content/piloting.md
+++ b/wiki/content/piloting.md
@@ -67,9 +67,9 @@ Your **sensor range** is how far an **active scan** reaches, and it is what rada
 | Research node | Cost | Scan range | Also gives you |
 | --- | --- | --- | --- |
 | *(none)* | - | 4 tiles | |
-| Radar Array | 1000 | 6 tiles | |
-| Radar Array: Signal Analysis | 2500 | 8 tiles | Names space ruins on the chart instead of "unknown signal" |
-| Radar Array: Vessel Tracking | 5000 | 10 tiles | Plots and names other crews' ships out to full sensor range |
+| Radar Array | 80 | 6 tiles | |
+| Radar Array: Signal Analysis | 120 | 8 tiles | Names space ruins on the chart instead of "unknown signal" |
+| Radar Array: Vessel Tracking | 160 | 10 tiles | Plots and names other crews' ships out to full sensor range |
 
 Vessels are the exception. They move, so they are never recorded. A ship is a live contact or nothing. Without the top radar tier you only see ships inside your view ring, and they read as **unknown contact** until a Ships scan resolves them. An unidentified blip hides whether it is a trader or a pirate, which is the point.
 
diff --git a/wiki/content/pirates-and-npc-ships.md b/wiki/content/pirates-and-npc-ships.md
index f8c0abb5d2d..33bb67031d6 100644
--- a/wiki/content/pirates-and-npc-ships.md
+++ b/wiki/content/pirates-and-npc-ships.md
@@ -49,7 +49,7 @@ Pay and they disengage, and that ship leaves you alone for five minutes. Refuse,
 
 Refusal in the Lawless Zone starts a staged assault rather than a straight shootout. About five seconds after the rejection they interdict you, announce the boarding, and roughly thirty seconds later the first pod lands.
 
-It runs in **three waves** with a thirty-second breather between each, the wave sizes scaled to how many crew you had aboard when it started. Between waves the captain taunts you over comms. Repel all three and the enemy commander comes down personally by drop pod.
+There is **one boarding wave**, sized to the crew aboard when it starts. Repel it in red space and the enemy commander comes down personally by drop pod. Their health and damage follow the spawn zone; see [Hostile Fauna & Elites](threats-and-elites.md).
 
 At the same time, if they can, they will shoot: lasers while your shields hold, missiles once they drop, and boarding pods only when your shields are down. The shield wall would swat the pods out of the sky. There is a hard cap of ten hostile boarders aboard your ship at once.
 
@@ -61,9 +61,9 @@ A pirate ship becomes boardable when it is disabled, when it is interdicted, or
 
 Two prizes are on the table.
 
-**The ship itself.** The pirate captain carries a **ship authorization key** and drops it where they die. Insert that key into the pirate ship's helm console and the vessel becomes yours to fly. If the whole crew is killed and nobody claims it in time, the ship is abandoned and drifts as a derelict. Still claimable, but you were on a clock.
+**The ship itself.** The pirate captain carries a **ship authorization key** and drops it where they die. Insert that key into the pirate ship's helm console and the vessel becomes yours to fly. Only your [crew leader](zone-reputation.md#your-crew-and-its-ships) can add it to your existing crew; another member must leave and found a new crew to claim it. If the whole crew is killed and nobody claims it in time, the ship is abandoned and drifts as a derelict. Still claimable, but you were on a clock.
 
-**The bounty.** About half the pirates out there have a bounty on them at any time, listed on your ship's [mission board](missions.md); the rest are just trouble. A bounty nobody is hunting comes down after a while and a new one goes up on another pirate, so check the board again later. Bounties are competitive: several crews can accept the same one, and the first to turn in the captain's key gets paid. Yellow-band pirates are worth 5,000 credits, Lawless-band pirates 15,000, and the heavier bounties pay out better loot crates, laser weapons, disablers, armour, batons and security supplies at the low end, premium military gear at the high end. You can also buy tracking on a bounty target, at the cost of a quarter of the reward.
+**The bounty.** About half the pirates out there have a bounty on them at any time, listed on your ship's [mission board](missions.md); the rest are just trouble. A bounty nobody is hunting comes down after a while and a new one goes up on another pirate, so check the board again later. Bounties are competitive: several crews can accept the same one, and the first to turn in the captain's key gets paid. Yellow-band pirates pay **3,200-4,800 credits**, Lawless-band pirates **9,600-14,400**, and the heavier bounties pay out better loot crates, laser weapons, disablers, armour, batons and security supplies at the low end, military supplies at the high end. Gun bundles contain **one gun each**. You can also buy tracking on a bounty target, at the cost of a quarter of the reward.
 
 You cannot have both. Turning the key in for the bounty spends it; using it to claim the ship fails the bounty.
 
@@ -73,7 +73,7 @@ While you are aboard, find their **data siphon**. Whatever they drained out of y
 
 There isn't any. Every roaming NPC ship in the galaxy is hostile by default, and there is no friendly convoy or merchant traffic to run into. Trade happens at [trader outposts](trader-outposts.md), not on the open overmap.
 
-The one exception is dispatched rather than roaming: **NTSV Vigilant**, a Nanotrasen customs enforcement corvette. It never scans for prey and never hunts at random. It is sent after one specific ship by mission code, currently the contraband-running mission, and it ignores everyone else. It opens with a hail like a pirate does, but the demand is a fixed fine or the surrender of the contraband it was sent for. Refuse and it escalates through the same interdiction, boarding waves and commander fight. Kill its commander and it spools emergency FTL and warps out: no wreck, no key, no salvage. It also chases across zone lines, which pirates will not do, and it keeps re-engaging after you dock and fly again until it eventually gives up.
+The one exception is dispatched rather than roaming: **NTSV Vigilant**, a Nanotrasen customs enforcement corvette. It never scans for prey and never hunts at random. It is sent after one specific ship by mission code, currently the contraband-running mission, and it ignores everyone else. It opens with a hail like a pirate does, but the demand is a fixed fine or the surrender of the contraband it was sent for. Refuse and it escalates through interdiction, a boarding wave and its commander fight. Kill its commander and it spools emergency FTL and warps out: no wreck, no key, no salvage. It also chases across zone lines, which pirates will not do, and it keeps re-engaging after you dock and fly again until it eventually gives up.
 
 ## Practical advice
 
diff --git a/wiki/content/planets.md b/wiki/content/planets.md
index 5e6f62d5240..3c727d81020 100644
--- a/wiki/content/planets.md
+++ b/wiki/content/planets.md
@@ -30,7 +30,7 @@ Your ship lands at a fixed berth on the edge of the map unless someone aboard us
 Ash storms and sandstorms both roll a harmless variant sometimes, gentle embers or drifting sand instead of the real thing. The real thing announces itself first, and the warning is your cue to get under a roof or back inside the ship.
 
 !!! danger "The lava world is not a walk"
-    Lava planets have thin air as well as heat, so a gas mask and a tank are not enough on their own. They are also the only planet type where a true megafauna can appear out in the open. At most one per world, but one is plenty.
+    Lava planets have thin air as well as heat, so a gas mask and a tank are not enough on their own. They are also the only planet type where a true megafauna can appear out in the open. At most one per yellow- or red-zone world, but one is plenty.
 
 ## What is down there
 
@@ -44,12 +44,19 @@ Ash storms and sandstorms both roll a harmless variant sometimes, gentle embers
 
 **Trade goods.** Each world grows or hides something traders want and nobody can manufacture aboard a ship: raw telecrystal in the crust of the volcanic and apocalyptic worlds, glacial cores in frozen permafrost, wild spice pods lying on jungle ground, pearl clams caught in beach shore water. None of them can be scanned for. Telecrystal and glacial veins look like ordinary rock until you swing at them. Prices are at [Trader Outposts](trader-outposts.md); the wider economy is in [Money & Trade](money-and-trade.md).
 
+## Anomalies
+
+Natural planets seed **one anomaly in green, two in yellow and three in red**, where safe ground allows. Neutralize one to recover its core. Purchased anomaly charts add a separate encounter; see [Trader Outposts](trader-outposts.md#anomaly-cores-and-charts).
+
+A planet's ice demons can drop at most **two anomaly cores in total**, shared by both demon kinds for the round. Returning after the surface unloads does not reset that allowance. Supermatter hazards do not yield recoverable cores.
+
 ## Dangerous space means a dangerous planet
 
 Each kind of world has one planet in the safe inner ring, so a new crew can try every terrain close to home. The rest are spread across the rings by area, which puts most of them out in the lawless ring. A planet's band changes how the same world plays:
 
-- Fauna spawns thicker, and a share of the rolls upgrade to the biome's meaner list: lone animals become nests.
-- Storms come around more often, give less warning before they hit, and last longer.
+- Hostile fauna gains health and damage, and a share of the rolls upgrades to the biome's meaner list. Population and nest limits stay the same across zones.
+- Storms come around more often, give less warning before they hit, and last longer. Red worlds also have radiation storms.
+- Ore walls are more likely to contain valuable minerals. Every ordinary ore remains possible in green.
 
 A planet keeps its band for the whole round. One the crew wrote off as lethal will still be lethal the next time it turns up.
 
diff --git a/wiki/content/player-outposts.md b/wiki/content/player-outposts.md
index df0db64fd33..b0a54864922 100644
--- a/wiki/content/player-outposts.md
+++ b/wiki/content/player-outposts.md
@@ -5,7 +5,7 @@ order: 5
 blurb: Found a home with its own bank, cargo deliveries, research, and resident cryopods.
 ---
 
-Player outposts are homes on the [overmap](overmap.md) that last for the round. Run a workshop, receive supplies, and welcome returning residents even after your founding ship is gone. Visiting ships keep their own money, equipment links, and crew membership.
+Player outposts are homes on the [overmap](overmap.md) that last for the round. Run a workshop, receive supplies, and welcome returning residents even after your founding ship is gone. Visiting ships keep their own money, equipment links, and crew membership. A crew can operate several ships and share [reputation](zone-reputation.md), but each ship keeps its own account. Services that offer a ship choice charge the selected hull.
 
 ## Founding a home
 
@@ -138,7 +138,7 @@ To share research with a ship, build an **R&D relay** aboard it. Print the relay
 
 Any number of ship relays can share the outpost server's **tech tree and research points**, including after undocking. Research earned or purchased at one connected lab is available at the others. Each ship keeps its own bank account, separate research disk, and fabrication materials.
 
-Outpost Management lists invitations and connections. Cancel an invitation or disconnect an individual relay there; the other fleet ships keep their access. Ship crew can also click their relay empty-handed to disconnect. You cannot download a technology disk through the relay.
+Outpost Management lists invitations and connections. Cancel an invitation or disconnect an individual relay there; the other fleet ships keep their access. Ship crew can also click their relay empty-handed to disconnect. You cannot download a technology disk through the relay. Reputation requirements for buying new research use the crew standing of the source server. A relay or imported disk does not grant your crew shopping or contract access.
 
 Keep the relay and outpost server powered. After a power outage, restore power and relink equipment. Removing the source disk, replacing an endpoint, or changing the outpost owner requires a new invitation. A change of ship captain keeps the connection intact.
 
@@ -160,16 +160,16 @@ A hull defense turret bolted to the outpost answers only to its owner, stewards,
 
 ## Ship Bay
 
-The **Rooms** tab sells a permanent **ship bay** for 10,000 credits, 100 iron and 50 glass from the outpost silo; it needs a working hangar elevator. Ships reach it through the **Ship Bay** option at the helm, and people by elevator. When a ship in the bay asks to use the outpost silo, the request appears on its bay row. An evicted ship has three minutes to undock, and gets its docking fee back if it paid in the last 30 minutes.
+The **Rooms** tab sells a permanent **ship bay** for 6,000 credits, 100 iron and 50 glass from the outpost silo; it needs a working hangar elevator. Ships reach it through the **Ship Bay** option at the helm, and people by elevator. When a ship in the bay asks to use the outpost silo, the request appears on its bay row. An evicted ship has three minutes to undock, and gets its docking fee back if it paid in the last 30 minutes.
 
 The bay's own **shipyard console**, found only in the bay itself, has two tabs:
 
 - **Shop** orders a new ship, built at the bay by your delivery drones and stocked with its usual starting supplies, paid from the outpost bank or your own account.
-- **Checkpoints** saves a captain's docked ship: **10,000 credits** the first time, **5,000 credits** to update it later. If that ship is ever lost or its hull abandoned, the same captain can pay to have it rebuilt from the saved checkpoint. The delivery drones do the rebuilding in one visible pass, then the ship launches into the bay.
+- **Checkpoints** saves a captain's docked ship: **5,000 credits** the first time, **2,000 credits** to update it later. If that ship is ever lost or its hull abandoned, the same captain can pay to have it rebuilt from the saved checkpoint. The delivery drones do the rebuilding in one visible pass, then the ship launches into the bay.
 
 ## Advertising
 
-A **broadcast** costs **2,500 credits from the outpost bank** and lasts 20 minutes, with a 10-minute purchase cooldown. Buy it through Outpost Management with treasury permission. It announces the outpost to crewed ships and marks it on helm charts. A refused purchase says why in chat.
+A **broadcast** costs **500 credits from the outpost bank** and lasts 20 minutes, with a 10-minute purchase cooldown. Buy it through Outpost Management with treasury permission. It announces the outpost to crewed ships and marks it on helm charts. A refused purchase says why in chat.
 
 ## Ownership and abandonment
 
diff --git a/wiki/content/research.md b/wiki/content/research.md
index c2821893582..ad5c954150e 100644
--- a/wiki/content/research.md
+++ b/wiki/content/research.md
@@ -5,67 +5,58 @@ order: 5
 blurb: Where your ship's research points actually come from, and what the tech tree is worth spending them on.
 ---
 
-Research in Voidcrew is **per-ship**. Your crew's tech tree lives on a hard drive in your own R&D server, it starts completely empty, and nothing you unlock is shared with any other crew. It is also the only route to things no trader stocks: longer sensor range and transporters. This page covers where the points come from and where they are worth spending.
+Research is **per ship**, stored on the source code disk in its R&D server. Earn points through experiments, surveys, salvage and dissection, then spend them at a linked R&D console. Other ships have separate trees unless you share research.
 
-## The suite
+## Building the suite
 
-Almost every hull carries an autolathe, and that one machine is enough. Print the **Research & Development Kit** (twenty sheets of iron and forty of glass, no research required) and the box holds the boards for the whole chain: R&D console, protolathe, destructive analyzer, circuit imprinter, ship R&D server, and the **source code disk** that goes in the server. See [Ship Systems](ship-systems.md) for where these sit aboard.
+Print the **Research & Development Kit** at an autolathe. A basic autolathe charges **50 iron and 50 glass sheets**; better parts reduce the cost. No research is required.
 
-The disk *is* the techweb. Slot it into the server and that server hosts your research; pull it out and the research goes with it. The autolathe prints a spare disk for two sheets of glass, but a fresh disk is a fresh blank tree, not a copy.
+The kit contains flat-packed machines for the server, protolathe, destructive analyzer and circuit imprinter. Deploy them with a multitool. It also includes the R&D console board, its construction materials and the server's source code disk.
 
-Everything that earns or spends points has to be told which server it belongs to. Slotting the source disk into the server **claims every scanner and operating computer aboard that has no link yet**, so build the server whenever you like and anything you made earlier falls in behind it. Everything else, R&D console, orbital survey console, protolathe, nanite chamber, destructive scanner. Is linked by hand: **multitool** the server, then the machine. One click, including to move a machine from one server to another.
+Insert the source disk into the server. Multitool the server, then each machine you want linked to it. Unlinked experiment scanners and operating computers aboard are claimed when the source disk goes in. Examine a scanner to check its link.
 
-A scanner with no server says so when you examine it and buzzes when you try to use it, so an unlinked machine is obvious rather than silently useless.
+The disk holds the tree. Removing it takes the research with it; printing a fresh source disk gives a fresh tree. A **technology disk** downloaded at the R&D console copies unlocked research to another console. Only crew can download a ship's research. Keep a copy before risking the server.
 
-!!! tip "Copy your research before you risk it"
-    An R&D console with a **technology disk** in it can download everything you have researched. That disk uploads into any other ship's console, so a second copy is cheap insurance and a fair trade good. The console refuses to download for anyone who is not on the ship's crew.
+Weapon crafting and R&D weapon printing work normally. Protolathe kits upgrade the appropriate guns through the crafting menu. See [Weapons & Gear](weapons-and-gear.md).
 
 ## Earning points
 
-Ships launch with **no research income at all**. No hull is mapped with a survey scanner or an orbital survey console, and an R&D server generates nothing by sitting there powered. Every point below is something a crew member goes and does. Sources are listed roughly in the order a new crew can reach them.
+A powered server generates no points by itself.
 
-| Source | Pays | What it needs |
-| --- | --- | --- |
-| Experiments | **2,000** each | An Experi-Scanner, which you can print from the start |
-| Research notes found as loot | 250 – 10,000 per document | Getting off the ship |
-| Orbital survey console | 50 – 1,000 per contact, plus the same in credits | One 40-point research node |
-| Survey scanner | 50 – 200 per two-second cycle, multiplied by its parts | A 1,000-point node, and a lot of power |
-| Anomaly cores in the destructive analyzer | 200 per core type, nine types | The anomaly refinery chain |
-| Dissection | 10 per body, up to 2,000 with the full ladder | Nothing to start |
-| Robbing another ship's server | 2,500 per attempt | Boarding somebody |
+| Source | Pays |
+|---|---|
+| Experiments | 200 each, plus any experiment-specific reward |
+| Loot research notes | 100, 250, 500, 750 or 1,000 per document |
+| Orbital surveys | 50-1,000 base points per contact |
+| Ground survey scanner | 9-18 per ten-second scan before depletion |
+| Refined anomaly cores in the destructive analyzer | 200 per core type, once per techweb |
+| Dissection | 100 per human body, rising to 600 with research |
+| Research theft | Up to 100 per attempt |
+| Research missions | The notes listed in the contract |
 
-### Experiments: the best thing you can do in the first ten minutes
+### Experiments
 
-This is the strongest early faucet in the game and it costs nothing. Every completed experiment pays a flat **2,000 points**.
+Print an **Experi-Scanner**, select an experiment and scan what it requests. The console's experiment panel lists available work. Starting experiments include blood or vomit scans, fish species, high-purity chemicals and autopsies. The autopsy experiment needs an **autopsy scanner**, available in cargo's Autopsy Kit.
 
-The **Experi-Scanner** is a protolathe design your web already has at round start, and it prints for half a sheet each of iron and glass. It finds your server on its own; check the examine text, and multitool it across if it says it has no link. Use it in your hand to pick an experiment, then hit whatever the experiment wants with it. Your R&D console's experiment panel shows everything currently on offer with a progress bar and a hint. A blank techweb already carries several, including:
+Each completed experiment pays 200 points plus its own listed reward. Printing another source disk or replacing the server does not reset that ship's experiment rewards. Discounts refund only points actually paid for the affected node.
 
-- Scan three patches of blood or vomit. That is the whole experiment.
-- Scan three different species of fish. A basic fishing rod is also a free design.
-- Scan a beaker of a named chemical at high purity.
-- Autopsy a corpse on an operating table wired to your server. That one is done with an **autopsy scanner**, which cannot be printed: order the Autopsy Kit crate from your [cargo console](money-and-trade.md).
-
-More experiments appear as you research deeper into a branch, so the supply does not dry up. The fishing chain pays a small bonus on top of the flat 2,000.
-
-**Ordnance experiments** pay the same 2,000, but they are finished differently: you capture a tank explosion on a doppler array or burst a gas tank in a tank compressor, print the data to a disk, and publish it through the **NT Frontier** app. Nine of them exist (five explosive and four gas) and each pays the first time a paper actually completes it. Publishing further tiers of an experiment you have already finished pays nothing.
+Ordnance experiments use a doppler array or tank compressor. Print the data and publish it through **NT Frontier**. Only the first paper that completes an experiment earns its completion reward.
 
 ### Research notes
 
-**Research notes** are a physical document with a point value printed on it. Put one against a linked R&D console and the points go straight into your web. Hit one note with another to stack them into a single bigger document.
-
-They turn up as loot, and the good ones are worth a lot: documents found in the wild are worth 250, 1,000, 2,500, 5,000 or 10,000 points. Research-themed loot caches carry one at every zone tier, cave dens on wasteland planets and old barrels on beach planets both roll the 5,000 and 10,000 tiers, and [space ruins](ruins.md) sometimes have one lying on a desk. This is the fastest way to a big number, and it is a good reason to have someone on every landing party checking the paperwork.
+Use notes on a linked R&D console to add their points. Use one note on another to combine them; their values add without a bonus.
 
-Salvaged documents can also be **sold** through the cargo console at half a credit per point, if your crew would rather have money than tech.
+Search research caches, planetary loot and ruin desks. Loot notes, including printed orbital survey results, can also be exported through cargo for half a credit per point. Ordinary dissection and mission dossiers do not have that export value.
 
-### The orbital survey console
+### Orbital surveys
 
-The **Orbital survey console** costs a single **40-point** node, which makes it the first thing most crews research. It surveys whatever your ship is sharing an overmap tile with. You sit in orbit alongside it, you do not have to dock. The one exception is storms: electric and EMP storms can also be scanned from up to **3 tiles away**, at **60%** of the normal payout, so you never have to fly into one just to log it.
+The **Orbital survey console** node costs **40 points**. Build the console and link it to your server. Survey a contact on your ship's overmap tile while holding still. Electrical and ion storms can also be scanned from up to **3 tiles away**, for **60%** of the normal points.
 
-A survey takes **60 seconds** and is cancelled the moment the ship moves, so park first. It pays points and an identical amount in credits, both banked in the console: **Print research** turns the points into a research-notes document, and **Cash out** spits the credits out as physical bills.
+A survey takes **60 seconds** and movement cancels it. **Print research** turns the banked points into notes. Surveys pay no cash.
 
-| Surveyed | Base points (and credits) |
-| --- | --- |
-| The star | 1,000 |
+| Target | Base research points |
+|---|---|
+| Star | 1,000 |
 | Planet | 500 |
 | Ion storm | 400 |
 | Space ruin | 300 |
@@ -73,127 +64,88 @@ A survey takes **60 seconds** and is cancelled the moment the ship moves, so par
 | Asteroid storm | 100 |
 | Nebula | 50 |
 
-Storm severity, nebula gas, and planet type do not change these base rates. Survey upgrades multiply payouts by 1.2, 1.5, or 2. The console shows the exact amount before you start. Surveying a space ruin also reveals its name on the chart.
-
-Each contact pays once per ship. The 20% bonus goes only to the first crew to survey it. Imported survey records count as completed surveys and cannot be scanned again for payment.
-
-Only one survey console works per ship, and it must be multitooled to your server. Unlinked, you get no payout multipliers and none of your surveys count toward the nodes that require them.
+The target's zone multiplies points by **1.25 in yellow** and **1.5 in red**. Superior survey research adds a **1.1** multiplier; elite uses **1.25** instead. Advanced does not increase pay. The console displays the quote before you start.
 
-### The survey scanner
+Each contact pays once per ship. There is no first-surveyor bonus. Imported records count as completed surveys and cannot be scanned again for payment. A ruin survey also reveals its name. Only one survey console works per ship; link it to the server so its records count toward research requirements.
 
-The **Survey Scanners** node costs **1,000 points** and sits behind Upgraded Parts, so it is a second-hour purchase. Bolt the machine down, switch it on, and it turns electricity into points by itself; right-click it to print out what it has banked.
+### Ground survey scanners
 
-Two parts set the rate:
+**Survey Scanners** costs **120 points**, behind Upgraded Parts. Take the machine onto natural ground at a planet, space ruin or asteroid field. It does not work aboard ships, at outposts or in empty space.
 
-- **Servo tier** sets the base yield: 50, 100, 150 or 200 points per two-second cycle.
-- **Matter bin tier** multiplies that by one to four, *and* decides how long a location lasts. Value falls one percent per cycle wherever you are parked, and the machine shuts itself off when the spot drops below a fifth of its worth. A basic bin exhausts a spot in under three minutes; the best bin runs for roughly a quarter of an hour at four times the rate. The counter is tied to where you are, so land somewhere new and it starts fresh.
+Wrench it down, open the panel, insert a charged power cell, close the panel and switch it on. It runs from its cell, not an APC. Right-click to print stored points.
 
-A better **micro-laser** cuts the power draw, which matters: a scanner on the cheapest laser pulls about 10 kW, and the best one brings that down to about 4 kW. That is a real load on a ship's grid, so watch the [SMES charge](ship-systems.md).
+Servo tiers give **9, 12, 15 or 18 points every ten seconds**, before depletion. Each scan reduces site value by four percentage points divided by the matter-bin tier. The scanner stops below **20%** value. Better bins extend the run; better micro-lasers reduce cell drain.
 
-### Anomaly cores in the destructive analyzer
+Scanners share the site's history. Moving or replacing the machine, or returning after the interior unloads, does not refresh that site.
 
-Feed a **refined anomaly core** to the destructive analyzer and it pays **200 points**. Nine core types exist and each pays once per techweb, so the full set is 1,800. Load an item and the analyzer tells you what it is worth before you pull the trigger.
+### Anomaly cores and hidden technology
 
-Getting there is about 240 points of bluespace research: Bluespace Theory, Applied Bluespace, then **Anomaly Research** for the refinery. Raw cores come from anomalies that turn up aboard your ship as a [dynamic event](dynamic-events.md), and from research-themed loot caches.
+A refined anomaly core pays **200 points** when destroyed in the analyzer, once per type per techweb. Nine types give 1,800 points in total. Research Anomaly Research for the refinery. Buy raw cores from Boffin or find them in research caches; neutralized natural and chart anomalies give finished cores. See [Trader Outposts](trader-outposts.md).
 
-Cores are the only items that pay research points when deconstructed.
-
-### Revealing hidden technology
-
-Load a suitable item into a linked destructive analyzer and choose the hidden field to reveal. This consumes the item. You still need the node's prerequisites and research points to buy it.
-
-- **Illegal Technology:** Vex sells a suppressor at the Undertow for 1200 credits that works as a research sample.
-- **Alien research:** Boffin sells alien crowbar samples at Quartermain for 1500 credits each. Each reveals one field: Alien Technology, Alien Engineering, or Alien Surgery. Bring three to reveal all three.
+The analyzer can also consume a sample to reveal a hidden field. You still need its prerequisites and points. Vex's suppressor reveals Illegal Technology. Boffin's alien crowbar sample costs **900 credits** and reveals one alien field; bring three for Alien Technology, Alien Engineering and Alien Surgery.
 
 ### Dissection
 
-Any crew can perform **Dissection** on a corpse with no research at all, and it climbs a four-rung ladder as you research surgery. Each rung replaces the last, so you only ever see the best one you own.
-
-| Tier | Pays (human) | Unlocked by |
-| --- | --- | --- |
-| Dissection | 10 | Nothing: you have it at round start |
-| Advanced Dissection | 1,000 | Advanced Surgery (80 points) |
-| Superior Dissection | 1,500 | Experimental Surgery (120 points) |
-| Elite Dissection | 2,000 | Alien Surgery: hidden, deep in the alien-technology branch |
+Operate on a corpse to produce research notes. Research unlocks stronger procedures.
 
-Advanced Surgery also wants the human autopsy experiment done, which you were going to do anyway for its 2,000 points. Counting its prerequisite, going from the 10-point dissection to the 1,000-point one costs about 120 points. One of the better returns on the tree.
+| Procedure | Human yield | Research |
+|---|---|---|
+| Dissection | 100 | None |
+| Advanced Dissection | 200 | Advanced Surgery |
+| Superior Dissection | 400 | Experimental Surgery |
+| Elite Dissection | 600 | Alien Surgery |
 
-Species change the figure: monkeys pay a fifth, most animals a sixth, jelly and pod people double, golems and zombies triple, abductors quadruple, adult xenomorphs five times and a royal xenomorph ten times. Each body can only be dissected once, and the result comes out as research notes.
+Species and threat change the yield. Monkeys pay a fifth, passive animals a sixth, creatures with melee attacks a third, elites triple and megafauna ten times. Human species have their own multipliers.
 
-### Robbing somebody
+A higher tier can reopen a body for the difference in value. Repeating the same tier pays nothing. A failed dissection pays 1% of the remaining value and consumes that tier's chance.
 
-Right-click another ship's R&D server in combat mode and hold still for ten seconds to strip **2,500 points** off their techweb and print it as a document you can carry home. They have to actually have the points, and you can repeat it while they do. Destroying the server outright drops its source disk on the floor, and that disk is their entire tech tree.
+### Theft and missions
 
-### What does not pay
+Right-click another ship's server in combat mode and hold still for ten seconds to steal up to **100 points** as notes. The victim must have the points. Destroying the server drops its source disk.
 
-[Mining](mining.md), [missions](missions.md) and [trading](trader-outposts.md) pay in ore, credits and vouchers, never in research points. No trader sells points or nodes either; what the Skunkworks at Quartermain Depot and the other stalls stock are **job packs**, which hand you a department's circuit boards outright so you can skip the research instead of doing it.
-
-[Bitrunning](bitrunning.md) has its own separate pool of points on the quantum server, which only buys domains and never touches your techweb. The one exception is a **reformatted technology disk**, dropped by a top-graded run on a medium-or-harder domain, which unlocks one hidden experimental node for free when uploaded at an R&D console.
+Telemetry and core-sample [missions](missions.md) also pay notes. [Bitrunning](bitrunning.md) has separate domain points; its reformatted technology disks unlock a single hidden node when uploaded.
 
 ## Spending points
 
-Nodes are bought at the R&D console, one at a time, by hand, or queued and bought for you.
-
-### The research queue
-
-The **Nanotrasen Science Hub** app is the other way into your techweb. Run it on a computer console, point it at your server with a multitool like any other machine, and its node list gains **Enqueue** buttons the wall-mounted R&D console does not have. A queued node researches itself within seconds of the points arriving, so a crew can line up what it wants and go fly the ship.
-
-It also solves the survey-gated nodes. Queue the elite survey console or a transporter tier, go and do the surveys it wants, and it unlocks the moment the last one lands. Survey requirements are checked when the node is actually researched, not just when the button is drawn.
-
-### Department access is cheap
-
-What your crew can build is gated by how far up the tree you have climbed, not by which hull you bought, and the inherited /tg/station tree is **cheap**, mostly 40 to 200 points a node. Robotics and the botany root are free from the start; Hydroponics is 80, Cytology 80, Xenobiology 120, Gene Engineering 160. Standing up a department is an afternoon's work, not a fortune. The expensive nodes are the Voidcrew ones, and they are what the big faucets are for.
-
-### Ship systems worth buying
-
-| Node | Cost | What it unlocks |
-| --- | --- | --- |
-| Orbital survey console | 40 | The survey console board. Research this first. |
-| Basic Shuttle Research | 40 | Plasma and ion engines, engine heaters, helm consoles, ram scoop, plasma sublimator |
-| Shuttle Construction | 80 | The ship construction console. See [Ship Upgrades](ship-upgrades.md) |
-| Shuttle Warfare Systems | 80 | The weapons console, and the gateway to every combat node below |
-| Shuttle Shield Systems / Cloaking Systems / Missile Ordnance | 120 each | Shield generators, the cloak, and the missile launcher with its light warhead |
-| Shuttle Laser Systems | 160 | Laser turrets |
-| Electronic Warfare Systems | 160 | The electronic warfare suite board and the tier-1 exploit cartridges. Stronger exploits are never researchable. See [Ship Hacking](ship-hacking.md) |
-| Shuttle Interdiction Systems / Ship Data Siphon | 200 each | The interdictor, and the siphon that drains a locked-on ship's account |
-| Mission Logistics | 500 | Replacement mission board and pad |
-| Survey Scanners | 1,000 | The survey scanner above |
-| Basic Nanite Programming | 1,000 | The whole nanite suite, including a program that pays a point per nanite host every time the nanites tick |
-| Sleeper Unit Construction | 5,000 | Sleepers |
+Buy nodes at the R&D console. The **Nanotrasen Science Hub** app can queue them; queued purchases wait for their points, surveys and permissions.
 
-All the ship combat hardware is covered properly in [Ship Combat](ship-combat.md).
+Most nodes cost **40-200 points**. Robotics and the botany root are starting research. Department starter packs at traders supply boards directly; they do not grant research points.
 
-### The radar ladder
+| Useful node | Points |
+|---|---|
+| Basic Shuttle Research | 40 |
+| Shuttle Construction / Shuttle Warfare Systems | 80 each |
+| Shield Systems / Cloaking Systems / Missile Ordnance | 120 each |
+| Shuttle Laser Systems / Electronic Warfare Systems | 160 each |
+| Interdiction Systems / Ship Data Siphon | 200 each |
+| Mission Logistics | 40 |
+| Survey Scanners / Basic Nanite Programming | 120 each |
+| Sleeper Unit Construction | 200 |
 
-Three nodes, each widening how far an active scan reaches from the helm. They unlock no printable object. The ship simply gets better sensors. See [Piloting Your Ship](piloting.md).
+See [Ship Combat](ship-combat.md), [Ship Upgrades](ship-upgrades.md) and [Nanites & Revival](nanites-and-revival.md) for the equipment.
 
-| Node | Cost | Scan range |
-| --- | --- | --- |
-| Radar Array | 1,000 | 6 tiles |
-| Radar Array: Signal Analysis | 2,500 | 8 tiles, and space ruins are named on the chart without a survey |
-| Radar Array: Vessel Tracking | 5,000 | 10 tiles, and other crews' ships are plotted out to full range |
+### Radar
 
-### The survey console ladder
+| Node | Points | Scan range |
+|---|---|---|
+| Radar Array | 80 | 6 tiles |
+| Radar Array: Signal Analysis | 120 | 8 tiles; identifies ruins |
+| Radar Array: Vessel Tracking | 160 | 10 tiles; tracks player ships |
 
-The upgrades to the survey console are gated on what you have already surveyed as well as on points, so they cannot be bought out of order.
+### Survey upgrades
 
-| Node | Cost | Surveys required | What it adds |
-| --- | --- | --- | --- |
-| Advanced | 5,000 | 1 planet, 3 nebulas, 1 electric storm | Choose where on a planet you land; 1.2× payouts |
-| Superior | 10,000 | 3 planets, 3 electric storms, 3 EMP storms | Wider survey view, structures visible, survey data disks; 1.5× payouts |
-| Elite | 20,000 | 5 planets, 2 asteroid fields, **1 star** | Widest view, lifeforms visible; 2× payouts |
+| Upgrade | Points | Surveys required | Adds |
+|---|---|---|---|
+| Advanced | 120 | 1 planet, 3 nebulas, 1 electrical storm | Choose planet landing sites |
+| Superior | 160 | 3 planets, 3 electrical storms, 3 ion storms | Structure view, data disks, 1.1 times points |
+| Elite | 200 | 5 planets, 2 asteroid fields, 1 star | Lifeform view, wider view, 1.25 times points |
 
-That star is the one at the dead centre of the map, inside the safe [inner ring](overmap.md). Park on it and hold perfectly still for a minute.
+[Transporters](transporters.md) cost **160, 200 and 200 points** across three nodes, with survey and technology prerequisites.
 
-### Transporters
+### Zone reputation
 
-Three more nodes at 12,000, 20,000 and 30,000 points, gated on planets and asteroid fields surveyed, sitting behind both the advanced survey console and bluespace travel. They are the most expensive thing a crew can research and they are covered in full on [Transporters](transporters.md).
+Some research needs [zone reputation](zone-reputation.md) before you can unlock it: Automatic Ammunition, C-20r and WT-550 ammunition and Specialist Ammunition need yellow; L6, Bulldog, sniper, Explosive and Experimental Ammunition need advanced; Military Nanite Programming needs elite.
 
-## Your first thirty minutes
+Electric Weaponry needs yellow reputation for ion, temperature and tesla kits. Advanced Beam Weaponry needs advanced reputation for X-ray and advanced energy gun kits. Illegal Technology needs elite reputation for the energy crossbow kit and rapid syringe gun, as does Unregulated Bluespace Research for the Event Horizon kit. Each requirement covers every design on that node.
 
-1. Print the **R&D Kit** at the autolathe and build the console, protolathe, imprinter and server. Put the source disk in the server. That is the step that switches everything on, so do it first and the rest is easy.
-2. **Multitool the server, then the R&D console.** Nothing works until they are talking.
-3. Print an **Experi-Scanner**. Built after the server is up it links itself; built before, the server claims it when the disk goes in. Examine it to check. Then pick an experiment off the console's list and go do it. That is 2,000 points.
-4. Buy the **Orbital survey console** node for 40 points, print its board on the imprinter, build it, and multitool it to the server.
-5. Fly to the nearest nebula, storm or unknown signal and survey it while the pilot holds station. Print the notes into the R&D console and cash the credits into the [bank](money-and-trade.md).
-6. Tell whoever goes planetside to bring back **any paperwork they find**. One 10,000-point document beats everything else on this page put together.
+Imported research still works. Copying technology does not grant reputation for other purchases.
diff --git a/wiki/content/ruins.md b/wiki/content/ruins.md
index 6d0c80491d9..9ca5ac05d66 100644
--- a/wiki/content/ruins.md
+++ b/wiki/content/ruins.md
@@ -13,22 +13,24 @@ A ruin starts as an "unknown signal", a contact with no name and no detail. Ther
 
 To board, fly onto the signal's tile and press Dock; the button reads "(boarding)". Two berths per ruin, same as a planet. Very large hulls are turned away, if the console says the ship is too big to dock, you need a smaller ride or a shuttle.
 
-The interior loads when the first ship arrives and is torn down once everyone leaves. **Anything you leave inside a ruin is gone when it unloads**, and once a ruin has been cleared out and abandoned, a different ruin appears elsewhere in its place. The supply does not run out.
+The interior loads when the first ship arrives and is torn down once everyone leaves. **Anything you leave inside a ruin is gone when it unloads**, and once a ruin has been cleared out and abandoned, a different ruin appears elsewhere in its place. The supply of ordinary space ruins does not run out. [Asteroid fields](mining.md) are different: a field is spent when it unloads.
 
 ## Loot caches
 
-Ruins carry abandoned caches: sealed crates whose contents are rolled from the zone the ruin is sitting in. A cache in the safe inner ring holds modest pickings; the same crate type deep in lawless space holds the good stuff. Some ruins carry a rare variant, which draws from the top of that zone's table.
+Ruins carry abandoned caches: sealed crates whose contents are rolled from the zone the ruin is sitting in. A cache in the safe inner ring holds modest pickings; the same crate type deep in lawless space holds the good stuff. Rare variants provide extra draws from the same zone-weighted tables. Every zone can reach the strongest loot, with better odds farther out.
 
 Two things worth knowing:
 
 - The value is locked in where the crate spawned. Hauling an unopened cache into a more dangerous zone does not improve it.
 - A cache never rolls the same prize twice, so the one-of-a-kind items in the rare tables are genuinely one per crate.
 
+A cache reserves one draw for a gun or melee weapon. Gun chances and weapon strength improve by zone; the other draws contain themed supplies. Freight and purchased mystery caches use a weaker gun selection. See [Weapons & Gear](weapons-and-gear.md).
+
 Not every ruin has one. The ones that do keep it in the most defensible room they have.
 
 ## What is guarding it
 
-Every ruin with a cache has something watching it, and the same ruin plays differently depending on where it spawned. Guard packs roll their size and their nastiness from the ruin's zone band: a green-ring site might have one straggler at the door, while the identical map in the lawless deep has packs at the chokepoints and a real monster on the vault.
+Every ruin with a cache has something watching it, and the same ruin plays differently depending on where it spawned. Ordinary guard groups use the same 1-2 enemy count in every band. Deeper zones improve their roster, health and damage rather than adding more guards to each group.
 
 Expect pirates, Syndicate operatives, cultists, undead, insects, wildlife or hostile robots depending on the ruin's theme. **Elite-tier enemies are the ceiling**. Harder versions of ordinary mobs, captains, lieutenants. Megafauna do not guard loot. The only places you will meet one are the surface of a volcanic planet, a short list of purpose-built arena ruins on volcanic, frozen and apocalyptic planet surfaces, and inside virtual reality ([Bitrunning](bitrunning.md)). See [Threats & Elites](threats-and-elites.md) for what you are actually fighting.
 
@@ -53,7 +55,7 @@ Each outpost stocks three randomly selected charts. Sold ruin charts return with
 
 Buying uploads a sealed rumour to your ship. Use the helm's reveal button when your crew is ready; it creates the ruin and marks a gold signal and waypoint. Each chart reveals once. Take your loot before everyone leaves, because the site clears out like an ordinary ruin.
 
-There is also a cheap standing tip ("word on the lanes", 1500 credits at any outpost) which simply marks one uncharted ordinary signal on your helm and names the band it sits in. Useful when the chart is empty and you do not want to fly a search pattern.
+There is also a cheap standing tip ("word on the lanes", 400 credits at any outpost) which simply marks one uncharted ordinary signal on your helm and names the band it sits in. Useful when the chart is empty and you do not want to fly a search pattern.
 
 ## Contested caches
 
diff --git a/wiki/content/ship-catalog.md b/wiki/content/ship-catalog.md
index c81c4a3cd78..7ae09c23ed7 100644
--- a/wiki/content/ship-catalog.md
+++ b/wiki/content/ship-catalog.md
@@ -27,7 +27,7 @@ Sizes are in tiles, width by height, on the default theme.
 
 <div class="ship-gallery">
 <figure><img src="assets/images/ships/ship_pill.png" alt="Pill-class"><figcaption>Pill-class: four tiles, one engine, a mining kit per bunk and one bay you can fit out.</figcaption></figure>
-<figure><img src="assets/images/ships/ship_pill_black.png" alt="Blackpill-class"><figcaption>Blackpill-class: three bunks, orange hardsuits, and a charge wired into the cabin floor.</figcaption></figure>
+<figure><img src="assets/images/ships/ship_pill_black.png" alt="Blackpill-class"><figcaption>Blackpill-class: three bunks, orange space suits, and a charge wired into the cabin floor.</figcaption></figure>
 <figure><img src="assets/images/ships/ship_goon_a.png" alt="Goon-class"><figcaption>Goon-class: four colour-coded pods off a central corridor, nearly all of it modular.</figcaption></figure>
 <figure><img src="assets/images/ships/ship_kilo_a.png" alt="Kilo-class"><figcaption>Kilo-class: east-side cargo hold, external dock prep strip, engine column and SMES bay permanent.</figcaption></figure>
 <figure><img src="assets/images/ships/ship_delta_a.png" alt="Delta-class"><figcaption>Delta-class: long and narrow, engine block aft, an airlock arm on each side.</figcaption></figure>
@@ -49,7 +49,7 @@ Each image shows the hull's default theme. The shipyard draws the same map live,
 
 **The Scarab** is the fleet's all-rounder and carries the biggest crew of any hull: nineteen job slots on its default configuration. It has a medbay, a cargo bay and full engineering as standard, and its four slots lean it medical, engineering, service or cargo.
 
-**The Phalanx** is the most expensive hull and by far the largest. It has no heavy weapons on the bare hull; its two long internal bays and cycling airlocks are built for putting a boarding party onto someone else's ship, which is a real tactic. See [Ship Combat](ship-combat.md). The lab, medbay and armory are all slots, so the marine gear only comes back if you pay for it. It is also a lot of ship to keep powered and crewed; see [Ship Systems](ship-systems.md).
+**The Phalanx** is the most expensive hull and by far the largest. It has no heavy weapons on the bare hull; its two long internal bays and cycling airlocks are built for putting a boarding party onto someone else's ship, which is a real tactic. See [Ship Combat](ship-combat.md). The lab, medbay and armory are all slots, so the support equipment depends on the modules you choose. The full armory carries guns, spare ammunition and a marine vendor; see [Weapons & Gear](weapons-and-gear.md). It is also a lot of ship to keep powered and crewed; see [Ship Systems](ship-systems.md).
 
 !!! warning "Crew numbers are not a target"
     The crew figure is how many job slots exist, not how many players you need. A Scarab with three people aboard is a very quiet ship with a lot of jobs nobody is doing. Pick a hull that matches the crowd you actually have.
diff --git a/wiki/content/ship-hacking.md b/wiki/content/ship-hacking.md
index 2cadc40fa65..f639a2979a3 100644
--- a/wiki/content/ship-hacking.md
+++ b/wiki/content/ship-hacking.md
@@ -9,7 +9,7 @@ Ship hacking is the quiet half of [ship combat](ship-combat.md). Instead of punc
 
 ## The suite
 
-The **Electronic Warfare Systems** research node (160 points, behind Shuttle Warfare Systems) unlocks the machine board and the three tier-1 cartridges. If your crew does not do research, Vex at the [Undertow Exchange](trader-outposts.md) sells the board for 3,200 credits or 3 vouchers, one per round. Build it with two capacitors, a micro-laser and a servo, wrench it down anywhere on your ship, and link it to your weapons system console with a multitool, a freshly built suite also links itself to a free console automatically. One suite per console.
+The **Electronic Warfare Systems** research node (160 points, behind Shuttle Warfare Systems) unlocks the machine board and the three tier-1 cartridges. If your crew does not do research, Vex at the [Undertow Exchange](trader-outposts.md) sells the board for **3,200 credits plus 3 vouchers**, one unit in stock. Buying it requires advanced [zone reputation](zone-reputation.md), after 3 green and 6 yellow points. Build it with two capacitors, a micro-laser and a servo, wrench it down anywhere on your ship, and link it to your weapons system console with a multitool, a freshly built suite also links itself to a free console automatically. One suite per console.
 
 The suite draws about 2 kW while an exploit is warming up or live, and losing power aborts whatever it was doing. Better parts matter: capacitors cut the signature each execution costs (down to a quarter of base), micro-lasers cut the power draw, and servos cut warmup time. Examining the suite shows its current signature, its loaded cartridges and all three reductions.
 
diff --git a/wiki/content/ship-systems.md b/wiki/content/ship-systems.md
index 1fa00b629d1..897bb3eaa94 100644
--- a/wiki/content/ship-systems.md
+++ b/wiki/content/ship-systems.md
@@ -28,13 +28,13 @@ Both the bank and the cargo console are explained properly in [Money & Trade](mo
 
 ## Fabrication and research
 
-Almost every ship has an **autolathe** somewhere aboard (on modular hulls it arrives with one of the modules) and that single machine is what makes research reachable on any ship. Print the **Research & Development Kit** from it (20 sheets of iron and 40 of glass) and the box contains the boards for the whole suite:
+Almost every ship has an **autolathe** somewhere aboard (on modular hulls it arrives with one of the modules) and that single machine is what makes research reachable on any ship. Print the **Research & Development Kit** from it (50 iron and 50 glass sheets at a basic autolathe) and the box contains the following:
 
-- R&D console
-- Protolathe
-- Destructive analyzer
-- **Circuit imprinter**
-- Ship R&D server, plus the source code disk that goes in it
+- R&D console board and construction materials
+- Flat-packed protolathe, destructive analyzer, **circuit imprinter** and ship R&D server
+- Source code disk for the server
+
+Deploy each flatpack with a multitool.
 
 The imprinter is the important one: machine boards can *only* be printed there, never on a protolathe. A ship without one is stuck with whatever machines it launched with, and a ship with one can eventually build anything.
 
@@ -68,8 +68,7 @@ Ships carry one or more **holopads**, which do double duty: they place calls to
 
 ## Defence
 
-Weapons are not standard equipment. Most hulls launch unarmed and you buy or build up from there. What you will eventually bolt on:
-
+Hull combat systems depend on the fitout. Starting personal guns and ammunition depend on the ship, rooms and job kits. See [Weapons & Gear](weapons-and-gear.md). What you can add to the hull:
 - **Shield generators**, which soak damage before the hull does and draw power to regenerate.
 - **Laser turrets** and **missile launchers**, aimed from a ship combat console.
 - An **interdictor**, which pins another ship in place so it cannot undock or run.
diff --git a/wiki/content/ship-upgrades.md b/wiki/content/ship-upgrades.md
index 7ee3c0b930d..6ba6e0ed19d 100644
--- a/wiki/content/ship-upgrades.md
+++ b/wiki/content/ship-upgrades.md
@@ -32,6 +32,8 @@ Buying anything asks for confirmation and tells you the cost. Purchases are one-
 
 Your ship is built to order (hull, theme and the module in each slot) and placed in the safe inner ring of the overmap. You spawn aboard as its captain, so you set its course and manage its crew. It then appears in every other player's join menu with its job list, so people can pick a role and spawn straight in. If you want a crew, launch early and put something useful in the ship's memo. Then read [Piloting](piloting.md), [Ship Systems](ship-systems.md) and [Ship Combat](ship-combat.md).
 
+A crew can run several ships, but only its leader can add one, by buying, requisitioning, commissioning or claiming it. The leader is whoever founded the crew. Anyone else who does it is asked whether they want to leave and start their own crew with that ship; saying no cancels it at no cost. A captain can still rebuild their own crew's ship from a checkpoint. If the leader leaves the crew, goes to cryo or respawns, the captain of the crew's oldest surviving ship takes over, or the earliest remaining member if it has no eligible captain. [Reputation and trader favor](zone-reputation.md) stay with the crew across hull losses and are shared by its ships; accounts, research and mission slots remain per ship.
+
 ## Modular hulls: slots and modules
 
 A modular hull is a fixed frame with empty pockets in it. The frame owns everything the ship cannot fly without (helm, engines, power, air, airlocks and at least one cryopod) so a bare hull with every slot on its default module is a working ship. Slots are the rooms, not the plumbing.
diff --git a/wiki/content/threats-and-elites.md b/wiki/content/threats-and-elites.md
index 36c1218723f..d980ec2eb39 100644
--- a/wiki/content/threats-and-elites.md
+++ b/wiki/content/threats-and-elites.md
@@ -5,23 +5,27 @@ order: 4
 blurb: What lives in the ruins and on the planets, how it scales with the zone you found it in, and the two things in the galaxy that are genuinely raid-sized.
 ---
 
-Most of what tries to kill you off-ship is scaled to where you found it. The same ruin template is close to empty in the Neutral Zone and full of teeth in the Lawless Zone, and the loot inside scales with it. Above that sit two deliberate ceilings: purpose-built apex beasts you hunt on contract, and a handful of legacy arenas where genuine megafauna still live. Knowing which tier you have walked into is most of the survival.
+Most of what tries to kill you off-ship is scaled to where you found it. Hostile NPCs have more health and deal more damage in yellow and red space, and the loot improves too. Above that sit two deliberate ceilings: purpose-built apex beasts you hunt on contract, and a handful of legacy arenas where genuine megafauna still live. Knowing which tier you have walked into is most of the survival.
 
 ## Ruin garrisons
 
 Every [ruin](ruins.md) that carries a loot cache also carries guards, and both are decided the moment the ruin loads, based on the overmap zone it surfaced in.
 
-| Zone | Guards per spawn point |
-|---|---|
-| Neutral | 0–1 |
-| Contested | 1–2 |
-| Lawless | 2–3 |
+Ordinary guard groups generally contain **1-2 enemies in every zone**. The roster still changes with the ruin's theme and zone: pirate sites can hold stronger factions, spiders upgrade to hunters and tarantulas, and undead sites can hold templars or plasma miners. Boss groups have their own fixed composition.
 
-The roster itself changes with the zone, not just the count. A pirate wreck in green space holds a couple of grey-tide thugs; the same wreck in red holds Silverscale and Interdyne gunmen with a faction captain in the vault. Spider nests go from nurses to hunters and tarantulas, robot sites from ordinary hivebots to rapid and mechanic variants, cult sites from proteon constructs to juggernauts, undead sites from skeletons to templars and plasma miners.
+Hostile NPCs keep the profile of the zone where they spawned. Moving one to another zone does not change it.
+
+| Zone | Ordinary health | Ordinary damage | Boss health | Boss damage |
+|---|---|---|---|---|
+| Green | Base | Base | Base | Base |
+| Yellow | 1.35 times | 1.15 times | 1.15 times | 1.1 times |
+| Red | 1.8 times | 1.35 times | 1.3 times | 1.2 times |
+
+This covers hostile wildlife, guards, mission enemies and pirate crews, including their attacks and projectiles. Pets, hired guards, recruits, arena fighters and player summons keep their normal stats. Planet wildlife and nests have the same population limits across zones.
 
 Every ruin with a **rare** cache also carries a setpiece guard: one hand-picked enemy standing on the prize. In green that is a lieutenant; in red it is the real thing, a faction warlord, a spider midwife, or a lavaland **elite** (broodmother, herald, legionnaire, pandora).
 
-Elites are the design ceiling for ruin guards: harder versions of normal mobs, not megafauna. A standalone elite fights as an ordinary NPC and drops nothing special. The cache it is standing on is the reward.
+Elites are the design ceiling for ruin guards: harder versions of normal mobs, not megafauna. A standalone elite fights as an ordinary NPC and drops nothing special. The cache it is standing on is the reward. Strong melee drops from other bosses, such as the hierophant club or cleaving saw, are no longer guaranteed.
 
 !!! tip "Read the zone before you dock"
     A ruin you cleared easily last round can be a wipe this round if it surfaced two bands deeper. Check where you are before you open the airlock.
@@ -44,7 +48,7 @@ The beast is named at random from a list per planet (the Widow Beneath, Old Scar
 
 ### The Hoarfrost Matriarch
 
-The frozen-world quarry is the first purpose-built boss in this tier, with a kit of its own rather than scaled-up stats. She is a huge white predator with 800 health, roughly twice the size of a bear, who fights in two phases. Past a health threshold her ability set upgrades. She is deliberately slow: every attack has a learnable dodge and you can always break contact and reset. She smashes ordinary walls, so a door will not save you, but she cannot tear reinforced walls. She takes extra damage from fire.
+The frozen-world quarry is the first purpose-built boss in this tier, with a kit of its own rather than scaled-up stats. She is a huge white predator with 800 base health before zone scaling, roughly twice the size of a bear, who fights in two phases. Past a health threshold her ability set upgrades. She is deliberately slow: every attack has a learnable dodge and you can always break contact and reset. She smashes ordinary walls, so a door will not save you, but she cannot tear reinforced walls. She takes extra damage from fire.
 
 She drops better loot than anything else in the tier:
 
@@ -55,9 +59,9 @@ She drops better loot than anything else in the tier:
 
 ## Megafauna
 
-True megafauna: blood-drunk miners, the hierophant, the wendigo, the last ash drake, the demonic frost miner, the clockwork defender, legion, The Thing, exist, but **only in the fourteen arenas built to host them**. Outpost 31, the hierophant's arena, the wendigo's cave, the blood-drunk shrines and their kin. Those ruins exist for that fight and nothing else.
+True megafauna include blood-drunk miners, the hierophant, the wendigo, the last ash drake, the demonic frost miner, the clockwork defender, legion and The Thing. Most live in purpose-built arenas. Outpost 31, the hierophant's arena, the wendigo's cave, the blood-drunk shrines and their kin. Those ruins exist for that fight and nothing else.
 
-They will never turn up as generic loot guards, they are banned from the zone garrison tables outright, and no planet mission will roll one. If you meet one, you walked into its house on purpose.
+They do not appear as generic loot guards or ordinary planet-mission targets. Volcanic worlds can also host at most one roaming megafauna where their zone permits it. Take the same precautions outside an arena.
 
 ## The Verdigris
 
@@ -76,6 +80,6 @@ Teleportation does not work anywhere inside, for you or for him. Ilthuun does no
 !!! danger "The lair does not reset"
     Every other ruin wipes itself clean when the last person leaves. This one does not. Boss health, dead guards, spent ammunition and opened wards all persist for the rest of the round. Wipe on layer three and you can come back to a lair that is still three-quarters cleared, but everything you burned getting there is still burned.
 
-Kill him and the beacon goes quiet for good. What he leaves on the sanctum floor: his robe and horned crown (both of which cast), the staff he was leaning on, the spent husk of the phylactery that stopped saving him, a bridle that takes someone else's body off them briefly, and three spell codices in his own hand. That hoard is the entire reward — his magic survives only in those codices, and nothing is handed to crews that stayed home. The site stays put afterward as a lootable husk, so you can strip it and fly home.
+Kill him and the beacon goes quiet for good. What he leaves on the sanctum floor: his robe and horned crown (both of which cast), the staff he was leaning on, the spent husk of the phylactery that stopped saving him, a bridle that takes someone else's body off them briefly, and three spell codices in his own hand. His kill-only [bounty](bounty-hunting.md) also pays credits, vouchers and crew reputation when its trophy is turned in. The hoard is physical loot — his magic survives only in those codices, and nothing is handed to crews that stayed home. The site stays put afterward as a lootable husk, so you can strip it and fly home.
 
 Bring a real party. Four layers of undead is not a two-person job, and the fight at the bottom is on the same tier as the Matriarch.
diff --git a/wiki/content/trader-outposts.md b/wiki/content/trader-outposts.md
index c82a743a121..3e094fe766b 100644
--- a/wiki/content/trader-outposts.md
+++ b/wiki/content/trader-outposts.md
@@ -11,7 +11,7 @@ Three trader outposts sit permanently on the [overmap](overmap.md), one per zone
 
 | Outpost | Zone | Trader | Sells |
 |---|---|---|---|
-| Waystation Halcyon | Neutral ring (green) | Barnaby | Survival kit, tools, medical, prospecting gear, sundries. Credits only. |
+| Waystation Halcyon | Neutral ring (green) | Barnaby | Survival kit, tools, medical, prospecting gear, basic arms and sundries. Back-room goods also cost vouchers. |
 | Quartermain Depot | Contested lanes (yellow) | Sarge | Armour, firearms, thruster and turret boards, ordnance, hull stock. |
 | Undertow Exchange | Lawless deep (red) | Vex | Syndicate hardware, MODsuit control units, ship shield, interdiction and electronic-warfare boards, exploit software, sealed mystery cargo. |
 
@@ -21,22 +21,37 @@ All three broadcast their positions constantly, so they show up on your helm's c
 
 Fly to the outpost and dock like anywhere else. Every ship that arrives gets its own private **hangar berth**, up to six at once; if all six are taken, traffic control tells you to come back later. Very large hulls are refused outright.
 
-Your berth is not the shop. To get to the market you use the **hangar elevator**: step into the marked alcove beside it, use the wall panel, and pick a floor. Floor 0 is the concourse; floors 1 through 6 are the berths, and the panel marks which one your own ship is parked in. The ride takes a few seconds and moves everything standing in the alcove, so crates and dragged bodies come along. There is a panel in the concourse for going back.
+Your berth is not the shop. To get to the market you use the **hangar elevator**: step into the marked alcove beside it, use the wall panel, and pick a floor. Floor 0 is the concourse; floors 1 through 6 are the berths, and the panel marks which one your own ship is parked in. The ride takes a few seconds and moves everything standing in the alcove, so crates and dragged bodies come along. Going up, the lift stops in the outpost's arrivals lobby, outside the weapons checkpoint (see below); the panel there takes you back down.
 
 A berth is locked to its own crew. Only your crew can send the elevator down to your berth, and anyone standing in the alcove with you rides along as your guest. If the crew member who pressed the button steps out before the car leaves, it stays put. Anyone can ride back up to the concourse, and once a ship is abandoned its berth is open to everyone.
 
 !!! tip "The elevator is the only way between floors"
     Berths are separate bays, not rooms down a corridor. If you walk out of your ship looking for a door to the shop, you will not find one. Get in the alcove.
 
+## The checkpoint
+
+No combat guns past the checkpoint. Work tools and disablers are fine, including kinetic accelerators and plasma cutters. Every way into an outpost, the lift lobby and the outer hatches alike, runs through a **scan chamber**: a small room between two doors, with a guard watching from a glass booth.
+
+- Walk in through the outer door and walk into the inner door. The outer door shuts behind you, the chamber scans everyone and everything inside it, and if you are clean the inner door opens. If anything in there is a combat gun or a mech weapon, the inner door stays shut and the outer door opens again so you can walk back out. Everyone in the chamber goes through together, or nobody does.
+- The scan looks everywhere: hands, pockets, bags inside bags, implants. Anything lying on the floor of the chamber counts too, and a gun left there keeps the chamber refusing everyone until someone carries it out.
+- **Lockers** line the lobby. Shut your guns in one and swipe your ID to lock it to yourself. It frees up again once you empty it.
+- You leave through the **exit gate**, a one-way light curtain beside the checkpoint. Nothing comes in through it.
+
+**Weapons permit.** The guard sells a personal weapons permit at the booth window for 1,000 credits. It is good for twenty minutes, at that outpost only, and lets you through the scan and carry openly inside. It is yours alone: the outpost keeps the record, and the paper the guard hands you is just a receipt. A permit is no licence to shoot anyone; the usual rules on violence still apply.
+
+Combat guns bought inside the outpost, or paid out by a contract there, come in a **sealed case** (cache crates come with a sealed lid). The seal breaks once you are back outside the checkpoint.
+
+**Getting a gun in anyway.** It can be done, but the outpost does not take it lightly. Anyone seen inside with a combat gun in hand, or firing one, without a permit, and anyone who comes through a checkpoint door that was pried or hacked open, is an **armed trespasser**: the turrets treat you as hostile, and the traders, the guard and the checkpoint all refuse you for a good while after. Forcing the inner door takes a long time and sets off the alarm. This only applies to the person who did it, not their whole crew.
+
 ## Shopping
 
 The trader is a person standing behind a counter, not a vending machine. Click them and a menu opens with **Trade**, **Talk**, and (on the main trader) **Contracts**.
 
-The Trade window has two halves: the shop, sorted into category tabs, and the trader's **wanted ledger** of what they are buying. Prices are fixed. Some lines want credits off your ID's account, some want vouchers out of your pocket, some want both, and a few want a **barter**. Hold the asked item in your hand and swap it across.
+The Trade window has two halves: the shop, sorted into category tabs, and the trader's **wanted ledger** of what they are buying. Each line has a base price; credit specials and favor discounts can reduce it. Some lines want credits off your ID's account, some want vouchers out of your pocket, some want both, and a few want a **barter**. Hold the asked item in your hand and swap it across.
 
-Stock is a single pool every crew at that outpost draws from, arranged in three shelves. **Core** stock is the same every round and restocks. **Rotating** stock is a handful of items rolled fresh each round, one or two units each. **Rare** stock is one or two showcase items, single unit, gone when somebody buys it. One credit-priced item goes on **special** each round at 15–30% off.
+Stock is a single pool every crew at that outpost draws from, arranged in three shelves. Reputation can restrict who may buy a line. Back-room limits are shared across all ships of a crew. **Core** stock is the same every round and restocks. **Rotating** stock is a handful of items rolled fresh each round, one or two units each. **Rare** stock is one or two showcase items, single unit, gone when somebody buys it. One credit-priced item goes on **special** each round at 15–30% off.
 
-Roughly every 22 minutes a **supply convoy** arrives: shelves refill, a sold-out rotating slot is replaced, the special rerolls, and the trader starts buying again. Every berthed ship is notified, which is a decent reason to swing back through.
+Roughly every 22 minutes a **supply convoy** arrives: ordinary shelves partly refill, a sold-out rotating slot is replaced, the special rerolls, and buyback demand recovers. Gun stock has its own clock, generally one unit per hour, and some rare weapons never refill. See [Weapons & Gear](weapons-and-gear.md) for prices and sources. Every berthed ship is notified, which is a decent reason to swing back through.
 
 ## The stalls
 
@@ -47,7 +62,7 @@ Each outpost's concourse has its own side vendors, each with their own shopkeep
 | Halcyon | The Potting Shed | Fern | Seeds, growing supplies, the botany starter pack |
 | Halcyon | Pike's Bait & Tackle | Pike | Rods, bait and tackle, beside an indoor pond |
 | Halcyon | The Chowder Pot | Roux | The diner. Hot meals in tiers, galley staples, buys home cooking |
-| Quartermain | The Skunkworks | Boffin | Research and fabrication gear, robotics and xenobiology starter packs |
+| Quartermain | The Skunkworks | Boffin | Research and fabrication gear, robotics and xenobiology starter packs, raw anomaly cores and anomaly charts |
 | Quartermain | The Fitting Bay | Wick | Civilian through advanced MODsuits |
 | The Undertow | The Dregs | Dram | The cantina |
 | The Undertow | Patch-Up Clinic | Sawbones | Medical supplies, the genetics starter pack |
@@ -63,8 +78,6 @@ Vex's own shelves carry the other half of the deep-band trade: **exploit softwar
 
 ## Services
 
-Halcyon and Quartermain both have a **neural schematic imprinter**, which burns a weapon schematic into your memory for the round and shreds the paper. The Undertow does not have one, so a red-tier schematic bought from Vex has to be imprinted elsewhere. See [Money & Trade](money-and-trade.md).
-
 Every outpost has a free **first-aid locker** and a heavy-duty **recovery sleeper**. The locker is an ordinary closet and taking the supplies is expected; the sleeper is fixed machinery and hitting it is not.
 
 Nobody goes hungry at a market, either: Halcyon has the diner, Sarge sells field rations off a **Mess Tin** shelf at Quartermain (with snack and hot-dog machines beside the coffee corner), and the Dregs runs a heat-lamp **Greasy Spoon** menu at the Undertow next to its own hot-dog machine.
@@ -77,7 +90,7 @@ Every outpost stocks its own selection of charts. Check the destination's band b
 
 **Star charts** reveal every contact in a whole zone band at once: 1200 credits for the neutral ring, 2400 for the contested band, 2 vouchers for the lawless deep.
 
-**Word on the lanes** costs 1500 credits anywhere. The trader marks one uncharted signal on your helm and names the band it sits in.
+**Word on the lanes** costs 400 credits anywhere. The trader marks one uncharted signal on your helm and names the band it sits in.
 
 **Ruin charts** upload a sealed rumour to your ship. When your crew is ready, use the helm's reveal button to mark a fresh copy of the named ruin on your chart in gold. Each purchased chart reveals once.
 
@@ -98,19 +111,33 @@ Sold ruin charts restock with supply convoys. Buying another gives you another f
 
 More on what is inside them is on [Ruins](ruins.md).
 
+### Anomaly cores and charts
+
+Boffin at the Skunkworks is the only place that sells **raw anomaly cores**. Cargo does not carry them. He has two on the shelf at a time, one of each. When one sells, the next convoy brings a different type. Rare types turn up less often. Raw cores still need the refinery and a bomb. Standing discounts and specials apply to cores and charts as usual (the better of the two, never both).
+
+Boffin also sells **anomaly charts** the same way. A chart names one anomaly. It uploads to your helm sealed, like a ruin chart, and the reveal marks either a derelict or a planet in the named band. The anomaly only forms once **your own ship** docks there. Another crew that gets there first finds nothing. Neutralize it for its core. If the site vanishes before you arrive, the chart goes back on your helm sealed and you can reveal it again. The chart is lost if your ship is.
+
+| Anomalies | Raw core | Chart | Chart band |
+|---|---|---|---|
+| Flux, gravitational, hallucination, pyroclastic | 8000 cr | 4000 cr | Contested |
+| Bioscrambler, ectoplasm, dimensional | 10000 cr | 5000 cr | Contested |
+| Bluespace, vortex | 12000 cr | 6000 cr | Lawless |
+
 ## Trader contracts
 
-The main trader's **Contracts** menu is a second, separate mission board. Four offers stay posted, and they pay in **goods off that trader's own shelves** rather than money, which makes them worth taking when your account is empty.
+The main trader's **Contracts** menu is a second, separate mission board. Up to four offers stay posted. Vacancies refill every **11 minutes**, and unaccepted offers expire after **22 minutes**. Rewards can mix **credits, vouchers and goods from trader stock**. Some pay entirely in currency. Goods are reserved on acceptance; unavailable goods are replaced with currency.
 
 The mix is supply requests, salvage and kill contracts on ruins, and courier runs hauling a sealed freight pod to a *different* outpost. Halcyon also posts angling requests and **kitchen orders**, because it has a fishing stall and a diner. A kitchen order wants dishes cooked by an actual person at a stated recipe depth. Factory food is refused at turn-in, and so are plates bought off Roux's own counter, so somebody on your crew genuinely has to cook.
 
-Check the offered reward before accepting. Harder contracts can offer rarer gear.
+Supply requests ask for fauna harvests, ruin finds, salvage, raw telecrystal or glacial cores, rather than ore or sheets. Kitchen orders, fish and hides remain. Quartermain's fitter contracts ask for recovered MOD cores, control units or modules. Stored qualifying goods can be delivered, except that Vex only takes a legion core that is still fresh or was stabilized.
+
+Check the offered reward before accepting. Higher-zone targeted work requires [zone reputation](zone-reputation.md), and rare completion prizes come from eligible guarded work rather than routine supply orders.
 
 Turn them in at any outpost trader or at your own mission pad. Except courier runs, whose pod only opens at its destination. See [Missions](missions.md).
 
 ### Trader favor
 
-Completing a trader's contracts earns your ship favor with that trader: **1 point** for easy, **2** for medium, and **4** for hard contracts.
+Completing a trader's contracts earns your **crew** favor: **1 point** for easy, **2** for medium and **3** for hard. Kitchen orders, fishing requests and fish or bear-hide supply requests give **1** regardless of difficulty.
 
 | Favor | Standing | Credit discount |
 |---|---|---|
@@ -118,7 +145,9 @@ Completing a trader's contracts earns your ship favor with that trader: **1 poin
 | 4 | Partner | 10% |
 | 6 | Trusted | 15% |
 
-The discount applies at every stall on that outpost. Voucher prices stay the same. **Trusted** also opens the **Back Room** shop, with up to three of each special item available to your crew per round. Favor belongs to the ship, so losing the hull loses its standing.
+The discount applies at every stall on that outpost. Voucher prices stay the same. A special and favor do not stack; you get the better discount. Favor is shared across the crew's ships and survives losing a hull. The trade and contract windows show it as your reputation there.
+
+**Back Room** purchases require [zone reputation](zone-reputation.md), rather than Trusted favor. Barnaby's goods open after 3 green points. Sarge's fitter gauntlets open then too; his Skunkworks cell and maneuvering harness need the next unlock, after 6 yellow points. Vex's insurance implant needs the elite unlock, after 9 red points. Each crew may buy up to **three of each** per round.
 
 ## Violence
 
@@ -126,7 +155,7 @@ Outposts are indestructible. Walls, doors, machines and traders all shrug off we
 
 Attacking outpost property (or attacking another visitor inside the outpost) earns you a **strike**. The first two only get you a warning, with the turrets swinging around to point at you. On the **third**, three things happen at once:
 
-- You are personally marked. Every trader on the station refuses to serve you for the rest of the round.
+- You are personally marked. Every trader on the station refuses to serve you for 15 minutes.
 - Every ship your crew belongs to is put under a **trade embargo** for 15 minutes.
 - The outpost's turrets go lethal on you and anyone else aboard your embargoed ship.
 
@@ -135,4 +164,6 @@ The shoppers, drinkers, staff and odd regulars milling around each concourse can
 !!! danger "The embargo covers your whole crew"
     One person losing their temper bars everybody on the ship, including people who were still shopping. Embargoed crew are shot on sight, not merely refused service.
 
+Carrying a gun past the checkpoint without a permit is a separate matter from strikes: see [The checkpoint](#the-checkpoint). It marks only you, and the turrets go for you straight away.
+
 Fuel and gas sold at outposts, and the exotic gases Vex buys by the tank, are covered on [Fuel & Gas](gas-economy.md). Deeds for founding your own station are sold at Halcyon and Quartermain and covered on [Player Outposts](player-outposts.md).
diff --git a/wiki/content/transporters.md b/wiki/content/transporters.md
index e8ae40b1a10..03138e23fa9 100644
--- a/wiki/content/transporters.md
+++ b/wiki/content/transporters.md
@@ -5,7 +5,7 @@ order: 4
 blurb: Beam crew down to a planet and back without ever landing the ship.
 ---
 
-A **transporter** puts people on a surface and pulls them back while the ship stays in orbit. It is the late-game answer to the drop pod: instead of a one-way crate fired at a planet, you get a two-way lift you can use over and over. It costs a lot of research and a lot of bluespace crystal to get there.
+A **transporter** puts people on a surface and pulls them back while the ship stays in orbit. It is the late-game answer to the drop pod: instead of a one-way crate fired at a planet, you get a two-way lift you can use over and over. It needs survey research and bluespace crystal.
 
 ## Researching it
 
@@ -13,9 +13,9 @@ Three nodes, in order. Each needs surveys from your [orbital survey console](shi
 
 | Node | Points | Also requires | What it gives you |
 | --- | --- | --- | --- |
-| Molecular Transporter | 12,000 | 3 planets surveyed | The pad, console and transponder designs. Beam down to open ground the computer picks; beam up transponder carriers standing in the open. |
-| Transporter Pattern Targeting | 20,000 | 5 planets, 2 asteroids surveyed | The targeting scanner: pick the exact tile at either end, beam through a roof, and pull up anything standing on the coordinates. |
-| Transporter Biofilter Matrix | 30,000 | - | Stops passengers taking damage in transit, cuts 20 seconds off the pad's recharge, and lets the console detect a sabotaged pad. |
+| Molecular Transporter | 160 | 3 planets surveyed | The pad, console and transponder designs. Beam down to open ground the computer picks; beam up transponder carriers standing in the open. |
+| Transporter Pattern Targeting | 200 | 5 planets, 2 asteroids surveyed | The targeting scanner: pick the exact tile at either end, beam through a roof, and pull up anything standing on the coordinates. |
+| Transporter Biofilter Matrix | 200 | - | Stops passengers taking damage in transit, cuts 20 seconds off the pad's recharge, and lets the console detect a sabotaged pad. |
 
 ## Building it
 
diff --git a/wiki/content/weapons-and-gear.md b/wiki/content/weapons-and-gear.md
new file mode 100644
index 00000000000..bce3350e9ac
--- /dev/null
+++ b/wiki/content/weapons-and-gear.md
@@ -0,0 +1,89 @@
+---
+title: Weapons & Gear
+category: Danger
+order: 1
+blurb: Starting equipment, buying and finding weapons, making ammunition, and getting better suits.
+---
+
+Starting guns and ammunition depend on your ship, rooms and job. Find more weapons in guarded loot, buy limited trader stock or make them through ordinary crafting and research. Dangerous zones improve your chances of finding stronger equipment.
+
+## Starting equipment
+
+Check your ship's lockers, crates and job kit for guns and spare ammunition. Marine vendors offer weapons for vouchers. Security and miners also receive survival knives. Hulls with MOD storage carry ordinary suits rather than command-grade equipment.
+
+The first chaplain of a round receives a null rod. Its starting choices exclude guns and certain high-end melee forms. Surgery kits contain their operating tools; Sawbones sells one at the Patch-Up Clinic for **750 credits**.
+
+## Buying weapons
+
+Cargo does not sell security equipment, individual combat guns or conversion kits. Visit [trader outposts](trader-outposts.md). Their stock is shared with every crew.
+
+| Gun | Counter | Price | Reputation required |
+|---|---|---|---|
+| Surplus bolt-action rifle | Barnaby, Halcyon | 900 cr | None |
+| Disabler | Sarge, Quartermain | 400 cr | None |
+| Laser gun | Sarge, Quartermain | 1,500 cr | None |
+| Riot shotgun | Sarge, Quartermain | 1,800 cr | 3 green points |
+| Energy gun | Sarge, Quartermain | 2,400 cr | 3 green points |
+| C-20r | Vex, Undertow | 3,600 cr + 2 vouchers | 3 green points |
+| WT-550 | Vex, Undertow | 4,200 cr + 2 vouchers | 3 green points |
+| Mateba, when stocked | Vex, Undertow | 3,000 cr + 1 voucher | 3 green points |
+
+These gun lines restore one unit per hour up to their stock limit. Convoys do not refill them early. Most lethal lines start with one gun; Barnaby starts with two rifles. Limited showcase weapons may never restock. Check [zone reputation](zone-reputation.md) for access requirements.
+
+Barnaby also sells hunting and survival knives. Sarge sells combat knives, shortswords, ablative bats, fire axes and sabres. A riot shield costs **1,200 credits**.
+
+## Finding weapons
+
+Loot weapons follow three broad groups:
+
+| Group | Examples |
+|---|---|
+| Green | Surplus rifles, pistols, detective revolvers, double-barrelled shotguns; survival knives, spears, hatchets and bats |
+| Yellow | Laser and energy guns, WT-550s, C-20rs, Uzis and Tommy guns; combat knives, shortswords, fire axes and sabres |
+| Red | Carbines, laser cannons, L6 SAWs, X-ray guns, sniper rifles, combat shotguns and Bulldogs; claymores, katanas and energy swords |
+
+These are loot groups, not restrictions on what you may carry. Green loot can rarely roll stronger equipment. Yellow and red improve the odds.
+
+A cache makes one main weapon roll. For an armory cache the gun chance is **12% in green, 32% in yellow and 55% in red**. Other themes have lower chances. A failed gun roll gives a melee weapon. The remaining contents follow the cache's theme.
+
+Abandoned freight crates have an **8%, 19% or 33%** gun chance by zone and otherwise give melee. Their gun selection stops at the yellow group. Purchased mystery caches also use this restricted weapon selection.
+
+NPC weapons and drops vary by zone. The weapon an enemy uses does not guarantee that it drops. Strong melee prizes such as the hierophant club and cleaving saw are no longer guaranteed boss rewards. Unguarded ruin floors do not provide the strongest weapons. See [Ruins](ruins.md) and [Hostile Fauna & Elites](threats-and-elites.md).
+
+Pirate bounty weapon bundles hold one gun each. Other bundles can contain armour or security supplies instead.
+
+## Crafting and research
+
+Use the ordinary crafting menu for improvised guns, melee weapons and shields. Research unlocks printable weapons and conversion kits as usual. Fit each kit to the gun named by its recipe.
+
+Kit research needs crew [zone reputation](zone-reputation.md):
+
+| Research | Unlocks | Reputation required |
+|---|---|---|
+| Electric Weaponry | Tesla, ion and temperature kits | Yellow |
+| Advanced Beam Weaponry | Advanced energy gun and X-ray kits | Advanced |
+| Illegal Technology | Energy crossbow kit and rapid syringe gun | Elite |
+| Unregulated Bluespace Research | **Event Horizon** kit | Elite |
+| Illumination Applications | Photon cannon kit | None |
+
+The requirement covers every design on each node. You still need its usual prerequisites and research points. Imported research remains usable.
+
+The Event Horizon recharges itself and fires a long-range beam that opens a brief reality tear on impact. It has **no scope**. Keep it away from your own crew and hull.
+
+## Ammunition and firing pins
+
+Traders sell ammunition, and the [research tree](research.md) unlocks magazines and specialty loads. A 50-round L6 SAW magazine costs **50 iron, 10 titanium, 10 plasma and 5 plastic sheets** before lathe discounts. Its 80-point node requires Exotic Ammunition and Automatic Ammunition. Fully upgraded lathes reduce the material cost to 40%.
+
+Pistol, revolver, shotgun shell and rifle-clip ammunition needs no reputation. Magazines for SMGs, rifles and the C-20r and WT-550 need yellow [zone reputation](zone-reputation.md) to research; L6, Bulldog, sniper and explosive ammunition need advanced.
+
+**No Quarter** uses heavy cartridges, which fit no other gun. Anyone can craft one from **two iron sheets and one paper** in three seconds, with batch crafting available. Reloading takes five seconds. The gun arrives with twelve cartridges in its bandolier.
+
+Sarge sells ordinary **firing pins for 250 credits**. Fit one to a gun that lacks a pin. Removing a fitted pin destroys it. **Riot Supression** research also unlocks the printable **Test-Range Firing Pin**, which only allows firing near a test range.
+
+## Suits and rare prizes
+
+Ruin suit storage chooses its stock from the zone where it appeared: ordinary MODsuits in green, security in yellow, and an unrestricted nuclear suit in red. Moving the storage unit does not improve its stock.
+
+Wick sells suits, parts and modules at Quartermain. A civilian suit costs **1,800 credits**. Vex sells stronger chassis with reputation requirements. Trader anomaly-powered modules do not yield a removable anomaly core.
+
+Elite and specialist suits, the captain's laser, the Meteor Piledriver and certain ship boards can also arrive as rare completion prizes for guarded [missions](missions.md). Check that page for eligible work and limits.
diff --git a/wiki/content/zone-reputation.md b/wiki/content/zone-reputation.md
new file mode 100644
index 00000000000..58cb6456cc7
--- /dev/null
+++ b/wiki/content/zone-reputation.md
@@ -0,0 +1,65 @@
+---
+title: Crews & Zone Reputation
+category: Economy
+order: 5
+blurb: Earn a crew reputation through varied field work to open contracts, trader stock and advanced research.
+---
+
+Your crew earns **zone reputation** by completing different kinds of dangerous work. It opens contracts farther out, better trader stock, back rooms and some research. Reputation belongs to the crew for the round and survives losing a ship.
+
+## Work that counts
+
+Finish the job and turn it in. These are the eight separate kinds of work:
+
+| Kind | Jobs that count |
+|---|---|
+| Named kills | Kill Contracts for named ruin targets |
+| Big game | Big Game Hunts |
+| Capture | Live Capture contracts |
+| Poachers | Poacher Busts |
+| Survey field work | Guarded ruin survey pylons and planetary Core Sample contracts, counted together |
+| Extraction | Guarded Extraction Contracts |
+| Criminal bounties | Paid criminal turn-ins, including private offers and the kingpin |
+| Lairs | Kill-only bounty trophy turn-ins, including the lich |
+
+Ship-console missions and trader-board missions both count when they belong to one of these kinds. A completed job only counts once. Simply killing ordinary enemies does not earn reputation.
+
+Ordinary orbital surveys, telemetry, exploration, deliveries, gas sales, supply requests, courier runs, rescues, suppression sweeps and prospect stakes do not count. Some still pay money, trader favor or other rewards.
+
+## Points and variety
+
+An easy job is worth **1 point**, medium **2**, hard **3**, subject to the limit for its kind of work in that zone:
+
+- **Green:** at most **1 point per kind**. You need three different kinds of work to reach 3 points.
+- **Yellow and red:** at most **5 points per kind in each zone**. Points beyond that limit are lost, so change jobs to keep progressing.
+
+Named field missions use the target zone. Criminal bounties use the zone where the criminal was first captured or killed, rather than the pad's zone. Petty criminals count as easy, Wanted as medium, and Most Wanted or boss criminals as hard. Lair trophies count as hard work. The same criminal cannot pay reputation again after a later escape or relisting.
+
+Reputation totals are separate for green, yellow and red. Work in one does not replace the requirements in another.
+
+## What it opens
+
+Unlock these in order:
+
+| Requirement | Access |
+|---|---|
+| Starting crew | Green contracts, ordinary research and public trader stock |
+| **3 green points** | Yellow contracts and stock, Barnaby's back room, fitter's gauntlets; Automatic, C-20r, WT-550 and Specialist Ammunition research; Electric Weaponry (ion, temperature and tesla kits) |
+| Then **6 yellow points** | Red contracts, advanced trader stock, Skunkworks cell and maneuvering harness; L6, Bulldog, sniper, Explosive and Experimental Ammunition research; Advanced Beam Weaponry (X-ray and advanced energy gun kits) |
+| Then **9 red points** | Elite trader stock, Vex's back room and Military Nanite Programming research; Illegal Technology (energy crossbow kit and rapid syringe gun) and Unregulated Bluespace Research (Event Horizon kit) |
+
+You still pay the listed prices. Different goods have different requirements: arriving at a red outpost does not unlock its entire shop. Back-room goods have a shared limit of **three of each item per crew per round**.
+
+These permissions do not stop you flying into another zone. Every raw resource remains obtainable in green, and ordinary research remains available there. Imported technology still works; it does not grant reputation for contracts or shopping.
+
+Trader favor is separate. Completing a trader's contracts earns discounts at that outpost, but favor does not unlock zone access or back rooms. See [Trader Outposts](trader-outposts.md).
+
+## Your crew and its ships
+
+You belong to **one crew at a time**. A crew can run several ships and share reputation, trader favor and back-room purchase limits across them. Each hull keeps its own bank account, research and mission slots. Select the ship you intend to use when a service offers a choice; its account pays.
+
+Only the **crew leader** can bring a newly bought, requisitioned, commissioned or claimed ship into that crew. The founder starts as leader. Another member acquiring a ship is asked whether to leave and found a new crew; refusing cancels the acquisition without a charge. A captain can still rebuild their crew's own ship from a checkpoint.
+
+If the leader leaves, enters cryo or respawns, leadership passes to the captain of the oldest surviving crew ship, or the earliest remaining member if it has no eligible captain.
+
+Losing or abandoning a hull does not erase the crew's reputation or trader favor. Joining another crew leaves the old one; its standing does not transfer with you. Ship and crew records last for this round. [Ship parts](ship-parts.md) are the separate progression that carries between rounds.