Scatter depot loot to the solar winds. (#27954)

* Scatter depot loot to the solar winds.

* make zoo spawners guaranteed

* INFINITY also used for spawn_all_loot, whoops

* move abandoned sec shuttle spawner to locked crate

* Can't use spawn_all_loot and nested lists together

* Reduce pixel offset on mech transport spawn scatter

* set updatepaths script number

* incorporate changes from #27398 and remove old spawners

* some numbers tweaking

* pct -> %

* move briefcase from common to rare for ruins

* lower loot budget from 1800 -> 1700

_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm

@@ -194,6 +194,10 @@
 /obj/effect/mapping_helpers/turfs/burn,
 /turf/simulated/floor/plating,
 /area/ruin/space/abandoned_engi_sat)
+"fs" = (
+/mob/living/simple_animal/hostile/asteroid/hivelord,
+/turf/simulated/floor/wood/airless,
+/area/ruin/space/abandoned_engi_sat)
 "fA" = (
 /turf/simulated/floor/plasteel,
 /area/ruin/space/abandoned_engi_sat)
@@ -364,6 +368,7 @@
 	name = "torn sign";
 	pixel_x = -1
 	},
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plating,
 /area/ruin/space/abandoned_engi_sat)
 "kT" = (
@@ -503,6 +508,7 @@
 	pixel_y = -24;
 	name = "south bump"
 	},
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel,
 /area/ruin/space/abandoned_engi_sat)
 "oL" = (
@@ -546,6 +552,7 @@
 /area/ruin/space/abandoned_engi_sat)
 "pX" = (
 /obj/structure/closet/secure_closet/engineering_personal/empty,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/wood/airless,
 /area/ruin/space/abandoned_engi_sat)
 "qu" = (
@@ -711,6 +718,7 @@
 	pixel_y = 32
 	},
 /obj/structure/closet/crate/internals,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel{
 	icon_state = "bot";
 	dir = 1
@@ -931,6 +939,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel{
 	icon_state = "vault";
 	dir = 5
@@ -950,6 +959,10 @@
 	name = "floor"
 	},
 /area/ruin/space/abandoned_engi_sat)
+"FN" = (
+/mob/living/simple_animal/hostile/asteroid/hivelord,
+/turf/simulated/floor/carpet/airless,
+/area/ruin/space/abandoned_engi_sat)
 "FQ" = (
 /obj/machinery/door/airlock/engineering{
 	name = "Construction Area"
@@ -1259,6 +1272,11 @@
 	dir = 5
 	},
 /area/ruin/space/abandoned_engi_sat)
+"RV" = (
+/obj/effect/mapping_helpers/turfs/damage,
+/mob/living/simple_animal/hostile/asteroid/hivelord,
+/turf/simulated/floor/plasteel,
+/area/ruin/space/abandoned_engi_sat)
 "Sa" = (
 /obj/structure/table,
 /turf/simulated/floor/plasteel{
@@ -1340,6 +1358,10 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/plating,
 /area/ruin/space/abandoned_engi_sat)
+"Ye" = (
+/mob/living/simple_animal/hostile/asteroid/hivelord,
+/turf/simulated/floor/plasteel,
+/area/ruin/space/abandoned_engi_sat)
 "Yz" = (
 /obj/structure/closet/emcloset,
 /turf/simulated/floor/plasteel{
@@ -2089,7 +2111,7 @@ Ux
 Vx
 mQ
 DO
-DO
+fs
 DO
 DO
 bi
@@ -2159,7 +2181,7 @@ kI
 mG
 pX
 hB
-nH
+FN
 pX
 EU
 EU
@@ -2286,9 +2308,9 @@ oL
 xp
 gL
 fA
-kd
-fA
+RV
 fA
+Ye
 fA
 eG
 iV

_maps/map_files/RandomRuins/SpaceRuins/abandoned_sec_shuttle.dmm

@@ -115,6 +115,7 @@
 /obj/item/gun/projectile/automatic/pistol/enforcer,
 /obj/item/grenade/flashbang,
 /obj/item/storage/firstaid/regular,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/sec_shuttle)
 "F" = (

_maps/map_files/RandomRuins/SpaceRuins/abandonedtele.dmm

@@ -90,6 +90,7 @@
 /area/ruin/space/abandtele)
 "w" = (
 /obj/structure/closet,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/abandtele)
 "x" = (
@@ -106,6 +107,7 @@
 /obj/item/weldingtool,
 /obj/item/wrench,
 /obj/item/circuitboard/teleporter,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/abandtele)
 "z" = (

_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm

@@ -216,7 +216,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/item/gun/energy/floragun,
+/obj/effect/spawner/random/pool/spaceloot/zoo,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -376,7 +376,7 @@
 /area/ruin/space/unpowered)
 "aY" = (
 /obj/structure/table/reinforced,
-/obj/item/gun/energy/temperature,
+/obj/effect/spawner/random/pool/spaceloot/zoo,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},

_maps/map_files/RandomRuins/SpaceRuins/asteroid1.dmm

@@ -9,6 +9,10 @@
 "c" = (
 /turf/simulated/mineral/random/high_chance,
 /area/ruin/space/unpowered)
+"l" = (
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
 "V" = (
 /turf/template_noop,
 /area/template_noop)
@@ -149,7 +153,7 @@ V
 V
 V
 b
-b
+l
 V
 V
 V

_maps/map_files/RandomRuins/SpaceRuins/asteroid2.dmm

@@ -15,6 +15,10 @@
 /obj/structure/spawner/mining/basilisk,
 /turf/simulated/floor/plating/asteroid/airless,
 /area/ruin/space/unpowered)
+"C" = (
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
 "R" = (
 /obj/structure/spawner/mining/goliath,
 /turf/simulated/floor/plating/asteroid/airless,
@@ -220,7 +224,7 @@ c
 d
 c
 c
-c
+C
 c
 c
 c
@@ -337,7 +341,7 @@ c
 c
 c
 c
-c
+C
 c
 c
 c

_maps/map_files/RandomRuins/SpaceRuins/asteroid3.dmm

@@ -22,6 +22,10 @@
 "q" = (
 /turf/simulated/mineral/random/low_chance,
 /area/ruin/space/unpowered)
+"r" = (
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
 "v" = (
 /obj/structure/spawner/mining/basilisk,
 /turf/simulated/floor/plating/asteroid/airless,
@@ -175,7 +179,7 @@ q
 c
 c
 c
-b
+r
 c
 c
 q

_maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm

@@ -50,6 +50,10 @@
 	},
 /turf/simulated/floor/mineral/titanium/blue,
 /area/ruin/space/unpowered)
+"p" = (
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plating,
+/area/ruin/space/unpowered)
 "Q" = (
 /turf/simulated/mineral/random/low_chance,
 /area/ruin/space/unpowered)
@@ -354,7 +358,7 @@ a
 c
 c
 b
-f
+p
 f
 i
 i

_maps/map_files/RandomRuins/SpaceRuins/asteroid5.dmm

@@ -15,6 +15,10 @@
 /obj/structure/spawner/mining/goliath,
 /turf/simulated/floor/plating/asteroid/airless,
 /area/ruin/space/unpowered)
+"o" = (
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plating/asteroid/airless,
+/area/ruin/space/unpowered)
 "A" = (
 /turf/simulated/mineral/random/low_chance,
 /area/ruin/space/unpowered)
@@ -606,7 +610,7 @@ d
 c
 c
 b
-d
+o
 d
 c
 d

_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm

@@ -51,6 +51,13 @@
 	},
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/tcommsat)
+"cl" = (
+/obj/structure/rack,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plasteel/airless{
+	icon_state = "dark"
+	},
+/area/ruin/space/tcommsat)
 "cM" = (
 /obj/effect/decal/cleanable/blood/writing{
 	dir = 8
@@ -207,7 +214,7 @@
 	},
 /area/ruin/space/tcommsat)
 "lq" = (
-/mob/living/simple_animal/hostile/syndicate/ranged/space/autogib,
+/obj/effect/spawner/random/pool/spaceloot/modsuit_syndie,
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/tcommsat)
 "my" = (
@@ -481,6 +488,7 @@
 /area/ruin/space/tcommsat)
 "Go" = (
 /obj/structure/table,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/tcommsat)
 "GG" = (
@@ -590,6 +598,10 @@
 	},
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/tcommsat)
+"NC" = (
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plating/airless,
+/area/ruin/space/tcommsat)
 "NJ" = (
 /obj/structure/disposaloutlet{
 	dir = 4
@@ -632,6 +644,7 @@
 	dir = 8
 	},
 /obj/structure/closet/firecloset,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel,
 /area/ruin/space/tcommsat)
 "PZ" = (
@@ -1241,7 +1254,7 @@ Wc
 Is
 ot
 UK
-fS
+cl
 Wr
 kx
 Jr
@@ -2082,7 +2095,7 @@ Wc
 Wc
 Wc
 Is
-Wc
+NC
 Wr
 kx
 Jr
@@ -2862,7 +2875,7 @@ au
 Wc
 ot
 bc
-Wc
+NC
 Wr
 bc
 Wc

_maps/map_files/RandomRuins/SpaceRuins/casino.dmm

@@ -293,6 +293,7 @@
 /area/ruin/space/powered/casino/security)
 "hv" = (
 /obj/structure/table/reinforced,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/carpet/black,
 /area/ruin/space/powered/casino/floor)
 "hJ" = (
@@ -323,6 +324,8 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/mineral/plastitanium,
 /area/ruin/space/powered/casino/security)
 "in" = (
@@ -382,6 +385,7 @@
 /area/ruin/space/powered/casino/arrivals)
 "jz" = (
 /obj/structure/closet/cabinet,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plating,
 /area/ruin/space/powered/casino/floor)
 "jJ" = (
@@ -660,6 +664,7 @@
 "rh" = (
 /obj/structure/grille/broken,
 /obj/structure/closet/crate/trashcart,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plating,
 /area/ruin/space/powered/casino/maints)
 "rp" = (
@@ -802,6 +807,7 @@
 	dir = 8
 	},
 /obj/effect/mob_spawn/human/corpse/random_species/gambler,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel/freezer,
 /area/ruin/space/powered/casino/hall)
 "wo" = (
@@ -1111,6 +1117,13 @@
 	},
 /turf/simulated/floor/plasteel/dark,
 /area/ruin/space/powered/casino/arrivals)
+"EK" = (
+/obj/structure/table,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plasteel{
+	icon_state = "cafeteria"
+	},
+/area/ruin/space/powered/casino/kitchen)
 "EZ" = (
 /obj/machinery/door/airlock/maintenance,
 /obj/effect/spawner/random/dirt/maybe,
@@ -1310,6 +1323,7 @@
 "Nh" = (
 /obj/structure/table/reinforced,
 /obj/item/tank/internals/oxygen,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/mineral/plastitanium/red,
 /area/ruin/space/powered/casino/docked_ships)
 "Nj" = (
@@ -1368,6 +1382,13 @@
 	},
 /turf/simulated/floor/plating,
 /area/ruin/space/powered/casino/security)
+"OZ" = (
+/obj/structure/closet/secure_closet/freezer/fridge,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plasteel{
+	icon_state = "showroomfloor"
+	},
+/area/ruin/space/powered/casino/kitchen)
 "Pz" = (
 /obj/structure/chair/wood{
 	dir = 8
@@ -2222,7 +2243,7 @@ cc
 cc
 fT
 sO
-UO
+OZ
 RS
 Is
 Is
@@ -2454,7 +2475,7 @@ An
 IS
 sO
 UW
-DM
+EK
 ql
 DM
 sO

_maps/map_files/RandomRuins/SpaceRuins/clownmime.dmm

@@ -73,6 +73,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/mineral/tranquillite,
 /area/ruin/space/powered)
 "fS" = (
@@ -732,6 +733,13 @@
 /obj/effect/mapping_helpers/turfs/burn,
 /turf/simulated/floor/mineral/titanium,
 /area/ruin/space/clown_mime_ruin)
+"OZ" = (
+/obj/effect/mapping_helpers/turfs/damage,
+/obj/effect/mapping_helpers/turfs/burn,
+/obj/item/stack/sheet/wood,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/mineral/plastitanium,
+/area/ruin/space/clown_mime_ruin)
 "Pt" = (
 /obj/structure/table/reinforced,
 /obj/effect/spawner/random/maintenance,
@@ -1079,7 +1087,7 @@ OK
 nX
 wP
 Bb
-TC
+OZ
 nX
 tN
 tN

_maps/map_files/RandomRuins/SpaceRuins/debris1.dmm

@@ -149,6 +149,10 @@
 	},
 /turf/simulated/floor/plating/burnt/airless,
 /area/template_noop)
+"QL" = (
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plating/burnt/airless,
+/area/template_noop)
 
 (1,1,1) = {"
 aa
@@ -359,7 +363,7 @@ aa
 ay
 ad
 ml
-ay
+QL
 aU
 aa
 aa

_maps/map_files/RandomRuins/SpaceRuins/debris2.dmm

@@ -129,6 +129,11 @@
 /obj/machinery/computer/pandemic,
 /turf/simulated/floor/plasteel/airless,
 /area/template_noop)
+"Di" = (
+/obj/effect/mapping_helpers/turfs/burn,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plasteel/airless,
+/area/template_noop)
 
 (1,1,1) = {"
 aa
@@ -179,7 +184,7 @@ aa
 ad
 aG
 aA
-aM
+Di
 aF
 ad
 as

_maps/map_files/RandomRuins/SpaceRuins/debris3.dmm

@@ -128,6 +128,10 @@
 /obj/item/stack/sheet/metal,
 /turf/template_noop,
 /area/template_noop)
+"P" = (
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plating/damaged/airless,
+/area/template_noop)
 "Q" = (
 /obj/structure/girder,
 /turf/template_noop,
@@ -529,7 +533,7 @@ U
 v
 a
 O
-z
+P
 z
 a
 a

_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm

@@ -5997,9 +5997,9 @@
 /area/ruin/space/deepstorage)
 "MR" = (
 /obj/structure/rack,
-/obj/item/paper/researchnotes,
 /obj/effect/turf_decal/delivery/hollow,
-/obj/effect/spawner/random/deepstorage_reward/main,
+/obj/effect/spawner/random/pool/spaceloot/deepstorage/main,
+/obj/item/paper/researchnotes,
 /turf/simulated/floor/plasteel{
 	dir = 6;
 	icon_state = "vault"

_maps/map_files/RandomRuins/SpaceRuins/derelict1.dmm

@@ -94,6 +94,12 @@
 /mob/living/simple_animal/hostile/alien,
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/unpowered)
+"I" = (
+/obj/structure/alien/weeds,
+/obj/structure/table,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plating/airless,
+/area/ruin/space/unpowered)
 "S" = (
 /obj/structure/alien/weeds,
 /obj/structure/bed/nest,
@@ -609,8 +615,8 @@ f
 G
 f
 c
-m
-m
+I
+I
 f
 c
 b

_maps/map_files/RandomRuins/SpaceRuins/derelict3.dmm

@@ -47,6 +47,10 @@
 /obj/effect/decal/remains/human,
 /turf/simulated/floor/plating/airless,
 /area/ruin/space/unpowered)
+"H" = (
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plating/airless,
+/area/ruin/space/unpowered)
 "O" = (
 /mob/living/simple_animal/hostile/carp,
 /turf/simulated/floor/plating/airless,
@@ -852,7 +856,7 @@ d
 d
 b
 c
-b
+H
 b
 b
 b
@@ -1090,7 +1094,7 @@ b
 b
 b
 c
-b
+H
 b
 b
 b

_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm

@@ -61,6 +61,7 @@
 /area/ruin/space/unpowered)
 "p" = (
 /obj/structure/table,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/mineral/titanium/blue/airless,
 /area/ruin/space/unpowered)
 "q" = (

_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm

@@ -83,6 +83,10 @@
 /obj/machinery/kitchen_machine/microwave,
 /turf/simulated/floor/plasteel,
 /area/ruin/space/unpowered)
+"lE" = (
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plasteel,
+/area/ruin/space/unpowered)
 "mn" = (
 /obj/structure/closet/crate,
 /obj/item/toy/plushie/nianplushie,
@@ -241,6 +245,7 @@
 /area/ruin/space/unpowered)
 "LA" = (
 /obj/structure/table,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel,
 /area/ruin/space/unpowered)
 "LD" = (
@@ -1324,7 +1329,7 @@ Qx
 Qx
 Qx
 Qx
-zN
+lE
 vE
 hG
 bO

_maps/map_files/RandomRuins/SpaceRuins/dj.dmm

@@ -525,6 +525,7 @@
 "bt" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/crate/can,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel{
 	icon_state = "bar"
 	},
@@ -694,6 +695,7 @@
 	pixel_y = 2
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel{
 	icon_state = "freezerfloor"
 	},

_maps/map_files/RandomRuins/SpaceRuins/druglab.dmm

@@ -13,6 +13,7 @@
 /area/ruin/space/methlab)
 "d" = (
 /obj/structure/closet/crate,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plating,
 /area/ruin/space/methlab)
 "e" = (

_maps/map_files/RandomRuins/SpaceRuins/emptyshell.dmm

@@ -40,6 +40,10 @@
 /mob/living/simple_animal/hostile/asteroid/hivelord,
 /turf/simulated/floor/plating,
 /area/ruin/space/unpowered)
+"t" = (
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plating,
+/area/ruin/space/unpowered)
 "T" = (
 /obj/item/salvage/ruin/tablet,
 /turf/simulated/floor/plating,
@@ -301,7 +305,7 @@ c
 c
 d
 d
-d
+t
 d
 d
 d

_maps/map_files/RandomRuins/SpaceRuins/freighter.dmm

@@ -153,7 +153,7 @@
 /area/ruin/space/powered)
 "nq" = (
 /obj/structure/closet/crate,
-/obj/item/banhammer,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/mineral/plastitanium,
 /area/ruin/space/powered)
 "nD" = (
@@ -184,6 +184,7 @@
 /area/ruin/space/powered)
 "rV" = (
 /obj/structure/closet/crate/secure/loot,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/mineral/plastitanium,
 /area/ruin/space/powered)
 "st" = (
@@ -254,6 +255,7 @@
 /obj/structure/safe,
 /obj/item/id_decal/gold,
 /obj/item/stack/spacecash/c200,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel{
 	dir = 5;
 	icon_state = "caution"

_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm

@@ -136,6 +136,11 @@
 /obj/item/salvage/ruin/tablet,
 /turf/simulated/floor/mineral/titanium/purple,
 /area/ruin/space/powered)
+"U" = (
+/obj/structure/closet,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/mineral/titanium/purple,
+/area/ruin/space/powered)
 
 (1,1,1) = {"
 a
@@ -322,7 +327,7 @@ a
 a
 a
 b
-j
+U
 r
 w
 Q

_maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm

@@ -136,6 +136,10 @@
 	icon_state = "solarpanel"
 	},
 /area/ruin/space/syndicate_listening_station/asteroid)
+"nk" = (
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/mineral/silver,
+/area/ruin/space/syndicate_listening_station)
 "oE" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/floodlight,
@@ -323,6 +327,7 @@
 /obj/item/storage/box/tapes,
 /obj/item/taperecorder,
 /obj/item/clothing/glasses/regular,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel/dark,
 /area/ruin/space/syndicate_listening_station)
 "AT" = (
@@ -550,6 +555,7 @@
 /obj/item/clothing/shoes/slippers,
 /obj/item/clothing/under/misc/pj/red,
 /obj/item/clothing/suit/jacket/bomber/syndicate,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/wood,
 /area/ruin/space/syndicate_listening_station)
 "RN" = (
@@ -1541,7 +1547,7 @@ yn
 yn
 kJ
 KM
-Nd
+nk
 kJ
 PH
 le

_maps/map_files/RandomRuins/SpaceRuins/meatpackers.dmm

@@ -63,6 +63,7 @@
 "ap" = (
 /obj/item/restraints/handcuffs,
 /obj/structure/closet/crate,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plating/airless,
 /area/ruin/unpowered/bmp_ship/delta)
 "aq" = (
@@ -193,6 +194,7 @@
 "aP" = (
 /obj/item/stack/spacecash/c50,
 /obj/item/stack/spacecash/c100,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/wood,
 /area/ruin/unpowered/bmp_ship/fore)
 "aQ" = (
@@ -211,6 +213,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plating,
 /area/ruin/unpowered/bmp_ship/fore)
 "aT" = (
@@ -713,6 +716,7 @@
 /obj/structure/closet/secure_closet/freezer/meat{
 	opened = 1
 	},
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -2198,11 +2202,13 @@
 /obj/structure/closet/crate/freezer,
 /obj/item/food/meat,
 /obj/item/food/hugemushroomslice,
-/obj/effect/turf_decal/stripes/line{
-	dir = 2
-	},
+/obj/effect/turf_decal/stripes/line,
 /turf/simulated/floor/plating,
 /area/ruin/unpowered/bmp_ship/delta)
+"PE" = (
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plating,
+/area/ruin/unpowered/bmp_ship/aft)
 "PP" = (
 /obj/structure/computerframe{
 	dir = 4
@@ -4671,7 +4677,7 @@ cl
 cv
 eb
 ex
-dG
+PE
 dG
 dG
 fu

_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm

@@ -21,6 +21,7 @@
 /area/ruin/space/mech_transport)
 "aZ" = (
 /obj/structure/closet/crate/secure/loot,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel/dark,
 /area/ruin/space/mech_transport)
 "bk" = (
@@ -101,10 +102,10 @@
 /area/ruin/space/mech_transport)
 "hm" = (
 /obj/structure/table,
-/obj/item/mecha_parts/core,
 /obj/structure/sign/poster/contraband/tools{
 	pixel_y = 32
 	},
+/obj/effect/spawner/random/pool/spaceloot/mechtransport/storage4,
 /turf/simulated/floor/plasteel/dark,
 /area/ruin/space/mech_transport)
 "hu" = (
@@ -121,12 +122,7 @@
 /area/ruin/space/mech_transport)
 "hW" = (
 /obj/structure/table,
-/obj/item/mecha_parts/mecha_equipment/repair_droid,
-/obj/item/mecha_parts/mecha_equipment/extinguisher,
-/obj/item/mecha_modkit/voice/honk{
-	pixel_y = 10;
-	pixel_x = 3
-	},
+/obj/effect/spawner/random/pool/spaceloot/mechtransport/storage1,
 /turf/simulated/floor/plasteel/dark,
 /area/ruin/space/mech_transport)
 "iG" = (
@@ -164,6 +160,7 @@
 	},
 /obj/machinery/door/window,
 /obj/effect/decal/cleanable/cobweb,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel/dark,
 /area/ruin/space/mech_transport)
 "od" = (
@@ -201,6 +198,7 @@
 /area/ruin/space/mech_transport)
 "pJ" = (
 /obj/structure/closet/firecloset,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/mineral/plastitanium/red/airless,
 /area/ruin/space/mech_transport)
 "qs" = (
@@ -212,7 +210,6 @@
 "qE" = (
 /obj/effect/turf_decal/delivery/hollow,
 /obj/structure/sign/nosmoking_1{
-	pixel_y = 0;
 	pixel_x = 32
 	},
 /obj/effect/mapping_helpers/turfs/burn,
@@ -248,7 +245,6 @@
 "sr" = (
 /obj/structure/rack,
 /obj/item/stack/sheet/glass/fifty{
-	pixel_y = 0;
 	pixel_x = -2
 	},
 /obj/item/stack/sheet/metal/fifty{
@@ -263,6 +259,7 @@
 /area/ruin/space/mech_transport)
 "sY" = (
 /obj/structure/closet,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plating,
 /area/ruin/space/mech_transport)
 "ta" = (
@@ -313,13 +310,7 @@
 /area/ruin/space/mech_transport)
 "wo" = (
 /obj/structure/table,
-/obj/item/mecha_parts/mecha_equipment/drill,
-/obj/item/mecha_parts/mecha_equipment/drill{
-	pixel_y = 10
-	},
-/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill{
-	pixel_y = 4
-	},
+/obj/effect/spawner/random/pool/spaceloot/mechtransport/storage2,
 /turf/simulated/floor/plasteel/dark,
 /area/ruin/space/mech_transport)
 "wz" = (
@@ -542,7 +533,7 @@
 /area/ruin/space/mech_transport)
 "MK" = (
 /obj/structure/table,
-/obj/item/mecha_parts/mecha_equipment/medical/sleeper,
+/obj/effect/spawner/random/pool/spaceloot/mechtransport/storage3,
 /turf/simulated/floor/plasteel/dark,
 /area/ruin/space/mech_transport)
 "Nc" = (

_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm

@@ -4992,7 +4992,7 @@
 /obj/effect/decal/cleanable/cobweb2,
 /obj/effect/turf_decal/delivery/hollow,
 /obj/structure/rack,
-/obj/item/paper/researchnotes,
+/obj/effect/spawner/random/pool/spaceloot/moonoutpost19/vault1,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -5921,9 +5921,8 @@
 /area/ruin/space/moonbase19)
 "vh" = (
 /obj/structure/rack,
-/obj/item/mecha_parts/core,
 /obj/effect/turf_decal/delivery/hollow,
-/obj/item/stock_parts/cell/infinite/abductor,
+/obj/effect/spawner/random/pool/spaceloot/moonoutpost19/vault3,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -8137,8 +8136,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/turf_decal/delivery/hollow,
-/obj/item/assembly/signaler/anomaly/random,
-/obj/item/storage/lockbox/experimental_weapon,
+/obj/effect/spawner/random/pool/spaceloot/moonoutpost19/vault2,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},

_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm

@@ -1030,6 +1030,7 @@
 /area/ruin/space/onehalf/abandonedbridge)
 "dd" = (
 /obj/structure/closet/firecloset/full,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel,
 /area/ruin/space/onehalf/abandonedbridge)
 "de" = (
@@ -1122,6 +1123,11 @@
 /mob/living/simple_animal/hostile/carp,
 /turf/template_noop,
 /area/template_noop)
+"jI" = (
+/obj/structure/disposalpipe/trunk,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plating/airless,
+/area/ruin/space/onehalf/drone_bay)
 "jQ" = (
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -1548,7 +1554,7 @@ aa
 aa
 aa
 as
-aE
+jI
 aM
 ba
 bo
@@ -1680,7 +1686,7 @@ aa
 aa
 aa
 av
-aE
+jI
 aR
 by
 bo

_maps/map_files/RandomRuins/SpaceRuins/rocky_motel.dmm

@@ -38,6 +38,7 @@
 /obj/structure/toilet{
 	dir = 4
 	},
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel{
 	icon_state = "freezerfloor"
 	},
@@ -46,6 +47,7 @@
 /obj/structure/closet/cabinet,
 /obj/item/clothing/under/color/random,
 /obj/item/clothing/under/dress/sundress,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/carpet/black,
 /area/ruin/space/powered)
 "fH" = (
@@ -74,6 +76,7 @@
 "gP" = (
 /obj/structure/table/wood,
 /obj/effect/mapping_helpers/turfs/damage,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/wood,
 /area/ruin/space/powered)
 "gY" = (

_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm

@@ -127,6 +127,7 @@
 /area/ruin/space/powered/bar)
 "aF" = (
 /obj/structure/closet/secure_closet/freezer/kitchen,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/wood,
 /area/ruin/space/powered/bar)
 "aG" = (
@@ -134,6 +135,7 @@
 /area/ruin/space/powered)
 "aH" = (
 /obj/structure/closet/secure_closet/freezer/fridge,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/wood,
 /area/ruin/space/powered/bar)
 "aI" = (
@@ -456,6 +458,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},

_maps/map_files/RandomRuins/SpaceRuins/syndicatedruglab.dmm

@@ -1,6 +1,7 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "cq" = (
 /obj/structure/table,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/pod/dark,
 /area/ruin/space/syndicate_druglab)
 "dL" = (
@@ -267,7 +268,7 @@
 /area/ruin/space/syndicate_druglab)
 "Fq" = (
 /obj/structure/closet/cabinet,
-/obj/item/soap/syndie,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/carpet/black,
 /area/ruin/space/syndicate_druglab)
 "Fx" = (

_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm

@@ -742,7 +742,7 @@
 /area/template_noop)
 "CR" = (
 /obj/structure/chair/office/dark,
-/mob/living/simple_animal/hostile/syndicate/ranged/space/autogib,
+/obj/effect/spawner/random/pool/spaceloot/modsuit_syndie,
 /turf/simulated/floor/engine,
 /area/ruin/space/syndicakefactory)
 "CW" = (
@@ -908,6 +908,13 @@
 /obj/item/stack/sheet/animalhide/corgi,
 /turf/simulated/floor/grass,
 /area/ruin/space/syndicakefactory)
+"ID" = (
+/obj/structure/table/glass/reinforced/plastitanium,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plasteel{
+	icon_state = "floorgrime"
+	},
+/area/ruin/space/syndicakefactory)
 "IE" = (
 /obj/item/flag/syndi{
 	anchored = 1
@@ -2747,7 +2754,7 @@ OK
 OK
 OK
 EJ
-Wh
+ID
 xO
 hq
 xO

_maps/map_files/RandomRuins/SpaceRuins/syndiedepot.dmm

@@ -146,13 +146,13 @@
 	dir = 1;
 	on = 1
 	},
-/obj/effect/spawner/random/syndicate/loot/common,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
 /area/syndicate_depot/core)
 "aB" = (
-/obj/effect/spawner/random/syndicate/loot/common,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -342,7 +342,7 @@
 	},
 /area/syndicate_depot/core)
 "bc" = (
-/obj/effect/spawner/random/syndicate/loot/rare,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/rare/depot,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -350,7 +350,7 @@
 "bd" = (
 /obj/item/lighter/zippo/black,
 /obj/structure/table,
-/obj/effect/spawner/random/syndicate/loot/stetchkin,
+/obj/effect/spawner/random/syndicate/stetchkin,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -367,7 +367,7 @@
 	dir = 1;
 	on = 1
 	},
-/obj/effect/spawner/random/syndicate/loot/rare,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/rare/depot,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -394,7 +394,7 @@
 /area/syndicate_depot/outer)
 "bl" = (
 /obj/structure/table,
-/obj/effect/spawner/random/syndicate/loot/stetchkin,
+/obj/effect/spawner/random/syndicate/stetchkin,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -409,20 +409,11 @@
 	icon_state = "dark"
 	},
 /area/syndicate_depot/outer)
-"bn" = (
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/effect/spawner/random/syndicate/loot/common,
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/syndicate_depot/core)
 "bo" = (
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/effect/spawner/random/syndicate/loot/common,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -532,7 +523,7 @@
 	},
 /area/syndicate_depot/core)
 "bE" = (
-/obj/effect/spawner/random/syndicate/loot/officer,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/officer/depot,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -652,7 +643,7 @@
 /area/syndicate_depot/outer)
 "bU" = (
 /obj/structure/table,
-/obj/effect/spawner/random/syndicate/loot/stetchkin,
+/obj/effect/spawner/random/syndicate/stetchkin,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -786,8 +777,8 @@
 	},
 /area/syndicate_depot/core)
 "cm" = (
-/obj/effect/spawner/random/syndicate/loot/armory,
 /obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/armory/depot,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -797,13 +788,13 @@
 	dir = 1;
 	on = 1
 	},
-/obj/effect/spawner/random/syndicate/loot/armory,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/armory/depot,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
 /area/syndicate_depot/core)
 "co" = (
-/obj/effect/spawner/random/syndicate/loot/armory,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/armory/depot,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -1100,7 +1091,7 @@
 /obj/machinery/light/small{
 	dir = 8
 	},
-/obj/effect/spawner/random/syndicate/loot/rare,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/rare/depot,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -1142,6 +1133,14 @@
 	},
 /turf/simulated/floor/plating/asteroid/airless,
 /area/syndicate_depot/outer)
+"Nh" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/syndicate_depot/core)
 "Te" = (
 /turf/simulated/mineral/random/high_chance,
 /area/syndicate_depot/outer)
@@ -1729,7 +1728,7 @@ aM
 at
 aD
 aD
-bn
+cW
 bu
 bz
 at
@@ -1933,7 +1932,7 @@ aD
 aD
 aD
 aD
-bo
+Nh
 aD
 bv
 at
@@ -2093,7 +2092,7 @@ aD
 aD
 aD
 aD
-bE
+aB
 at
 aD
 aD
@@ -2452,7 +2451,7 @@ cl
 cz
 aD
 cQ
-bE
+aD
 aD
 aD
 at
@@ -2488,11 +2487,11 @@ af
 at
 aw
 aD
-aB
+aD
 at
 aD
 aD
-bc
+aD
 bi
 aD
 aD
@@ -2547,7 +2546,7 @@ aD
 at
 aD
 aD
-bE
+aD
 bE
 cb
 cn
@@ -2558,7 +2557,7 @@ aD
 bC
 aD
 at
-bh
+aL
 aD
 at
 af
@@ -2609,7 +2608,7 @@ cV
 aD
 aD
 at
-bc
+aD
 aD
 at
 at
@@ -2746,7 +2745,7 @@ aD
 aD
 aE
 aD
-bc
+aD
 bc
 at
 aD
@@ -2757,12 +2756,12 @@ at
 aD
 cD
 aD
-bE
+aD
 at
 aL
 aD
 bc
-bc
+aD
 aD
 aD
 at
@@ -2894,7 +2893,7 @@ af
 af
 af
 at
-aB
+aD
 aD
 aK
 aR
@@ -2965,7 +2964,7 @@ aD
 cW
 aD
 aD
-aB
+aD
 at
 af
 af

_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm

@@ -84,9 +84,9 @@
 	},
 /area/ruin/space/telecomms/chamber)
 "bP" = (
-/obj/effect/spawner/random/telecomms_core_table,
 /obj/machinery/ai_slipper,
 /obj/structure/table/glass/reinforced/plastitanium,
+/obj/effect/spawner/random/pool/spaceloot/dvorak_core_table,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "vault";
@@ -388,7 +388,7 @@
 /turf/simulated/floor/plasteel,
 /area/ruin/space/telecomms/tele)
 "ia" = (
-/obj/effect/spawner/random/telecomms_emp_loot,
+/obj/effect/spawner/random/pool/spaceloot/dvorak_emp_loot,
 /turf/simulated/floor/engine,
 /area/ruin/space/telecomms/computer)
 "ik" = (
@@ -1667,7 +1667,7 @@
 	},
 /area/ruin/space/telecomms/chamber)
 "CI" = (
-/obj/structure/displaycase/dvoraks_treat,
+/obj/effect/spawner/random/pool/spaceloot/dvorak_displaycase,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "vault";

_maps/map_files/RandomRuins/SpaceRuins/turretedoutpost.dmm

@@ -70,6 +70,7 @@
 /area/ruin/space/unpowered)
 "q" = (
 /obj/machinery/light,
+/mob/living/simple_animal/hostile/syndicate/melee/autogib,
 /turf/simulated/floor/plasteel,
 /area/ruin/space/unpowered)
 "r" = (
@@ -183,6 +184,7 @@
 /area/ruin/space/unpowered)
 "H" = (
 /obj/structure/chair,
+/mob/living/simple_animal/hostile/syndicate/melee/autogib,
 /turf/simulated/floor/plasteel,
 /area/ruin/space/unpowered)
 "I" = (
@@ -263,6 +265,22 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/ruin/space/unpowered)
+"T" = (
+/obj/item/rack_parts,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "vault"
+	},
+/area/ruin/space/unpowered)
+"Z" = (
+/obj/structure/rack,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "vault"
+	},
+/area/ruin/space/unpowered)
 
 (1,1,1) = {"
 a
@@ -384,10 +402,10 @@ a
 l
 d
 d
-s
-r
+T
+Z
 F
-r
+Z
 d
 d
 l
@@ -429,8 +447,8 @@ l
 d
 s
 x
-r
-r
+Z
+Z
 x
 s
 d

_maps/map_files/RandomRuins/SpaceRuins/unathi_skiff.dmm

@@ -129,9 +129,7 @@
 /area/ruin/space/unathi_breacher/hold)
 "kb" = (
 /obj/structure/rack,
-/obj/item/stack/sheet/mineral/gold,
-/obj/item/stack/sheet/mineral/gold,
-/obj/item/stack/sheet/mineral/gold,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/pod/dark,
 /area/ruin/space/unathi_breacher/hold)
 "kf" = (
@@ -146,6 +144,7 @@
 "kt" = (
 /obj/structure/table,
 /obj/item/screwdriver,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel/airless,
 /area/ruin/space/unathi_breacher/engineering)
 "li" = (

_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm

@@ -1284,6 +1284,7 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel{
 	dir = 6;
 	icon_state = "darkred"
@@ -3271,6 +3272,7 @@
 /area/ruin/space/derelict/hallway/primary)
 "iI" = (
 /obj/structure/closet/firecloset,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel{
 	dir = 6;
 	icon_state = "caution"
@@ -4893,6 +4895,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "whitered"
@@ -4939,6 +4942,7 @@
 /area/ruin/space/derelict/crew_quarters)
 "nh" = (
 /obj/structure/closet/athletic_mixed,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel{
 	icon_state = "hydrofloor"
 	},
@@ -5716,6 +5720,7 @@
 /area/ruin/space/derelict/hallway/primary)
 "pt" = (
 /obj/structure/closet/jcloset,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel/dark,
 /area/ruin/space/derelict/crew_quarters)
 "pu" = (
@@ -6950,6 +6955,10 @@
 /obj/effect/spawner/random/fungus/frequent,
 /turf/simulated/wall/indestructible/titanium/soviet/nodiagonal,
 /area/ruin/space/derelict/arrival)
+"Ae" = (
+/mob/living/simple_animal/hostile/poison/giant_spider/hunter,
+/turf/simulated/floor/plasteel/dark,
+/area/ruin/space/derelict/crew_quarters)
 "Bx" = (
 /obj/machinery/door_control{
 	id = "ruslock";
@@ -7029,6 +7038,13 @@
 	icon_state = "white"
 	},
 /area/ruin/space/derelict/arrival)
+"Za" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/mineral/plastitanium/red,
+/area/ruin/space/derelict/arrival)
 
 (1,1,1) = {"
 ac
@@ -7264,7 +7280,7 @@ ac
 ir
 iP
 ji
-jQ
+Za
 jQ
 lt
 lI
@@ -12452,7 +12468,7 @@ ac
 aV
 pm
 pt
-hU
+Ae
 pM
 pY
 db
@@ -12736,7 +12752,7 @@ pn
 pw
 pw
 db
-db
+qA
 db
 Mi
 aV

_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm

@@ -230,6 +230,7 @@
 /area/ruin/space/derelict/teleporter)
 "vr" = (
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel{
 	dir = 10;
 	icon_state = "darkblue"

_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm

@@ -315,6 +315,7 @@
 /area/ruin/space/powered)
 "bk" = (
 /obj/structure/rack,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel{
 	icon_state = "chapel"
 	},
@@ -396,6 +397,7 @@
 /area/ruin/space/powered)
 "bz" = (
 /mob/living/simple_animal/hostile/mimic/crate,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plating,
 /area/ruin/space/powered)
 "bA" = (
@@ -488,6 +490,10 @@
 /obj/structure/table,
 /turf/simulated/floor/plating,
 /area/ruin/space/powered)
+"EZ" = (
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
+/turf/simulated/floor/plating,
+/area/ruin/space/powered)
 "YM" = (
 /obj/structure/table/wood,
 /obj/item/blank_tarot_card,
@@ -577,7 +583,7 @@ aa
 bH
 ae
 aY
-aS
+EZ
 bl
 bq
 ae

_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm

@@ -274,6 +274,7 @@
 /obj/effect/decal/cleanable/cobweb,
 /obj/structure/rack,
 /obj/item/stack/rods/fifty,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel{
 	icon_state = "titanium";
 	dir = 4
@@ -666,6 +667,7 @@
 	dir = 1
 	},
 /obj/structure/closet/crate/secure/loot,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/pod/light,
 /area/ruin/space/wreck_cargoship)
 "AN" = (
@@ -783,6 +785,7 @@
 "Fk" = (
 /obj/structure/closet/crate,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel{
 	icon_state = "yellowsiding";
 	dir = 1
@@ -1084,6 +1087,7 @@
 	pixel_y = -32
 	},
 /obj/structure/closet/crate/secure/loot,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "blackcorner"
@@ -1193,6 +1197,7 @@
 "Vc" = (
 /obj/effect/decal/cleanable/cobweb,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plasteel{
 	dir = 9;
 	icon_state = "caution"
@@ -1307,6 +1312,7 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
 /turf/simulated/floor/plating,
 /area/ruin/space/wreck_cargoship)
 "XX" = (

code/datums/ruins/space_ruins.dm

@@ -225,7 +225,6 @@
 	name = "Suspicious Supply Depot"
 	description = "A syndicate supply depot, heavily stocked, but heavily guarded with an assortment of shields, sentry bots, armed operatives and more."
 	allow_duplicates = FALSE // One of these is enough
-	always_place = TRUE // This is on the always spawn list because of the shielding chance
 
 /datum/map_template/ruin/space/ussp_tele
 	id = "ussp_tele"

code/game/objects/effects/spawners/depot_spawners.dm

@@ -65,37 +65,9 @@
 	)
 
 // Loot
-/obj/effect/spawner/random/syndicate/loot
-	spawn_inside = /obj/structure/closet/secure_closet/depot
-
-/obj/effect/spawner/random/syndicate/loot/common
-	name = "syndicate depot loot, common"
-	icon_state = "loot"
-	spawn_loot_chance = 50
-	// Loot schema: costumes, toys, useless gimmick items
-	loot = list(
-		/obj/item/clothing/mask/gas/syndicate,
-		/obj/item/clothing/shoes/magboots/syndie,
-		/obj/item/clothing/suit/jacket/bomber/syndicate,
-		/obj/item/clothing/suit/storage/iaa/blackjacket/armored,
-		/obj/item/clothing/under/syndicate/combat,
-		/obj/item/clothing/under/syndicate/sniper,
-		/obj/item/coin/antagtoken/syndicate,
-		/obj/item/deck/cards/syndicate,
-		/obj/item/lighter/zippo/gonzofist,
-		/obj/item/soap/syndie,
-		/obj/item/stamp/chameleon,
-		/obj/item/storage/fancy/cigarettes/cigpack_syndicate,
-		/obj/item/storage/secure/briefcase/syndie,
-		/obj/item/storage/toolbox/syndicate,
-		/obj/item/suppressor,
-		/obj/item/toy/syndicateballoon,
-	)
-
-/obj/effect/spawner/random/syndicate/loot/stetchkin
+/obj/effect/spawner/random/syndicate/stetchkin
 	name = "syndicate depot loot, 20pct stetchkin"
 	icon_state = "stetchkin"
-	spawn_inside = null
 	spawn_loot_chance = 80
 	loot = list(
 		/obj/item/gun/projectile/automatic/pistol,
@@ -104,84 +76,6 @@
 		/obj/item/wrench,
 	)
 
-/obj/effect/spawner/random/syndicate/loot/rare
-	name = "syndicate depot loot, rare"
-	icon_state = "doubleloot"
-	spawn_loot_chance = 50
-	// Basic stealth, utility and environmental gear.
-	loot = list(
-		/obj/item/ammo_box/magazine/m10mm,
-		/obj/item/clothing/gloves/color/black/thief,
-		/obj/item/clothing/shoes/chameleon/noslip,
-		/obj/item/clothing/under/syndicate/silicon_cham,
-		/obj/item/clothing/mask/chameleon/voice_change,
-		/obj/item/flash/cameraflash,
-		/obj/item/gun/projectile/automatic/toy/pistol/riot,
-		/obj/item/mod/control/pre_equipped/traitor,
-		/obj/item/mod/module/chameleon,
-		/obj/item/mod/module/holster/hidden,
-		/obj/item/mod/module/noslip,
-		/obj/item/mod/module/visor/night,
-		/obj/item/mod/module/plate_compression,
-		/obj/item/reagent_containers/hypospray/autoinjector/hyper_medipen,
-		/obj/item/reagent_containers/hypospray/autoinjector/nanocalcium,
-		/obj/item/stack/sheet/mineral/gold{amount = 20},
-		/obj/item/stack/sheet/mineral/plasma{amount = 20},
-		/obj/item/stack/sheet/mineral/silver{amount = 20},
-		/obj/item/stack/sheet/mineral/uranium{amount = 20},
-		/obj/item/storage/backpack/duffel/syndie/med/surgery,
-		/obj/item/storage/backpack/satchel_flat,
-		/obj/item/storage/belt/military,
-		/obj/item/storage/box/syndie_kit/camera_bug,
-		/obj/item/storage/box/syndie_kit/chameleon,
-		/obj/item/storage/box/syndie_kit/space,
-	)
-
-/obj/effect/spawner/random/syndicate/loot/officer
-	name = "syndicate depot loot, officer"
-	spawn_loot_chance = 40
-	// Primarily utility items with occasional low damage weaponry.
-	loot = list(
-		/obj/item/borg/upgrade/syndicate,
-		/obj/item/clothing/glasses/hud/security/chameleon,
-		/obj/item/clothing/glasses/thermal,
-		/obj/item/clothing/shoes/magboots/elite,
-		/obj/item/door_remote/omni/access_tuner,
-		/obj/item/encryptionkey/binary,
-		/obj/item/gun/projectile/automatic/c20r/toy/riot,
-		/obj/item/jammer,
-		/obj/item/mod/module/power_kick,
-		/obj/item/mod/module/stealth,
-		/obj/item/mod/module/visor/thermal,
-		/obj/item/pen/edagger,
-		/obj/item/pinpointer/advpinpointer,
-		/obj/item/stack/sheet/mineral/diamond{amount = 10},
-		/obj/item/storage/belt/sheath/snakesfang,
-		/obj/item/storage/box/syndidonkpockets,
-		/obj/item/storage/box/syndie_kit/stechkin,
-		/obj/item/storage/firstaid/tactical,
-	)
-
-/obj/effect/spawner/random/syndicate/loot/armory
-	name = "syndicate depot loot, armory"
-	spawn_inside = /obj/structure/closet/secure_closet/depot/armory
-	// Combat orientated items that could give the player an advantage if an antag messes with them.
-	loot = list(
-		/obj/item/bio_chip_implanter/proto_adrenalin,
-		/obj/item/chameleon,
-		/obj/item/cqc_manual,
-		/obj/item/gun/medbeam,
-		/obj/item/gun/projectile/automatic/sniper_rifle/toy,
-		/obj/item/melee/energy/sword/saber,
-		/obj/item/mod/control/pre_equipped/traitor_elite,
-		/obj/item/organ/internal/cyberimp/arm/razorwire,
-		/obj/item/organ/internal/cyberimp/brain/sensory_enhancer,
-		/obj/item/reagent_containers/hypospray/autoinjector/stimulants,
-		/obj/item/shield/energy,
-		/obj/item/storage/box/syndie_kit/teleporter,
-		/obj/item/weaponcrafting/gunkit/universal_gun_kit,
-	)
-
 // Layout-affecting spawns
 
 /obj/effect/spawner/random/syndicate/walldoor

code/game/objects/effects/spawners/random/pool/pool_spawner.dm

@@ -4,10 +4,10 @@
 	icon_state = "loot"
 
 	/// How much this spawner will subtract from the available budget if it
-	/// spawns. A value of `INFINITY` (i.e., not setting the value on a subtype)
+	/// spawns. A value of `-1` (i.e., not setting the value on a subtype)
 	/// does not attempt to subtract from the budget. This is useful for
 	/// spawners which themselves spawn other spawners.
-	var/point_value = INFINITY
+	var/point_value = -1
 	/// Whether non-spawner items should be removed from the shared loot pool
 	/// after spawning.
 	var/unique_picks = FALSE
@@ -79,7 +79,7 @@
 		deduct_points = FALSE
 
 	// If we don't have a sane point value, don't deduct points
-	if(point_value == INFINITY)
+	if(point_value == -1)
 		deduct_points = FALSE
 
 	// If we deduct points, we need to check affordability

code/game/objects/effects/spawners/random/pool/space_loot.dm

@@ -0,0 +1,340 @@
+/datum/spawn_pool/spaceloot
+	id = "space_loot_spawn_pool"
+	available_points = 1700
+
+/obj/effect/spawner/random/pool/spaceloot
+	icon = 'icons/effects/random_spawners.dmi'
+	icon_state = "giftbox"
+	spawn_pool_id = "space_loot_spawn_pool"
+	record_spawn = TRUE
+
+/obj/effect/spawner/random/pool/spaceloot/record_item(type_path_to_make)
+	if(ispath(type_path_to_make, /obj/effect))
+		return
+
+	SSblackbox.record_feedback("tally", "space_loot_spawns", 1, "[type_path_to_make]")
+
+/obj/effect/spawner/random/pool/spaceloot/dvorak_core_table
+	point_value = 100
+	guaranteed = TRUE
+	loot = list(
+		/obj/item/rcd/combat,
+		/obj/item/gun/medbeam,
+		/obj/item/gun/energy/wormhole_projector,
+		/obj/item/storage/box/syndie_kit/oops_all_extraction_flares,
+	)
+
+/obj/effect/spawner/random/pool/spaceloot/dvorak_emp_loot
+	point_value = 35
+	guaranteed = TRUE
+	loot = list(
+		/obj/item/grenade/empgrenade = 8,
+		/obj/item/gun/energy/ionrifle/carbine = 1,
+		/obj/item/gun/energy/ionrifle = 1,
+	)
+
+/obj/effect/spawner/random/pool/spaceloot/dvorak_displaycase
+	point_value = 100
+	guaranteed = TRUE
+	loot = list(/obj/structure/displaycase/dvoraks_treat)
+
+/obj/effect/spawner/random/pool/spaceloot/syndicate/common
+	name = "syndicate depot loot, common"
+	icon_state = "loot"
+	point_value = 10
+	loot = list(
+		// Loot schema: costumes, toys, useless gimmick items
+		/obj/item/clothing/mask/gas/syndicate,
+		/obj/item/clothing/shoes/magboots/syndie,
+		/obj/item/clothing/suit/jacket/bomber/syndicate,
+		/obj/item/clothing/suit/storage/iaa/blackjacket/armored,
+		/obj/item/clothing/under/syndicate/combat,
+		/obj/item/clothing/under/syndicate/sniper,
+		/obj/item/coin/antagtoken/syndicate,
+		/obj/item/deck/cards/syndicate,
+		/obj/item/lighter/zippo/gonzofist,
+		/obj/item/soap/syndie,
+		/obj/item/stamp/chameleon,
+		/obj/item/storage/fancy/cigarettes/cigpack_syndicate,
+		/obj/item/storage/toolbox/syndicate,
+		/obj/item/suppressor,
+		/obj/item/toy/syndicateballoon,
+	)
+
+/obj/effect/spawner/random/pool/spaceloot/syndicate/common/depot
+	spawn_inside = /obj/structure/closet/secure_closet/depot
+	spawn_loot_chance = 40
+	loot = list(
+		// Loot schema: costumes, toys, useless gimmick items
+		/obj/item/clothing/mask/gas/syndicate,
+		/obj/item/clothing/shoes/magboots/syndie,
+		/obj/item/clothing/suit/jacket/bomber/syndicate,
+		/obj/item/clothing/suit/storage/iaa/blackjacket/armored,
+		/obj/item/clothing/under/syndicate/combat,
+		/obj/item/clothing/under/syndicate/sniper,
+		/obj/item/coin/antagtoken/syndicate,
+		/obj/item/deck/cards/syndicate,
+		/obj/item/lighter/zippo/gonzofist,
+		/obj/item/soap/syndie,
+		/obj/item/stamp/chameleon,
+		/obj/item/storage/fancy/cigarettes/cigpack_syndicate,
+		/obj/item/storage/toolbox/syndicate,
+		/obj/item/suppressor,
+		/obj/item/toy/syndicateballoon,
+
+		// only in depot for common-tier
+		/obj/item/storage/secure/briefcase/syndie,
+	)
+
+/obj/effect/spawner/random/pool/spaceloot/syndicate/stetchkin
+	name = "syndicate depot loot, 20% stetchkin"
+	icon_state = "stetchkin"
+	spawn_loot_chance = 80
+	point_value = 25
+	loot = list(/obj/item/gun/projectile/automatic/pistol)
+
+/obj/effect/spawner/random/pool/spaceloot/syndicate/rare
+	name = "syndicate depot loot, rare"
+	icon_state = "doubleloot"
+	point_value = 45
+	// Basic stealth, utility and environmental gear.
+	loot = list(
+		/obj/item/ammo_box/magazine/m10mm,
+		/obj/item/clothing/gloves/color/black/thief,
+		/obj/item/clothing/shoes/chameleon/noslip,
+		/obj/item/clothing/under/syndicate/silicon_cham,
+		/obj/item/clothing/mask/chameleon/voice_change,
+		/obj/item/flash/cameraflash,
+		/obj/item/gun/projectile/automatic/toy/pistol/riot,
+		/obj/item/lighter/zippo/gonzofist,
+		/obj/item/mod/module/chameleon,
+		/obj/item/mod/module/holster/hidden,
+		/obj/item/mod/module/noslip,
+		/obj/item/mod/module/visor/night,
+		/obj/item/mod/module/plate_compression,
+		/obj/item/reagent_containers/hypospray/autoinjector/hyper_medipen,
+		/obj/item/reagent_containers/hypospray/autoinjector/nanocalcium,
+		/obj/item/stack/sheet/mineral/gold{amount = 20},
+		/obj/item/stack/sheet/mineral/plasma{amount = 20},
+		/obj/item/stack/sheet/mineral/silver{amount = 20},
+		/obj/item/stack/sheet/mineral/uranium{amount = 20},
+		/obj/item/stamp/chameleon,
+		/obj/item/storage/backpack/duffel/syndie/med/surgery,
+		/obj/item/storage/backpack/satchel_flat,
+		/obj/item/storage/belt/military,
+		/obj/item/storage/box/syndie_kit/camera_bug,
+		/obj/item/storage/box/syndie_kit/chameleon,
+		/obj/item/storage/box/syndie_kit/space,
+
+		// common -> rare-tier for ruins
+		/obj/item/storage/secure/briefcase/syndie,
+	)
+
+/obj/effect/spawner/random/pool/spaceloot/syndicate/rare/depot
+	spawn_inside = /obj/structure/closet/secure_closet/depot
+	spawn_loot_chance = 40
+	loot = list(
+		/obj/item/ammo_box/magazine/m10mm,
+		/obj/item/clothing/gloves/color/black/thief,
+		/obj/item/clothing/shoes/chameleon/noslip,
+		/obj/item/clothing/under/syndicate/silicon_cham,
+		/obj/item/clothing/mask/chameleon/voice_change,
+		/obj/item/flash/cameraflash,
+		/obj/item/gun/projectile/automatic/toy/pistol/riot,
+		/obj/item/lighter/zippo/gonzofist,
+		/obj/item/mod/module/chameleon,
+		/obj/item/mod/module/holster/hidden,
+		/obj/item/mod/module/noslip,
+		/obj/item/mod/module/visor/night,
+		/obj/item/mod/module/plate_compression,
+		/obj/item/reagent_containers/hypospray/autoinjector/hyper_medipen,
+		/obj/item/reagent_containers/hypospray/autoinjector/nanocalcium,
+		/obj/item/stack/sheet/mineral/gold{amount = 20},
+		/obj/item/stack/sheet/mineral/plasma{amount = 20},
+		/obj/item/stack/sheet/mineral/silver{amount = 20},
+		/obj/item/stack/sheet/mineral/uranium{amount = 20},
+		/obj/item/stamp/chameleon,
+		/obj/item/storage/backpack/duffel/syndie/med/surgery,
+		/obj/item/storage/backpack/satchel_flat,
+		/obj/item/storage/belt/military,
+		/obj/item/storage/box/syndie_kit/camera_bug,
+		/obj/item/storage/box/syndie_kit/chameleon,
+		/obj/item/storage/box/syndie_kit/space,
+	)
+
+/obj/effect/spawner/random/pool/spaceloot/syndicate/officer
+	name = "syndicate depot loot, officer"
+	point_value = 110
+	// Primarily utility items with occasional low damage weaponry, and a blood-red, because that's too good for rare-tier.
+	loot = list(
+		/obj/item/borg/upgrade/syndicate,
+		/obj/item/clothing/glasses/hud/security/chameleon,
+		/obj/item/clothing/glasses/thermal,
+		/obj/item/clothing/shoes/magboots/elite,
+		/obj/item/door_remote/omni/access_tuner,
+		/obj/item/encryptionkey/binary,
+		/obj/item/jammer,
+		/obj/item/mod/module/power_kick,
+		/obj/item/mod/module/visor/thermal,
+		/obj/item/pen/edagger,
+		/obj/item/pinpointer/advpinpointer,
+		/obj/item/stack/sheet/mineral/diamond{amount = 10},
+		/obj/item/storage/belt/sheath/snakesfang,
+		/obj/item/storage/box/syndidonkpockets,
+		/obj/item/storage/box/syndie_kit/stechkin,
+		/obj/item/mod/control/pre_equipped/traitor,
+	)
+
+/obj/effect/spawner/random/pool/spaceloot/syndicate/officer/depot
+	spawn_inside = /obj/structure/closet/secure_closet/depot
+	spawn_loot_chance = 40
+	loot = list(
+		/obj/item/borg/upgrade/syndicate,
+		/obj/item/clothing/glasses/hud/security/chameleon,
+		/obj/item/clothing/glasses/thermal,
+		/obj/item/clothing/shoes/magboots/elite,
+		/obj/item/door_remote/omni/access_tuner,
+		/obj/item/encryptionkey/binary,
+		/obj/item/jammer,
+		/obj/item/mod/module/power_kick,
+		/obj/item/mod/module/visor/thermal,
+		/obj/item/pen/edagger,
+		/obj/item/pinpointer/advpinpointer,
+		/obj/item/stack/sheet/mineral/diamond{amount = 10},
+		/obj/item/storage/belt/sheath/snakesfang,
+		/obj/item/storage/box/syndidonkpockets,
+		/obj/item/storage/box/syndie_kit/stechkin,
+		/obj/item/mod/control/pre_equipped/traitor,
+
+		// only in depot for officer-tier
+		/obj/item/mod/module/stealth,
+	)
+
+
+/obj/effect/spawner/random/pool/spaceloot/syndicate/armory
+	name = "syndicate depot loot, armory"
+	// Combat orientated items that could give the player an advantage if an antag messes with them.
+	point_value = 200
+	loot = list(
+		/obj/item/bio_chip_implanter/proto_adrenalin,
+		/obj/item/chameleon,
+		/obj/item/gun/medbeam,
+		/obj/item/gun/projectile/automatic/sniper_rifle/toy,
+		/obj/item/melee/energy/sword/saber,
+		/obj/item/mod/control/pre_equipped/traitor_elite,
+		/obj/item/organ/internal/cyberimp/arm/razorwire,
+		/obj/item/organ/internal/cyberimp/brain/sensory_enhancer,
+		/obj/item/reagent_containers/hypospray/autoinjector/stimulants,
+		/obj/item/shield/energy,
+		/obj/item/weaponcrafting/gunkit/universal_gun_kit,
+
+		// officer -> armory tier for ruins
+		/obj/item/mod/module/stealth,
+	)
+
+/obj/effect/spawner/random/pool/spaceloot/syndicate/armory/depot
+	guaranteed = TRUE
+	spawn_inside = /obj/structure/closet/secure_closet/depot/armory
+	loot = list(
+		/obj/item/bio_chip_implanter/proto_adrenalin,
+		/obj/item/chameleon,
+		/obj/item/gun/medbeam,
+		/obj/item/gun/projectile/automatic/sniper_rifle/toy,
+		/obj/item/melee/energy/sword/saber,
+		/obj/item/mod/control/pre_equipped/traitor_elite,
+		/obj/item/organ/internal/cyberimp/arm/razorwire,
+		/obj/item/organ/internal/cyberimp/brain/sensory_enhancer,
+		/obj/item/reagent_containers/hypospray/autoinjector/stimulants,
+		/obj/item/shield/energy,
+		/obj/item/weaponcrafting/gunkit/universal_gun_kit,
+
+		// only in armory tier for depot
+		/obj/item/storage/box/syndie_kit/teleporter,
+		/obj/item/cqc_manual,
+	)
+
+
+/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed
+	loot = list(
+		/obj/effect/spawner/random/pool/spaceloot/syndicate/common = 30,
+		/obj/effect/spawner/random/pool/spaceloot/syndicate/rare = 20,
+		/obj/effect/spawner/random/pool/spaceloot/syndicate/officer = 5,
+		/obj/effect/spawner/random/pool/spaceloot/syndicate/armory = 1,
+	)
+
+// Only two of these
+/obj/effect/spawner/random/pool/spaceloot/zoo
+	unique_picks = TRUE
+	guaranteed = TRUE
+	point_value = 20
+	loot = list(
+		/obj/item/gun/energy/floragun,
+		/obj/item/gun/energy/temperature,
+	)
+
+/obj/effect/spawner/random/pool/spaceloot/modsuit_syndie
+	point_value = 100
+	spawn_loot_chance = 50
+	loot = list(/mob/living/simple_animal/hostile/syndicate/ranged/space/autogib)
+
+/obj/effect/spawner/random/pool/spaceloot/moonoutpost19
+	name = "moon outpost 19 loot spawner"
+	point_value = 30
+	guaranteed = TRUE
+	spawn_all_loot = TRUE
+
+/obj/effect/spawner/random/pool/spaceloot/moonoutpost19/vault1
+	loot = list(/obj/item/paper/researchnotes)
+
+/obj/effect/spawner/random/pool/spaceloot/moonoutpost19/vault2
+	loot = list(
+		/obj/item/storage/lockbox/experimental_weapon,
+		/obj/item/assembly/signaler/anomaly/random,
+	)
+
+/obj/effect/spawner/random/pool/spaceloot/moonoutpost19/vault3
+	loot = list(
+		/obj/item/mecha_parts/core,
+		/obj/item/stock_parts/cell/infinite/abductor,
+	)
+
+/obj/effect/spawner/random/pool/spaceloot/deepstorage/main
+	name = "warehouse main reward spawner"
+	guaranteed = TRUE
+	point_value = 100
+	loot = list(
+		/obj/item/storage/belt/champion/wrestling,
+		/obj/item/storage/box/weaver_kit,
+		/obj/item/gun/medbeam,
+		/obj/item/storage/lockbox/experimental_weapon,
+	)
+
+/obj/effect/spawner/random/pool/spaceloot/mechtransport
+	name = "mech transport storage loot spawner"
+	guaranteed = TRUE
+	point_value = 20
+	spawn_all_loot = TRUE
+	spawn_random_offset = TRUE
+	spawn_random_offset_max_pixels = 8
+
+
+/obj/effect/spawner/random/pool/spaceloot/mechtransport/storage1
+	loot = list(
+		/obj/item/mecha_parts/mecha_equipment/repair_droid,
+		/obj/item/mecha_parts/mecha_equipment/extinguisher,
+		/obj/item/mecha_modkit/voice/honk,
+	)
+
+/obj/effect/spawner/random/pool/spaceloot/mechtransport/storage2
+	loot = list(
+		/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill,
+		/obj/item/mecha_parts/mecha_equipment/drill,
+		/obj/item/mecha_parts/mecha_equipment/drill,
+	)
+
+/obj/effect/spawner/random/pool/spaceloot/mechtransport/storage3
+	loot = list(/obj/item/mecha_parts/mecha_equipment/medical/sleeper)
+
+/obj/effect/spawner/random/pool/spaceloot/mechtransport/storage4
+	loot = list(/obj/item/mecha_parts/core)
+

code/game/objects/effects/spawners/random/pool/spawn_pool.dm

@@ -55,5 +55,6 @@
 
 		qdel(spawner)
 
+	log_game("finished spawner [id] with [length(known_spawners)] remaining spawners and [available_points] points remaining.")
 
 	QDEL_LIST_CONTENTS(known_spawners)

code/game/objects/effects/spawners/random/random_spawner.dm

@@ -70,9 +70,10 @@
 
 	var/list/spawn_locations = get_spawn_locations(spawn_scatter_radius)
 	var/spawn_loot_count = isnull(lootcount_override) ? src.spawn_loot_count : lootcount_override
+	var/atom/container
 
 	if(spawn_inside)
-		new spawn_inside(loc)
+		container = new spawn_inside(loc)
 
 	if(spawn_all_loot)
 		spawn_loot_count = INFINITY
@@ -127,6 +128,10 @@
 						spawned_loot.pixel_x = spawn_loot_split_pixel_offsets * (loot_spawned % pixel_divider) + (column * spawn_loot_split_pixel_offsets)
 						spawned_loot.pixel_y = spawn_loot_split_pixel_offsets * (loot_spawned % pixel_divider)
 
+				if(container)
+					spawned_loot.forceMove(container)
+
+
 /**
  *  Makes the actual item related to our spawner. If `record_spawn` is `TRUE`,
  *  this is when the items spawned are recorded to blackbox (except for `/obj/effect`s).

code/modules/awaymissions/mission_code/ruins/abandoned_engi_sat.dm

@@ -1,12 +1,9 @@
 /obj/structure/closet/secure_closet/engineering_personal/empty
-	locked = FALSE
-	opened = TRUE
 
 /obj/structure/closet/secure_closet/engineering_personal/empty/populate_contents()
 	return
 
 /obj/structure/closet/wardrobe/atmospherics_yellow/empty
-	opened = TRUE
 
 /obj/structure/closet/wardrobe/atmospherics_yellow/populate_contents()
 	return

code/modules/awaymissions/mission_code/ruins/deepstorage.dm

@@ -293,15 +293,6 @@
 			/obj/item/clothing/glasses/sunglasses/yeah
 	)
 
-/obj/effect/spawner/random/deepstorage_reward/main
-	name = "warehouse main reward"
-	loot = list(
-			/obj/item/storage/belt/champion/wrestling,
-			/obj/item/storage/box/weaver_kit,
-			/obj/item/gun/medbeam,
-			/obj/item/storage/lockbox/experimental_weapon
-	)
-
 // paper stuff & lore
 
 /obj/item/paper/fluff/ruins/deepstorage/log1

paradise.dme

@@ -1075,6 +1075,7 @@
 #include "code\game\objects\effects\spawners\random\toy_spawners.dm"
 #include "code\game\objects\effects\spawners\random\trash_spawners.dm"
 #include "code\game\objects\effects\spawners\random\pool\pool_spawner.dm"
+#include "code\game\objects\effects\spawners\random\pool\space_loot.dm"
 #include "code\game\objects\effects\spawners\random\pool\spawn_pool.dm"
 #include "code\game\objects\effects\spawners\random\pool\spawn_pool_manager.dm"
 #include "code\game\objects\effects\spawners\random\traders\trader_department_spawners.dm"

tools/UpdatePaths/Scripts/27954_spaceloot_pool.txt

@@ -0,0 +1,4 @@
+/obj/effect/spawner/random/syndicate/loot/stetchkin : /obj/effect/spawner/random/syndicate/stetchkin
+/obj/effect/spawner/random/syndicate/loot/@SUBTYPES : /obj/effect/spawner/random/pool/spaceloot/syndicate/@SUBTYPES/depot
+/mob/living/simple_animal/hostile/syndicate/ranged/space/autogib : /obj/effect/spawner/random/pool/spaceloot/modsuit_syndie
+/obj/effect/spawner/random/deepstorage_reward/main : /obj/effect/spawner/random/pool/spaceloot/deepstorage/main