diff --git a/code/controllers/subsystems/supply.dm b/code/controllers/subsystems/supply.dm
index 084058b50f..96ef08d05a 100644
--- a/code/controllers/subsystems/supply.dm
+++ b/code/controllers/subsystems/supply.dm
@@ -121,6 +121,11 @@ SUBSYSTEM_DEF(supply)
 						EC.contents[EC.contents.len]["quantity"] = cashmoney.worth
 						EC.value += EC.contents[EC.contents.len]["value"]
 
+					// CHOMPAdd Start - Sell salvage
+					if(istype(A, /obj/item/salvage))
+						var/obj/item/salvage/salvagedStuff = A
+						EC.contents[EC.contents.len]["value"] = salvagedStuff.worth
+					// CHOMPAdd End
 
 
 			// Make a log of it, but it wasn't shipped properly, and so isn't worth anything
diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_ch.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_ch.dm
index ea2116d66a..eb3a5af253 100644
--- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_ch.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs_ch.dm
@@ -69,6 +69,10 @@
 	icon = 'modular_chomp/icons/mob/animal_ch.dmi'
 	catalogue_data = list(/datum/category_item/catalogue/fauna/mercenary/human)
 
+/mob/living/simple_mob/humanoid/merc/Initialize()
+	. = ..()
+	loot_list += list(/obj/item/salvage/loot/syndicate = 10)
+
 /mob/living/simple_mob/humanoid/merc/ranged
 	desc = "A tough looking individual armed with an pistol."
 
diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates_ch.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates_ch.dm
index d7eab07f0c..9021d9e506 100644
--- a/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates_ch.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates_ch.dm
@@ -49,6 +49,10 @@
 	ai_holder_type = /datum/ai_holder/simple_mob/merc
 	say_list_type = /datum/say_list/pirate
 
+/mob/living/simple_mob/humanoid/pirate/Initialize()
+	. = ..()
+	loot_list += list(/obj/item/salvage/loot/pirate = 35)
+
 //Armored Variant
 
 /mob/living/simple_mob/humanoid/pirate/armored
diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm
index bf5c611547..d8e1f5f95d 100644
--- a/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm
@@ -23,6 +23,12 @@
 
 	corpse = /obj/effect/landmark/mobcorpse/russian
 
+// CHOMPEdit Start
+/mob/living/simple_mob/humanoid/russian
+
+	loot_list = list(/obj/item/salvage/loot/russian = 10)
+
+// CHOMPEdit End
 
 /mob/living/simple_mob/humanoid/russian/ranged
 	icon_state = "russianranged"
diff --git a/modular_chomp/code/modules/salvage/bags.dm b/modular_chomp/code/modules/salvage/bags.dm
new file mode 100644
index 0000000000..83736de310
--- /dev/null
+++ b/modular_chomp/code/modules/salvage/bags.dm
@@ -0,0 +1,15 @@
+/obj/item/storage/bag/salvage
+	name = "treasure satchel"
+	desc = "A satchel for storing scavenged salvage. There be tresure."
+	icon = 'icons/obj/mining.dmi'
+	slot_flags = SLOT_BELT | SLOT_POCKET
+	w_class = ITEMSIZE_NORMAL
+	storage_slots = 15
+	max_w_class = ITEMSIZE_NORMAL
+	can_hold = list(/obj/item/salvage)
+
+/obj/item/storage/bag/salvage/bluespace
+	name = "bluespace treasure satchel"
+	desc = "A satchel to store even more scavenged salvage! There be lots of treasure."
+	storage_slots = 30
+	icon_state = "satchel_bspace"
diff --git a/modular_chomp/code/modules/salvage/salvage.dm b/modular_chomp/code/modules/salvage/salvage.dm
new file mode 100644
index 0000000000..8fae069a23
--- /dev/null
+++ b/modular_chomp/code/modules/salvage/salvage.dm
@@ -0,0 +1,84 @@
+/obj/item/salvage
+	name = "salvage"
+	desc = "A tonne of salvage from bad mapping practices. Who spawned the base type? Report this on GitHub"
+	icon = 'modular_chomp/icons/obj/salvage/sellable.dmi'
+	force = 5
+	throwforce = 5
+	throw_speed = 1
+	throw_speed = 4
+	hitsound = 'modular_chomp/sound/items/salvage/salvagepickup.ogg'
+	drop_sound = 'modular_chomp/sound/items/salvage/salvagedrop.ogg'
+	w_class = ITEMSIZE_NORMAL
+	var/worth = 100
+
+/obj/item/salvage/examine(mob/user)
+	. = ..()
+	. += span_notice("This could fetch a good price...")
+
+/obj/item/salvage/ruin
+	desc = "A tonne of salvage recovered from an abandoned ruin. Who spawned the base type? Report this on GitHub"
+
+/obj/item/salvage/ruin/pirate
+	name = "rum keg"
+	desc = "A highly valued keg of aged space rum. Limited edition and sure to be a collector's item."
+	icon_state = "barrel"
+	color = "#7e5c00"
+
+/obj/item/salvage/ruin/russian
+	name = "armaments cache"
+	desc = "A crate of old disused Belastrav ballistic firearms clearly long past their usability. This crate would make good scrap metal for shuttle construction."
+	icon_state = "weapon_crate"
+
+/obj/item/salvage/ruin/brick
+	name = "mysterious brick"
+	desc = "A peculier brick formed out of what appears to be plastic. This would make a fantastic collector's item."
+	icon_state = "lego_brick"
+	hitsound = 'sound/items/smolesmallbuild.ogg'
+	drop_sound = 'sound/items/drop/smolematerial.ogg'
+
+/obj/item/salvage/ruin/nanotrasen
+	name = "lost research notes"
+	desc = "A collection of research notes penned by old Nanotrasen scientists from decades past, technology lost in time- until you found them. It is a mystery what technology Central Command will push if they could just get their hands on these notes."
+	icon_state = "research_doc"
+	hitsound = 'sound/items/pickup/paper.ogg'
+	pickup_sound = 'sound/items/pickup/paper.ogg'
+	drop_sound = 'sound/items/drop/paper.ogg'
+
+/obj/item/salvage/ruin/nanotrasen/Initialize(mapload)
+	. = ..()
+	become_anomalous()
+
+/obj/item/salvage/ruin/carp
+	name = "carp scales"
+	desc = "A collection of scales shed from a corrupted space carp. Their culinary potential could mean untold riches for Nanotrasen."
+	icon_state = "dragon_scales"
+	hitsound = 'sound/effects/glass_step.ogg'
+	pickup_sound = 'sound/effects/glass_step.ogg'
+	drop_sound = 'sound/effects/glass_step.ogg'
+
+/obj/item/salvage/loot
+	desc = "A tonne of salvage looted from a fallen foe. Who spawned the base type? Report this on the github."
+
+/obj/item/salvage/loot/pirate
+	name = "stolen jewellery"
+	desc = "A collection of stolen jewellery, fashioned from pilfered bluespace crystals and gems. Rumour has it, local pirates have been known to use these accessories to avoid capture."
+	icon_state = "pirate_treasure"
+	hitsound = 'modular_chomp/sound/items/taperecorder_drop.ogg'
+	pickup_sound = 'modular_chomp/sound/items/taperecorder_pickup.ogg'
+	drop_sound = 'modular_chomp/sound/items/taperecorder_drop.ogg'
+
+/obj/item/salvage/loot/russian
+	name = "siosp manual"
+	desc = "A small manual, written in Neo-Russkyia, detailing the manifesto of Malfoy Ames, father of The Cygni Rebellion. Central Command may wish to share this with their allies in the Trans-Solar Federation."
+	icon_state = "ussp_manual"
+	hitsound = 'sound/items/pickup/paper.ogg'
+	pickup_sound = 'sound/items/pickup/paper.ogg'
+	drop_sound = 'sound/items/drop/paper.ogg'
+
+/obj/item/salvage/loot/syndicate
+	name = "syndicate intel"
+	desc = "A folder detailing Syndicate plans to infiltrate and sabotage operations in the Vir system. Central Command may find use of this to aid them in counter-intelligence."
+	icon_state = "syndie_doc"
+	hitsound = 'sound/items/pickup/paper.ogg'
+	pickup_sound = 'sound/items/pickup/paper.ogg'
+	drop_sound = 'sound/items/drop/paper.ogg'
diff --git a/modular_chomp/icons/obj/salvage/sellable.dmi b/modular_chomp/icons/obj/salvage/sellable.dmi
new file mode 100644
index 0000000000..96238af046
Binary files /dev/null and b/modular_chomp/icons/obj/salvage/sellable.dmi differ
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/CultBar.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/CultBar.dmm
index 334ac99af7..fb6a871832 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/CultBar.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/CultBar.dmm
@@ -27,7 +27,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table/fancyblack,
 /obj/random/maintenance/foodstuff,
-/obj/random/maintenance/cargo,
 /obj/item/gun/magic/firestaff/cultstaff,
 /obj/random/maintenance/research,
 /turf/simulated/floor/carpet,
@@ -288,7 +287,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/item/soulstone,
 /obj/item/gun/magic/firestaff,
-/obj/item/holosign_creator/smokewand,
 /turf/simulated/floor/gorefloor2,
 /area/submap/CultBar)
 "kY" = (
@@ -447,8 +445,6 @@
 /obj/structure/table/sifwooden_reinforced,
 /obj/random/maintenance/misc,
 /obj/random/maintenance/cargo,
-/obj/item/stack/nanopaste/advanced,
-/obj/random/maintenance/security,
 /turf/simulated/floor/wood/sif,
 /area/submap/CultBar)
 "pE" = (
@@ -499,10 +495,8 @@
 /area/submap/CultBar)
 "tE" = (
 /obj/structure/table/standard,
-/obj/random/cash/big,
-/obj/random/cash/big,
-/obj/random/cash/big,
 /obj/effect/floor_decal/corner/red/diagonal,
+/obj/random/cash,
 /turf/simulated/floor/tiled/asteroid_steel,
 /area/submap/CultBar)
 "tO" = (
@@ -553,8 +547,7 @@
 /area/submap/CultBar)
 "xX" = (
 /obj/structure/table/sifwooden_reinforced,
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stolenpackage,
+/obj/item/stack/nanopaste/advanced,
 /turf/simulated/floor/wood/sif,
 /area/submap/CultBar)
 "yI" = (
@@ -621,8 +614,9 @@
 /area/submap/CultBar)
 "BW" = (
 /obj/structure/table/sifwooden_reinforced,
-/obj/item/stolenpackage,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/random/maintenance/security,
 /turf/simulated/floor/wood/sif,
 /area/submap/CultBar)
 "Cf" = (
@@ -738,11 +732,6 @@
 /obj/structure/loot_pile/surface/bones,
 /turf/simulated/floor/tiled/freezer,
 /area/submap/CultBar)
-"GO" = (
-/obj/structure/table/sifwooden_reinforced,
-/obj/random/contraband,
-/turf/simulated/floor/wood/sif,
-/area/submap/CultBar)
 "Hw" = (
 /obj/effect/floor_decal/corner/lightgrey/diagonal,
 /obj/effect/decal/cleanable/dirt,
@@ -777,7 +766,6 @@
 "Jj" = (
 /obj/structure/table/standard,
 /obj/item/reagent_containers/food/snacks/ribplate,
-/obj/item/reagent_containers/food/snacks/ribplate,
 /obj/effect/floor_decal/corner/red/diagonal,
 /turf/simulated/floor/tiled/asteroid_steel,
 /area/submap/CultBar)
@@ -794,8 +782,8 @@
 /area/submap/CultBar)
 "Ka" = (
 /obj/structure/table/gamblingtable,
-/obj/random/cash/big,
 /obj/effect/decal/cleanable/dirt,
+/obj/random/cash,
 /turf/simulated/floor/wood/sif,
 /area/submap/CultBar)
 "Kb" = (
@@ -850,7 +838,8 @@
 "LD" = (
 /obj/effect/decal/cleanable/dirt,
 /mob/living/simple_mob/humanoid/cultist/elite{
-	faction = "demon"
+	faction = "demon";
+	loot_list = list(/obj/item/telecube = 50)
 	},
 /turf/simulated/floor/wood/sif,
 /area/submap/CultBar)
@@ -887,23 +876,12 @@
 /obj/effect/decal/cleanable/blood,
 /turf/simulated/floor/wood/sif/broken,
 /area/submap/CultBar)
-"MJ" = (
-/obj/structure/table/sifwooden_reinforced,
-/obj/random/energy,
-/turf/simulated/floor/wood/sif,
-/area/submap/CultBar)
 "MO" = (
 /obj/structure/bookcase,
 /obj/item/book/codex/lore/vir,
 /obj/item/book/manual/supermatter_engine,
 /turf/simulated/floor/carpet,
 /area/submap/CultBar)
-"MS" = (
-/obj/structure/table/sifwooden_reinforced,
-/obj/effect/decal/cleanable/dirt,
-/obj/random/firstaid,
-/turf/simulated/floor/wood/sif,
-/area/submap/CultBar)
 "Na" = (
 /obj/structure/table/sifwooden_reinforced,
 /obj/item/clothing/gloves/regen,
@@ -983,11 +961,8 @@
 /area/submap/CultBar)
 "RO" = (
 /obj/structure/table/fancyblack,
-/obj/random/contraband,
 /obj/machinery/light/small/flicker,
 /obj/random/maintenance/misc,
-/obj/random/mainttoyloot/nofail,
-/obj/item/telecube/randomized,
 /turf/simulated/floor/carpet,
 /area/submap/CultBar)
 "Sn" = (
@@ -1069,7 +1044,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /mob/living/simple_mob/humanoid/cultist/elite{
-	faction = "demon"
+	faction = "demon";
+	loot_list = list(/obj/item/telecube = 50)
 	},
 /turf/simulated/floor/wood/sif/broken,
 /area/submap/CultBar)
@@ -1136,7 +1112,7 @@
 /area/submap/CultBar)
 "WT" = (
 /obj/structure/table/gamblingtable,
-/obj/random/cash/huge,
+/obj/random/cash,
 /turf/simulated/floor/wood/sif/broken,
 /area/submap/CultBar)
 "WW" = (
@@ -1165,9 +1141,7 @@
 /obj/structure/table/sifwooden_reinforced,
 /obj/random/maintenance/misc,
 /obj/random/maintenance/morestuff,
-/obj/random/maintenance/medical,
 /obj/random/maintenance/research,
-/obj/random/firstaid,
 /turf/simulated/floor/wood/sif,
 /area/submap/CultBar)
 "YT" = (
@@ -1770,7 +1744,7 @@ EH
 qP
 zU
 Ah
-GO
+qP
 Le
 zy
 dt
@@ -1807,7 +1781,7 @@ eT
 gu
 Ah
 zU
-qP
+lm
 rJ
 HK
 dY
@@ -1844,7 +1818,7 @@ qG
 cL
 or
 YZ
-MJ
+qP
 LY
 mT
 zU
@@ -1918,8 +1892,8 @@ EH
 qP
 yP
 NZ
-GO
-xX
+qP
+gu
 Ah
 or
 ZZ
@@ -1993,7 +1967,7 @@ VZ
 Ks
 mT
 Ot
-Ot
+gu
 SN
 zU
 ZZ
@@ -2177,7 +2151,7 @@ Xa
 or
 HK
 at
-qP
+xX
 pv
 zU
 or
@@ -2252,7 +2226,7 @@ or
 ez
 HK
 gP
-gP
+BW
 HK
 or
 ZZ
@@ -2288,8 +2262,8 @@ cX
 Ah
 dt
 Ki
-MS
-BW
+gu
+gu
 Ah
 HK
 VZ
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/Redshuttledown.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/Redshuttledown.dmm
index 6efcf3762b..557eb67de4 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/Redshuttledown.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/Redshuttledown.dmm
@@ -11,7 +11,9 @@
 /turf/simulated/floor/tiled/yellow,
 /area/submap/redshuttledown)
 "bU" = (
-/mob/living/simple_mob/humanoid/merc/ranged/space/shotgun/auto,
+/mob/living/simple_mob/humanoid/merc/ranged/space/shotgun/auto{
+	loot_list = list(/obj/item/gun/projectile/automatic/as24 = 100, /obj/item/perfect_tele = 20)
+	},
 /obj/structure/bed/chair/office/dark{
 	dir = 1
 	},
@@ -102,7 +104,6 @@
 	dir = 6;
 	icon_state = "bordercolor"
 	},
-/obj/random/maintenance/medical,
 /turf/simulated/floor/tiled/white,
 /area/submap/redshuttledown)
 "ix" = (
@@ -310,7 +311,6 @@
 /area/submap/redshuttledown)
 "qr" = (
 /obj/structure/table/steel,
-/obj/random/firstaid,
 /turf/simulated/floor/tiled/steel,
 /area/submap/redshuttledown)
 "qT" = (
@@ -347,18 +347,14 @@
 /obj/random/grenade/box,
 /obj/random/grenade/box,
 /obj/item/stolenpackage,
-/obj/item/stolenpackage,
 /obj/item/rig/merc,
 /obj/item/rig/internalaffairs,
-/obj/random/contraband/nofail,
-/obj/random/contraband/nofail,
 /obj/random/maintenance/medical,
 /obj/random/maintenance/morestuff,
 /obj/random/maintenance/misc,
-/obj/random/maintenance/security,
 /obj/random/maintenance/cargo,
 /obj/random/ammo,
-/obj/random/ammo,
+/obj/random/contraband,
 /turf/simulated/floor/tiled/yellow,
 /area/submap/redshuttledown)
 "tv" = (
@@ -396,7 +392,9 @@
 /turf/template_noop,
 /area/submap/redshuttledown)
 "vX" = (
-/mob/living/simple_mob/humanoid/merc/ranged/deagle,
+/mob/living/simple_mob/humanoid/merc/ranged/deagle{
+	loot_list = list(/obj/item/gun/projectile/deagle = 100, /obj/item/perfect_tele = 20)
+	},
 /obj/structure/bed/chair/office/dark{
 	dir = 1
 	},
@@ -501,9 +499,6 @@
 /obj/structure/table/steel,
 /obj/random/maintenance/foodstuff,
 /obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
 /obj/effect/floor_decal/borderfloor{
 	dir = 9
 	},
@@ -531,10 +526,6 @@
 /obj/machinery/light,
 /obj/structure/table/steel,
 /obj/random/tool,
-/obj/random/maintenance/research,
-/obj/random/maintenance/engineering,
-/obj/random/material/refined,
-/obj/item/cell/device/weapon/recharge/alien/omni,
 /turf/simulated/floor/tiled/steel,
 /area/submap/redshuttledown)
 "zv" = (
@@ -594,7 +585,6 @@
 /obj/structure/table/standard,
 /obj/item/tank/anesthetic,
 /obj/effect/floor_decal/corner/green/border,
-/obj/random/maintenance/medical,
 /turf/simulated/floor/tiled/white,
 /area/submap/redshuttledown)
 "Cu" = (
@@ -686,7 +676,6 @@
 	},
 /obj/structure/table/standard,
 /obj/item/storage/pill_bottle/combat,
-/obj/random/maintenance/medical,
 /turf/simulated/floor/tiled/white,
 /area/submap/redshuttledown)
 "GZ" = (
@@ -774,7 +763,9 @@
 /turf/simulated/floor/tiled/steel,
 /area/submap/redshuttledown)
 "Mn" = (
-/mob/living/simple_mob/mechanical/mecha/combat/phazon,
+/mob/living/simple_mob/mechanical/mecha/combat/phazon{
+	loot_list = list(/obj/item/cell/device/weapon/recharge/alien/omni = 50)
+	},
 /turf/simulated/floor/tiled/steel,
 /area/submap/redshuttledown)
 "MX" = (
@@ -796,10 +787,7 @@
 /obj/structure/table/steel,
 /obj/item/stack/cable_coil/alien/blood,
 /obj/item/circuitboard/mecha/phazon/main,
-/obj/random/tool/power,
-/obj/random/maintenance/research,
 /obj/random/maintenance/engineering,
-/obj/random/material/precious,
 /obj/item/mecha_parts/mecha_equipment/weapon/energy/taser/rigged,
 /turf/simulated/floor/tiled/steel,
 /area/submap/redshuttledown)
@@ -873,7 +861,6 @@
 /obj/item/clothing/gloves/sterile,
 /obj/item/clothing/gloves/sterile,
 /obj/effect/floor_decal/corner/green/border,
-/obj/random/maintenance/medical,
 /turf/simulated/floor/tiled/white,
 /area/submap/redshuttledown)
 "Sz" = (
@@ -983,9 +970,6 @@
 /obj/random/energy/highend,
 /obj/item/rig/pmc/commander/grey/equipped,
 /obj/item/rig/pmc/commander/grey/equipped,
-/obj/item/card/emag/used,
-/obj/random/contraband/nofail,
-/obj/random/contraband/nofail,
 /obj/random/maintenance/medical,
 /obj/random/maintenance/morestuff,
 /obj/random/maintenance/misc,
@@ -993,6 +977,7 @@
 /obj/random/maintenance/cargo,
 /obj/random/ammo,
 /obj/random/ammo,
+/obj/random/contraband,
 /turf/simulated/floor/tiled/yellow,
 /area/submap/redshuttledown)
 "Yv" = (
@@ -1008,14 +993,6 @@
 	},
 /turf/simulated/floor/tiled/yellow,
 /area/submap/redshuttledown)
-"YR" = (
-/obj/structure/table/steel,
-/obj/effect/floor_decal/borderfloor{
-	dir = 8
-	},
-/obj/item/perfect_tele,
-/turf/simulated/floor/tiled/steel,
-/area/submap/redshuttledown)
 "YZ" = (
 /obj/structure/table/steel,
 /obj/item/material/knife,
@@ -1026,12 +1003,10 @@
 /area/submap/redshuttledown)
 "ZC" = (
 /obj/structure/table/standard,
-/obj/item/storage/firstaid/surgery,
 /obj/effect/floor_decal/corner/green/border{
 	dir = 10;
 	icon_state = "bordercolor"
 	},
-/obj/random/maintenance/medical,
 /turf/simulated/floor/tiled/white,
 /area/submap/redshuttledown)
 "ZN" = (
@@ -1319,7 +1294,7 @@ Ni
 ss
 kx
 GI
-YR
+BA
 BA
 Bx
 AD
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/begderg.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/begderg.dmm
index 23b67b11cb..9b0e03d620 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/begderg.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/begderg.dmm
@@ -577,7 +577,7 @@ H
 H
 H
 H
-M
+H
 I
 H
 H
@@ -701,7 +701,7 @@ H
 I
 I
 I
-M
+H
 H
 H
 H
@@ -737,7 +737,7 @@ H
 H
 H
 H
-M
+H
 I
 H
 H
@@ -768,7 +768,7 @@ H
 H
 H
 H
-M
+H
 I
 I
 I
@@ -850,7 +850,7 @@ H
 I
 I
 I
-M
+H
 H
 H
 H
@@ -936,7 +936,7 @@ I
 I
 I
 I
-M
+H
 H
 H
 H
@@ -1011,7 +1011,7 @@ H
 H
 H
 H
-M
+H
 I
 I
 I
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/bloodchurch.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/bloodchurch.dmm
index ab26913471..d17eadd731 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/bloodchurch.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/bloodchurch.dmm
@@ -11,14 +11,14 @@
 /turf/simulated/floor/wood/sif,
 /area/submap/bloodchurch)
 "cq" = (
-/mob/living/simple_mob/construct/shade,
 /obj/effect/decal/cleanable/dirt,
+/mob/living/simple_mob/construct/shade{
+	loot_list = list(/obj/item/ectoplasm = 100, /obj/item/storage/backpack/holding/duffle = 5)
+	},
 /turf/simulated/floor/wood/sif,
 /area/submap/bloodchurch)
 "cH" = (
 /obj/structure/closet,
-/obj/random/energy/highend,
-/obj/item/clothing/gloves/regen,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood/sif,
 /area/submap/bloodchurch)
@@ -72,13 +72,6 @@
 /obj/item/bedsheet/hosdouble,
 /turf/simulated/floor/wood/sif,
 /area/submap/bloodchurch)
-"il" = (
-/obj/structure/closet,
-/obj/random/energy/highend,
-/obj/item/storage/belt/holding,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/wood/sif,
-/area/submap/bloodchurch)
 "iT" = (
 /obj/structure/kitchenspike,
 /turf/simulated/floor/wood/sif,
@@ -104,7 +97,6 @@
 "mn" = (
 /obj/item/clothing/suit/wizrobe/psypurple,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/holosign_creator/forcewand,
 /turf/simulated/floor/wood/sif,
 /area/submap/bloodchurch)
 "mG" = (
@@ -137,7 +129,9 @@
 /area/submap/bloodchurch)
 "qb" = (
 /obj/structure/bed/double/padded,
-/mob/living/simple_mob/humanoid/cultist/human/bloodjaunt,
+/mob/living/simple_mob/humanoid/cultist/human/bloodjaunt{
+	health = 200
+	},
 /obj/item/bedsheet/hosdouble,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood/sif,
@@ -167,26 +161,20 @@
 /turf/simulated/floor/wood/sif,
 /area/submap/bloodchurch)
 "wh" = (
-/mob/living/simple_mob/humanoid/cultist/elite,
+/mob/living/simple_mob/humanoid/cultist/elite{
+	loot_list = list(/obj/item/clothing/head/psy_crown/wrath = 25, /obj/item/clothing/gloves/regen = 10, /obj/item/storage/belt/utility/holding = 10)
+	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood/sif,
 /area/submap/bloodchurch)
-"wA" = (
-/obj/item/clothing/head/wizard/amp,
-/mob/living/simple_mob/construct/shade,
-/turf/simulated/floor/wood/sif,
-/area/submap/bloodchurch)
 "xJ" = (
 /obj/structure/closet/crate,
 /obj/item/stolenpackage,
-/obj/item/stolenpackage,
-/obj/item/stolenpackage,
 /obj/item/rig_module/vision/thermal,
 /turf/simulated/floor/wood/sif,
 /area/submap/bloodchurch)
 "xN" = (
 /obj/structure/table/sifwoodentable,
-/obj/random/mouseray,
 /turf/simulated/floor/wood/sif,
 /area/submap/bloodchurch)
 "yn" = (
@@ -205,12 +193,6 @@
 "yC" = (
 /turf/simulated/floor/outdoors/dirt,
 /area/submap/bloodchurch)
-"yD" = (
-/obj/structure/table/sifwoodentable,
-/obj/item/holosign_creator/forcewand,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/wood/sif,
-/area/submap/bloodchurch)
 "zB" = (
 /obj/structure/cliff/automatic/corner{
 	dir = 9
@@ -219,8 +201,10 @@
 /area/submap/bloodchurch)
 "zO" = (
 /obj/item/clothing/suit/wizrobe,
-/mob/living/simple_mob/construct/shade,
 /obj/effect/decal/cleanable/dirt,
+/mob/living/simple_mob/construct/shade{
+	loot_list = list(/obj/item/ectoplasm = 100, /obj/item/storage/backpack/holding/duffle = 5)
+	},
 /turf/simulated/floor/wood/sif,
 /area/submap/bloodchurch)
 "Ac" = (
@@ -257,7 +241,6 @@
 /area/submap/bloodchurch)
 "DJ" = (
 /obj/structure/table/sifwoodentable,
-/obj/item/clothing/head/psy_crown/wrath,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood/sif,
 /area/submap/bloodchurch)
@@ -289,7 +272,6 @@
 "Hn" = (
 /obj/random/explorer_shield,
 /obj/random/contraband/nofail,
-/obj/random/contraband/nofail,
 /obj/structure/closet/crate/secure/loot,
 /obj/item/rig_module/mounted/energy_blade,
 /obj/item/rig_module/sprinter,
@@ -359,9 +341,8 @@
 /area/submap/bloodchurch)
 "RN" = (
 /obj/structure/table/sifwoodentable,
-/obj/random/contraband/nofail,
-/obj/random/contraband/nofail,
 /obj/random/gun/random,
+/obj/random/contraband,
 /turf/simulated/floor/wood/sif,
 /area/submap/bloodchurch)
 "Uz" = (
@@ -382,7 +363,9 @@
 /turf/simulated/floor/wood/sif,
 /area/submap/bloodchurch)
 "Yz" = (
-/mob/living/simple_mob/construct/shade,
+/mob/living/simple_mob/construct/shade{
+	loot_list = list(/obj/item/ectoplasm = 100, /obj/item/storage/backpack/holding/duffle = 5)
+	},
 /turf/simulated/floor/wood/sif,
 /area/submap/bloodchurch)
 "YL" = (
@@ -782,7 +765,7 @@ or
 cq
 Gk
 AZ
-Pn
+rQ
 gy
 ev
 Nn
@@ -817,11 +800,11 @@ Nn
 cq
 mn
 MK
-wA
+Yz
 kn
 fn
 gy
-il
+cH
 Nn
 Nn
 gy
@@ -1071,7 +1054,7 @@ yC
 eT
 MQ
 rQ
-yD
+DJ
 Nn
 MH
 GX
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/carriershuttle.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/carriershuttle.dmm
index 2d973c36d0..6188cc3ad0 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/carriershuttle.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/carriershuttle.dmm
@@ -12,7 +12,9 @@
 /turf/simulated/shuttle/floor/darkred,
 /area/submap/carriershuttle)
 "bh" = (
-/mob/living/simple_mob/animal/space/carp/large,
+/mob/living/simple_mob/animal/space/carp/large{
+	loot_list = list(/obj/item/salvage/ruin/carp = 100)
+	},
 /obj/machinery/light/poi{
 	dir = 1
 	},
@@ -24,7 +26,6 @@
 /obj/structure/cable/green,
 /obj/structure/cable/blue,
 /obj/structure/table/gold,
-/obj/random/material/precious,
 /obj/machinery/light/poi{
 	dir = 8
 	},
@@ -80,6 +81,15 @@
 	},
 /turf/simulated/shuttle/wall/voidcraft,
 /area/submap/carriershuttle)
+"gp" = (
+/obj/structure/table/standard,
+/obj/random/maintenance/foodstuff,
+/obj/machinery/light/poi{
+	dir = 1
+	},
+/obj/effect/floor_decal/corner/lime/diagonal,
+/turf/simulated/shuttle/floor/darkred,
+/area/submap/carriershuttle)
 "gu" = (
 /obj/structure/grille/cult{
 	name = "Alien grille"
@@ -113,18 +123,15 @@
 /area/submap/carriershuttle)
 "ju" = (
 /obj/structure/table/standard,
-/obj/random/maintenance/foodstuff,
-/obj/random/medical/pillbottle,
 /obj/machinery/light/poi,
 /obj/effect/floor_decal/corner/lime/diagonal,
 /turf/simulated/shuttle/floor/darkred,
 /area/submap/carriershuttle)
 "ln" = (
 /obj/structure/table/standard,
-/obj/random/ammo,
-/obj/random/contraband/nofail,
 /obj/machinery/light/poi,
 /obj/effect/floor_decal/corner/red/diagonal,
+/obj/random/contraband,
 /turf/simulated/shuttle/floor/darkred,
 /area/submap/carriershuttle)
 "lR" = (
@@ -237,6 +244,18 @@
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/shuttle/floor/darkred,
 /area/submap/carriershuttle)
+"tv" = (
+/obj/structure/table/standard,
+/obj/machinery/recharger,
+/obj/effect/floor_decal/corner/lime/diagonal,
+/turf/simulated/shuttle/floor/darkred,
+/area/submap/carriershuttle)
+"tN" = (
+/obj/structure/table/standard,
+/obj/random/medical/lite,
+/obj/effect/floor_decal/corner/lime/diagonal,
+/turf/simulated/shuttle/floor/darkred,
+/area/submap/carriershuttle)
 "tQ" = (
 /obj/machinery/light/poi{
 	dir = 8
@@ -309,7 +328,6 @@
 "yb" = (
 /obj/structure/table/standard,
 /obj/random/maintenance/foodstuff,
-/obj/random/medical/lite,
 /obj/effect/floor_decal/corner/lime/diagonal,
 /turf/simulated/shuttle/floor/darkred,
 /area/submap/carriershuttle)
@@ -332,7 +350,6 @@
 	icon_state = "0-2"
 	},
 /obj/structure/table/gold,
-/obj/random/material/precious,
 /obj/machinery/light/poi{
 	dir = 8
 	},
@@ -399,6 +416,13 @@
 /obj/effect/floor_decal/corner/red/diagonal,
 /turf/simulated/shuttle/floor/darkred,
 /area/submap/carriershuttle)
+"BW" = (
+/obj/structure/table/standard,
+/obj/random/ammo,
+/obj/effect/floor_decal/corner/red/diagonal,
+/obj/random/contraband,
+/turf/simulated/shuttle/floor/darkred,
+/area/submap/carriershuttle)
 "Cz" = (
 /obj/structure/cable/green{
 	d1 = 4;
@@ -410,7 +434,6 @@
 /area/submap/carriershuttle)
 "CR" = (
 /obj/structure/table/standard,
-/obj/random/ammo,
 /obj/random/grenade/lethal,
 /obj/effect/floor_decal/corner/red/diagonal,
 /turf/simulated/shuttle/floor/darkred,
@@ -422,7 +445,6 @@
 	icon_state = "1-2"
 	},
 /obj/structure/table/gold,
-/obj/random/material/precious,
 /obj/machinery/light/poi{
 	dir = 8
 	},
@@ -461,7 +483,6 @@
 /area/submap/carriershuttle)
 "EN" = (
 /obj/random/maintenance/morestuff,
-/obj/random/maintenance/morestuff,
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/shuttle/floor/darkred,
 /area/submap/carriershuttle)
@@ -511,6 +532,11 @@
 /obj/effect/floor_decal/corner/lime/diagonal,
 /turf/simulated/shuttle/floor/darkred,
 /area/submap/carriershuttle)
+"JQ" = (
+/obj/structure/table/standard,
+/obj/effect/floor_decal/corner/lime/diagonal,
+/turf/simulated/shuttle/floor/darkred,
+/area/submap/carriershuttle)
 "KX" = (
 /obj/structure/grille/cult{
 	name = "Alien grille"
@@ -566,11 +592,11 @@
 "MZ" = (
 /obj/structure/table/standard,
 /obj/random/ammo,
-/obj/random/contraband/nofail,
 /obj/machinery/light/poi{
 	dir = 1
 	},
 /obj/effect/floor_decal/corner/red/diagonal,
+/obj/random/contraband,
 /turf/simulated/shuttle/floor/darkred,
 /area/submap/carriershuttle)
 "NI" = (
@@ -591,9 +617,8 @@
 /area/submap/carriershuttle)
 "PM" = (
 /obj/structure/table/standard,
-/obj/random/ammo,
-/obj/random/contraband/nofail,
 /obj/effect/floor_decal/corner/red/diagonal,
+/obj/random/contraband,
 /turf/simulated/shuttle/floor/darkred,
 /area/submap/carriershuttle)
 "Qm" = (
@@ -644,6 +669,13 @@
 /obj/effect/floor_decal/corner/lightorange/diagonal,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/carriershuttle)
+"Vr" = (
+/obj/structure/table/standard,
+/obj/random/maintenance/foodstuff,
+/obj/machinery/light/poi,
+/obj/effect/floor_decal/corner/lime/diagonal,
+/turf/simulated/shuttle/floor/darkred,
+/area/submap/carriershuttle)
 "Vv" = (
 /obj/machinery/light/poi{
 	dir = 1
@@ -1171,7 +1203,7 @@ Qm
 BP
 QQ
 QQ
-PM
+BW
 Qm
 mM
 mM
@@ -1251,11 +1283,11 @@ mM
 mM
 mM
 Qm
-dI
+gp
 VX
 VX
 VX
-ju
+Vr
 Qm
 mM
 "}
@@ -1288,18 +1320,18 @@ mM
 mM
 mM
 Qm
-yb
+tN
 VX
 VX
 VX
-yb
+JQ
 Qm
 mM
 "}
 (17,1,1) = {"
 mM
 Qm
-ZO
+tv
 Eb
 VX
 Eb
@@ -1325,7 +1357,7 @@ mM
 mM
 mM
 Qm
-ZO
+tv
 Eb
 VX
 Eb
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/cliffmanor.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/cliffmanor.dmm
index baf0acd495..e216888639 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/cliffmanor.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/cliffmanor.dmm
@@ -53,16 +53,6 @@
 	temperature = 243.15
 	},
 /area/submap/cliffmanor)
-"iA" = (
-/obj/structure/railing,
-/obj/structure/table/wooden_reinforced,
-/obj/random/material/precious,
-/turf/simulated/floor/wood{
-	nitrogen = 93.7835;
-	oxygen = 20.7263;
-	temperature = 243.15
-	},
-/area/submap/cliffmanor)
 "iR" = (
 /obj/structure/simple_door/wood,
 /turf/simulated/floor/wood{
@@ -109,13 +99,10 @@
 	temperature = 243.15
 	},
 /area/submap/cliffmanor)
-"oX" = (
-/obj/structure/table/wooden_reinforced,
-/obj/item/clothing/head/psy_crown/gluttony,
-/turf/simulated/floor/wood,
-/area/submap/cliffmanor)
 "pI" = (
-/mob/living/simple_mob/humanoid/cultist/hunter,
+/mob/living/simple_mob/humanoid/cultist/hunter{
+	loot_list = list(/obj/item/material/butterfly/saw = 100, /obj/item/gun/projectile/shotgun/doublebarrel/sawn/alt = 100, /obj/item/clothing/head/psy_crown/wrath = 25)
+	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood{
 	nitrogen = 93.7835;
@@ -282,15 +269,6 @@
 	temperature = 243.15
 	},
 /area/submap/cliffmanor)
-"Ik" = (
-/obj/structure/table/wooden_reinforced,
-/obj/random/energy/highend,
-/turf/simulated/floor/wood{
-	nitrogen = 93.7835;
-	oxygen = 20.7263;
-	temperature = 243.15
-	},
-/area/submap/cliffmanor)
 "Ja" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -302,7 +280,9 @@
 	},
 /area/submap/cliffmanor)
 "Kj" = (
-/mob/living/simple_mob/humanoid/cultist/hunter,
+/mob/living/simple_mob/humanoid/cultist/hunter{
+	loot_list = list(/obj/item/material/butterfly/saw = 100, /obj/item/gun/projectile/shotgun/doublebarrel/sawn/alt = 100, /obj/item/clothing/head/psy_crown/gluttony = 25)
+	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood,
@@ -331,18 +311,8 @@
 	temperature = 243.15
 	},
 /area/submap/cliffmanor)
-"Mt" = (
-/obj/structure/table/wooden_reinforced,
-/obj/random/firstaid,
-/turf/simulated/floor/wood{
-	nitrogen = 93.7835;
-	oxygen = 20.7263;
-	temperature = 243.15
-	},
-/area/submap/cliffmanor)
 "ND" = (
 /obj/structure/table/wooden_reinforced,
-/obj/item/clothing/head/psy_crown/wrath,
 /turf/simulated/floor/wood,
 /area/submap/cliffmanor)
 "NQ" = (
@@ -360,8 +330,6 @@
 	dir = 1
 	},
 /obj/structure/table/wooden_reinforced,
-/obj/random/medical/pillbottle,
-/obj/random/material/refined,
 /turf/simulated/floor/wood{
 	nitrogen = 93.7835;
 	oxygen = 20.7263;
@@ -465,8 +433,6 @@
 "Wc" = (
 /obj/structure/railing,
 /obj/structure/table/wooden_reinforced,
-/obj/random/medical/pillbottle,
-/obj/random/material/refined,
 /turf/simulated/floor/wood{
 	nitrogen = 93.7835;
 	oxygen = 20.7263;
@@ -477,13 +443,11 @@
 /turf/simulated/floor/water,
 /area/submap/cliffmanor)
 "Zp" = (
-/obj/structure/table/wooden_reinforced,
-/obj/random/gun/random,
-/turf/simulated/floor/wood{
-	nitrogen = 93.7835;
-	oxygen = 20.7263;
-	temperature = 243.15
-	},
+/obj/structure/closet/crate/secure/loot,
+/obj/random/mainttoyloot/nofail,
+/obj/item/stack/material/mhydrogen,
+/obj/random/material,
+/turf/simulated/floor/wood,
 /area/submap/cliffmanor)
 "ZA" = (
 /obj/structure/cliff/automatic{
@@ -723,7 +687,7 @@ bi
 Qi
 SZ
 kW
-oX
+ND
 uv
 ei
 kW
@@ -813,7 +777,7 @@ lK
 SZ
 nu
 gX
-Zp
+gX
 uS
 kW
 bA
@@ -1069,7 +1033,7 @@ nu
 SZ
 SZ
 SZ
-iA
+Wc
 xD
 rT
 rT
@@ -1155,7 +1119,7 @@ rT
 rT
 aJ
 kW
-GU
+Zp
 wg
 Rh
 Dd
@@ -1247,7 +1211,7 @@ lK
 SZ
 SZ
 gX
-Mt
+gX
 uS
 kW
 Rm
@@ -1255,7 +1219,7 @@ Rm
 Rm
 kW
 uS
-Ik
+gX
 Ls
 SZ
 SZ
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/cove.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/cove.dmm
index 0549d2e4bf..69cbfd8d62 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/cove.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/cove.dmm
@@ -50,7 +50,6 @@
 /obj/structure/table/rack,
 /obj/item/reagent_containers/chem_disp_cartridge/corophizine,
 /obj/item/reagent_containers/chem_disp_cartridge/moonshine,
-/obj/random/gun/random,
 /obj/random/energy/highend,
 /obj/random/maintenance/morestuff,
 /obj/random/maintenance/morestuff,
@@ -67,11 +66,15 @@
 /obj/machinery/appliance/cooker/grill,
 /turf/simulated/floor/wood,
 /area/submap/cove)
+"iO" = (
+/obj/structure/table/marble,
+/obj/random/maintenance/foodstuff,
+/obj/random/maintenance/foodstuff,
+/turf/simulated/floor/wood,
+/area/submap/cove)
 "iU" = (
 /obj/structure/table/sifwooden_reinforced,
 /obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
 /turf/simulated/floor/wood,
 /area/submap/cove)
 "jw" = (
@@ -142,9 +145,6 @@
 "ov" = (
 /obj/structure/table/marble,
 /obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
 /turf/simulated/floor/wood,
 /area/submap/cove)
 "oM" = (
@@ -201,7 +201,6 @@
 /area/submap/cove)
 "vN" = (
 /obj/structure/table/standard,
-/obj/item/gun/projectile/revolvershotgun,
 /obj/item/paper{
 	info = "The Eclipse bastards are really getting in the way of business. Every raid is becoming a battle on two fronts, and they just keep coming. Fortantly I have rainy day money, and got some of my bois backing me up. Narsch is the least offensive, so dead or alive for 100 thosuand thalers. I want to do the deed myself on Virrzzur, so alive for 150 thousand. Not sure what to do about the head admiral dude, since we have no name or face. I think they're made up.";
 	name = "Work in progress bounty"
@@ -231,12 +230,7 @@
 /obj/structure/table/rack,
 /obj/item/reagent_containers/chem_disp_cartridge/dexalin,
 /obj/item/reagent_containers/chem_disp_cartridge/nuka_cola,
-/obj/random/gun/random,
-/obj/random/energy/highend,
 /obj/random/maintenance/morestuff,
-/obj/random/maintenance/morestuff,
-/obj/random/maintenance/morestuff,
-/obj/random/contraband,
 /turf/simulated/floor/wood,
 /area/submap/cove)
 "Ac" = (
@@ -287,11 +281,6 @@
 /obj/structure/table/rack,
 /obj/item/reagent_containers/chem_disp_cartridge/sleeptox,
 /obj/item/reagent_containers/chem_disp_cartridge/oxycodone,
-/obj/random/gun/random,
-/obj/random/energy/highend,
-/obj/random/maintenance/morestuff,
-/obj/random/maintenance/morestuff,
-/obj/random/maintenance/morestuff,
 /obj/random/contraband,
 /turf/simulated/floor/wood,
 /area/submap/cove)
@@ -364,7 +353,6 @@
 /area/submap/cove)
 "RE" = (
 /obj/structure/table/sifwooden_reinforced,
-/obj/random/gun/random,
 /turf/simulated/floor/wood,
 /area/submap/cove)
 "RT" = (
@@ -393,7 +381,9 @@
 /area/submap/cove)
 "US" = (
 /mob/living/simple_mob/mechanical/mecha/combat/gygax/dark/advanced{
-	faction = "pirate"
+	faction = "pirate";
+	loot_list = list(/obj/item/gun/projectile/revolvershotgun = 50);
+	health = 150
 	},
 /turf/simulated/floor/wood,
 /area/submap/cove)
@@ -613,7 +603,7 @@ lk
 Gb
 aP
 Ox
-Ox
+Gb
 TN
 Gb
 lk
@@ -646,7 +636,7 @@ Gb
 LQ
 ht
 qW
-LQ
+iO
 Gb
 lk
 rj
@@ -674,8 +664,8 @@ qI
 qI
 Tm
 lk
-Ox
-TN
+Gb
+Gb
 Gb
 Gb
 Ox
@@ -707,7 +697,7 @@ Tm
 Tm
 lk
 Gb
-LQ
+ov
 Ky
 Ky
 ov
@@ -739,11 +729,11 @@ Tm
 Tm
 lk
 Gb
-Ox
-TN
+Gb
+Gb
 NQ
 Gb
-Ox
+Gb
 lk
 rj
 RT
@@ -866,10 +856,10 @@ IP
 sl
 Gb
 MQ
-ld
-MQ
 RE
 MQ
+RE
+RE
 Gb
 RV
 lk
@@ -964,7 +954,7 @@ Gb
 Gb
 MQ
 RE
-MQ
+RE
 ld
 MQ
 RV
@@ -1089,12 +1079,12 @@ qI
 qI
 lk
 Gb
-ld
-MQ
+RE
+RE
 RE
 MQ
-ld
-MQ
+RE
+iU
 RE
 lk
 rj
@@ -1155,7 +1145,7 @@ lk
 HQ
 iU
 kD
-iU
+MQ
 wD
 EC
 Gb
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/crashedexplo.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/crashedexplo.dmm
index 28b6ecdd68..8816245883 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/crashedexplo.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/crashedexplo.dmm
@@ -16,8 +16,6 @@
 /obj/item/defib_kit/loaded,
 /obj/structure/closet/walllocker_double/medical/south,
 /obj/item/storage/firstaid/regular,
-/obj/item/storage/firstaid/surgery,
-/obj/item/storage/firstaid/adv,
 /obj/item/selectable_item/chemistrykit/gender,
 /obj/item/selectable_item/chemistrykit/size,
 /turf/simulated/shuttle/floor/white,
@@ -82,7 +80,9 @@
 /obj/structure/bed/chair/bay/comfy/blue{
 	dir = 1
 	},
-/mob/living/simple_mob/animal/giant_spider/phorogenic,
+/mob/living/simple_mob/animal/giant_spider/phorogenic{
+	loot_list = list(/obj/item/stock_parts/scanning_module/omni = 50)
+	},
 /turf/simulated/shuttle/floor/black,
 /area/submap/crashedexplo)
 "ey" = (
@@ -90,14 +90,12 @@
 	dir = 1
 	},
 /obj/structure/bed/chair/bay/shuttle,
-/obj/random/rigsuit/chancetofail,
 /turf/simulated/shuttle/floor/black,
 /area/submap/crashedexplo)
 "eQ" = (
 /turf/simulated/shuttle/wall/voidcraft/lightblue,
 /area/submap/crashedexplo)
 "fv" = (
-/obj/random/energy/highend,
 /turf/simulated/shuttle/floor/black,
 /area/submap/crashedexplo)
 "go" = (
@@ -151,13 +149,14 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
-/obj/item/stock_parts/micro_laser/omni,
 /turf/simulated/shuttle/floor/black,
 /area/submap/crashedexplo)
 "jc" = (
 /obj/structure/bed/chair/bay/shuttle,
 /obj/effect/decal/cleanable/blood,
-/mob/living/simple_mob/animal/giant_spider/lurker,
+/mob/living/simple_mob/animal/giant_spider/lurker{
+	loot_list = list(/obj/item/stock_parts/capacitor/omni = 50)
+	},
 /turf/simulated/shuttle/floor/black,
 /area/submap/crashedexplo)
 "ke" = (
@@ -216,7 +215,9 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/mob/living/simple_mob/animal/giant_spider/phorogenic,
+/mob/living/simple_mob/animal/giant_spider/phorogenic{
+	loot_list = list(/obj/item/stock_parts/manipulator/omni = 50)
+	},
 /obj/item/circuitboard/sleeper,
 /turf/simulated/shuttle/floor/white,
 /area/submap/crashedexplo)
@@ -224,7 +225,9 @@
 /turf/simulated/shuttle/wall/voidcraft/hard_corner,
 /area/submap/crashedexplo)
 "nV" = (
-/mob/living/simple_mob/animal/giant_spider/phorogenic,
+/mob/living/simple_mob/animal/giant_spider/phorogenic{
+	loot_list = list(/obj/item/stock_parts/capacitor/omni = 50)
+	},
 /turf/simulated/shuttle/floor/black,
 /area/submap/crashedexplo)
 "pd" = (
@@ -273,7 +276,9 @@
 	dir = 1;
 	pixel_y = -32
 	},
-/mob/living/simple_mob/animal/giant_spider/carrier,
+/mob/living/simple_mob/animal/giant_spider/carrier{
+	loot_list = list(/obj/item/stock_parts/matter_bin/omni = 50)
+	},
 /turf/simulated/shuttle/floor/black,
 /area/submap/crashedexplo)
 "sR" = (
@@ -351,7 +356,9 @@
 /area/submap/crashedexplo)
 "vH" = (
 /obj/item/stock_parts/capacitor/omni,
-/mob/living/simple_mob/animal/giant_spider/lurker,
+/mob/living/simple_mob/animal/giant_spider/lurker{
+	loot_list = list(/obj/item/stock_parts/manipulator/omni = 50)
+	},
 /turf/simulated/shuttle/floor/white,
 /area/submap/crashedexplo)
 "wv" = (
@@ -518,7 +525,9 @@
 /turf/simulated/shuttle/plating,
 /area/submap/crashedexplo)
 "Cc" = (
-/mob/living/simple_mob/animal/giant_spider/carrier,
+/mob/living/simple_mob/animal/giant_spider/carrier{
+	loot_list = list(/obj/item/stock_parts/matter_bin/omni = 50)
+	},
 /turf/simulated/shuttle/floor/black,
 /area/submap/crashedexplo)
 "CY" = (
@@ -526,10 +535,6 @@
 /obj/effect/catwalk_plated/dark,
 /turf/simulated/shuttle/plating,
 /area/submap/crashedexplo)
-"DH" = (
-/obj/item/stock_parts/matter_bin/omni,
-/turf/simulated/shuttle/floor/black,
-/area/submap/crashedexplo)
 "DJ" = (
 /obj/structure/salvageable/console_broken_os,
 /turf/simulated/shuttle/floor/black,
@@ -543,12 +548,6 @@
 /obj/item/gps,
 /obj/structure/closet/walllocker_double/kitchen/east,
 /obj/item/storage/mre/random,
-/obj/item/storage/mre/random,
-/obj/item/storage/mre/random,
-/obj/item/storage/mre/random,
-/obj/item/storage/mre/random,
-/obj/item/storage/mre/random,
-/obj/item/storage/mre/random,
 /turf/simulated/shuttle/floor/black,
 /area/submap/crashedexplo)
 "Ft" = (
@@ -598,7 +597,6 @@
 /area/submap/crashedexplo)
 "KT" = (
 /obj/structure/table/glass,
-/obj/machinery/chemical_dispenser/full,
 /turf/simulated/shuttle/floor/white,
 /area/submap/crashedexplo)
 "KV" = (
@@ -624,7 +622,6 @@
 /obj/structure/bed/chair/bay/shuttle{
 	dir = 1
 	},
-/obj/item/stock_parts/capacitor/omni,
 /turf/simulated/shuttle/floor/black,
 /area/submap/crashedexplo)
 "LY" = (
@@ -633,7 +630,6 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/obj/item/stock_parts/scanning_module/omni,
 /turf/simulated/shuttle/floor/black,
 /area/submap/crashedexplo)
 "MU" = (
@@ -765,7 +761,9 @@
 	pixel_x = -25;
 	pixel_y = 32
 	},
-/mob/living/simple_mob/animal/giant_spider/phorogenic,
+/mob/living/simple_mob/animal/giant_spider/phorogenic{
+	loot_list = list(/obj/item/stock_parts/scanning_module/omni = 50)
+	},
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/crashedexplo)
 "SV" = (
@@ -775,7 +773,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/mob/living/simple_mob/animal/giant_spider/carrier,
+/mob/living/simple_mob/animal/giant_spider/carrier{
+	loot_list = list(/obj/item/stock_parts/micro_laser/omni = 50)
+	},
 /turf/simulated/shuttle/floor/black,
 /area/submap/crashedexplo)
 "Tb" = (
@@ -869,7 +869,6 @@
 	icon_state = "2-4"
 	},
 /obj/effect/decal/cleanable/blood,
-/obj/item/stock_parts/scanning_module/omni,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/crashedexplo)
 "VE" = (
@@ -911,7 +910,6 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
-/obj/item/stock_parts/manipulator/omni,
 /turf/simulated/shuttle/floor/black,
 /area/submap/crashedexplo)
 "Yq" = (
@@ -921,10 +919,6 @@
 	},
 /turf/simulated/shuttle/wall/voidcraft/lightblue,
 /area/submap/crashedexplo)
-"Yr" = (
-/obj/item/stock_parts/capacitor/omni,
-/turf/simulated/shuttle/floor/black,
-/area/submap/crashedexplo)
 "YK" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/yellow{
 	dir = 8
@@ -1060,7 +1054,7 @@ UG
 UG
 bF
 DJ
-DH
+fv
 LY
 go
 dv
@@ -1082,7 +1076,7 @@ hn
 Cc
 RE
 jc
-Yr
+fv
 Ft
 cI
 lL
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/demonranch.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/demonranch.dmm
index d30b46ba25..bb82c8a380 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/demonranch.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/demonranch.dmm
@@ -1,24 +1,8 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "ax" = (
 /obj/structure/closet/crate,
-/obj/random/contraband/nofail,
-/obj/random/contraband/nofail,
-/obj/random/ammo,
-/obj/random/ammo,
-/obj/random/energy/highend,
-/obj/random/energy/highend,
-/obj/random/firstaid,
-/obj/random/firstaid,
-/obj/random/maintenance/morestuff,
-/obj/random/maintenance/morestuff,
-/obj/random/maintenance/misc,
-/obj/random/maintenance/misc,
+/obj/random/contraband,
 /obj/random/maintenance/research,
-/obj/random/maintenance/research,
-/obj/random/material/precious,
-/obj/random/material/precious,
-/obj/random/material/refined,
-/obj/random/material/refined,
 /turf/simulated/floor/wood/sif{
 	temperature = 243.15;
 	oxygen = 20.7263;
@@ -31,9 +15,6 @@
 /area/submap/demonranch)
 "aT" = (
 /obj/structure/table/sifwoodentable,
-/obj/random/mainttoyloot/nofail,
-/obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
 /obj/random/medical/pillbottle,
 /turf/simulated/floor/wood/sif{
 	temperature = 243.15;
@@ -134,12 +115,8 @@
 "ml" = (
 /obj/structure/closet/crate/secure/loot,
 /obj/item/personal_shield_generator/belt/security,
-/obj/random/contraband/nofail,
-/obj/random/contraband/nofail,
-/obj/random/contraband/nofail,
-/obj/random/contraband/nofail,
 /obj/item/storage/backpack/dufflebag/syndie/med,
-/obj/item/holosign_creator/forcewand,
+/obj/random/contraband,
 /turf/simulated/floor/wood/sif{
 	temperature = 243.15;
 	oxygen = 20.7263;
@@ -164,15 +141,11 @@
 /turf/simulated/floor/outdoors/dirt,
 /area/submap/demonranch)
 "nX" = (
-/obj/structure/table/sifwoodentable,
-/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/reagent_containers/food/snacks/meat,
-/obj/random/medical/pillbottle,
-/obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
+/obj/structure/closet/crate,
+/obj/random/ammo,
+/obj/random/ammo,
+/obj/random/maintenance/morestuff,
+/obj/random/material/precious,
 /turf/simulated/floor/wood/sif{
 	temperature = 243.15;
 	oxygen = 20.7263;
@@ -293,7 +266,6 @@
 /obj/item/reagent_containers/food/snacks/meat,
 /obj/item/reagent_containers/food/snacks/meat,
 /obj/item/reagent_containers/food/snacks/meat,
-/obj/random/medical/pillbottle,
 /obj/random/maintenance/foodstuff,
 /obj/random/maintenance/foodstuff,
 /turf/simulated/floor/wood/sif{
@@ -319,9 +291,13 @@
 	},
 /area/submap/demonranch)
 "Dw" = (
-/obj/effect/landmark/loot_spawn,
-/obj/fire,
-/turf/simulated/floor/outdoors/dirt,
+/obj/structure/table/sifwoodentable,
+/obj/random/maintenance/foodstuff,
+/turf/simulated/floor/wood/sif{
+	temperature = 243.15;
+	oxygen = 20.7263;
+	nitrogen = 93.7835
+	},
 /area/submap/demonranch)
 "Fw" = (
 /obj/structure/table/bench/sifwooden,
@@ -363,14 +339,6 @@
 "IW" = (
 /obj/structure/table/sifwoodentable,
 /obj/item/reagent_containers/food/snacks/meat,
-/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/reagent_containers/food/snacks/meat,
-/obj/random/contraband/nofail,
-/obj/random/medical/pillbottle,
-/obj/random/maintenance/foodstuff,
 /obj/random/maintenance/foodstuff,
 /turf/simulated/floor/wood/sif{
 	temperature = 243.15;
@@ -441,7 +409,6 @@
 /area/submap/demonranch)
 "QH" = (
 /obj/structure/table/sifwoodentable,
-/obj/random/firstaid,
 /obj/random/maintenance/foodstuff,
 /obj/random/maintenance/foodstuff,
 /turf/simulated/floor/wood/sif{
@@ -749,7 +716,7 @@ mG
 mG
 mG
 yT
-nX
+IW
 Kt
 mG
 yj
@@ -960,7 +927,7 @@ Zy
 Zy
 pr
 Kt
-aT
+Dw
 mG
 mG
 ie
@@ -1034,7 +1001,7 @@ Zy
 Zy
 pr
 Kt
-QH
+aT
 AI
 mG
 mG
@@ -1046,7 +1013,7 @@ TL
 su
 aM
 aM
-Si
+su
 su
 su
 su
@@ -1083,7 +1050,7 @@ aM
 aM
 aM
 ot
-mC
+su
 su
 hq
 hq
@@ -1116,7 +1083,7 @@ Rp
 Kt
 eM
 su
-su
+Si
 aM
 aM
 aM
@@ -1153,7 +1120,7 @@ Kt
 Kt
 eM
 su
-Si
+su
 aM
 su
 aM
@@ -1350,7 +1317,7 @@ hq
 hq
 su
 su
-mC
+su
 su
 sA
 su
@@ -1414,7 +1381,7 @@ vk
 su
 aM
 su
-mC
+su
 su
 su
 kd
@@ -1525,13 +1492,13 @@ eM
 su
 su
 su
-Dw
+aM
 aM
 aM
 aM
 su
 mC
-su
+iw
 su
 aM
 aM
@@ -1569,7 +1536,7 @@ su
 su
 su
 su
-Si
+su
 aM
 aM
 ot
@@ -1936,7 +1903,7 @@ hY
 hY
 Kt
 qA
-ax
+nX
 Rp
 Kt
 hY
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/dronelord.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/dronelord.dmm
index 4ed3794f0d..83851fcf2e 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/dronelord.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/dronelord.dmm
@@ -11,9 +11,6 @@
 /area/submap/dronelord)
 "ax" = (
 /obj/structure/table/glass,
-/obj/random/firstaid,
-/obj/random/firstaid,
-/obj/random/firstaid,
 /obj/machinery/light/poi,
 /turf/simulated/shuttle/floor/white,
 /area/submap/dronelord)
@@ -57,7 +54,6 @@
 /turf/simulated/shuttle/floor/purple,
 /area/submap/dronelord)
 "dw" = (
-/obj/item/gun/projectile/heavysniper,
 /obj/item/tank/jetpack/oxygen,
 /turf/simulated/shuttle/floor/black,
 /area/submap/dronelord)
@@ -111,7 +107,7 @@
 /area/submap/dronelord)
 "jy" = (
 /obj/structure/table/glass,
-/obj/item/storage/firstaid/clotting,
+/obj/item/storage/firstaid/o2,
 /turf/simulated/shuttle/floor/white,
 /area/submap/dronelord)
 "ko" = (
@@ -191,7 +187,7 @@
 /area/submap/dronelord)
 "xz" = (
 /obj/structure/table/glass,
-/obj/item/storage/firstaid/adv,
+/obj/item/storage/firstaid,
 /turf/simulated/shuttle/floor/white,
 /area/submap/dronelord)
 "yh" = (
@@ -212,8 +208,6 @@
 "En" = (
 /obj/structure/closet/secure_closet/guncabinet,
 /obj/item/gun/projectile/giskard/olivaw,
-/obj/item/gun/energy/lasershotgun,
-/obj/item/gun/energy/particle/cannon,
 /turf/simulated/shuttle/floor/red,
 /area/submap/dronelord)
 "Fc" = (
@@ -312,11 +306,6 @@
 	},
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/dronelord)
-"RI" = (
-/obj/item/tank/jetpack/oxygen,
-/obj/item/gun/projectile/automatic/sts35,
-/turf/simulated/shuttle/floor/black,
-/area/submap/dronelord)
 "RV" = (
 /turf/template_noop,
 /area/template_noop)
@@ -346,8 +335,8 @@
 /area/submap/dronelord)
 "Uz" = (
 /obj/structure/table/standard,
-/obj/item/card/emag/used,
 /obj/machinery/light/poi,
+/obj/random/contraband,
 /turf/simulated/shuttle/floor/purple,
 /area/submap/dronelord)
 "VO" = (
@@ -356,7 +345,6 @@
 "WO" = (
 /obj/structure/closet/secure_closet/guncabinet,
 /obj/item/gun/magnetic/matfed,
-/obj/item/gun/energy/ionrifle,
 /obj/item/gun/energy/sickshot,
 /turf/simulated/shuttle/floor/red,
 /area/submap/dronelord)
@@ -737,7 +725,7 @@ Gi
 kG
 mG
 yh
-RI
+dw
 aj
 tK
 tK
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/eclipseaqua.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/eclipseaqua.dmm
index 81198f2945..1fb5fc9309 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/eclipseaqua.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/eclipseaqua.dmm
@@ -162,9 +162,6 @@
 /area/template_noop)
 "mL" = (
 /obj/structure/table/steel,
-/obj/random/ammo,
-/obj/random/ammo,
-/obj/random/projectile/random,
 /obj/effect/floor_decal/corner/grey,
 /obj/effect/floor_decal/corner/black{
 	dir = 1
@@ -380,19 +377,16 @@
 /obj/structure/table/rack,
 /obj/random/rigsuit,
 /obj/item/rig_module/mounted/egun,
-/obj/random/energy/highend,
 /obj/effect/floor_decal/corner/blue/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipseaqua)
 "Dw" = (
 /obj/structure/table/steel,
-/obj/random/ammo,
-/obj/random/ammo,
-/obj/random/energy/highend,
 /obj/effect/floor_decal/corner/grey,
 /obj/effect/floor_decal/corner/black{
 	dir = 1
 	},
+/obj/random/maintenance/foodstuff,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipseaqua)
 "Ej" = (
@@ -419,7 +413,6 @@
 /obj/structure/table/rack,
 /obj/random/rigsuit,
 /obj/item/rig_module/chem_dispenser/combat,
-/obj/random/energy/highend,
 /obj/effect/floor_decal/corner/blue/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipseaqua)
@@ -529,7 +522,6 @@
 /obj/structure/table/steel,
 /obj/random/maintenance/foodstuff,
 /obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
 /obj/effect/floor_decal/corner/grey,
 /obj/effect/floor_decal/corner/black{
 	dir = 1
@@ -592,8 +584,6 @@
 /area/submap/eclipseaqua)
 "Oo" = (
 /obj/structure/table/steel,
-/obj/random/ammo,
-/obj/random/ammo,
 /obj/random/grenade/lethal,
 /obj/effect/floor_decal/corner/grey,
 /obj/effect/floor_decal/corner/black{
@@ -662,7 +652,6 @@
 /obj/structure/table/rack,
 /obj/item/rig/breacher,
 /obj/item/rig_module/pat_module,
-/obj/random/energy/highend,
 /obj/effect/floor_decal/corner/blue/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipseaqua)
@@ -676,9 +665,9 @@
 /area/submap/eclipseaqua)
 "UH" = (
 /obj/structure/table/steel,
-/obj/random/ammo,
-/obj/random/ammo,
-/obj/random/firstaid,
+/obj/random/maintenance/research,
+/obj/random/maintenance/research,
+/obj/random/maintenance/morestuff,
 /obj/effect/floor_decal/corner/grey,
 /obj/effect/floor_decal/corner/black{
 	dir = 1
@@ -742,13 +731,11 @@
 /area/submap/eclipseaqua)
 "Vn" = (
 /obj/structure/table/steel,
-/obj/random/ammo,
-/obj/random/ammo,
-/obj/random/gun/random,
 /obj/effect/floor_decal/corner/grey,
 /obj/effect/floor_decal/corner/black{
 	dir = 1
 	},
+/obj/random/grenade/lethal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipseaqua)
 "Wc" = (
@@ -1451,7 +1438,7 @@ Pf
 Pf
 Pf
 Qu
-Dw
+Xm
 sX
 gA
 Ry
@@ -1594,7 +1581,7 @@ Pf
 Qu
 Ry
 Vg
-KI
+Dw
 KI
 cC
 Qu
@@ -1642,7 +1629,7 @@ Qu
 nf
 Vg
 eK
-KI
+mL
 Vg
 On
 gA
@@ -2019,7 +2006,7 @@ Qu
 Ry
 jw
 JQ
-KH
+UH
 Qu
 Vn
 Xm
@@ -2291,13 +2278,13 @@ Ry
 jw
 gA
 Ry
-mL
+Xm
 Qu
 Pf
 Pf
 Pf
 Qu
-UH
+Xm
 Ry
 gA
 jw
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/eclipseblob.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/eclipseblob.dmm
index 25e434bbe0..2c157ba002 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/eclipseblob.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/eclipseblob.dmm
@@ -31,7 +31,9 @@
 /turf/simulated/floor/tiled/yellow,
 /area/submap/eclipseblob)
 "ez" = (
-/mob/living/simple_mob/humanoid/eclipse/lunar/ravanger,
+/mob/living/simple_mob/humanoid/eclipse/lunar/ravanger{
+	loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/stack/material/void_opal = 50)
+	},
 /turf/simulated/floor/tiled/red,
 /area/submap/eclipseblob)
 "eG" = (
@@ -58,6 +60,13 @@
 /obj/structure/blob/normal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipseblob)
+"fJ" = (
+/obj/structure/table/steel,
+/obj/random/maintenance/foodstuff,
+/obj/random/maintenance/foodstuff,
+/obj/random/maintenance/foodstuff,
+/turf/simulated/floor/tiled/red,
+/area/submap/eclipseblob)
 "gb" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /turf/simulated/floor/tiled/dark,
@@ -74,12 +83,6 @@
 /area/submap/eclipseblob)
 "hH" = (
 /obj/structure/table/steel,
-/obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
 /turf/simulated/floor/tiled/red,
 /area/submap/eclipseblob)
 "iI" = (
@@ -91,7 +94,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipseblob)
 "jl" = (
-/mob/living/simple_mob/humanoid/eclipse/solar/hellhound,
+/mob/living/simple_mob/humanoid/eclipse/solar/hellhound{
+	loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/stack/material/void_opal = 50)
+	},
 /turf/simulated/floor/tiled/yellow,
 /area/submap/eclipseblob)
 "jt" = (
@@ -162,12 +167,6 @@
 "sE" = (
 /obj/structure/table/steel,
 /obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
-/obj/item/stack/material/void_opal,
 /turf/simulated/floor/tiled/yellow,
 /area/submap/eclipseblob)
 "tF" = (
@@ -222,10 +221,6 @@
 /obj/structure/table/steel,
 /obj/random/maintenance/foodstuff,
 /obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
 /turf/simulated/floor/tiled/yellow,
 /area/submap/eclipseblob)
 "Ej" = (
@@ -249,6 +244,15 @@
 /obj/item/slime_extract/dark_blue,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipseblob)
+"Ic" = (
+/obj/structure/table/steel,
+/obj/random/maintenance/foodstuff,
+/obj/random/maintenance/foodstuff,
+/obj/random/maintenance/foodstuff,
+/obj/random/maintenance/foodstuff,
+/obj/random/maintenance/foodstuff,
+/turf/simulated/floor/tiled/yellow,
+/area/submap/eclipseblob)
 "In" = (
 /turf/simulated/shuttle/wall/voidcraft/lightblue,
 /area/submap/eclipseblob)
@@ -739,7 +743,7 @@ np
 In
 Cy
 hH
-Cy
+sE
 In
 gb
 gb
@@ -857,9 +861,9 @@ np
 np
 np
 In
-sE
-hH
 Cy
+fJ
+Ic
 In
 gb
 gb
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/eclipsecargo.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/eclipsecargo.dmm
index def8d891c3..b913808b33 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/eclipsecargo.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/eclipsecargo.dmm
@@ -20,18 +20,31 @@
 /obj/item/gun/energy/clockwork,
 /turf/simulated/shuttle/floor/purple,
 /area/submap/eclipsecargo)
+"f" = (
+/obj/structure/closet/crate,
+/obj/random/ammo,
+/obj/random/ammo,
+/obj/random/ammo,
+/obj/random/material,
+/obj/random/contraband,
+/turf/simulated/shuttle/floor/black,
+/area/submap/eclipsecargo)
 "g" = (
 /obj/structure/bed/chair/bay/comfy/teal{
 	dir = 1
 	},
-/mob/living/simple_mob/humanoid/eclipse/solar/hellhound,
+/mob/living/simple_mob/humanoid/eclipse/solar/hellhound{
+	loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/prop/alien/junk = 50)
+	},
 /turf/simulated/shuttle/floor/red,
 /area/submap/eclipsecargo)
 "h" = (
 /obj/structure/bed/chair/bay/comfy/teal{
 	dir = 1
 	},
-/mob/living/simple_mob/humanoid/eclipse/lunar/shotgunner,
+/mob/living/simple_mob/humanoid/eclipse/lunar/shotgunner{
+	loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/prop/alien/junk = 50)
+	},
 /turf/simulated/shuttle/floor/red,
 /area/submap/eclipsecargo)
 "i" = (
@@ -41,12 +54,9 @@
 "j" = (
 /obj/structure/closet/crate,
 /obj/item/mecha_parts/mecha_equipment/cloak,
-/obj/random/contraband/nofail,
-/obj/random/ammo,
-/obj/random/ammo,
 /obj/random/ammo,
 /obj/random/material,
-/obj/random/material/precious,
+/obj/random/contraband,
 /turf/simulated/shuttle/floor/black,
 /area/submap/eclipsecargo)
 "k" = (
@@ -76,7 +86,9 @@
 /turf/simulated/shuttle/floor/black,
 /area/submap/eclipsecargo)
 "m" = (
-/mob/living/simple_mob/humanoid/eclipse/lunar/ravanger,
+/mob/living/simple_mob/humanoid/eclipse/lunar/ravanger{
+	loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/prop/alien/junk = 50)
+	},
 /turf/simulated/shuttle/floor/black,
 /area/submap/eclipsecargo)
 "n" = (
@@ -105,6 +117,15 @@
 /obj/structure/window/plastitanium/full,
 /turf/simulated/shuttle/plating,
 /area/submap/eclipsecargo)
+"q" = (
+/obj/structure/closet/crate,
+/obj/random/ammo,
+/obj/random/ammo,
+/obj/random/ammo,
+/obj/random/material,
+/obj/random/material/precious,
+/turf/simulated/shuttle/floor/black,
+/area/submap/eclipsecargo)
 "r" = (
 /mob/living/simple_mob/humanoid/eclipse/solar/radiation,
 /turf/simulated/shuttle/floor/black,
@@ -124,12 +145,12 @@
 "u" = (
 /obj/structure/closet/crate,
 /obj/item/organ/internal/immunehub/replicant,
-/obj/random/contraband/nofail,
 /obj/random/ammo,
 /obj/random/ammo,
 /obj/random/ammo,
 /obj/random/material,
 /obj/random/material/precious,
+/obj/random/contraband,
 /turf/simulated/shuttle/floor/black,
 /area/submap/eclipsecargo)
 "v" = (
@@ -160,7 +181,6 @@
 /area/submap/eclipsecargo)
 "y" = (
 /obj/structure/table/glass,
-/obj/item/prop/alien/junk,
 /turf/simulated/shuttle/floor/red,
 /area/submap/eclipsecargo)
 "z" = (
@@ -220,7 +240,6 @@
 "H" = (
 /obj/structure/closet/crate,
 /obj/item/mecha_parts/mecha_equipment/weapon/honker,
-/obj/random/contraband/nofail,
 /obj/random/ammo,
 /obj/random/ammo,
 /obj/random/ammo,
@@ -250,6 +269,16 @@
 "K" = (
 /turf/simulated/shuttle/floor/red,
 /area/submap/eclipsecargo)
+"L" = (
+/obj/structure/closet/crate,
+/obj/random/ammo,
+/obj/random/ammo,
+/obj/random/ammo,
+/obj/random/material,
+/obj/random/material/precious,
+/obj/random/contraband,
+/turf/simulated/shuttle/floor/black,
+/area/submap/eclipsecargo)
 "M" = (
 /mob/living/simple_mob/humanoid/eclipse/lunar/silvernoodle,
 /turf/simulated/shuttle/floor/purple,
@@ -275,9 +304,6 @@
 "S" = (
 /obj/structure/closet/crate,
 /obj/item/organ/internal/fruitgland,
-/obj/random/contraband/nofail,
-/obj/random/ammo,
-/obj/random/ammo,
 /obj/random/ammo,
 /obj/random/material,
 /obj/random/material/precious,
@@ -286,23 +312,20 @@
 "T" = (
 /obj/structure/closet/crate,
 /obj/item/organ/internal/augment/armmounted/dartbow,
-/obj/random/contraband/nofail,
 /obj/random/ammo,
 /obj/random/ammo,
 /obj/random/ammo,
 /obj/random/material,
 /obj/random/material/precious,
+/obj/random/contraband,
 /turf/simulated/shuttle/floor/black,
 /area/submap/eclipsecargo)
 "U" = (
 /obj/structure/closet/crate,
-/obj/random/contraband/nofail,
 /obj/random/ammo,
 /obj/random/ammo,
 /obj/random/ammo,
-/obj/random/firstaid,
-/obj/random/material,
-/obj/random/material/precious,
+/obj/random/contraband,
 /turf/simulated/shuttle/floor/black,
 /area/submap/eclipsecargo)
 "V" = (
@@ -310,7 +333,9 @@
 /turf/simulated/shuttle/floor/purple,
 /area/submap/eclipsecargo)
 "W" = (
-/mob/living/simple_mob/humanoid/eclipse/solar/firemoff,
+/mob/living/simple_mob/humanoid/eclipse/solar/firemoff{
+	loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/prop/alien/junk = 50)
+	},
 /turf/simulated/shuttle/floor/black,
 /area/submap/eclipsecargo)
 "X" = (
@@ -320,23 +345,16 @@
 "Y" = (
 /obj/structure/closet/crate,
 /obj/item/clothing/under/yw/blueshield,
-/obj/random/contraband/nofail,
-/obj/random/ammo,
-/obj/random/ammo,
-/obj/random/ammo,
-/obj/random/material,
-/obj/random/material/precious,
+/obj/random/contraband,
 /turf/simulated/shuttle/floor/black,
 /area/submap/eclipsecargo)
 "Z" = (
 /obj/structure/closet/crate,
-/obj/item/organ/internal/lungs/replicant/mending,
-/obj/random/contraband/nofail,
-/obj/random/ammo,
 /obj/random/ammo,
 /obj/random/ammo,
 /obj/random/material,
 /obj/random/material/precious,
+/obj/random/contraband,
 /turf/simulated/shuttle/floor/black,
 /area/submap/eclipsecargo)
 
@@ -507,7 +525,7 @@ e
 D
 B
 a
-o
+f
 a
 l
 m
@@ -534,7 +552,7 @@ B
 a
 S
 a
-o
+L
 a
 R
 C
@@ -559,7 +577,7 @@ B
 a
 T
 a
-o
+q
 a
 R
 C
@@ -632,7 +650,7 @@ B
 B
 B
 a
-o
+U
 a
 Z
 a
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/eclipselava.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/eclipselava.dmm
index d3749e92be..8ecdb4f7f1 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/eclipselava.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/eclipselava.dmm
@@ -44,16 +44,14 @@
 /obj/structure/table/rack/shelf,
 /obj/item/gun/projectile/automatic/sol,
 /obj/random/contraband,
-/obj/random/contraband,
-/obj/random/contraband,
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/random/contraband/nofail,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipselava)
 "bI" = (
 /obj/structure/table/steel,
-/obj/random/maintenance/medical,
 /obj/machinery/light{
 	dir = 1
 	},
@@ -95,13 +93,10 @@
 /area/submap/eclipselava)
 "dB" = (
 /obj/structure/table/rack/shelf,
-/obj/item/gun/energy/gun/rifle,
-/obj/random/contraband,
-/obj/random/contraband,
-/obj/random/contraband,
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/random/contraband/nofail,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipselava)
 "dE" = (
@@ -143,7 +138,9 @@
 /turf/simulated/mineral/floor/ignore_mapgen/sif,
 /area/submap/eclipselava)
 "ge" = (
-/mob/living/simple_mob/humanoid/eclipse/lunar/shotgunner,
+/mob/living/simple_mob/humanoid/eclipse/lunar/shotgunner{
+	loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/prop/alien/junk = 50)
+	},
 /turf/simulated/floor/tiled/dark{
 	temperature = 243.15;
 	oxygen = 20.7263;
@@ -185,8 +182,6 @@
 /obj/structure/table/hardwoodtable,
 /obj/random/ammo,
 /obj/random/ammo,
-/obj/random/ammo,
-/obj/random/medical/pillbottle,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipselava)
 "hm" = (
@@ -205,15 +200,12 @@
 	},
 /area/submap/eclipselava)
 "il" = (
-/obj/structure/table/steel,
-/obj/random/energy/sec,
-/obj/random/maintenance/foodstuff,
+/obj/structure/table/rack/shelf,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipselava)
 "iq" = (
 /obj/structure/table/steel,
 /obj/random/rigsuit,
-/obj/random/maintenance/medical,
 /obj/machinery/light{
 	dir = 4
 	},
@@ -235,9 +227,7 @@
 "jS" = (
 /obj/structure/table/rack/shelf,
 /obj/item/slime_extract/emerald,
-/obj/random/contraband,
-/obj/random/contraband,
-/obj/random/contraband,
+/obj/random/contraband/nofail,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipselava)
 "jU" = (
@@ -247,12 +237,14 @@
 /turf/simulated/mineral/floor/ignore_mapgen/sif,
 /area/submap/eclipselava)
 "la" = (
-/mob/living/simple_mob/humanoid/eclipse/lunar/shotgunner,
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/mob/living/simple_mob/humanoid/eclipse/lunar/shotgunner{
+	loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/prop/alien/junk = 50)
+	},
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipselava)
 "mn" = (
@@ -733,8 +725,6 @@
 /obj/structure/table/hardwoodtable,
 /obj/random/ammo,
 /obj/random/ammo,
-/obj/random/ammo,
-/obj/random/medical/pillbottle,
 /obj/machinery/light{
 	dir = 1
 	},
@@ -765,23 +755,22 @@
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipselava)
 "Ed" = (
-/obj/structure/table/steel,
-/obj/random/energy,
-/obj/random/maintenance/medical,
+/obj/structure/table/hardwoodtable,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipselava)
 "Ej" = (
 /obj/structure/table/steel,
-/obj/random/contraband,
 /obj/random/maintenance/research,
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipselava)
 "El" = (
 /obj/structure/table/rack/shelf,
 /obj/item/cell/device/weapon/recharge/alien,
-/obj/random/contraband,
-/obj/random/contraband,
-/obj/random/contraband,
+/obj/random/contraband/nofail,
+/obj/random/contraband/nofail,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipselava)
 "En" = (
@@ -869,15 +858,12 @@
 "GK" = (
 /obj/structure/table/steel,
 /obj/random/firstaid,
-/obj/random/maintenance/medical,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipselava)
 "GM" = (
 /obj/structure/table/rack/shelf,
 /obj/item/slime_extract/ruby,
-/obj/random/contraband,
-/obj/random/contraband,
-/obj/random/contraband,
+/obj/random/contraband/nofail,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipselava)
 "GS" = (
@@ -1092,13 +1078,6 @@
 /obj/structure/bed/chair/office/light,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipselava)
-"Pq" = (
-/obj/structure/table/steel,
-/obj/random/contraband,
-/obj/random/medical/pillbottle,
-/obj/random/maintenance/research,
-/turf/simulated/floor/tiled/dark,
-/area/submap/eclipselava)
 "PP" = (
 /obj/structure/table/steel,
 /obj/random/firstaid,
@@ -1114,8 +1093,8 @@
 /area/submap/eclipselava)
 "Qr" = (
 /obj/structure/table/steel,
-/obj/random/firstaid,
 /obj/random/maintenance/research,
+/obj/random/contraband,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipselava)
 "QN" = (
@@ -1301,7 +1280,6 @@
 "Ux" = (
 /obj/structure/table/steel,
 /obj/random/maintenance/medical,
-/obj/random/maintenance/medical,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipselava)
 "UF" = (
@@ -1330,7 +1308,6 @@
 /area/submap/eclipselava)
 "VR" = (
 /obj/structure/table/steel,
-/obj/random/contraband,
 /obj/random/maintenance/research,
 /obj/item/paper{
 	info = "The extreme heat of the lava and dragons, along side of the energy of the emitter still are unable to replicate the effects of the solar flare project. The dragons have been gorging themselves on wild life, and bandits seem highly keen for the slime core. Stealth is no longer an option, although our position is heavily fortified. We highly recommend for the Head Admiral to relocate resources and attempts for recreation of the solar project off planet.";
@@ -1363,16 +1340,20 @@
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipselava)
 "XX" = (
-/mob/living/simple_mob/humanoid/eclipse/solar/firemoff,
 /obj/structure/cable/green{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/mob/living/simple_mob/humanoid/eclipse/solar/firemoff{
+	loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/prop/alien/junk = 50)
+	},
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipselava)
 "Yf" = (
-/mob/living/simple_mob/humanoid/eclipse/solar/hellhound,
+/mob/living/simple_mob/humanoid/eclipse/solar/hellhound{
+	loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/cell/device/weapon/recharge/alien/hybrid = 50)
+	},
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 2;
@@ -2223,7 +2204,7 @@ vN
 oc
 dj
 bp
-Ed
+LV
 MO
 MO
 wA
@@ -2410,7 +2391,7 @@ ZS
 bp
 GM
 bB
-El
+il
 bp
 ZS
 ZS
@@ -3204,8 +3185,8 @@ ZS
 Ad
 bp
 ZK
-Pq
-Ej
+ZK
+ZK
 ZK
 bp
 MO
@@ -3264,7 +3245,7 @@ MO
 LC
 RA
 qq
-il
+RA
 qq
 MO
 bp
@@ -3316,7 +3297,7 @@ MO
 XX
 RA
 qq
-RA
+LV
 qq
 MO
 wA
@@ -3359,7 +3340,7 @@ ZS
 ZS
 Ad
 bp
-En
+Ej
 MO
 MO
 qP
@@ -3837,7 +3818,7 @@ MO
 pX
 Oj
 Du
-hg
+Ed
 pX
 bp
 dw
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/eclipsemountain.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/eclipsemountain.dmm
index 95df8b4fa9..8fb4b95db5 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/eclipsemountain.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/eclipsemountain.dmm
@@ -12,8 +12,10 @@
 /turf/simulated/floor/tiled/steel,
 /area/submap/eclipsemountain)
 "bN" = (
-/mob/living/simple_mob/humanoid/eclipse/solar/firemoff,
 /obj/effect/floor_decal/corner/black/diagonal,
+/mob/living/simple_mob/humanoid/eclipse/solar/firemoff{
+	loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/prop/alien/junk = 50)
+	},
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipsemountain)
 "bY" = (
@@ -63,7 +65,6 @@
 /obj/structure/table/gold,
 /obj/random/ammo,
 /obj/random/maintenance/security,
-/obj/random/maintenance/research,
 /obj/machinery/light{
 	dir = 8
 	},
@@ -92,8 +93,8 @@
 "jt" = (
 /obj/structure/table/wooden_reinforced,
 /obj/random/tool/alien,
-/obj/random/contraband,
 /obj/machinery/light,
+/obj/random/contraband,
 /turf/simulated/floor/wood{
 	oxygen = 20.7263;
 	nitrogen = 93.7835;
@@ -202,6 +203,12 @@
 /obj/machinery/telecomms/relay/preset,
 /turf/simulated/floor/tiled/dark,
 /area/submap/eclipsemountain)
+"sr" = (
+/obj/structure/table/steel,
+/obj/effect/floor_decal/corner/black/diagonal,
+/obj/random/medical/pillbottle,
+/turf/simulated/floor/tiled/dark,
+/area/submap/eclipsemountain)
 "sy" = (
 /obj/structure/table/gold,
 /obj/random/ammo,
@@ -287,8 +294,10 @@
 /turf/simulated/floor/tiled/steel,
 /area/submap/eclipsemountain)
 "vC" = (
-/mob/living/simple_mob/humanoid/eclipse/lunar/shotgunner,
 /obj/effect/floor_decal/corner/grey/diagonal,
+/mob/living/simple_mob/humanoid/eclipse/lunar/shotgunner{
+	loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/prop/alien/junk = 50)
+	},
 /turf/simulated/floor/tiled/steel,
 /area/submap/eclipsemountain)
 "vO" = (
@@ -309,7 +318,6 @@
 /area/submap/eclipsemountain)
 "yy" = (
 /obj/structure/table/steel,
-/obj/random/firstaid,
 /obj/random/material/refined,
 /obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/tiled/steel,
@@ -432,8 +440,10 @@
 /turf/simulated/floor/bluegrid,
 /area/submap/eclipsemountain)
 "IQ" = (
-/mob/living/simple_mob/humanoid/eclipse/solar/hellhound,
 /obj/effect/floor_decal/corner/grey/diagonal,
+/mob/living/simple_mob/humanoid/eclipse/solar/hellhound{
+	loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/cell/device/weapon/recharge/alien/hybrid = 50)
+	},
 /turf/simulated/floor/tiled/steel,
 /area/submap/eclipsemountain)
 "Jg" = (
@@ -483,7 +493,6 @@
 /obj/structure/table/gold,
 /obj/random/ammo,
 /obj/random/maintenance/security,
-/obj/random/maintenance/research,
 /obj/machinery/light,
 /obj/effect/floor_decal/corner/yellow/diagonal,
 /turf/simulated/floor/tiled/yellow,
@@ -595,15 +604,11 @@
 	},
 /area/submap/eclipsemountain)
 "Tp" = (
-/obj/structure/table/wooden_reinforced,
-/obj/random/contraband,
-/obj/random/contraband,
-/obj/random/firstaid,
-/turf/simulated/floor/wood{
-	oxygen = 20.7263;
-	nitrogen = 93.7835;
-	temperature = 243.15
-	},
+/obj/structure/table/gold,
+/obj/random/maintenance/security,
+/obj/random/maintenance/research,
+/obj/effect/floor_decal/corner/yellow/diagonal,
+/turf/simulated/floor/tiled/yellow,
 /area/submap/eclipsemountain)
 "TT" = (
 /obj/structure/table/rack,
@@ -667,7 +672,6 @@
 /area/submap/eclipsemountain)
 "XM" = (
 /obj/structure/table/gold,
-/obj/random/ammo,
 /obj/random/maintenance/security,
 /obj/random/maintenance/research,
 /obj/machinery/light{
@@ -1324,7 +1328,7 @@ MM
 MM
 LV
 LV
-kX
+sr
 kX
 LV
 LV
@@ -1367,7 +1371,7 @@ MM
 kx
 LV
 yy
-Ln
+yy
 LV
 kx
 MM
@@ -1488,7 +1492,7 @@ JO
 JO
 JO
 JO
-bY
+QT
 MM
 LV
 LV
@@ -1529,8 +1533,8 @@ MM
 JO
 JO
 Tc
+QT
 bY
-Tp
 MM
 kx
 qv
@@ -1610,7 +1614,7 @@ Cz
 yY
 Cz
 MM
-sy
+Tp
 VM
 ec
 xO
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/fallenlab.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/fallenlab.dmm
index e15aaab7d1..f784514446 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/fallenlab.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/fallenlab.dmm
@@ -7,8 +7,6 @@
 "aZ" = (
 /obj/structure/table/darkglass,
 /obj/item/ammo_casing/microbattery/medical/burn3,
-/obj/random/maintenance/medical,
-/obj/random/maintenance/medical,
 /turf/simulated/floor/tiled/dark,
 /area/submap/fallenlab)
 "bH" = (
@@ -25,10 +23,20 @@
 /mob/living/simple_mob/mechanical/cyber_horror/grey,
 /turf/simulated/floor/tiled/dark,
 /area/submap/fallenlab)
+"dg" = (
+/obj/structure/table/standard,
+/obj/random/maintenance/engineering,
+/obj/effect/floor_decal/corner/red/diagonal,
+/turf/simulated/floor/tiled/dark,
+/area/submap/fallenlab)
 "dx" = (
 /obj/effect/floor_decal/corner/red/diagonal,
-/mob/living/simple_mob/mechanical/cyber_horror/grey,
-/turf/simulated/floor/tiled/dark,
+/mob/living/simple_mob/mechanical/cyber_horror/grey{
+	loot_list = list(/obj/item/gun/projectile/cell_loaded/medical = 5)
+	},
+/turf/simulated/floor/tiled/dark{
+	loot_list = list(/obj/item/gun/projectile/cell_loaded/medical = 5)
+	},
 /area/submap/fallenlab)
 "eq" = (
 /obj/structure/closet/toolcloset,
@@ -50,10 +58,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/submap/fallenlab)
 "fr" = (
-/mob/living/simple_mob/mechanical/cyber_horror/tajaran,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/floor_decal/corner/orange/diagonal,
+/mob/living/simple_mob/mechanical/cyber_horror/tajaran{
+	loot_list = list(/obj/item/gun/projectile/cell_loaded/medical = 5)
+	},
 /turf/simulated/floor/tiled/dark,
 /area/submap/fallenlab)
 "fL" = (
@@ -86,8 +96,6 @@
 "gP" = (
 /obj/structure/table/standard,
 /obj/item/ammo_casing/microbattery/medical/haste,
-/obj/random/material/refined,
-/obj/random/material/precious,
 /obj/effect/floor_decal/corner/red/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/fallenlab)
@@ -181,7 +189,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/submap/fallenlab)
 "rL" = (
-/mob/living/simple_mob/mechanical/cyber_horror/tajaran,
+/mob/living/simple_mob/mechanical/cyber_horror/tajaran{
+	loot_list = list(/obj/item/gun/projectile/cell_loaded/medical = 5)
+	},
 /obj/effect/floor_decal/corner/orange/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/fallenlab)
@@ -189,6 +199,7 @@
 /obj/machinery/optable,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/floor_decal/corner/orange/diagonal,
+/obj/random/maintenance/medical,
 /turf/simulated/floor/tiled/dark,
 /area/submap/fallenlab)
 "sg" = (
@@ -241,13 +252,11 @@
 "vt" = (
 /obj/machinery/optable,
 /obj/effect/floor_decal/corner/orange/diagonal,
+/obj/random/maintenance/medical,
 /turf/simulated/floor/tiled/dark,
 /area/submap/fallenlab)
 "wi" = (
-/obj/structure/table/standard,
-/obj/item/gun/projectile/cell_loaded/medical,
-/obj/random/maintenance/medical,
-/obj/random/maintenance/engineering,
+/obj/structure/table/darkglass,
 /obj/effect/floor_decal/corner/orange/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/fallenlab)
@@ -369,9 +378,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/submap/fallenlab)
 "Iw" = (
-/mob/living/simple_mob/mechanical/cyber_horror/tajaran,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/floor_decal/corner/orange/diagonal,
+/mob/living/simple_mob/mechanical/cyber_horror/tajaran{
+	loot_list = list(/obj/item/gun/projectile/cell_loaded/medical = 5)
+	},
 /turf/simulated/floor/tiled/dark,
 /area/submap/fallenlab)
 "Ix" = (
@@ -386,10 +397,7 @@
 /area/submap/fallenlab)
 "KI" = (
 /obj/structure/table/darkglass,
-/obj/random/maintenance/medical,
-/obj/random/maintenance/medical,
 /obj/effect/floor_decal/corner/red/diagonal,
-/obj/random/medical,
 /turf/simulated/floor/tiled/dark,
 /area/submap/fallenlab)
 "KR" = (
@@ -419,13 +427,14 @@
 "Ni" = (
 /obj/structure/table/standard,
 /obj/item/ammo_casing/microbattery/medical/haste,
-/obj/random/maintenance/medical,
 /obj/random/maintenance/engineering,
 /obj/effect/floor_decal/corner/orange/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/fallenlab)
 "NT" = (
-/mob/living/simple_mob/mechanical/cyber_horror/vox,
+/mob/living/simple_mob/mechanical/cyber_horror/vox{
+	loot_list = list(/obj/item/gun/projectile/cell_loaded/medical = 5)
+	},
 /obj/effect/floor_decal/corner/red/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/fallenlab)
@@ -443,7 +452,9 @@
 /turf/simulated/floor/tiled/dark,
 /area/submap/fallenlab)
 "PB" = (
-/mob/living/simple_mob/mechanical/cyber_horror/ling_cyber_horror,
+/mob/living/simple_mob/mechanical/cyber_horror/ling_cyber_horror{
+	loot_list = list(/obj/item/gun/projectile/cell_loaded/medical = 5)
+	},
 /obj/effect/floor_decal/corner/orange/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/fallenlab)
@@ -453,14 +464,15 @@
 /turf/simulated/floor/tiled/dark,
 /area/submap/fallenlab)
 "QH" = (
-/mob/living/simple_mob/mechanical/cyber_horror/tajaran,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/floor_decal/corner/red/diagonal,
+/mob/living/simple_mob/mechanical/cyber_horror/tajaran{
+	loot_list = list(/obj/item/gun/projectile/cell_loaded/medical = 5)
+	},
 /turf/simulated/floor/tiled/dark,
 /area/submap/fallenlab)
 "Rg" = (
 /obj/structure/table/standard,
-/obj/random/material/refined,
 /obj/effect/floor_decal/corner/orange/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/fallenlab)
@@ -500,6 +512,13 @@
 /obj/effect/floor_decal/corner/orange/diagonal,
 /turf/simulated/floor/tiled/dark,
 /area/submap/fallenlab)
+"Uv" = (
+/obj/effect/floor_decal/corner/orange/diagonal,
+/mob/living/simple_mob/mechanical/cyber_horror/tajaran{
+	loot_list = list(/obj/item/gun/projectile/cell_loaded/medical = 5)
+	},
+/turf/simulated/floor/tiled/dark,
+/area/submap/fallenlab)
 "UG" = (
 /obj/machinery/oxygen_pump/mobile/anesthetic,
 /obj/effect/decal/cleanable/dirt,
@@ -621,7 +640,7 @@ cQ
 bH
 ki
 Gi
-rL
+Uv
 bH
 Cx
 bH
@@ -981,7 +1000,7 @@ Gi
 bH
 kW
 bH
-qK
+wi
 Gi
 SX
 "}
@@ -1027,7 +1046,7 @@ Rg
 dx
 kh
 bH
-tI
+Rg
 Gi
 es
 lh
@@ -1035,8 +1054,8 @@ Yn
 lh
 es
 Gi
-wi
-fY
+sg
+dg
 Ni
 fY
 Gi
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/frostlake.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/frostlake.dmm
index 6e16da4dca..3210894f36 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/frostlake.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/frostlake.dmm
@@ -267,7 +267,7 @@ i
 D
 i
 i
-O
+i
 i
 i
 i
@@ -291,7 +291,7 @@ a
 i
 i
 i
-n
+i
 A
 o
 o
@@ -351,7 +351,7 @@ i
 o
 o
 o
-J
+o
 o
 a
 i
@@ -360,7 +360,7 @@ o
 o
 o
 o
-O
+i
 i
 s
 d
@@ -501,7 +501,7 @@ o
 i
 o
 o
-J
+o
 o
 a
 i
@@ -556,7 +556,7 @@ o
 o
 o
 o
-O
+i
 a
 o
 o
@@ -648,7 +648,7 @@ i
 i
 a
 i
-O
+i
 i
 i
 i
@@ -673,7 +673,7 @@ i
 i
 i
 i
-n
+i
 i
 i
 i
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/frozenlab.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/frozenlab.dmm
index 409d0ba83d..b3dc2311b3 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/frozenlab.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/frozenlab.dmm
@@ -54,7 +54,9 @@
 /turf/simulated/floor/tiled/milspec,
 /area/submap/frozenlab)
 "m" = (
-/mob/living/simple_mob/humanoid/eclipse/lunar/ravanger,
+/mob/living/simple_mob/humanoid/eclipse/lunar/ravanger{
+	loot_list = list(/obj/item/slime_extract/sepia = 1, /obj/item/bone/skull = 100, /obj/item/storage/belt/medical/alien = 20, /obj/item/reagent_containers/glass/beaker/bluespace = 20)
+	},
 /turf/simulated/floor/tiled/milspec,
 /area/submap/frozenlab)
 "n" = (
@@ -82,8 +84,6 @@
 /area/template_noop)
 "s" = (
 /obj/structure/table/steel,
-/obj/random/firstaid,
-/obj/random/maintenance/medical,
 /obj/random/maintenance/security,
 /turf/simulated/floor/tiled/milspec,
 /area/submap/frozenlab)
@@ -105,6 +105,12 @@
 /mob/living/simple_mob/humanoid/eclipse/solar/cryomancer,
 /turf/simulated/floor/snow,
 /area/template_noop)
+"x" = (
+/obj/structure/table/steel,
+/obj/random/firstaid,
+/obj/random/maintenance/security,
+/turf/simulated/floor/tiled/milspec,
+/area/submap/frozenlab)
 "z" = (
 /obj/machinery/portable_atmospherics/canister/oxygen/prechilled,
 /obj/machinery/light{
@@ -126,8 +132,12 @@
 /turf/simulated/floor/tiled/milspec,
 /area/submap/frozenlab)
 "G" = (
-/mob/living/simple_mob/humanoid/eclipse/lunar/silvernoodle,
-/turf/simulated/floor/tiled/milspec,
+/obj/structure/table/steel,
+/turf/simulated/floor/outdoors/shelfice{
+	nitrogen = 82.1472;
+	oxygen = 21.8366;
+	temperature = 293.15
+	},
 /area/submap/frozenlab)
 "H" = (
 /obj/random/material/refined,
@@ -137,6 +147,14 @@
 /obj/item/stack/material/void_opal,
 /turf/simulated/floor/snow,
 /area/template_noop)
+"J" = (
+/obj/structure/table/steel,
+/obj/random/maintenance/security,
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/milspec,
+/area/submap/frozenlab)
 "L" = (
 /obj/machinery/atmospherics/unary/freezer,
 /turf/simulated/floor/outdoors/shelfice{
@@ -147,7 +165,6 @@
 /area/submap/frozenlab)
 "M" = (
 /obj/structure/table/steel,
-/obj/random/maintenance/medical,
 /obj/random/maintenance/security,
 /obj/machinery/light{
 	dir = 8
@@ -550,7 +567,7 @@ D
 D
 D
 c
-W
+G
 T
 a
 a
@@ -604,7 +621,7 @@ D
 D
 D
 c
-R
+G
 T
 a
 a
@@ -714,7 +731,7 @@ D
 D
 c
 c
-G
+m
 a
 a
 a
@@ -770,8 +787,8 @@ D
 D
 c
 c
-X
-s
+J
+x
 c
 z
 a
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/hydroxeno.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/hydroxeno.dmm
index edf2dbaa8a..3f34e4e027 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/hydroxeno.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/hydroxeno.dmm
@@ -60,17 +60,10 @@
 	outdoors = 0
 	},
 /area/submap/hydroxeno)
-"m" = (
-/obj/item/storage/backpack/holding,
-/turf/simulated/floor/water{
-	outdoors = 0
-	},
-/area/submap/hydroxeno)
 "n" = (
 /obj/effect/alien/weeds,
 /obj/structure/closet/secure_closet/egg/xenomorph,
 /obj/item/organ/internal/lungs/replicant/mending,
-/obj/item/stolenpackage,
 /obj/random/maintenance/morestuff,
 /obj/random/maintenance/morestuff,
 /obj/random/maintenance/misc,
@@ -85,7 +78,6 @@
 "p" = (
 /obj/effect/alien/weeds,
 /obj/structure/closet/secure_closet/egg/xenomorph,
-/obj/item/stolenpackage,
 /obj/random/maintenance/morestuff,
 /obj/random/maintenance/morestuff,
 /obj/random/maintenance/misc,
@@ -100,10 +92,7 @@
 "r" = (
 /obj/effect/alien/weeds,
 /obj/structure/closet/secure_closet/egg/xenomorph,
-/obj/item/stolenpackage,
 /obj/random/maintenance/morestuff,
-/obj/random/maintenance/morestuff,
-/obj/random/maintenance/misc,
 /obj/item/organ/internal/kidneys/replicant,
 /turf/simulated/floor/outdoors/rocks/caves,
 /area/submap/hydroxeno)
@@ -112,10 +101,8 @@
 /obj/structure/closet/secure_closet/egg/xenomorph,
 /obj/item/organ/internal/heart/replicant/rage,
 /obj/item/organ/internal/brainmirror,
-/obj/item/stolenpackage,
 /obj/random/maintenance/morestuff,
 /obj/random/maintenance/morestuff,
-/obj/random/maintenance/misc,
 /turf/simulated/floor/outdoors/rocks/caves,
 /area/submap/hydroxeno)
 "t" = (
@@ -131,7 +118,9 @@
 /turf/simulated/mineral,
 /area/submap/hydroxeno)
 "w" = (
-/mob/living/simple_mob/animal/space/alien/queen/empress,
+/mob/living/simple_mob/animal/space/alien/queen/empress{
+	loot_list = list(/obj/item/storage/backpack/holding = 20)
+	},
 /turf/simulated/floor/water{
 	outdoors = 0
 	},
@@ -156,7 +145,6 @@
 /obj/effect/alien/weeds,
 /obj/structure/closet/secure_closet/egg/xenomorph,
 /obj/item/organ/internal/metamorphgland/replicant,
-/obj/item/stolenpackage,
 /obj/random/maintenance/morestuff,
 /obj/random/maintenance/morestuff,
 /obj/random/maintenance/misc,
@@ -167,7 +155,6 @@
 /obj/structure/closet/secure_closet/egg/xenomorph,
 /obj/random/maintenance/morestuff,
 /obj/random/maintenance/morestuff,
-/obj/item/stolenpackage,
 /obj/item/organ/internal/intestine/xeno,
 /turf/simulated/floor/outdoors/rocks/caves,
 /area/submap/hydroxeno)
@@ -177,10 +164,8 @@
 "D" = (
 /obj/effect/alien/weeds,
 /obj/structure/closet/secure_closet/egg/xenomorph,
-/obj/item/stolenpackage,
 /obj/random/maintenance/morestuff,
 /obj/random/maintenance/morestuff,
-/obj/random/maintenance/misc,
 /obj/item/organ/internal/liver/replicant,
 /turf/simulated/floor/outdoors/rocks/caves,
 /area/submap/hydroxeno)
@@ -224,7 +209,6 @@
 /obj/effect/alien/weeds,
 /obj/structure/closet/secure_closet/egg/xenomorph,
 /obj/item/organ/internal/immunehub/replicant,
-/obj/item/stolenpackage,
 /obj/random/maintenance/morestuff,
 /obj/random/maintenance/morestuff,
 /obj/random/maintenance/misc,
@@ -396,12 +380,12 @@ J
 X
 J
 u
-k
 J
 J
 J
 J
-H
+J
+J
 C
 C
 a
@@ -463,7 +447,7 @@ a
 a
 C
 v
-H
+J
 J
 y
 G
@@ -539,7 +523,7 @@ J
 J
 M
 J
-k
+J
 V
 F
 F
@@ -697,7 +681,7 @@ J
 J
 D
 J
-k
+J
 Q
 P
 h
@@ -724,7 +708,7 @@ J
 Q
 P
 I
-l
+I
 O
 f
 f
@@ -809,11 +793,11 @@ J
 J
 J
 J
-H
+J
 b
 T
 P
-l
+I
 j
 J
 G
@@ -825,7 +809,7 @@ a
 (15,1,1) = {"
 a
 C
-k
+J
 J
 J
 J
@@ -868,7 +852,7 @@ J
 J
 G
 J
-H
+J
 O
 f
 f
@@ -881,7 +865,7 @@ J
 J
 J
 Q
-k
+J
 J
 J
 J
@@ -1086,7 +1070,7 @@ a
 a
 a
 v
-k
+J
 J
 J
 q
@@ -1103,7 +1087,7 @@ u
 H
 J
 Q
-H
+J
 J
 J
 J
@@ -1184,7 +1168,7 @@ Q
 P
 I
 I
-l
+I
 j
 J
 J
@@ -1284,7 +1268,7 @@ I
 I
 I
 I
-m
+I
 I
 I
 j
@@ -1348,7 +1332,7 @@ a
 a
 C
 C
-k
+J
 X
 J
 E
@@ -1368,7 +1352,7 @@ J
 b
 T
 P
-l
+I
 N
 j
 J
@@ -1402,7 +1386,7 @@ H
 J
 J
 E
-H
+J
 b
 f
 f
@@ -1478,7 +1462,7 @@ G
 J
 J
 J
-k
+J
 C
 v
 v
@@ -1505,7 +1489,7 @@ C
 v
 v
 C
-k
+J
 J
 J
 J
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/leppy.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/leppy.dmm
index 8eadca979f..2b9de4f375 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/leppy.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/leppy.dmm
@@ -27,7 +27,7 @@
 /area/submap/leppy)
 "r" = (
 /obj/structure/table/gold,
-/obj/random/contraband/nofail,
+/obj/random/contraband,
 /turf/simulated/mineral/floor/cave{
 	nitrogen = 93.7835;
 	oxygen = 20.7263;
@@ -57,7 +57,6 @@
 /area/template_noop)
 "D" = (
 /obj/structure/table/gold,
-/obj/random/medical/pillbottle,
 /turf/simulated/mineral/floor/cave{
 	nitrogen = 93.7835;
 	oxygen = 20.7263;
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/mausarmy.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/mausarmy.dmm
index 112731d76f..42371128e2 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/mausarmy.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/mausarmy.dmm
@@ -78,7 +78,6 @@
 /obj/random/maintenance/clean,
 /obj/random/maintenance/engineering,
 /obj/random/maintenance/medical,
-/obj/random/contraband,
 /turf/simulated/floor/tiled/asteroid_steel,
 /area/submap/mausarmy)
 "mQ" = (
@@ -88,6 +87,7 @@
 "oS" = (
 /obj/effect/floor_decal/corner/blue/diagonal,
 /obj/structure/closet/crate/secure/lootsafe/numberlock,
+/obj/random/cash,
 /turf/simulated/floor/tiled/asteroid_steel,
 /area/submap/mausarmy)
 "pB" = (
@@ -148,7 +148,6 @@
 /obj/random/maintenance/clean,
 /obj/random/maintenance/medical,
 /obj/random/maintenance/security,
-/obj/random/contraband,
 /turf/simulated/floor/tiled/asteroid_steel,
 /area/submap/mausarmy)
 "we" = (
@@ -187,9 +186,7 @@
 /obj/structure/table/fancyblack,
 /obj/random/cash,
 /obj/random/cash,
-/obj/random/cash,
 /obj/item/stolenpackage,
-/obj/item/card/emag/used,
 /turf/simulated/floor/tiled/asteroid_steel,
 /area/submap/mausarmy)
 "zV" = (
@@ -237,10 +234,10 @@
 /area/submap/mausarmy)
 "Do" = (
 /obj/effect/floor_decal/corner_techfloor_gray/diagonal,
-/obj/effect/landmark/loot_spawn,
 /obj/machinery/light/poi{
 	dir = 4
 	},
+/obj/effect/landmark/loot_spawn/low,
 /turf/simulated/floor/tiled/asteroid_steel,
 /area/submap/mausarmy)
 "DU" = (
@@ -249,7 +246,6 @@
 /obj/random/maintenance/clean,
 /obj/random/maintenance/engineering,
 /obj/random/maintenance/research,
-/obj/random/contraband,
 /obj/random/rigsuit/chancetofail,
 /turf/simulated/floor/tiled/asteroid_steel,
 /area/submap/mausarmy)
@@ -272,8 +268,6 @@
 /obj/effect/floor_decal/corner/blue/diagonal,
 /obj/structure/table/fancyblack,
 /obj/random/cash,
-/obj/random/cash,
-/obj/random/cash,
 /turf/simulated/floor/tiled/asteroid_steel,
 /area/submap/mausarmy)
 "FO" = (
@@ -286,9 +280,7 @@
 "Hr" = (
 /obj/effect/floor_decal/corner_techfloor_gray/diagonal,
 /obj/random/crate,
-/obj/item/stolenpackage,
 /obj/random/maintenance/clean,
-/obj/random/maintenance/medical,
 /turf/simulated/floor/tiled/asteroid_steel,
 /area/submap/mausarmy)
 "JM" = (
@@ -326,7 +318,6 @@
 "OJ" = (
 /obj/effect/floor_decal/corner_techfloor_gray/diagonal,
 /obj/random/crate,
-/obj/item/stolenpackage,
 /obj/random/maintenance/clean,
 /obj/random/maintenance/engineering,
 /obj/random/maintenance/research,
@@ -340,15 +331,12 @@
 /obj/effect/floor_decal/corner/blue/diagonal,
 /obj/structure/table/fancyblack,
 /obj/random/cash,
-/obj/random/cash,
-/obj/random/cash,
 /obj/random/rigsuit,
 /turf/simulated/floor/tiled/asteroid_steel,
 /area/submap/mausarmy)
 "Qd" = (
 /obj/effect/floor_decal/corner_techfloor_gray/diagonal,
 /obj/random/crate,
-/obj/item/stolenpackage,
 /obj/random/maintenance/clean,
 /obj/random/maintenance/security,
 /turf/simulated/floor/tiled/asteroid_steel,
@@ -356,9 +344,7 @@
 "Qj" = (
 /obj/effect/floor_decal/corner_techfloor_gray/diagonal,
 /obj/random/crate,
-/obj/item/stolenpackage,
 /obj/random/maintenance/clean,
-/obj/random/maintenance/medical,
 /obj/effect/decal/cleanable/blood,
 /turf/simulated/floor/tiled/asteroid_steel,
 /area/submap/mausarmy)
@@ -396,10 +382,8 @@
 "VC" = (
 /obj/effect/floor_decal/corner_techfloor_gray/diagonal,
 /obj/random/crate,
-/obj/item/stolenpackage,
 /obj/random/maintenance/clean,
 /obj/random/maintenance/research,
-/obj/random/contraband,
 /turf/simulated/floor/tiled/asteroid_steel,
 /area/submap/mausarmy)
 "VE" = (
@@ -695,8 +679,8 @@ Ev
 vj
 Ev
 Ev
-Rp
-Rp
+Ev
+Ev
 Rx
 Rx
 Rx
@@ -742,12 +726,12 @@ Zm
 NM
 Rx
 vp
-Rp
+Ev
 Ev
 Ev
 vI
 Ev
-xm
+Ev
 Ev
 Ev
 BV
@@ -831,7 +815,7 @@ DU
 Hr
 Ev
 ra
-Rp
+Ev
 Rx
 ht
 CB
@@ -851,7 +835,7 @@ CB
 Rx
 Qd
 Ev
-Rp
+xm
 Do
 Ev
 vj
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/metroidmaze.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/metroidmaze.dmm
index 41323d62fb..88b0b950ca 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/metroidmaze.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/metroidmaze.dmm
@@ -2,6 +2,19 @@
 "a" = (
 /turf/simulated/floor/dungeon,
 /area/submap/metroidmaze)
+"b" = (
+/obj/structure/table/standard,
+/obj/random/projectile/random,
+/obj/random/energy/highend,
+/turf/simulated/floor/dungeon,
+/area/submap/metroidmaze)
+"e" = (
+/obj/structure/table/standard,
+/obj/random/projectile/random,
+/obj/random/energy/highend,
+/obj/random/firstaid,
+/turf/simulated/floor/dungeon,
+/area/submap/metroidmaze)
 "p" = (
 /turf/simulated/wall/gold{
 	can_open = 1
@@ -16,6 +29,12 @@
 /mob/living/simple_mob/metroid/juvenile/omega,
 /turf/simulated/floor/dungeon,
 /area/submap/metroidmaze)
+"C" = (
+/obj/structure/table/standard,
+/obj/random/projectile/random,
+/obj/random/medical/pillbottle,
+/turf/simulated/floor/dungeon,
+/area/submap/metroidmaze)
 "D" = (
 /turf/template_noop,
 /area/template_noop)
@@ -26,9 +45,7 @@
 "F" = (
 /obj/structure/table/standard,
 /obj/random/projectile/random,
-/obj/random/energy/highend,
 /obj/random/firstaid,
-/obj/random/medical/pillbottle,
 /turf/simulated/floor/dungeon,
 /area/submap/metroidmaze)
 "Z" = (
@@ -432,7 +449,7 @@ Z
 a
 Z
 Z
-F
+C
 a
 a
 F
@@ -560,10 +577,10 @@ Z
 a
 Z
 Z
-F
+b
 a
 a
-F
+e
 Z
 Z
 a
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/mousehq.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/mousehq.dmm
index ad78bee1e6..54ffa345de 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/mousehq.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/mousehq.dmm
@@ -5,7 +5,9 @@
 /turf/simulated/floor/bmarble,
 /area/submap/mousehq)
 "b" = (
-/mob/living/simple_mob/mechanical/mecha/mouse_tank/manned,
+/mob/living/simple_mob/mechanical/mecha/mouse_tank/manned{
+	loot_list = list(/obj/item/prop/alien/junk = 50)
+	},
 /turf/simulated/floor/bmarble,
 /area/submap/mousehq)
 "c" = (
@@ -27,7 +29,6 @@
 /area/submap/mousehq)
 "g" = (
 /obj/structure/table/alien/blue,
-/obj/item/prop/alien/junk,
 /turf/simulated/floor/bmarble,
 /area/submap/mousehq)
 "h" = (
@@ -117,7 +118,6 @@
 /area/submap/mousehq)
 "x" = (
 /obj/structure/closet/alien,
-/obj/item/prop/alien/junk,
 /turf/simulated/floor/wmarble,
 /area/submap/mousehq)
 "y" = (
@@ -151,8 +151,10 @@
 /turf/simulated/floor/wmarble,
 /area/submap/mousehq)
 "G" = (
-/obj/structure/table/alien/blue,
-/obj/item/prop/alien/junk,
+/mob/living/simple_mob/mechanical/mecha/mouse_tank/livewire/manned,
+/mob/living/simple_mob/mechanical/mecha/mouse_tank/manned{
+	loot_list = list(/obj/item/prop/alien/junk = 50)
+	},
 /turf/simulated/floor/wmarble,
 /area/submap/mousehq)
 "H" = (
@@ -160,7 +162,9 @@
 /turf/simulated/floor/wmarble,
 /area/submap/mousehq)
 "J" = (
-/mob/living/simple_mob/mechanical/mecha/mouse_tank/eraticator/manned,
+/mob/living/simple_mob/mechanical/mecha/mouse_tank/eraticator/manned{
+	loot_list = list(/obj/item/prop/alien/junk = 50)
+	},
 /obj/random/material/refined,
 /turf/simulated/floor/bmarble,
 /area/submap/mousehq)
@@ -168,7 +172,9 @@
 /turf/simulated/mineral/floor/ignore_mapgen/sif,
 /area/submap/mousehq)
 "M" = (
-/mob/living/simple_mob/mechanical/mecha/mouse_tank/eraticator/manned,
+/mob/living/simple_mob/mechanical/mecha/mouse_tank/eraticator/manned{
+	loot_list = list(/obj/item/prop/alien/junk = 50)
+	},
 /turf/simulated/floor/bmarble,
 /area/submap/mousehq)
 "N" = (
@@ -205,8 +211,10 @@
 /turf/simulated/floor/bmarble,
 /area/submap/mousehq)
 "U" = (
-/obj/structure/loot_pile/surface/alien/security,
-/turf/simulated/floor/bmarble,
+/mob/living/simple_mob/mechanical/mecha/mouse_tank/eraticator/manned{
+	loot_list = list(/obj/item/prop/alien/junk = 50)
+	},
+/turf/simulated/floor/wmarble,
 /area/submap/mousehq)
 "V" = (
 /turf/template_noop,
@@ -217,7 +225,9 @@
 /turf/simulated/floor/wmarble,
 /area/submap/mousehq)
 "X" = (
-/mob/living/simple_mob/mechanical/mecha/mouse_tank/manned,
+/mob/living/simple_mob/mechanical/mecha/mouse_tank/manned{
+	loot_list = list(/obj/item/prop/alien/junk = 50)
+	},
 /turf/simulated/floor/wmarble,
 /area/submap/mousehq)
 "Y" = (
@@ -228,7 +238,6 @@
 /area/submap/mousehq)
 "Z" = (
 /obj/structure/closet/alien,
-/obj/item/prop/alien/junk,
 /turf/simulated/floor/bmarble,
 /area/submap/mousehq)
 
@@ -316,7 +325,7 @@ Y
 g
 W
 g
-G
+i
 O
 O
 V
@@ -344,13 +353,13 @@ V
 V
 O
 O
-j
+x
 f
 p
 y
 p
 f
-z
+x
 O
 O
 V
@@ -442,7 +451,7 @@ O
 O
 O
 Z
-N
+U
 y
 H
 y
@@ -450,7 +459,7 @@ D
 y
 H
 y
-N
+U
 Z
 O
 O
@@ -723,7 +732,7 @@ y
 p
 y
 p
-a
+g
 O
 V
 "}
@@ -746,7 +755,7 @@ p
 m
 s
 v
-D
+G
 y
 p
 y
@@ -789,7 +798,7 @@ y
 p
 y
 p
-a
+g
 O
 V
 "}
@@ -876,7 +885,7 @@ K
 O
 r
 y
-N
+U
 t
 O
 y
@@ -1172,8 +1181,8 @@ V
 K
 O
 n
-j
-U
+x
+Z
 e
 O
 O
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/paperworks.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/paperworks.dmm
index ad6c9c33eb..be6dddb46e 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/paperworks.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/paperworks.dmm
@@ -58,14 +58,6 @@
 /obj/machinery/light/poi,
 /turf/simulated/floor/tiled/steel,
 /area/submap/paperworks)
-"E" = (
-/obj/structure/closet/crate,
-/obj/item/paper{
-	info = "In an attempt to expirment on the effects and potential of suns, we used a great deal of resources on constructing a station to orbit a sun. This had wonderful but unntended results. Within the first half year, we had to spend more resources to fish it out of orbit as it was half melted from a solar storm. Most of our intended expirments failed, but there was a great deal of goods we recovered. Attempts are being made to replicate the results, the main target being the Kronos Core.";
-	name = "Solar Station"
-	},
-/turf/simulated/floor/tiled/steel,
-/area/submap/paperworks)
 "F" = (
 /turf/simulated/wall/rplastihull,
 /area/submap/paperworks)
@@ -86,6 +78,7 @@
 "O" = (
 /obj/structure/table/gold,
 /obj/item/soulstone,
+/obj/item/salvage/ruin/nanotrasen,
 /turf/simulated/floor/tiled/steel,
 /area/submap/paperworks)
 "Q" = (
@@ -102,10 +95,7 @@
 /area/submap/paperworks)
 "X" = (
 /obj/structure/closet/crate,
-/obj/item/paper{
-	info = "What is fact, fiction, and soon to be fact. It is a great deal of importance is it not. What realms can we traverse, and what are nothing but in our minds. And what can we force out of our minds, and into reality. This is one of our goals to find out.";
-	name = "Fact and Fiction."
-	},
+/obj/item/salvage/ruin/nanotrasen,
 /turf/simulated/floor/tiled/steel,
 /area/submap/paperworks)
 "Z" = (
@@ -394,7 +384,7 @@ a
 F
 y
 F
-E
+X
 F
 f
 F
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/phorondragon.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/phorondragon.dmm
index 8aa1254b31..833dd063b7 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/phorondragon.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/phorondragon.dmm
@@ -368,7 +368,7 @@ j
 a
 j
 s
-W
+j
 j
 j
 c
@@ -391,7 +391,7 @@ x
 x
 x
 J
-S
+j
 j
 j
 j
@@ -420,7 +420,7 @@ x
 x
 x
 J
-j
+S
 j
 j
 i
@@ -544,7 +544,7 @@ j
 j
 j
 j
-W
+j
 j
 j
 j
@@ -636,7 +636,7 @@ j
 j
 j
 j
-W
+j
 s
 j
 j
@@ -652,7 +652,7 @@ x
 x
 x
 J
-j
+S
 j
 P
 j
@@ -724,7 +724,7 @@ j
 s
 j
 j
-S
+j
 J
 J
 x
@@ -779,7 +779,7 @@ j
 j
 j
 j
-S
+j
 J
 J
 x
@@ -803,7 +803,7 @@ x
 J
 J
 J
-S
+j
 J
 J
 J
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/piratefortress.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/piratefortress.dmm
index 9bdc5fa819..e0b892ca19 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/piratefortress.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/piratefortress.dmm
@@ -3,9 +3,6 @@
 /obj/item/clothing/glasses/thermal/plain/eyepatch,
 /obj/structure/closet/crate,
 /obj/item/stolenpackage,
-/obj/item/stolenpackage,
-/obj/random/energy/highend,
-/obj/item/stolenpackage,
 /obj/effect/floor_decal/corner/paleblue/diagonal{
 	dir = 4
 	},
@@ -14,7 +11,6 @@
 "aE" = (
 /obj/structure/table/reinforced,
 /obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
 /turf/simulated/floor/tiled/yellow,
 /area/submap/piratefortress)
 "bt" = (
@@ -48,8 +44,6 @@
 /area/submap/piratefortress)
 "ck" = (
 /obj/structure/closet/crate/secure/loot,
-/obj/item/stolenpackage,
-/obj/item/card/emag,
 /obj/item/rig_module/mounted/energy_blade,
 /obj/effect/floor_decal/corner/paleblue/diagonal{
 	dir = 4
@@ -122,7 +116,6 @@
 /obj/structure/table/reinforced,
 /obj/random/maintenance/security,
 /obj/random/maintenance/security,
-/obj/random/energy/highend,
 /obj/effect/floor_decal/corner/paleblue/border{
 	dir = 6
 	},
@@ -369,11 +362,11 @@
 /obj/item/clothing/glasses/graviton/medgravpatch,
 /obj/structure/closet/crate,
 /obj/item/stolenpackage,
-/obj/random/energy/highend,
 /obj/item/stolenpackage,
 /obj/effect/floor_decal/corner/paleblue/diagonal{
 	dir = 4
 	},
+/obj/random/projectile/shotgun,
 /turf/simulated/floor/tiled/red,
 /area/submap/piratefortress)
 "vr" = (
@@ -470,7 +463,6 @@
 "xX" = (
 /obj/structure/table/gold,
 /obj/item/aliencoin/gold,
-/obj/random/energy/highend,
 /obj/effect/floor_decal/corner/orange/diagonal,
 /turf/simulated/floor/tiled/yellow,
 /area/submap/piratefortress)
@@ -524,11 +516,6 @@
 	},
 /turf/simulated/floor/tiled/red,
 /area/submap/piratefortress)
-"BT" = (
-/obj/structure/table/reinforced,
-/obj/random/projectile,
-/turf/simulated/floor/tiled/yellow,
-/area/submap/piratefortress)
 "Di" = (
 /obj/item/dnainjector/telemut,
 /turf/simulated/floor/outdoors/rocks,
@@ -754,11 +741,6 @@
 /obj/structure/window/reinforced,
 /turf/simulated/floor/plating,
 /area/submap/piratefortress)
-"QI" = (
-/obj/structure/table/reinforced,
-/obj/random/energy/highend,
-/turf/simulated/floor/tiled/yellow,
-/area/submap/piratefortress)
 "QM" = (
 /obj/effect/floor_decal/corner/purple/diagonal,
 /turf/simulated/floor/tiled/yellow,
@@ -777,8 +759,6 @@
 /area/submap/piratefortress)
 "Su" = (
 /obj/structure/closet/secure_closet/engineering_electrical,
-/obj/item/stolenpackage,
-/obj/item/stolenpackage,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/submap/piratefortress)
 "Td" = (
@@ -792,7 +772,6 @@
 /area/submap/piratefortress)
 "TJ" = (
 /obj/structure/table/reinforced,
-/obj/random/projectile/shotgun,
 /obj/random/maintenance/security,
 /obj/random/maintenance/security,
 /obj/effect/floor_decal/corner/paleblue/border{
@@ -2097,7 +2076,7 @@ cg
 DD
 oX
 PJ
-BT
+pA
 aE
 pA
 aE
@@ -2146,7 +2125,7 @@ pA
 aE
 vr
 aE
-QI
+pA
 ft
 oX
 xk
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/piratevessel.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/piratevessel.dmm
index 4422975808..edaf100028 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/piratevessel.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/piratevessel.dmm
@@ -64,6 +64,13 @@
 /obj/item/reagent_containers/glass/bottle/left4zed,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
+"fK" = (
+/obj/structure/closet/crate/secure/loot,
+/obj/effect/floor_decal/corner/purple/diagonal,
+/obj/random/contraband,
+/obj/random/maintenance/morestuff,
+/turf/simulated/shuttle/floor/yellow,
+/area/submap/piratevessel)
 "fX" = (
 /mob/living/simple_mob/humanoid/pirate/ranged,
 /obj/effect/floor_decal/corner/purple/diagonal,
@@ -89,8 +96,6 @@
 "hc" = (
 /obj/structure/closet/crate/medical,
 /obj/effect/floor_decal/corner/purple/diagonal,
-/obj/random/contraband,
-/obj/random/contraband,
 /obj/random/maintenance/morestuff,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
@@ -131,13 +136,12 @@
 /obj/effect/floor_decal/corner/purple/diagonal,
 /obj/machinery/light/poi,
 /obj/random/contraband,
-/obj/random/contraband,
 /obj/random/maintenance/morestuff,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
 "iP" = (
-/obj/effect/floor_decal/corner/yellow/diagonal,
-/obj/random/contraband,
+/obj/structure/table/marble,
+/obj/effect/floor_decal/corner/purple/diagonal,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
 "ka" = (
@@ -247,8 +251,6 @@
 "rw" = (
 /obj/structure/table/gold,
 /obj/effect/floor_decal/corner/yellow/diagonal,
-/obj/item/rig_module/fabricator/energy_net,
-/obj/item/rig/pmc/security/grey/equipped,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
 "st" = (
@@ -284,7 +286,6 @@
 /obj/effect/floor_decal/corner/purple/diagonal,
 /obj/random/contraband,
 /obj/random/contraband,
-/obj/random/maintenance/morestuff,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
 "tX" = (
@@ -343,7 +344,6 @@
 /obj/structure/closet/crate/mimic,
 /obj/effect/floor_decal/corner/purple/diagonal,
 /obj/random/contraband,
-/obj/random/contraband,
 /obj/random/maintenance/morestuff,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
@@ -351,11 +351,10 @@
 /obj/effect/floor_decal/corner/yellow/diagonal,
 /obj/structure/table/rack/shelf/steel,
 /obj/random/gun/random,
-/obj/random/gun/random,
 /obj/machinery/light/poi{
 	dir = 1
 	},
-/obj/random/contraband,
+/obj/random/medical/pillbottle,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
 "BJ" = (
@@ -368,10 +367,8 @@
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
 "Dr" = (
-/obj/effect/floor_decal/corner/yellow/diagonal,
-/obj/structure/table/rack/shelf/steel,
-/obj/random/contraband,
-/obj/item/gun/energy/lasershotgun,
+/obj/structure/table/marble,
+/obj/random/maintenance/foodstuff,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
 "Dy" = (
@@ -443,8 +440,7 @@
 "Fw" = (
 /obj/effect/floor_decal/corner/yellow/diagonal,
 /obj/structure/table/rack/shelf/steel,
-/obj/random/contraband,
-/obj/item/gun/energy/lasercannon,
+/obj/random/medical/pillbottle,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
 "Gl" = (
@@ -463,7 +459,6 @@
 /obj/structure/closet/crate,
 /obj/effect/floor_decal/corner/purple/diagonal,
 /obj/random/contraband,
-/obj/random/contraband,
 /obj/random/maintenance/morestuff,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
@@ -500,14 +495,11 @@
 /obj/machinery/light/poi{
 	dir = 1
 	},
-/obj/random/contraband,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
 "Jd" = (
 /obj/structure/closet/crate/freezer/nanotrasen,
 /obj/effect/floor_decal/corner/purple/diagonal,
-/obj/random/contraband,
-/obj/random/contraband,
 /obj/random/maintenance/morestuff,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
@@ -556,7 +548,6 @@
 /obj/effect/floor_decal/corner/yellow/diagonal,
 /obj/structure/table/rack/shelf/steel,
 /obj/random/toolbox,
-/obj/random/contraband,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
 "Mb" = (
@@ -620,18 +611,16 @@
 "Pd" = (
 /obj/effect/floor_decal/corner/yellow/diagonal,
 /obj/structure/table/rack/shelf/steel,
-/obj/random/gun/random,
-/obj/random/gun/random,
 /obj/machinery/light/poi,
-/obj/random/contraband,
+/obj/random/medical/pillbottle,
+/obj/item/rig_module/fabricator/energy_net,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
 "PL" = (
 /obj/effect/floor_decal/corner/yellow/diagonal,
 /obj/structure/table/rack/shelf/steel,
-/obj/random/firstaid,
 /obj/machinery/light/poi,
-/obj/random/contraband,
+/obj/item/rig/pmc/security/grey/equipped,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
 "PT" = (
@@ -656,9 +645,6 @@
 "RN" = (
 /obj/structure/closet/crate/carp,
 /obj/effect/floor_decal/corner/purple/diagonal,
-/obj/random/contraband,
-/obj/random/contraband,
-/obj/random/maintenance/morestuff,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
 "Sb" = (
@@ -686,23 +672,17 @@
 /obj/random/contraband/nofail,
 /obj/random/contraband/nofail,
 /obj/random/contraband,
-/obj/random/contraband,
 /obj/random/maintenance/morestuff,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
 "Uc" = (
 /obj/structure/closet/crate/medical/blood,
 /obj/effect/floor_decal/corner/purple/diagonal,
-/obj/random/contraband,
-/obj/random/contraband,
 /obj/random/maintenance/morestuff,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
 "Un" = (
 /obj/structure/table/marble,
-/obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
-/obj/random/maintenance/foodstuff,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
 "Vb" = (
@@ -728,6 +708,12 @@
 /obj/effect/floor_decal/corner/purple/diagonal,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
+"Wj" = (
+/obj/structure/table/gold,
+/obj/effect/floor_decal/corner/yellow/diagonal,
+/obj/machinery/recharger,
+/turf/simulated/shuttle/floor/yellow,
+/area/submap/piratevessel)
 "Wy" = (
 /obj/effect/floor_decal/corner/red/diagonal,
 /turf/simulated/shuttle/floor/yellow,
@@ -757,7 +743,9 @@
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
 "YG" = (
-/mob/living/simple_mob/humanoid/pirate/captain,
+/mob/living/simple_mob/humanoid/pirate/captain{
+	loot_list = list(/obj/item/gun/energy/zip = 100, /obj/item/gun/energy/zip = 100, /obj/item/gun/energy/zip = 100, /obj/item/gun/energy/zip = 100, /obj/item/card/emag = 50)
+	},
 /obj/effect/floor_decal/corner/yellow/diagonal,
 /turf/simulated/shuttle/floor/yellow,
 /area/submap/piratevessel)
@@ -1050,7 +1038,7 @@ EC
 mq
 xr
 Wd
-tX
+iP
 Wd
 Fh
 mq
@@ -1101,10 +1089,10 @@ Ev
 mq
 bh
 bT
+Dr
 Un
 Un
-Un
-Un
+Dr
 gO
 Nu
 mq
@@ -1131,9 +1119,9 @@ Ev
 MZ
 bh
 bT
+Dr
 Un
-Un
-Un
+Dr
 Un
 gO
 Nu
@@ -1170,7 +1158,7 @@ qW
 mq
 Wd
 Wd
-tX
+iP
 Wd
 Jd
 mq
@@ -1232,7 +1220,7 @@ Wd
 Wd
 tX
 Wd
-DY
+fK
 mq
 dt
 dt
@@ -1309,7 +1297,7 @@ mq
 MZ
 mq
 mq
-Dr
+Fw
 BJ
 BJ
 BJ
@@ -1344,7 +1332,7 @@ BJ
 cn
 rw
 hR
-cn
+Wj
 BJ
 LZ
 mq
@@ -1375,7 +1363,7 @@ BJ
 YG
 BJ
 BJ
-iP
+BJ
 PL
 mq
 hO
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/piratevox.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/piratevox.dmm
index b13b608b97..3b62f4fa38 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/piratevox.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/piratevox.dmm
@@ -2,7 +2,6 @@
 "cD" = (
 /obj/structure/table/rack/shelf/steel,
 /obj/random/gun/random,
-/obj/random/gun/random,
 /obj/machinery/light/poi{
 	dir = 1
 	},
@@ -59,8 +58,6 @@
 "fV" = (
 /obj/structure/table/standard,
 /obj/random/maintenance/medical,
-/obj/random/maintenance/medical,
-/obj/random/gun/random,
 /turf/simulated/floor/tiled/white,
 /area/submap/piratevox)
 "gp" = (
@@ -75,7 +72,6 @@
 "hj" = (
 /obj/structure/table/rack/shelf/steel,
 /obj/random/gun/random,
-/obj/random/gun/random,
 /obj/machinery/light/poi,
 /obj/item/rig/baymed,
 /turf/simulated/floor/tiled/white,
@@ -148,7 +144,6 @@
 /area/submap/piratevox)
 "pK" = (
 /obj/structure/table/standard,
-/obj/random/gun/random,
 /turf/simulated/floor/tiled/white,
 /area/submap/piratevox)
 "pV" = (
@@ -234,9 +229,9 @@
 /turf/template_noop,
 /area/template_noop)
 "Dg" = (
-/obj/structure/table/standard,
-/obj/random/firstaid,
-/obj/random/medical/pillbottle,
+/obj/structure/table/rack/shelf/steel,
+/obj/random/gun/random,
+/obj/item/rig/bayeng,
 /turf/simulated/floor/tiled/white,
 /area/submap/piratevox)
 "Dt" = (
@@ -368,12 +363,6 @@
 /obj/structure/bed/chair/bay/shuttle,
 /turf/simulated/floor/tiled/red,
 /area/submap/piratevox)
-"Wj" = (
-/obj/structure/table/standard,
-/obj/random/maintenance/medical,
-/obj/random/maintenance/medical,
-/turf/simulated/floor/tiled/white,
-/area/submap/piratevox)
 "WN" = (
 /obj/structure/table/standard,
 /obj/item/reagent_containers/spray/cleaner,
@@ -387,12 +376,6 @@
 /obj/effect/landmark/mobcorpse/vox/boarder_m,
 /turf/simulated/floor/tiled/white,
 /area/submap/piratevox)
-"YI" = (
-/obj/structure/table/standard,
-/obj/random/contraband/nofail,
-/obj/random/medical/pillbottle,
-/turf/simulated/floor/tiled/white,
-/area/submap/piratevox)
 "YQ" = (
 /obj/effect/decal/cleanable/blood/splatter,
 /obj/machinery/light/poi{
@@ -671,7 +654,7 @@ Cm
 Cm
 Cm
 SL
-to
+Dg
 AV
 Os
 SL
@@ -702,7 +685,7 @@ Cm
 Cm
 Cm
 SL
-Dg
+An
 Op
 Os
 SL
@@ -720,7 +703,7 @@ Os
 SL
 pD
 Op
-YI
+An
 SL
 Cm
 Cm
@@ -733,7 +716,7 @@ Cm
 Cm
 Cm
 SL
-Dg
+pK
 ZP
 Os
 fD
@@ -751,7 +734,7 @@ Ap
 gp
 iU
 Tk
-YI
+pK
 SL
 Cm
 Cm
@@ -764,7 +747,7 @@ Cm
 Cm
 Cm
 SL
-Dg
+pK
 ki
 LP
 SL
@@ -782,7 +765,7 @@ Os
 SL
 Os
 YQ
-YI
+An
 SL
 Cm
 Cm
@@ -1019,11 +1002,11 @@ Cm
 uQ
 UL
 UL
-Wj
+pK
 hB
 Os
 hB
-Wj
+pK
 UL
 UL
 uQ
@@ -1049,13 +1032,13 @@ Cm
 ye
 UL
 UL
-Wj
+fV
 LP
 Os
 Tl
 Os
 Os
-Wj
+fV
 UL
 UL
 ye
@@ -1079,7 +1062,7 @@ Cm
 Cm
 UL
 UL
-Wj
+pK
 rp
 Os
 Os
@@ -1087,7 +1070,7 @@ Os
 Os
 Os
 OH
-Wj
+An
 cK
 UL
 Cm
@@ -1109,7 +1092,7 @@ Cm
 Cm
 ye
 SL
-Wj
+pK
 Os
 Os
 Os
@@ -1119,7 +1102,7 @@ Os
 Os
 Os
 LP
-Wj
+fV
 SL
 ye
 Cm
@@ -1233,7 +1216,7 @@ Cm
 Cm
 ye
 SL
-Wj
+pK
 Os
 Os
 Os
@@ -1243,7 +1226,7 @@ LP
 Os
 Os
 Os
-Wj
+pK
 SL
 ye
 Cm
@@ -1265,7 +1248,7 @@ Cm
 Cm
 UL
 UL
-Wj
+An
 OH
 Os
 Os
@@ -1273,7 +1256,7 @@ Os
 Os
 Os
 rp
-Wj
+pK
 UL
 UL
 Cm
@@ -1297,13 +1280,13 @@ Cm
 Cm
 UL
 UL
-Wj
+pK
 LP
 Os
 OH
 LP
 Os
-Wj
+fV
 UL
 UL
 Cm
@@ -1333,7 +1316,7 @@ fV
 pJ
 pK
 pJ
-fV
+An
 UL
 UL
 uQ
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/plontden.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/plontden.dmm
index 70050c893c..04ef414c47 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/plontden.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/plontden.dmm
@@ -304,9 +304,9 @@
 /area/submap/plontden)
 "HB" = (
 /obj/structure/closet/cabinet,
-/obj/random/contraband/nofail,
-/obj/random/contraband/nofail,
-/obj/random/contraband/nofail,
+/obj/random/contraband,
+/obj/random/contraband,
+/obj/random/contraband,
 /turf/simulated/floor/tiled/yellow,
 /area/submap/plontden)
 "HD" = (
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/settlement.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/settlement.dmm
index afcc4f7683..f63585dd4b 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/settlement.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/settlement.dmm
@@ -121,11 +121,11 @@
 /turf/simulated/floor/tiled/white,
 /area/submap/settlement)
 "gl" = (
-/obj/structure/table/standard,
-/obj/random/maintenance/foodstuff,
-/obj/effect/floor_decal/corner/orange/diagonal,
-/obj/random/energy/sec,
-/turf/simulated/floor/tiled/white,
+/obj/effect/floor_decal/corner/red/diagonal,
+/obj/structure/table/rack,
+/obj/random/cash,
+/obj/random/cash,
+/turf/simulated/floor/tiled/red,
 /area/submap/settlement)
 "gz" = (
 /mob/living/simple_mob/construct/juggernaut,
@@ -151,9 +151,7 @@
 "hy" = (
 /obj/effect/floor_decal/corner/red/diagonal,
 /obj/structure/table/rack,
-/obj/random/cash/huge,
-/obj/random/cash/huge,
-/obj/random/cash/huge,
+/obj/random/cash,
 /turf/simulated/floor/tiled/red,
 /area/submap/settlement)
 "hV" = (
@@ -169,7 +167,7 @@
 /area/submap/settlement)
 "im" = (
 /obj/structure/table/woodentable,
-/obj/random/multiple/gun/projectile/handgun,
+/obj/random/energy/sec,
 /turf/simulated/floor/lino,
 /area/submap/settlement)
 "it" = (
@@ -208,7 +206,9 @@
 /turf/simulated/floor/tiled/white,
 /area/submap/settlement)
 "kg" = (
-/mob/living/simple_mob/humanoid/cultist/magus,
+/mob/living/simple_mob/humanoid/cultist/magus{
+	loot_list = list(/obj/item/gun/energy/imperial = 40)
+	},
 /turf/simulated/floor/cult,
 /area/submap/settlement)
 "km" = (
@@ -267,10 +267,9 @@
 "oa" = (
 /obj/effect/floor_decal/corner/red/diagonal,
 /obj/structure/table/rack,
-/obj/random/cash/huge,
-/obj/random/cash/huge,
-/obj/random/cash/huge,
 /obj/random/rigsuit/chancetofail,
+/obj/random/cash,
+/obj/random/cash,
 /turf/simulated/floor/tiled/red,
 /area/submap/settlement)
 "oq" = (
@@ -587,7 +586,6 @@
 "HK" = (
 /obj/structure/table/fancyblack,
 /obj/item/storage/belt/soulstone/full,
-/obj/item/gun/energy/imperial,
 /turf/simulated/floor/cult,
 /area/submap/settlement)
 "HR" = (
@@ -684,10 +682,9 @@
 "MN" = (
 /obj/effect/floor_decal/corner/red/diagonal,
 /obj/structure/table/rack,
-/obj/random/cash/huge,
-/obj/random/cash/huge,
-/obj/random/cash/huge,
 /obj/random/rigsuit,
+/obj/random/cash,
+/obj/random/cash,
 /turf/simulated/floor/tiled/red,
 /area/submap/settlement)
 "MS" = (
@@ -1038,7 +1035,7 @@ Mm
 OI
 yR
 lt
-xQ
+TJ
 jZ
 lt
 lt
@@ -1080,7 +1077,7 @@ ft
 OI
 GU
 lt
-xQ
+TJ
 jZ
 lt
 lt
@@ -1210,7 +1207,7 @@ xQ
 Vp
 lt
 lt
-gl
+xQ
 xQ
 rh
 PG
@@ -1519,7 +1516,7 @@ PP
 PP
 PP
 PP
-BT
+Ja
 PP
 PP
 Fi
@@ -2440,7 +2437,7 @@ PG
 PG
 TU
 TU
-hy
+gl
 xH
 TU
 TU
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/siegepoint.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/siegepoint.dmm
index 7bcfc855f5..812224fa50 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/siegepoint.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/siegepoint.dmm
@@ -5,8 +5,8 @@
 /area/submap/siegepoint)
 "cm" = (
 /obj/structure/table/steel_reinforced,
-/obj/random/contraband/nofail,
 /obj/machinery/light/poi,
+/obj/random/contraband,
 /turf/simulated/floor/tiled/techfloor,
 /area/submap/siegepoint)
 "cM" = (
@@ -33,7 +33,8 @@
 /area/submap/siegepoint)
 "gL" = (
 /mob/living/simple_mob/humanoid/merc/ranged/smg/sol{
-	faction = "neutral"
+	faction = "neutral";
+	loot_list = list(/obj/item/gun/projectile/automatic/c20r = 100, /obj/item/gun/energy/medigun = 20)
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/submap/siegepoint)
@@ -90,11 +91,6 @@
 /obj/item/clothing/suit/armor/pcarrier/blue/sol,
 /turf/simulated/floor/tiled/techfloor,
 /area/submap/siegepoint)
-"lL" = (
-/obj/structure/table/steel_reinforced,
-/obj/item/gun/projectile/revolver/lemat,
-/turf/simulated/floor/tiled/techfloor,
-/area/submap/siegepoint)
 "nl" = (
 /obj/structure/table/steel_reinforced,
 /obj/random/medical/pillbottle,
@@ -129,7 +125,9 @@
 /obj/structure/bed/chair/office{
 	dir = 4
 	},
-/mob/living/simple_mob/humanoid/pirate/mate/ranged/shotgun,
+/mob/living/simple_mob/humanoid/pirate/mate/ranged/shotgun{
+	loot_list = list(/obj/item/gun/projectile/shotgun/doublebarrel/quad = 100, /obj/item/clothing/suit/pirate = 100, /obj/item/stack/medical/advanced/bruise_pack = 20)
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/submap/siegepoint)
 "pW" = (
@@ -152,7 +150,8 @@
 	dir = 1
 	},
 /mob/living/simple_mob/humanoid/merc/ranged/smg/sol{
-	faction = "neutral"
+	faction = "neutral";
+	loot_list = list(/obj/item/gun/projectile/automatic/c20r = 100, /obj/item/gun/energy/medigun = 20)
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/submap/siegepoint)
@@ -224,7 +223,7 @@
 /area/submap/siegepoint)
 "zJ" = (
 /obj/structure/table/steel_reinforced,
-/obj/random/contraband/nofail,
+/obj/random/contraband,
 /turf/simulated/floor/tiled/techfloor,
 /area/submap/siegepoint)
 "zZ" = (
@@ -261,11 +260,6 @@
 /obj/effect/decal/cleanable/cobweb2,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/submap/siegepoint)
-"BY" = (
-/obj/structure/table/steel_reinforced,
-/obj/item/gun/projectile/revolver/saa,
-/turf/simulated/floor/tiled/techfloor,
-/area/submap/siegepoint)
 "Da" = (
 /mob/living/simple_mob/humanoid/pirate/ranged/shotgun/armored,
 /obj/machinery/light/poi{
@@ -299,7 +293,8 @@
 "GW" = (
 /mob/living/simple_mob/humanoid/merc/ranged{
 	health = 15;
-	maxHealth = 15
+	maxHealth = 15;
+	loot_list = list(/obj/item/gun/projectile/colt = 100, /obj/item/stack/medical/advanced/bruise_pack = 20)
 	},
 /obj/item/clothing/suit/armor/pcarrier/merc,
 /turf/simulated/floor/tiled/techfloor,
@@ -333,11 +328,6 @@
 /obj/structure/bookcase,
 /turf/simulated/floor/tiled/techfloor,
 /area/submap/siegepoint)
-"Jv" = (
-/obj/structure/table/steel_reinforced,
-/obj/random/medical,
-/turf/simulated/floor/tiled/techfloor,
-/area/submap/siegepoint)
 "KZ" = (
 /obj/structure/cable/cyan{
 	d2 = 4;
@@ -411,7 +401,9 @@
 /obj/structure/bed/chair/office{
 	dir = 8
 	},
-/mob/living/simple_mob/humanoid/pirate/las/armored,
+/mob/living/simple_mob/humanoid/pirate/las/armored{
+	loot_list = list(/obj/item/melee/energy/sword/pirate = 100, /obj/item/clothing/suit/armor/material/makeshift = 100, /obj/item/stack/medical/advanced/bruise_pack = 20)
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/submap/siegepoint)
 "Rs" = (
@@ -426,18 +418,15 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/submap/siegepoint)
 "Tg" = (
-/mob/living/simple_mob/humanoid/pirate/captain,
+/mob/living/simple_mob/humanoid/pirate/captain{
+	loot_list = list(/obj/item/gun/energy/zip = 100, /obj/item/gun/energy/zip = 100, /obj/item/gun/energy/zip = 100, /obj/item/gun/energy/zip = 100, /obj/item/salvage/loot/pirate = 50)
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/submap/siegepoint)
 "Tp" = (
 /obj/structure/salvageable/autolathe,
 /turf/simulated/floor/tiled/techfloor,
 /area/submap/siegepoint)
-"We" = (
-/obj/structure/table/steel_reinforced,
-/obj/item/gun/energy/medigun,
-/turf/simulated/floor/tiled/techfloor,
-/area/submap/siegepoint)
 "Xi" = (
 /obj/machinery/door/airlock/maintenance/common,
 /turf/simulated/floor/tiled/techfloor,
@@ -685,7 +674,7 @@ Pm
 Pm
 xK
 oW
-AO
+oW
 oW
 Da
 oW
@@ -820,7 +809,7 @@ oW
 oW
 ZG
 oW
-AO
+oW
 xK
 FV
 hs
@@ -882,7 +871,7 @@ oW
 xK
 wV
 Yc
-Jv
+Yc
 Yc
 Nv
 xK
@@ -912,7 +901,7 @@ xK
 Xi
 xK
 xK
-AO
+oW
 Ap
 oW
 Ap
@@ -924,7 +913,7 @@ hs
 (15,1,1) = {"
 hs
 xK
-zJ
+Yc
 oW
 oW
 Lu
@@ -968,9 +957,9 @@ wF
 xK
 oW
 Yc
-We
+Yc
 oW
-lL
+Yc
 xK
 oW
 oW
@@ -992,7 +981,7 @@ QI
 oW
 ZG
 oW
-zJ
+Yc
 xK
 oW
 Tg
@@ -1004,13 +993,13 @@ ta
 oW
 ji
 xK
-AO
+oW
 oW
 Nv
 xK
 wV
 Yc
-Jv
+Yc
 Yc
 Nv
 xK
@@ -1034,7 +1023,7 @@ oW
 Yc
 IW
 oW
-BY
+Yc
 xK
 oW
 oW
@@ -1076,7 +1065,7 @@ oW
 oW
 XH
 oW
-AO
+oW
 xK
 FV
 hs
@@ -1152,7 +1141,7 @@ gA
 oW
 ZG
 oW
-zJ
+Yc
 xK
 wV
 oa
@@ -1201,7 +1190,7 @@ oW
 oW
 xK
 oW
-AO
+oW
 oW
 oW
 oW
@@ -1286,7 +1275,7 @@ oW
 oW
 oW
 oW
-AO
+oW
 fx
 oW
 oW
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/solarmoff.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/solarmoff.dmm
index 01575a3f68..d7ca059016 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/solarmoff.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/solarmoff.dmm
@@ -85,7 +85,9 @@
 /turf/simulated/mineral/floor/ignore_mapgen,
 /area/submap/solarmoff)
 "E" = (
-/mob/living/simple_mob/animal/space/carp/large,
+/mob/living/simple_mob/animal/space/carp/large{
+	loot_list = list(/obj/item/salvage/ruin/carp = 100)
+	},
 /turf/simulated/floor/water,
 /area/submap/solarmoff)
 "F" = (
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/spooderchurch.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/spooderchurch.dmm
index 3fa8f79aea..f8b8b62816 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/spooderchurch.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/spooderchurch.dmm
@@ -33,13 +33,12 @@
 /area/submap/spooderchurch)
 "hn" = (
 /obj/structure/table/sifwoodentable,
-/obj/random/contraband/nofail,
+/obj/random/contraband,
 /turf/simulated/floor/wood/sif,
 /area/submap/spooderchurch)
 "hp" = (
 /obj/structure/closet/crate/plastic,
-/obj/random/cash/huge,
-/obj/random/cash/huge,
+/obj/random/cash,
 /turf/simulated/floor/wood/sif,
 /area/submap/spooderchurch)
 "ig" = (
@@ -64,10 +63,8 @@
 /area/submap/spooderchurch)
 "lF" = (
 /obj/structure/table/rack/shelf,
-/obj/random/energy/highend,
-/obj/random/energy/highend,
-/obj/item/clothing/glasses/night,
-/obj/item/clothing/glasses/night,
+/obj/random/toolbox,
+/obj/random/toolbox,
 /turf/simulated/floor/wood/sif,
 /area/submap/spooderchurch)
 "mY" = (
@@ -108,15 +105,7 @@
 /area/submap/spooderchurch)
 "uF" = (
 /obj/structure/table/sifwoodentable,
-/obj/random/firstaid,
-/turf/simulated/floor/wood/sif,
-/area/submap/spooderchurch)
-"vk" = (
-/obj/structure/table/rack/shelf,
-/obj/random/projectile,
-/obj/random/projectile,
-/obj/item/clothing/glasses/night,
-/obj/item/clothing/glasses/night,
+/obj/random/toolbox,
 /turf/simulated/floor/wood/sif,
 /area/submap/spooderchurch)
 "vA" = (
@@ -177,8 +166,7 @@
 /turf/simulated/floor/wood/sif,
 /area/submap/spooderchurch)
 "zY" = (
-/obj/structure/table/sifwoodentable,
-/obj/item/card/emag,
+/obj/structure/closet/crate/plastic,
 /turf/simulated/floor/wood/sif,
 /area/submap/spooderchurch)
 "Ah" = (
@@ -323,7 +311,9 @@
 /turf/simulated/floor/wood/sif,
 /area/submap/spooderchurch)
 "Wb" = (
-/mob/living/simple_mob/humanoid/merc/ranged/deagle,
+/mob/living/simple_mob/humanoid/merc/ranged/deagle{
+	loot_list = list(/obj/item/gun/projectile/deagle = 100, /obj/item/spellbook/oneuse/smoke = 100)
+	},
 /turf/simulated/floor/wood/sif,
 /area/submap/spooderchurch)
 "Xe" = (
@@ -350,7 +340,6 @@
 /area/submap/spooderchurch)
 "ZX" = (
 /obj/structure/table/rack/shelf,
-/obj/item/spellbook/oneuse/smoke,
 /turf/simulated/floor/wood/sif,
 /area/submap/spooderchurch)
 
@@ -549,11 +538,11 @@ Cm
 Cm
 JI
 Bw
-hn
+Cq
 xx
 hn
-Ah
-hn
+zY
+Cq
 FR
 hn
 Bw
@@ -819,7 +808,7 @@ YO
 YO
 Zl
 Bw
-xx
+YO
 YO
 YO
 Bw
@@ -857,7 +846,7 @@ YO
 YO
 lF
 Bw
-VU
+zY
 YO
 YO
 Bw
@@ -928,12 +917,12 @@ Cm
 JI
 Bw
 YO
-zY
+Cq
 YO
 YO
-vk
+lF
 Bw
-VU
+zY
 YO
 YO
 Bw
@@ -1233,13 +1222,13 @@ Cm
 Pd
 JI
 Bw
-hn
-xx
+Cq
+YO
 hn
 FR
 hn
-xx
-hn
+YO
+Cq
 Bw
 tI
 yY
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/teppifarm.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/teppifarm.dmm
index 270e84af18..8ab992c80c 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/teppifarm.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/teppifarm.dmm
@@ -61,7 +61,7 @@
 /area/submap/teppifarm)
 "r" = (
 /obj/structure/table/woodentable,
-/obj/random/contraband/nofail,
+/obj/random/contraband,
 /turf/simulated/floor/wood/alt,
 /area/submap/teppifarm)
 "s" = (
@@ -98,7 +98,6 @@
 "A" = (
 /obj/structure/table/rack,
 /obj/item/melee/umbrella/random,
-/obj/item/gun/energy/taser/xeno,
 /turf/simulated/floor/wood/alt,
 /area/submap/teppifarm)
 "B" = (
@@ -173,7 +172,6 @@
 /obj/effect/decal/cleanable/blood/oil/streak,
 /obj/structure/table/rack,
 /obj/item/melee/umbrella/random,
-/obj/item/gun/energy/taser/xeno,
 /turf/simulated/floor/wood/alt,
 /area/submap/teppifarm)
 "W" = (
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/terraformer.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/terraformer.dmm
index 0619cf1497..094977d993 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/terraformer.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/terraformer.dmm
@@ -232,7 +232,7 @@ I
 P
 P
 P
-o
+P
 M
 "}
 (10,1,1) = {"
@@ -371,7 +371,6 @@ M
 a
 M
 M
-o
 P
 P
 P
@@ -384,7 +383,8 @@ P
 P
 P
 P
-o
+P
+P
 M
 M
 M
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/vault.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/vault.dmm
index 5fa36b8ffb..41aaff0063 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/vault.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/vault.dmm
@@ -3,8 +3,10 @@
 /turf/simulated/shuttle/floor/alienplating/blue,
 /area/submap/vault)
 "b" = (
-/mob/living/simple_mob/mechanical/hivebot/precusor/machinegun,
-/turf/simulated/shuttle/floor/alien,
+/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/emp{
+	loot_list = list(/obj/item/prop/alien/junk = 20, /obj/item/prop/alien/junk = 20)
+	},
+/turf/simulated/shuttle/floor/alienplating/blue,
 /area/submap/vault)
 "c" = (
 /turf/simulated/shuttle/wall/alien,
@@ -14,15 +16,9 @@
 /area/template_noop)
 "e" = (
 /obj/structure/table/alien/blue,
-/obj/item/prop/alien/junk,
-/obj/item/prop/alien/junk,
 /obj/item/implantcase/chem,
 /turf/simulated/shuttle/floor/alienplating/blue,
 /area/submap/vault)
-"i" = (
-/obj/structure/loot_pile/surface/alien/security,
-/turf/simulated/shuttle/floor/alienplating/blue,
-/area/submap/vault)
 "j" = (
 /obj/structure/loot_pile/surface/alien/engineering,
 /turf/simulated/shuttle/floor/alienplating/blue,
@@ -68,10 +64,6 @@
 "z" = (
 /turf/simulated/shuttle/floor/alien,
 /area/submap/vault)
-"B" = (
-/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/radiation,
-/turf/simulated/shuttle/floor/alienplating/blue,
-/area/submap/vault)
 "C" = (
 /mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/emp,
 /turf/simulated/shuttle/floor/alienplating/blue,
@@ -95,14 +87,13 @@
 /turf/simulated/shuttle/floor/alienplating/external,
 /area/submap/vault)
 "G" = (
-/mob/living/simple_mob/mechanical/hivebot/precusor/laser,
+/mob/living/simple_mob/mechanical/hivebot/precusor/machinegun{
+	loot_list = list(/obj/item/prop/alien/junk = 20, /obj/item/prop/alien/junk = 20, /obj/item/cell/device/weapon/recharge/alien/omni = 5)
+	},
 /turf/simulated/shuttle/floor/alien,
 /area/submap/vault)
 "H" = (
 /obj/structure/table/alien/blue,
-/obj/item/prop/alien/junk,
-/obj/item/prop/alien/junk,
-/obj/item/cell/device/weapon/recharge/alien/omni/empty,
 /turf/simulated/shuttle/floor/alienplating/blue,
 /area/submap/vault)
 "I" = (
@@ -110,17 +101,17 @@
 /turf/simulated/shuttle/floor/alienplating/blue,
 /area/submap/vault)
 "J" = (
-/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/radiation,
+/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/emp,
 /turf/simulated/shuttle/floor/alien,
 /area/submap/vault)
 "L" = (
-/mob/living/simple_mob/mechanical/hivebot/support/logistics,
+/mob/living/simple_mob/mechanical/hivebot/support/logistics{
+	loot_list = list(/obj/item/prop/alien/junk = 20, /obj/item/prop/alien/junk = 20, /obj/item/cell/device/weapon/recharge/alien/omni = 5)
+	},
 /turf/simulated/shuttle/floor/alienplating/blue,
 /area/submap/vault)
 "M" = (
 /obj/structure/table/alien/blue,
-/obj/item/prop/alien/junk,
-/obj/item/prop/alien/junk,
 /obj/item/implantcase/medkit,
 /turf/simulated/shuttle/floor/alienplating/blue,
 /area/submap/vault)
@@ -143,8 +134,6 @@
 "R" = (
 /obj/structure/table/alien/blue,
 /obj/item/gun/energy/alien,
-/obj/item/prop/alien/junk,
-/obj/item/prop/alien/junk,
 /turf/simulated/shuttle/floor/alienplating/blue,
 /area/submap/vault)
 "V" = (
@@ -166,9 +155,6 @@
 /area/submap/vault)
 "Z" = (
 /obj/structure/table/alien/blue,
-/obj/item/gun/energy/alien,
-/obj/item/prop/alien/junk,
-/obj/item/prop/alien/junk,
 /obj/item/clothing/head/technomancer/apprentice,
 /turf/simulated/shuttle/floor/alienplating/blue,
 /area/submap/vault)
@@ -513,7 +499,7 @@ c
 r
 a
 a
-i
+a
 c
 c
 a
@@ -633,7 +619,7 @@ a
 a
 a
 c
-i
+a
 j
 c
 c
@@ -856,7 +842,7 @@ V
 c
 c
 a
-B
+C
 a
 z
 a
@@ -1060,7 +1046,7 @@ p
 p
 D
 D
-C
+b
 z
 a
 J
@@ -1102,7 +1088,7 @@ V
 c
 c
 a
-B
+C
 a
 z
 a
@@ -1257,11 +1243,11 @@ c
 a
 a
 a
-b
+G
 z
 G
 z
-b
+G
 a
 a
 a
@@ -1311,7 +1297,7 @@ c
 c
 c
 j
-i
+a
 c
 a
 a
@@ -1431,7 +1417,7 @@ a
 a
 c
 c
-i
+a
 a
 a
 c
diff --git a/modular_chomp/maps/submaps/surface_submaps/valley/warzone.dmm b/modular_chomp/maps/submaps/surface_submaps/valley/warzone.dmm
index bf1af8ce06..987e2ccab6 100644
--- a/modular_chomp/maps/submaps/surface_submaps/valley/warzone.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/valley/warzone.dmm
@@ -27,7 +27,7 @@
 /area/submap/warzone)
 "mm" = (
 /obj/structure/table/steel_reinforced,
-/obj/random/contraband/nofail,
+/obj/random/contraband,
 /turf/simulated/floor/tiled/techfloor,
 /area/submap/warzone)
 "nj" = (
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/AbandonedLab.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/AbandonedLab.dmm
index 50482f0fa5..f92f86ead2 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/AbandonedLab.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/AbandonedLab.dmm
@@ -92,6 +92,7 @@
 "dI" = (
 /obj/item/material/shard,
 /obj/effect/decal/cleanable/dirt,
+/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/emp,
 /turf/simulated/floor/tiled/steel,
 /area/submap/AbandonedLab{
 	requires_power = 0
@@ -99,7 +100,7 @@
 "dO" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/floor_decal/rust,
-/obj/random/maintenance/research,
+/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser,
 /turf/simulated/floor/tiled/dark,
 /area/submap/AbandonedLab{
 	requires_power = 0
@@ -163,7 +164,11 @@
 	requires_power = 0
 	})
 "gP" = (
-/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong,
+/mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong{
+	size_multiplier = 1.2;
+	health = 240;
+	loot_list = list(/obj/item/gun/energy/laser = 5, /obj/item/gun/energy/laser/sleek = 5, /obj/item/gun/energy/gun = 5, /obj/item/gun/energy/sniperrifle = 5)
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/submap/AbandonedLab{
 	requires_power = 0
@@ -201,7 +206,6 @@
 	},
 /obj/random/projectile/shotgun,
 /obj/random/ammo,
-/obj/random/ammo,
 /obj/item/storage/box/empslite,
 /obj/item/storage/box/handcuffs,
 /turf/simulated/floor/tiled/steel,
@@ -232,7 +236,6 @@
 /obj/machinery/light/poi{
 	dir = 1
 	},
-/obj/effect/landmark/loot_spawn/low,
 /obj/structure/table/rack,
 /turf/simulated/floor/tiled/dark,
 /area/submap/AbandonedLab{
@@ -262,7 +265,6 @@
 	})
 "iA" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/random/maintenance/research,
 /turf/simulated/floor/reinforced,
 /area/submap/AbandonedLab{
 	requires_power = 0
@@ -296,13 +298,6 @@
 "jE" = (
 /obj/effect/wingrille_spawn,
 /turf/simulated/wall/iron,
-/area/submap/AbandonedLab{
-	requires_power = 0
-	})
-"jN" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/random/contraband/nofail,
-/turf/simulated/floor/tiled/hydro,
 /area/submap/AbandonedLab{
 	requires_power = 0
 	})
@@ -367,7 +362,6 @@
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 1
 	},
-/obj/random/maintenance/cargo,
 /turf/simulated/floor/tiled/dark,
 /area/submap/AbandonedLab{
 	requires_power = 0
@@ -385,7 +379,6 @@
 /obj/effect/floor_decal/industrial/danger{
 	dir = 1
 	},
-/obj/random/maintenance/research,
 /turf/simulated/floor/tiled/dark,
 /area/submap/AbandonedLab{
 	requires_power = 0
@@ -513,8 +506,6 @@
 	})
 "rs" = (
 /obj/structure/closet/cabinet,
-/obj/random/contraband,
-/obj/random/contraband,
 /obj/random/maintenance/medical,
 /obj/random/cash,
 /turf/simulated/floor/tiled/steel,
@@ -571,7 +562,6 @@
 	})
 "uu" = (
 /obj/structure/table/rack/shelf/steel,
-/obj/random/energy,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/submap/AbandonedLab{
 	requires_power = 0
@@ -700,7 +690,9 @@
 "AB" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/floor_decal/rust,
-/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid,
+/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid{
+	loot_list = list(/obj/item/reagent_containers/glass/beaker/bluespace = 25)
+	},
 /turf/simulated/floor,
 /area/submap/AbandonedLab{
 	requires_power = 0
@@ -723,13 +715,6 @@
 	pixel_y = 24
 	},
 /turf/simulated/floor/tiled/dark,
-/area/submap/AbandonedLab{
-	requires_power = 0
-	})
-"Bb" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/loot_spawn/low,
-/turf/simulated/floor/reinforced,
 /area/submap/AbandonedLab{
 	requires_power = 0
 	})
@@ -740,7 +725,6 @@
 	})
 "BD" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/loot_spawn/low,
 /turf/simulated/floor/tiled/old_tile/green,
 /area/submap/AbandonedLab{
 	requires_power = 0
@@ -762,7 +746,6 @@
 	maxHealth = 15
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/random/projectile/scrapped_gun,
 /obj/item/ammo_casing/a10mm{
 	dir = 6
 	},
@@ -809,7 +792,6 @@
 	})
 "DR" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/random/maintenance/security,
 /obj/item/material/shard,
 /turf/simulated/floor/reinforced,
 /area/submap/AbandonedLab{
@@ -871,7 +853,6 @@
 "FN" = (
 /obj/structure/table/rack/shelf/steel,
 /obj/item/stolenpackage,
-/obj/item/storage/backpack/holding,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/submap/AbandonedLab{
 	requires_power = 0
@@ -908,7 +889,6 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/floor_decal/rust,
 /obj/effect/decal/remains/human,
-/obj/item/broken_gun/ionrifle,
 /turf/simulated/floor/tiled/dark,
 /area/submap/AbandonedLab{
 	requires_power = 0
@@ -924,7 +904,6 @@
 /obj/structure/table/standard{
 	name = "plastic table frame"
 	},
-/obj/effect/landmark/loot_spawn/low,
 /turf/simulated/floor/tiled/asteroid_steel,
 /area/submap/AbandonedLab{
 	requires_power = 0
@@ -958,7 +937,6 @@
 "Iz" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/generic,
-/obj/effect/landmark/loot_spawn/low,
 /turf/simulated/floor/tiled/dark,
 /area/submap/AbandonedLab{
 	requires_power = 0
@@ -967,7 +945,6 @@
 /obj/structure/table/glass,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/reagent_containers/dropper,
-/obj/item/reagent_containers/glass/beaker/bluespace,
 /turf/simulated/floor/tiled/steel,
 /area/submap/AbandonedLab{
 	requires_power = 0
@@ -1010,9 +987,6 @@
 	})
 "JC" = (
 /obj/structure/table/rack/shelf/steel,
-/obj/item/spacecash/c500,
-/obj/item/spacecash/c500,
-/obj/item/spacecash/c500,
 /obj/structure/window/reinforced/survival_pod,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/submap/AbandonedLab{
@@ -1059,7 +1033,6 @@
 "KR" = (
 /obj/structure/table/rack/shelf/steel,
 /obj/item/stolenpackage,
-/obj/item/stolenpackage,
 /obj/structure/window/reinforced/survival_pod,
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/submap/AbandonedLab{
@@ -1123,7 +1096,6 @@
 	})
 "ML" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/random/maintenance/security,
 /obj/structure/table/steel,
 /obj/effect/decal/cleanable/generic,
 /turf/simulated/floor/tiled/steel,
@@ -1243,7 +1215,6 @@
 	})
 "QA" = (
 /obj/effect/decal/cleanable/cobweb2,
-/obj/random/maintenance/cargo,
 /obj/structure/catwalk,
 /obj/effect/floor_decal/rust{
 	pixel_y = 1
@@ -1300,7 +1271,6 @@
 	})
 "Ta" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/random/maintenance/security,
 /obj/structure/table/steel,
 /turf/simulated/floor/tiled/steel,
 /area/submap/AbandonedLab{
@@ -1387,11 +1357,8 @@
 	})
 "Xo" = (
 /obj/effect/floor_decal/rust,
-/obj/item/storage/pill_bottle/vermicetol,
-/obj/item/storage/pill_bottle/dermaline,
-/obj/item/storage/pill_bottle/dexalin_plus,
-/obj/item/storage/pill_bottle/carthatoline,
 /obj/structure/closet/crate,
+/obj/random/medical/pillbottle,
 /turf/simulated/floor/tiled/steel,
 /area/submap/AbandonedLab{
 	requires_power = 0
@@ -1445,7 +1412,6 @@
 	})
 "Za" = (
 /obj/effect/floor_decal/rust,
-/obj/effect/landmark/loot_spawn/low,
 /turf/simulated/floor/tiled/steel,
 /area/submap/AbandonedLab{
 	requires_power = 0
@@ -1467,7 +1433,6 @@
 /area/template_noop)
 "Zr" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/loot_spawn/low,
 /obj/effect/floor_decal/rust{
 	pixel_y = 1
 	},
@@ -1573,7 +1538,7 @@ ku
 sb
 gk
 oI
-jN
+bI
 ot
 SB
 WZ
@@ -1771,7 +1736,7 @@ ie
 LL
 yS
 mQ
-Bb
+iA
 mu
 ku
 Dh
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/AmbushBase.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/AmbushBase.dmm
index 7a9409dd39..cd154cc246 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/AmbushBase.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/AmbushBase.dmm
@@ -50,13 +50,10 @@
 "bF" = (
 /obj/structure/table/rack,
 /obj/random/projectile/shotgun,
-/obj/random/projectile/shotgun,
-/obj/item/gun/projectile/shotgun/pump/combat,
 /obj/item/ammo_magazine/ammo_box/b12g/flechette,
 /obj/item/ammo_magazine/ammo_box/b12g/flechette,
 /obj/item/ammo_magazine/ammo_box/b12g/flechette,
 /obj/item/ammo_magazine/ammo_box/b12g/flechette,
-/obj/item/gun/projectile/shotgun/doublebarrel/quad,
 /turf/simulated/floor/tiled/techmaint,
 /area/submap/DugOutMercs)
 "bS" = (
@@ -112,12 +109,7 @@
 /area/submap/DugOutMercs)
 "dI" = (
 /obj/structure/table/rack,
-/obj/item/gun/energy/vepr,
 /obj/item/gun/energy/laser,
-/obj/random/energy,
-/obj/random/energy,
-/obj/item/cell/device/weapon,
-/obj/item/cell/device/weapon,
 /obj/item/cell/device/weapon,
 /obj/item/cell/device/weapon,
 /turf/simulated/floor/tiled/techmaint,
@@ -164,14 +156,6 @@
 	nitrogen = 93.7835
 	},
 /area/submap/DugOutMercs)
-"fx" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/table/standard,
-/obj/item/surgical/surgicaldrill/alien,
-/obj/machinery/light,
-/obj/item/archaeological_find,
-/turf/simulated/floor/tiled/techmaint,
-/area/submap/DugOutMercs)
 "fL" = (
 /obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/structure/table/standard,
@@ -207,7 +191,6 @@
 "hZ" = (
 /obj/structure/table/reinforced,
 /obj/effect/floor_decal/corner/red/diagonal,
-/obj/item/stolenpackage,
 /turf/simulated/floor/tiled,
 /area/submap/DugOutMercs)
 "iq" = (
@@ -243,15 +226,6 @@
 /obj/machinery/light,
 /turf/simulated/floor/tiled,
 /area/submap/DugOutMercs)
-"jz" = (
-/obj/structure/table/rack,
-/obj/item/clothing/suit/armor/laserproof,
-/obj/item/clothing/head/helmet/laserproof,
-/obj/item/clothing/gloves/arm_guard/laserproof,
-/obj/item/clothing/shoes/leg_guard/laserproof,
-/obj/item/clothing/suit/armor/pcarrier/laserproof,
-/turf/simulated/floor/tiled/techmaint,
-/area/submap/DugOutMercs)
 "kg" = (
 /obj/effect/floor_decal/corner/blue/border{
 	dir = 4
@@ -290,7 +264,8 @@
 "lq" = (
 /obj/effect/floor_decal/corner/mauve/diagonal,
 /mob/living/simple_mob/animal/space/carp/large/huge{
-	faction = "syndicate"
+	faction = "syndicate";
+	loot_list = list(/obj/item/salvage/ruin/carp = 100)
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/submap/DugOutMercs)
@@ -361,7 +336,6 @@
 /obj/effect/floor_decal/corner/blue/border{
 	dir = 9
 	},
-/obj/random/energy,
 /obj/item/clothing/suit/space/syndicate/black/blue,
 /obj/item/clothing/head/helmet/space/syndicate/black/blue,
 /obj/item/tank/oxygen/welded,
@@ -393,6 +367,7 @@
 /obj/random/maintenance/research,
 /obj/random/maintenance/research,
 /obj/random/toolbox,
+/obj/item/gun/magnetic/gasthrower,
 /turf/simulated/floor/tiled/techmaint,
 /area/submap/DugOutMercs)
 "pg" = (
@@ -445,7 +420,7 @@
 "rl" = (
 /obj/structure/table/reinforced,
 /obj/effect/floor_decal/corner/red/diagonal,
-/obj/random/cash/huge,
+/obj/random/cash,
 /turf/simulated/floor/tiled,
 /area/submap/DugOutMercs)
 "rn" = (
@@ -540,6 +515,7 @@
 /obj/random/maintenance/research,
 /obj/random/maintenance/research,
 /obj/item/clothing/head/wizard/amp,
+/obj/item/cell/device/weapon/recharge/alien/omni,
 /turf/simulated/floor/tiled/techmaint,
 /area/submap/DugOutMercs)
 "ul" = (
@@ -590,7 +566,6 @@
 /obj/effect/floor_decal/corner/blue/border{
 	dir = 5
 	},
-/obj/random/energy,
 /obj/item/clothing/suit/space/syndicate/black/blue,
 /obj/item/clothing/head/helmet/space/syndicate/black/blue,
 /obj/item/tank/oxygen/welded,
@@ -609,8 +584,6 @@
 "xC" = (
 /obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/structure/table/standard,
-/obj/random/maintenance/research,
-/obj/random/maintenance/research,
 /obj/random/janusmodule,
 /obj/item/surgical/bone_clamp/alien,
 /obj/machinery/light{
@@ -624,11 +597,6 @@
 /area/submap/DugOutMercs)
 "yr" = (
 /obj/structure/table/rack,
-/obj/item/clothing/suit/armor/pcarrier/laserproof,
-/obj/item/clothing/suit/armor/laserproof,
-/obj/item/clothing/head/helmet/laserproof,
-/obj/item/clothing/gloves/arm_guard/laserproof,
-/obj/item/clothing/shoes/leg_guard/laserproof,
 /turf/simulated/floor/tiled/techmaint,
 /area/submap/DugOutMercs)
 "yA" = (
@@ -684,9 +652,7 @@
 "Ca" = (
 /obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/structure/table/standard,
-/obj/item/gun/projectile/revolver/nova,
 /obj/machinery/light,
-/obj/item/archaeological_find,
 /turf/simulated/floor/tiled/techmaint,
 /area/submap/DugOutMercs)
 "Cl" = (
@@ -782,11 +748,11 @@
 /area/submap/DugOutMercs)
 "Ex" = (
 /obj/structure/table/rack/shelf,
-/obj/random/firstaid,
 /obj/effect/floor_decal/corner/red/diagonal,
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/random/pottedplant,
 /turf/simulated/floor/tiled,
 /area/submap/DugOutMercs)
 "EQ" = (
@@ -878,13 +844,6 @@
 /obj/structure/railing/grey,
 /turf/simulated/floor/outdoors/rocks,
 /area/submap/DugOutMercs)
-"Ig" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/table/standard,
-/obj/item/telecube/randomized,
-/obj/item/archaeological_find,
-/turf/simulated/floor/tiled/techmaint,
-/area/submap/DugOutMercs)
 "IM" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 9
@@ -912,8 +871,8 @@
 /area/submap/DugOutMercs)
 "Jp" = (
 /obj/structure/table/woodentable,
-/obj/random/cash/big,
 /obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/random/cash,
 /turf/simulated/floor/tiled,
 /area/submap/DugOutMercs)
 "Jz" = (
@@ -950,14 +909,12 @@
 	},
 /obj/structure/table/rack,
 /obj/item/rig/pmc/security,
-/obj/item/rig/pmc/medical,
 /turf/simulated/floor/tiled/techmaint,
 /area/submap/DugOutMercs)
 "Lg" = (
 /obj/machinery/light,
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /obj/structure/table/woodentable,
-/obj/item/stolenpackage,
 /turf/simulated/floor/tiled,
 /area/submap/DugOutMercs)
 "Mh" = (
@@ -1055,7 +1012,7 @@
 /obj/structure/table/standard,
 /obj/random/maintenance/research,
 /obj/random/maintenance/research,
-/obj/random/medical,
+/obj/item/telecube/randomized,
 /turf/simulated/floor/tiled/techmaint,
 /area/submap/DugOutMercs)
 "QM" = (
@@ -1095,8 +1052,6 @@
 "Sn" = (
 /obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/structure/table/standard,
-/obj/item/gun/magnetic/gasthrower,
-/obj/item/cell/device/weapon/recharge/alien/omni,
 /obj/item/archaeological_find,
 /turf/simulated/floor/tiled/techmaint,
 /area/submap/DugOutMercs)
@@ -1200,7 +1155,6 @@
 	},
 /obj/structure/table/rack,
 /obj/item/rig/pmc/security,
-/obj/item/rig/pmc/medical,
 /turf/simulated/floor/tiled/techmaint,
 /area/submap/DugOutMercs)
 "Wx" = (
@@ -1248,7 +1202,9 @@
 /area/submap/DugOutMercs)
 "YE" = (
 /obj/effect/floor_decal/corner/mauve/diagonal,
-/mob/living/simple_mob/humanoid/merc/ranged/technician,
+/mob/living/simple_mob/humanoid/merc/ranged/technician{
+	loot_list = list(/obj/item/gun/projectile/dartgun = 100, /obj/item/gun/launcher/grenade = 100, /obj/item/grenade/spawnergrenade/manhacks/mercenary = 50, /obj/item/grenade/spawnergrenade/manhacks/mercenary = 30, /obj/item/gun/projectile/revolver/nova = 50)
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/submap/DugOutMercs)
 "YF" = (
@@ -1264,15 +1220,13 @@
 /area/submap/DugOutMercs)
 "YK" = (
 /obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/item/archaeological_find,
-/obj/item/archaeological_find,
 /obj/structure/table/standard,
 /turf/simulated/floor/tiled/techmaint,
 /area/submap/DugOutMercs)
 "YW" = (
 /obj/structure/table/rack/shelf,
-/obj/random/medical,
 /obj/effect/floor_decal/corner/red/diagonal,
+/obj/random/pottedplant,
 /turf/simulated/floor/tiled,
 /area/submap/DugOutMercs)
 "Zg" = (
@@ -2101,7 +2055,7 @@ pf
 WY
 CQ
 WY
-fx
+Ca
 uv
 De
 go
@@ -2227,7 +2181,7 @@ my
 wU
 WY
 WY
-Ig
+Sn
 uv
 Qf
 go
@@ -2256,7 +2210,7 @@ FZ
 VX
 VX
 uv
-jz
+yr
 Ks
 Mi
 Vl
@@ -2310,7 +2264,7 @@ uv
 YW
 Pe
 Pe
-iL
+Pe
 Pe
 uv
 Qf
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/AmbushBaseAlt.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/AmbushBaseAlt.dmm
index f8f5014b9f..5837a69f84 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/AmbushBaseAlt.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/AmbushBaseAlt.dmm
@@ -45,8 +45,8 @@
 /area/submap/DugOutMercs)
 "bp" = (
 /obj/structure/table/rack/shelf,
-/obj/random/medical,
 /obj/effect/floor_decal/corner/red/diagonal,
+/obj/random/pottedplant,
 /turf/simulated/floor/tiled,
 /area/submap/DugOutMercs)
 "bu" = (
@@ -129,9 +129,7 @@
 "dp" = (
 /obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/structure/table/standard,
-/obj/item/surgical/surgicaldrill/alien,
 /obj/machinery/light,
-/obj/item/archaeological_find,
 /turf/simulated/floor/tiled/techmaint,
 /area/submap/DugOutMercs)
 "dr" = (
@@ -211,14 +209,6 @@
 	},
 /turf/simulated/floor/water/deep,
 /area/submap/DugOutMercs)
-"gc" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/table/standard,
-/obj/item/gun/projectile/revolver/nova,
-/obj/machinery/light,
-/obj/item/archaeological_find,
-/turf/simulated/floor/tiled/techmaint,
-/area/submap/DugOutMercs)
 "gg" = (
 /obj/structure/table/sifwooden_reinforced,
 /obj/item/material/fishing_net,
@@ -257,6 +247,7 @@
 /obj/random/maintenance/research,
 /obj/random/maintenance/research,
 /obj/random/toolbox,
+/obj/item/surgical/surgicaldrill/alien,
 /turf/simulated/floor/tiled/techmaint,
 /area/submap/DugOutMercs)
 "in" = (
@@ -273,15 +264,6 @@
 /obj/structure/railing/grey,
 /turf/simulated/floor/water/deep,
 /area/submap/DugOutMercs)
-"iL" = (
-/obj/structure/table/rack,
-/obj/item/clothing/suit/armor/pcarrier/laserproof,
-/obj/item/clothing/suit/armor/laserproof,
-/obj/item/clothing/head/helmet/laserproof,
-/obj/item/clothing/gloves/arm_guard/laserproof,
-/obj/item/clothing/shoes/leg_guard/laserproof,
-/turf/simulated/floor/tiled/techmaint,
-/area/submap/DugOutMercs)
 "jb" = (
 /obj/effect/floor_decal/borderfloorblack{
 	dir = 9
@@ -298,19 +280,17 @@
 /area/submap/DugOutMercs)
 "jn" = (
 /obj/structure/table/woodentable,
-/obj/random/cash/big,
 /obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/random/cash,
 /turf/simulated/floor/tiled,
 /area/submap/DugOutMercs)
 "jp" = (
 /obj/structure/table/rack,
 /obj/random/projectile/shotgun,
-/obj/random/projectile/shotgun,
 /obj/item/ammo_magazine/ammo_box/b12g/flechette,
 /obj/item/ammo_magazine/ammo_box/b12g/flechette,
 /obj/item/ammo_magazine/ammo_box/b12g/flechette,
 /obj/item/ammo_magazine/ammo_box/b12g/flechette,
-/obj/item/gun/projectile/shotgun/doublebarrel/quad,
 /obj/item/gun/projectile/shotgun/pump,
 /turf/simulated/floor/tiled/techmaint,
 /area/submap/DugOutMercs)
@@ -413,7 +393,9 @@
 /area/submap/DugOutMercs)
 "nC" = (
 /obj/effect/floor_decal/corner/mauve/diagonal,
-/mob/living/simple_mob/humanoid/merc/ranged/space/shotgun,
+/mob/living/simple_mob/humanoid/merc/ranged/space/shotgun{
+	loot_list = list(/obj/item/gun/projectile/shotgun/pump/combat = 100, /obj/item/storage/belt/holding = 40)
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/submap/DugOutMercs)
 "nD" = (
@@ -464,19 +446,12 @@
 /area/submap/DugOutMercs)
 "qo" = (
 /obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/item/archaeological_find,
-/obj/item/archaeological_find,
 /obj/structure/table/standard,
 /turf/simulated/floor/tiled/techmaint,
 /area/submap/DugOutMercs)
 "qR" = (
 /obj/structure/table/rack,
-/obj/item/gun/energy/vepr,
 /obj/item/gun/energy/laser,
-/obj/random/energy,
-/obj/random/energy,
-/obj/item/cell/device/weapon,
-/obj/item/cell/device/weapon,
 /obj/item/cell/device/weapon,
 /obj/item/cell/device/weapon,
 /turf/simulated/floor/tiled/techmaint,
@@ -547,7 +522,9 @@
 /area/submap/DugOutMercs)
 "uI" = (
 /obj/effect/floor_decal/corner/mauve/diagonal,
-/mob/living/simple_mob/humanoid/merc/melee/sword/space,
+/mob/living/simple_mob/humanoid/merc/melee/sword/space{
+	loot_list = list(/obj/item/melee/energy/sword = 100, /obj/item/shield/energy = 100, /obj/item/cell/device/weapon/recharge/alien/omni = 40, /obj/item/gun/projectile/revolver/nova = 50)
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/submap/DugOutMercs)
 "uV" = (
@@ -575,8 +552,6 @@
 /obj/effect/floor_decal/corner/blue/border{
 	dir = 5
 	},
-/obj/random/material/refined,
-/obj/random/material,
 /turf/simulated/floor/tiled{
 	nitrogen = 93.7835;
 	oxygen = 20.7263;
@@ -601,11 +576,11 @@
 /area/submap/DugOutMercs)
 "wK" = (
 /obj/structure/table/rack/shelf,
-/obj/random/firstaid,
 /obj/effect/floor_decal/corner/red/diagonal,
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/random/pottedplant,
 /turf/simulated/floor/tiled,
 /area/submap/DugOutMercs)
 "wO" = (
@@ -630,7 +605,7 @@
 "zi" = (
 /obj/structure/table/reinforced,
 /obj/effect/floor_decal/corner/red/diagonal,
-/obj/random/cash/huge,
+/obj/random/cash,
 /turf/simulated/floor/tiled,
 /area/submap/DugOutMercs)
 "zs" = (
@@ -650,7 +625,6 @@
 /obj/effect/floor_decal/corner/blue/border{
 	dir = 5
 	},
-/obj/random/energy,
 /obj/item/clothing/suit/space/syndicate/black/blue,
 /obj/item/clothing/head/helmet/space/syndicate/black/blue,
 /obj/item/tank/oxygen/welded,
@@ -790,7 +764,6 @@
 /obj/effect/floor_decal/corner/blue/border{
 	dir = 1
 	},
-/obj/random/material/precious,
 /obj/machinery/light{
 	dir = 1
 	},
@@ -843,7 +816,6 @@
 /obj/effect/floor_decal/corner/blue/border{
 	dir = 1
 	},
-/obj/random/material/precious,
 /turf/simulated/floor/tiled{
 	nitrogen = 93.7835;
 	oxygen = 20.7263;
@@ -891,7 +863,7 @@
 	dir = 5
 	},
 /obj/structure/table/rack,
-/obj/item/rig/ch/precursor,
+/obj/random/material/precious,
 /turf/simulated/floor/tiled/techmaint,
 /area/submap/DugOutMercs)
 "Ly" = (
@@ -902,7 +874,7 @@
 	dir = 10
 	},
 /obj/structure/table/rack,
-/obj/item/rig/ch/precursor,
+/obj/random/material/precious,
 /turf/simulated/floor/tiled/techmaint,
 /area/submap/DugOutMercs)
 "LU" = (
@@ -945,11 +917,7 @@
 /area/submap/DugOutMercs)
 "Nr" = (
 /obj/structure/table/rack,
-/obj/item/clothing/suit/armor/laserproof,
-/obj/item/clothing/head/helmet/laserproof,
-/obj/item/clothing/gloves/arm_guard/laserproof,
-/obj/item/clothing/shoes/leg_guard/laserproof,
-/obj/item/clothing/suit/armor/pcarrier/laserproof,
+/obj/random/material/precious,
 /turf/simulated/floor/tiled/techmaint,
 /area/submap/DugOutMercs)
 "NB" = (
@@ -985,7 +953,9 @@
 	},
 /area/submap/DugOutMercs)
 "Oz" = (
-/mob/living/simple_mob/mechanical/mecha/combat/gygax/dark/advanced,
+/mob/living/simple_mob/mechanical/mecha/combat/gygax/dark/advanced{
+	loot_list = list(/obj/item/rig/ch/precursor = 100)
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/submap/DugOutMercs)
 "OC" = (
@@ -1080,14 +1050,6 @@
 /obj/machinery/door/airlock/external/bolted,
 /turf/simulated/floor/tiled,
 /area/submap/DugOutMercs)
-"SW" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/table/standard,
-/obj/item/storage/pouch/holding,
-/obj/random/maintenance/research,
-/obj/random/maintenance/research,
-/turf/simulated/floor/tiled/techmaint,
-/area/submap/DugOutMercs)
 "SX" = (
 /obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/structure/table/standard,
@@ -1116,15 +1078,6 @@
 /obj/structure/railing/grey,
 /turf/simulated/floor/water/deep,
 /area/submap/DugOutMercs)
-"Va" = (
-/obj/effect/floor_decal/corner/mauve/diagonal,
-/obj/structure/table/standard,
-/obj/random/maintenance/research,
-/obj/random/maintenance/research,
-/obj/item/storage/belt/holding,
-/obj/item/cell/device/weapon/recharge/alien/hybrid,
-/turf/simulated/floor/tiled/techmaint,
-/area/submap/DugOutMercs)
 "VI" = (
 /obj/structure/bed,
 /obj/item/bedsheet,
@@ -1181,7 +1134,6 @@
 /obj/effect/floor_decal/corner/blue/border{
 	dir = 9
 	},
-/obj/random/energy,
 /obj/item/clothing/suit/space/syndicate/black/blue,
 /obj/item/clothing/head/helmet/space/syndicate/black/blue,
 /obj/item/tank/oxygen/welded,
@@ -1227,8 +1179,6 @@
 "Zj" = (
 /obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/structure/table/standard,
-/obj/item/gun/magnetic/gasthrower,
-/obj/item/cell/device/weapon/recharge/alien/omni,
 /obj/item/archaeological_find,
 /turf/simulated/floor/tiled/techmaint,
 /area/submap/DugOutMercs)
@@ -2059,14 +2009,14 @@ qR
 Il
 eO
 Jt
-iL
+Nr
 bu
 Qu
 aM
 bu
 zs
 nC
-SW
+Hc
 uI
 qo
 bu
@@ -2110,7 +2060,7 @@ SX
 RM
 Hc
 RM
-gc
+dp
 bu
 Ly
 kR
@@ -2148,7 +2098,7 @@ bu
 Qu
 aM
 bu
-Va
+Hc
 RM
 RM
 RM
@@ -2235,7 +2185,7 @@ bu
 bp
 UB
 UB
-RP
+UB
 UB
 bu
 Ly
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
index c461dcfa4d..e90edc0c3a 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
@@ -156,8 +156,6 @@
 /area/submap/Blackshuttledown)
 "ax" = (
 /obj/structure/table/steel,
-/obj/item/gun/projectile/automatic/wt550,
-/obj/item/gun/projectile/automatic/p90,
 /obj/random/rigsuit/chancetofail,
 /turf/simulated/floor/tiled/steel_grid,
 /area/submap/Blackshuttledown)
@@ -260,7 +258,6 @@
 /obj/effect/floor_decal/borderfloor{
 	dir = 8
 	},
-/obj/random/contraband/nofail,
 /turf/simulated/floor/tiled/steel,
 /area/submap/Blackshuttledown)
 "aP" = (
@@ -308,7 +305,6 @@
 /area/submap/Blackshuttledown)
 "aV" = (
 /obj/structure/table/standard,
-/obj/item/storage/firstaid/surgery,
 /obj/effect/floor_decal/corner/green/border{
 	dir = 10;
 	icon_state = "bordercolor"
@@ -488,7 +484,6 @@
 /area/submap/Blackshuttledown)
 "bv" = (
 /obj/structure/table/steel,
-/obj/random/projectile,
 /turf/simulated/floor/tiled/yellow,
 /area/submap/Blackshuttledown)
 "bw" = (
@@ -565,13 +560,11 @@
 /turf/simulated/floor/tiled/yellow,
 /area/submap/Blackshuttledown)
 "bI" = (
-/obj/item/stolenpackage,
 /obj/structure/closet/crate,
 /obj/random/material/precious,
 /obj/random/material/precious,
 /obj/random/material/precious,
 /obj/random/rigsuit/chancetofail,
-/obj/random/projectile,
 /turf/simulated/floor/tiled/yellow,
 /area/submap/Blackshuttledown)
 "bJ" = (
@@ -658,9 +651,6 @@
 /area/submap/Blackshuttledown)
 "bV" = (
 /obj/structure/table/steel,
-/obj/random/rigsuit/chancetofail,
-/obj/random/projectile,
-/obj/random/projectile,
 /turf/simulated/floor/tiled/steel_grid,
 /area/submap/Blackshuttledown)
 "bW" = (
@@ -701,7 +691,6 @@
 /area/submap/Blackshuttledown)
 "cc" = (
 /obj/structure/table/steel,
-/obj/item/gun/projectile/pistol,
 /obj/machinery/light/small{
 	dir = 4;
 	pixel_y = 0
@@ -735,7 +724,6 @@
 "ch" = (
 /obj/structure/table/steel,
 /obj/random/energy/highend,
-/obj/random/energy/highend,
 /obj/random/rigsuit/chancetofail,
 /turf/simulated/floor/tiled/steel_grid,
 /area/submap/Blackshuttledown)
@@ -771,7 +759,6 @@
 /area/submap/Blackshuttledown)
 "cl" = (
 /obj/structure/table/woodentable,
-/obj/random/projectile,
 /turf/simulated/floor/tiled/steel,
 /area/submap/Blackshuttledown)
 "cm" = (
@@ -782,7 +769,7 @@
 /area/submap/Blackshuttledown)
 "cn" = (
 /obj/structure/table/woodentable,
-/obj/random/contraband/nofail,
+/obj/random/contraband,
 /turf/simulated/floor/tiled/steel,
 /area/submap/Blackshuttledown)
 "co" = (
@@ -830,7 +817,11 @@
 /area/submap/Blackshuttledown)
 "DG" = (
 /obj/structure/table/steel,
-/obj/random/contraband/nofail,
+/obj/random/contraband,
+/turf/simulated/floor/tiled/steel,
+/area/submap/Blackshuttledown)
+"Fp" = (
+/obj/structure/table/steel,
 /turf/simulated/floor/tiled/steel,
 /area/submap/Blackshuttledown)
 "RP" = (
@@ -1564,7 +1555,7 @@ aj
 bl
 jW
 bB
-DG
+Fp
 jW
 bl
 aj
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/CaveS.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/CaveS.dmm
index 16b210053b..ef02fe8da8 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/CaveS.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/CaveS.dmm
@@ -82,7 +82,9 @@
 	},
 /area/submap/CaveS)
 "r" = (
-/mob/living/simple_mob/animal/giant_spider/lurker,
+/mob/living/simple_mob/animal/giant_spider/lurker{
+	loot_list = list(/obj/item/stock_parts/manipulator/omni = 50)
+	},
 /turf/simulated/floor/outdoors/dirt{
 	outdoors = 0
 	},
@@ -116,7 +118,9 @@
 	},
 /area/submap/CaveS)
 "x" = (
-/mob/living/simple_mob/animal/giant_spider/lurker,
+/mob/living/simple_mob/animal/giant_spider/lurker{
+	loot_list = list(/obj/item/stock_parts/manipulator/omni = 50)
+	},
 /turf/simulated/floor/outdoors/dirt,
 /area/submap/CaveS)
 "y" = (
@@ -166,7 +170,6 @@
 /obj/item/reagent_containers/pill/antitox,
 /obj/item/reagent_containers/pill/antitox,
 /obj/item/reagent_containers/pill/paracetamol,
-/obj/random/firstaid,
 /turf/simulated/floor,
 /area/submap/CaveS)
 "H" = (
@@ -183,7 +186,6 @@
 /obj/random/contraband,
 /obj/random/contraband,
 /obj/random/contraband,
-/obj/random/energy,
 /obj/item/material/star,
 /obj/item/material/star,
 /obj/item/material/star,
@@ -227,6 +229,20 @@
 /obj/structure/loot_pile/maint/boxfort,
 /turf/simulated/floor,
 /area/submap/CaveS)
+"W" = (
+/mob/living/simple_mob/animal/giant_spider/lurker{
+	loot_list = list(/obj/item/stock_parts/capacitor/omni = 50)
+	},
+/turf/simulated/floor/outdoors/dirt{
+	outdoors = 0
+	},
+/area/submap/CaveS)
+"Z" = (
+/mob/living/simple_mob/animal/giant_spider/lurker{
+	loot_list = list(/obj/item/stock_parts/capacitor/omni = 50)
+	},
+/turf/simulated/floor/outdoors/dirt,
+/area/submap/CaveS)
 
 (1,1,1) = {"
 a
@@ -763,7 +779,7 @@ d
 k
 k
 d
-x
+Z
 d
 d
 d
@@ -925,7 +941,7 @@ k
 k
 d
 d
-r
+W
 k
 k
 k
@@ -1356,7 +1372,7 @@ A
 A
 k
 k
-r
+W
 d
 d
 d
@@ -1430,7 +1446,7 @@ d
 k
 k
 d
-r
+W
 k
 A
 A
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/CaveSAlt.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/CaveSAlt.dmm
index cefa884e7a..d8e9c5e515 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/CaveSAlt.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/CaveSAlt.dmm
@@ -11,8 +11,6 @@
 "d" = (
 /obj/structure/closet/crate,
 /obj/random/contraband,
-/obj/random/contraband,
-/obj/random/energy,
 /obj/random/energy,
 /turf/simulated/floor,
 /area/submap/CaveS)
@@ -43,7 +41,9 @@
 /turf/simulated/wall,
 /area/submap/CaveS)
 "o" = (
-/mob/living/simple_mob/animal/giant_spider/phorogenic,
+/mob/living/simple_mob/animal/giant_spider/phorogenic{
+	loot_list = list(/obj/item/stock_parts/manipulator/omni = 50)
+	},
 /turf/simulated/floor/outdoors/dirt{
 	outdoors = 0
 	},
@@ -68,8 +68,7 @@
 /area/submap/CaveS)
 "t" = (
 /obj/structure/closet/crate,
-/obj/random/firstaid,
-/obj/random/firstaid,
+/obj/random/contraband,
 /turf/simulated/floor,
 /area/submap/CaveS)
 "u" = (
@@ -87,18 +86,36 @@
 "z" = (
 /turf/simulated/mineral/ignore_mapgen,
 /area/submap/CaveS)
+"C" = (
+/mob/living/simple_mob/animal/giant_spider/phorogenic{
+	loot_list = list(/obj/item/stock_parts/capacitor/omni = 50)
+	},
+/turf/simulated/floor/outdoors/dirt{
+	outdoors = 0
+	},
+/area/submap/CaveS)
 "D" = (
 /obj/effect/decal/cleanable/cobweb,
 /turf/simulated/floor/outdoors/dirt{
 	outdoors = 0
 	},
 /area/submap/CaveS)
+"F" = (
+/mob/living/simple_mob/animal/giant_spider/phorogenic{
+	loot_list = list(/obj/item/stock_parts/scanning_module/omni = 50)
+	},
+/turf/simulated/floor/outdoors/dirt{
+	outdoors = 0
+	},
+/area/submap/CaveS)
 "H" = (
 /turf/simulated/floor,
 /area/submap/CaveS)
 "I" = (
-/mob/living/simple_mob/animal/giant_spider/phorogenic,
 /obj/effect/spider/stickyweb,
+/mob/living/simple_mob/animal/giant_spider/phorogenic{
+	loot_list = list(/obj/item/stock_parts/manipulator/omni = 50)
+	},
 /turf/simulated/floor/outdoors/dirt{
 	outdoors = 0
 	},
@@ -106,6 +123,15 @@
 "J" = (
 /turf/simulated/floor/outdoors/dirt,
 /area/submap/CaveS)
+"K" = (
+/obj/effect/spider/stickyweb,
+/mob/living/simple_mob/animal/giant_spider/phorogenic{
+	loot_list = list(/obj/item/stock_parts/scanning_module/omni = 50)
+	},
+/turf/simulated/floor/outdoors/dirt{
+	outdoors = 0
+	},
+/area/submap/CaveS)
 "M" = (
 /obj/effect/decal/cleanable/cobweb2,
 /turf/simulated/floor/outdoors/dirt{
@@ -117,6 +143,15 @@
 	outdoors = 0
 	},
 /area/submap/CaveS)
+"Q" = (
+/obj/effect/spider/stickyweb,
+/mob/living/simple_mob/animal/giant_spider/phorogenic{
+	loot_list = list(/obj/item/stock_parts/capacitor/omni = 50)
+	},
+/turf/simulated/floor/outdoors/dirt{
+	outdoors = 0
+	},
+/area/submap/CaveS)
 "S" = (
 /obj/structure/loot_pile/surface/bones,
 /obj/item/rig/industrial,
@@ -394,7 +429,7 @@ P
 P
 P
 r
-I
+K
 z
 z
 z
@@ -512,7 +547,7 @@ z
 z
 z
 z
-I
+K
 P
 P
 r
@@ -1226,7 +1261,7 @@ P
 P
 c
 P
-o
+F
 z
 z
 z
@@ -1259,7 +1294,7 @@ z
 z
 z
 z
-o
+C
 P
 P
 H
@@ -1355,7 +1390,7 @@ H
 P
 z
 z
-I
+Q
 r
 P
 P
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/Chapel.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/Chapel.dmm
index 5e5d682792..c9ae342aae 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/Chapel.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/Chapel.dmm
@@ -293,7 +293,6 @@
 /area/submap/Chapel1)
 "bf" = (
 /obj/structure/closet/coffin,
-/obj/random/contraband,
 /obj/effect/decal/remains/mouse,
 /obj/effect/decal/remains/unathi,
 /turf/simulated/floor/wood/sif,
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
index 4ce1cecac8..4539772943 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
@@ -305,6 +305,12 @@
 /obj/machinery/portable_atmospherics/hydroponics,
 /turf/simulated/floor/wood,
 /area/submap/DJOutpost1)
+"W" = (
+/obj/structure/ghost_pod/manual/lost_drone/dogborg{
+	activated = 1
+	},
+/turf/template_noop,
+/area/template_noop)
 
 (1,1,1) = {"
 a
@@ -552,7 +558,7 @@ a
 o
 u
 C
-a
+W
 a
 a
 a
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/DoomP.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/DoomP.dmm
index e9fe007243..44d31d42cd 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/DoomP.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/DoomP.dmm
@@ -330,11 +330,6 @@
 /obj/effect/floor_decal/borderfloor,
 /turf/simulated/floor/tiled,
 /area/submap/DoomP)
-"bg" = (
-/obj/structure/table/standard,
-/obj/random/firstaid,
-/turf/simulated/floor/tiled,
-/area/submap/DoomP)
 "bh" = (
 /obj/machinery/door/airlock/hatch,
 /turf/simulated/floor/tiled,
@@ -391,13 +386,7 @@
 "br" = (
 /obj/structure/table/rack,
 /obj/item/cell/device/weapon,
-/obj/item/cell/device/weapon,
-/obj/item/cell/device/weapon,
-/obj/item/cell/device/weapon,
 /obj/random/energy,
-/obj/random/energy,
-/obj/random/energy/highend,
-/obj/random/energy/highend,
 /turf/simulated/floor/tiled/techfloor,
 /area/submap/DoomP)
 "bs" = (
@@ -952,11 +941,6 @@
 /obj/effect/map_helper/no_phaseshift,
 /turf/simulated/floor/tiled/asteroid_steel,
 /area/submap/DoomP)
-"Xj" = (
-/obj/structure/table/standard,
-/obj/item/stolenpackage,
-/turf/simulated/floor/tiled,
-/area/submap/DoomP)
 "XV" = (
 /obj/structure/table/darkglass,
 /obj/item/gun/energy/imperial,
@@ -2501,7 +2485,7 @@ ad
 at
 aA
 aO
-Xj
+aN
 be
 bC
 JU
@@ -2625,7 +2609,7 @@ as
 at
 aB
 aO
-bg
+aN
 be
 at
 at
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/DoomPAlt.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/DoomPAlt.dmm
index f12dac1dc2..abfafd7d49 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/DoomPAlt.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/DoomPAlt.dmm
@@ -355,11 +355,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/submap/DoomP)
-"tP" = (
-/obj/structure/table/standard,
-/obj/item/stolenpackage,
-/turf/simulated/floor/tiled,
-/area/submap/DoomP)
 "tX" = (
 /obj/item/mine/phoron,
 /turf/simulated/floor/wood{
@@ -997,13 +992,7 @@
 "Ya" = (
 /obj/structure/table/rack,
 /obj/item/cell/device/weapon,
-/obj/item/cell/device/weapon,
-/obj/item/cell/device/weapon,
-/obj/item/cell/device/weapon,
 /obj/random/energy,
-/obj/random/energy,
-/obj/random/energy/highend,
-/obj/random/energy/highend,
 /turf/simulated/floor/tiled/techfloor,
 /area/submap/DoomP)
 "Yi" = (
@@ -1019,11 +1008,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/submap/DoomP)
-"YL" = (
-/obj/structure/table/standard,
-/obj/random/firstaid,
-/turf/simulated/floor/tiled,
-/area/submap/DoomP)
 "YM" = (
 /obj/effect/floor_decal/corner/lime{
 	dir = 10
@@ -2576,7 +2560,7 @@ Hw
 Yl
 ZH
 zO
-tP
+CT
 KR
 RT
 HL
@@ -2700,7 +2684,7 @@ bK
 Yl
 jH
 zO
-YL
+CT
 KR
 Yl
 Yl
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/Drugden.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/Drugden.dmm
index d9604468d7..13048532a8 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/Drugden.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/Drugden.dmm
@@ -237,7 +237,6 @@
 "W" = (
 /obj/structure/closet/cabinet,
 /obj/random/mre,
-/obj/random/medical/lite,
 /turf/simulated/floor/carpet,
 /area/submap/Drugd)
 
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/Epod3.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/Epod3.dmm
index 68cde0066f..f996f5628c 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/Epod3.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/Epod3.dmm
@@ -111,6 +111,12 @@
 /obj/structure/grille,
 /turf/simulated/shuttle/plating,
 /area/submap/Epod3)
+"w" = (
+/obj/structure/ghost_pod/manual/lost_drone/dogborg{
+	activated = 1
+	},
+/turf/template_noop,
+/area/submap/Epod3)
 
 (1,1,1) = {"
 a
@@ -271,7 +277,7 @@ a
 (14,1,1) = {"
 a
 b
-b
+w
 b
 b
 b
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/Epod4.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/Epod4.dmm
index cc4848a402..eea6a5f5a0 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/Epod4.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/Epod4.dmm
@@ -106,6 +106,12 @@
 /obj/structure/flora/grass/brown,
 /turf/simulated/floor/outdoors/dirt,
 /area/submap/Epod4)
+"J" = (
+/obj/structure/ghost_pod/manual/lost_drone/dogborg{
+	activated = 1
+	},
+/turf/simulated/floor/outdoors/dirt,
+/area/submap/Epod4)
 
 (1,1,1) = {"
 a
@@ -145,7 +151,7 @@ a
 a
 b
 c
-c
+J
 c
 e
 f
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/FrostflyNest.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/FrostflyNest.dmm
index 6ceed46e98..c8e95e4384 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/FrostflyNest.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/FrostflyNest.dmm
@@ -40,13 +40,6 @@
 	outdoors = 0
 	},
 /area/submap/FrostflyNest)
-"j" = (
-/obj/random/humanoidremains,
-/obj/random/gun/random,
-/turf/simulated/floor/outdoors/dirt{
-	outdoors = 0
-	},
-/area/submap/FrostflyNest)
 "k" = (
 /obj/random/medical/pillbottle,
 /turf/simulated/floor/outdoors/dirt{
@@ -101,7 +94,7 @@ d
 d
 d
 h
-j
+g
 e
 f
 d
@@ -112,7 +105,7 @@ d
 d
 d
 f
-i
+e
 e
 e
 h
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/MCamp1.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/MCamp1.dmm
index 5e1224ed17..26bf942c0a 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/MCamp1.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/MCamp1.dmm
@@ -77,7 +77,6 @@
 /obj/structure/table/standard,
 /mob/living/simple_mob/mechanical/viscerator,
 /mob/living/simple_mob/mechanical/viscerator,
-/obj/random/energy,
 /turf/simulated/floor/plating/sif/planetuse,
 /area/submap/MilitaryCamp1)
 "u" = (
@@ -116,7 +115,6 @@
 /area/submap/MilitaryCamp1)
 "C" = (
 /obj/structure/table,
-/obj/random/firstaid,
 /turf/simulated/floor/plating/sif/planetuse,
 /area/submap/MilitaryCamp1)
 "D" = (
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/Manor1.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/Manor1.dmm
index b4346e9e6e..01ea284f72 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/Manor1.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/Manor1.dmm
@@ -19,7 +19,6 @@
 "ae" = (
 /obj/structure/table/woodentable,
 /obj/item/reagent_containers/food/drinks/cans/waterbottle,
-/obj/random/medical,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "af" = (
@@ -45,7 +44,6 @@
 /obj/item/clothing/mask/smokable/cigarette/cigar,
 /obj/item/material/ashtray/glass,
 /obj/effect/spider/stickyweb,
-/obj/random/medical,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "ak" = (
@@ -225,7 +223,6 @@
 /area/submap/Manor1)
 "aT" = (
 /obj/structure/closet/cabinet,
-/obj/random/projectile/shotgun,
 /obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat,
 /obj/item/clothing/shoes/boots/winter/climbing,
 /turf/simulated/floor/holofloor/wood,
@@ -537,12 +534,10 @@
 /obj/structure/closet/crate,
 /obj/item/stack/cable_coil/random_belt,
 /obj/random/cash,
-/obj/random/contraband,
-/obj/random/contraband/nofail,
-/obj/random/cash/huge,
 /obj/item/stack/material/gold{
 	amount = 18
 	},
+/obj/random/cash,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "ca" = (
@@ -560,8 +555,6 @@
 "cc" = (
 /obj/structure/closet/cabinet,
 /obj/item/cell/device/weapon,
-/obj/item/cell/device/weapon,
-/obj/random/energy,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "cd" = (
@@ -598,9 +591,8 @@
 /obj/item/flame/lighter/random,
 /obj/random/powercell,
 /obj/random/contraband,
-/obj/random/contraband/nofail,
-/obj/random/cash/huge,
 /obj/item/material/sword,
+/obj/random/cash,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "cj" = (
@@ -628,13 +620,11 @@
 "cn" = (
 /obj/structure/closet/crate,
 /obj/item/storage/wallet/random,
-/obj/random/contraband,
-/obj/random/contraband/nofail,
-/obj/random/cash/huge,
 /obj/item/stack/material/tritium{
 	amount = 20
 	},
 /obj/item/cell/super,
+/obj/random/cash,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "co" = (
@@ -715,7 +705,6 @@
 "cD" = (
 /obj/structure/closet/crate,
 /obj/item/gun/energy/locked/frontier/handbow,
-/obj/item/gun/energy/locked/frontier/handbow,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "cE" = (
@@ -822,7 +811,6 @@
 "eI" = (
 /obj/structure/table/woodentable,
 /obj/item/reagent_containers/food/snacks/sandwich,
-/obj/item/gun/projectile/revolver/cappeacekeeper,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "eL" = (
@@ -841,7 +829,6 @@
 "fo" = (
 /obj/structure/table/rack,
 /obj/random/firstaid,
-/obj/random/firstaid,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "fx" = (
@@ -1000,13 +987,6 @@
 /obj/random/humanoidremains,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
-"nr" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spider/stickyweb/dark,
-/obj/item/gun/energy/medigun,
-/turf/simulated/floor/carpet/purcarpet,
-/area/submap/Manor1)
 "nP" = (
 /mob/living/simple_mob/animal/giant_spider/frost,
 /obj/effect/spider/stickyweb,
@@ -1023,7 +1003,9 @@
 /turf/simulated/floor/carpet/bcarpet,
 /area/submap/Manor1)
 "pl" = (
-/mob/living/simple_mob/animal/giant_spider/broodmother,
+/mob/living/simple_mob/animal/giant_spider/broodmother{
+	loot_list = list(/obj/item/royal_spider_egg = 100, /obj/item/gun/energy/medigun = 60, /obj/item/gun/energy/pummeler = 40)
+	},
 /obj/effect/spider/stickyweb/dark,
 /turf/simulated/floor/carpet/purcarpet,
 /area/submap/Manor1)
@@ -1224,7 +1206,6 @@
 /area/submap/Manor1)
 "DW" = (
 /obj/structure/table/woodentable,
-/obj/item/gun/energy/locked/frontier/rifle,
 /obj/item/clothing/suit/storage/hooded/techpriest{
 	armor = list("melee"=20,"bullet"=10,"laser"=50,"energy"=60,"bomb"=25,"bio"=50,"rad"=25)
 	},
@@ -1467,7 +1448,6 @@
 "RX" = (
 /obj/structure/table/woodentable,
 /obj/item/gun/energy/hooklauncher/ring,
-/obj/random/medical/pillbottle,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "Sl" = (
@@ -1517,11 +1497,6 @@
 /obj/effect/spider/stickyweb,
 /turf/simulated/floor/tiled/hydro,
 /area/submap/Manor1)
-"WG" = (
-/obj/structure/table/woodentable,
-/obj/random/medical,
-/turf/simulated/floor/holofloor/wood,
-/area/submap/Manor1)
 "WS" = (
 /obj/effect/spider/stickyweb,
 /turf/simulated/floor/carpet/turcarpet,
@@ -1550,7 +1525,6 @@
 /obj/item/bone/ribs,
 /obj/item/bone/ribs,
 /obj/item/bone/skull,
-/obj/item/gun/energy/pummeler,
 /turf/simulated/floor/carpet/purcarpet,
 /area/submap/Manor1)
 "YP" = (
@@ -2707,7 +2681,7 @@ aQ
 bU
 BE
 ie
-nr
+cP
 cP
 MZ
 cP
@@ -3642,7 +3616,7 @@ eA
 KN
 an
 ab
-WG
+al
 ag
 ag
 ag
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/Manor1Alt.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/Manor1Alt.dmm
index ed4d3f016a..7a2b44860c 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/Manor1Alt.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/Manor1Alt.dmm
@@ -261,11 +261,6 @@
 	},
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
-"jQ" = (
-/obj/structure/table/woodentable,
-/obj/random/projectile/shotgun,
-/turf/simulated/floor/holofloor/wood,
-/area/submap/Manor1)
 "jT" = (
 /obj/structure/table/standard,
 /turf/simulated/floor/tiled/hydro,
@@ -296,7 +291,6 @@
 "kh" = (
 /obj/structure/closet/crate,
 /obj/item/gun/energy/locked/frontier/handbow,
-/obj/item/gun/energy/locked/frontier/handbow,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "kn" = (
@@ -455,7 +449,6 @@
 /area/submap/Manor1)
 "pm" = (
 /obj/structure/closet/cabinet,
-/obj/random/projectile/shotgun,
 /obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat,
 /obj/item/clothing/shoes/boots/winter/climbing,
 /turf/simulated/floor/holofloor/wood,
@@ -508,7 +501,6 @@
 /obj/item/clothing/head/hood/winter,
 /obj/item/clothing/shoes/boots/winter/climbing,
 /obj/item/clothing/suit/storage/hooded/wintercoat,
-/obj/random/contraband,
 /obj/item/clothing/suit/storage/hooded/wintercoat/kilanocoat,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
@@ -569,13 +561,10 @@
 "sM" = (
 /obj/structure/closet/crate,
 /obj/item/stack/cable_coil/random_belt,
-/obj/random/cash,
-/obj/random/contraband,
-/obj/random/contraband/nofail,
-/obj/random/cash/huge,
 /obj/item/stack/material/gold{
 	amount = 18
 	},
+/obj/random/cash,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "sR" = (
@@ -607,7 +596,6 @@
 "tK" = (
 /obj/structure/table/rack,
 /obj/random/firstaid,
-/obj/random/firstaid,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "tO" = (
@@ -737,7 +725,6 @@
 /obj/item/clothing/mask/smokable/cigarette/cigar,
 /obj/item/material/ashtray/glass,
 /obj/effect/spider/stickyweb,
-/obj/random/medical,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "xK" = (
@@ -822,11 +809,6 @@
 /obj/item/bedsheet,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
-"Ay" = (
-/obj/structure/table/woodentable,
-/obj/random/medical,
-/turf/simulated/floor/holofloor/wood,
-/area/submap/Manor1)
 "AS" = (
 /obj/random/trash,
 /turf/simulated/floor/holofloor/wood,
@@ -934,13 +916,6 @@
 	},
 /turf/simulated/floor/tiled/hydro,
 /area/submap/Manor1)
-"EN" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spider/stickyweb/dark,
-/obj/item/gun/energy/medigun,
-/turf/simulated/floor/carpet/purcarpet,
-/area/submap/Manor1)
 "EW" = (
 /obj/structure/simple_door/wood,
 /turf/simulated/floor/carpet/purcarpet,
@@ -950,7 +925,6 @@
 /obj/item/flame/lighter/random,
 /obj/random/powercell,
 /obj/random/contraband,
-/obj/random/contraband/nofail,
 /obj/random/cash/huge,
 /obj/item/material/sword,
 /turf/simulated/floor/holofloor/wood,
@@ -1000,8 +974,10 @@
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "GY" = (
-/mob/living/simple_mob/animal/giant_spider/broodmother,
 /obj/effect/spider/stickyweb/dark,
+/mob/living/simple_mob/animal/giant_spider/broodmother{
+	loot_list = list(/obj/item/royal_spider_egg = 100, /obj/item/gun/energy/medigun = 60, /obj/item/gun/energy/pummeler = 40)
+	},
 /turf/simulated/floor/carpet/purcarpet,
 /area/submap/Manor1)
 "Hi" = (
@@ -1012,8 +988,6 @@
 "Ho" = (
 /obj/structure/closet/cabinet,
 /obj/item/cell/device/weapon,
-/obj/item/cell/device/weapon,
-/obj/random/energy,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "HX" = (
@@ -1160,7 +1134,6 @@
 /obj/item/bone/ribs,
 /obj/item/bone/ribs,
 /obj/item/bone/skull,
-/obj/item/gun/energy/pummeler,
 /mob/living/simple_mob/animal/passive/mouse/white,
 /turf/simulated/floor/carpet/purcarpet,
 /area/submap/Manor1)
@@ -1188,13 +1161,11 @@
 "Nl" = (
 /obj/structure/closet/crate,
 /obj/item/storage/wallet/random,
-/obj/random/contraband,
-/obj/random/contraband/nofail,
-/obj/random/cash/huge,
 /obj/item/stack/material/tritium{
 	amount = 20
 	},
 /obj/item/cell/super,
+/obj/random/cash,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "Nq" = (
@@ -1291,7 +1262,6 @@
 "QA" = (
 /obj/structure/table/woodentable,
 /obj/item/reagent_containers/food/drinks/cans/waterbottle,
-/obj/random/medical,
 /turf/simulated/floor/holofloor/wood,
 /area/submap/Manor1)
 "QI" = (
@@ -2701,7 +2671,7 @@ sR
 ml
 Yq
 lk
-EN
+Sf
 Sf
 NW
 Fp
@@ -3552,7 +3522,7 @@ CY
 cT
 Ef
 CY
-jQ
+Zg
 Ua
 yD
 Nq
@@ -3636,7 +3606,7 @@ xK
 Zo
 gQ
 CY
-Ay
+Zg
 rh
 rh
 rh
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/Rockybase.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/Rockybase.dmm
index e422581ee9..214e41b3f1 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/Rockybase.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/Rockybase.dmm
@@ -1140,6 +1140,12 @@
 /obj/effect/gibspawner/human,
 /turf/template_noop,
 /area/template_noop)
+"Hx" = (
+/obj/structure/ghost_pod/manual/lost_drone/dogborg{
+	activated = 1
+	},
+/turf/simulated/floor/holofloor/lino,
+/area/submap/Rockybase)
 
 (1,1,1) = {"
 aa
@@ -1763,7 +1769,7 @@ ai
 ai
 ai
 at
-aE
+Hx
 aE
 bm
 at
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/borglab.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/borglab.dmm
index 5397a7db21..4ad973d474 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/borglab.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/borglab.dmm
@@ -276,11 +276,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/submap/BorgLab)
-"jR" = (
-/obj/effect/floor_decal/techfloor/orange,
-/obj/item/broken_gun/ionrifle,
-/turf/simulated/floor/reinforced,
-/area/submap/BorgLab)
 "kj" = (
 /obj/effect/floor_decal/rust,
 /obj/random/junk,
@@ -548,11 +543,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/submap/BorgLab)
-"ub" = (
-/obj/effect/floor_decal/industrial/warning,
-/obj/item/stolenpackage,
-/turf/simulated/floor/reinforced,
-/area/submap/BorgLab)
 "ug" = (
 /obj/machinery/door/window/brigdoor/westright{
 	dir = 2;
@@ -1082,7 +1072,6 @@
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 1
 	},
-/obj/item/broken_gun/laserrifle,
 /turf/simulated/floor/reinforced,
 /area/submap/BorgLab)
 "Pf" = (
@@ -1137,7 +1126,6 @@
 /obj/structure/closet/l3closet/general,
 /obj/effect/floor_decal/rust,
 /obj/random/maintenance/medical,
-/obj/random/maintenance/medical,
 /obj/random/maintenance/research,
 /obj/random/maintenance/research,
 /obj/effect/floor_decal/rust/color_rustedcee,
@@ -1260,7 +1248,6 @@
 	dir = 1
 	},
 /obj/random/maintenance,
-/obj/random/maintenance/medical,
 /obj/effect/floor_decal/rust/color_rustedcee,
 /obj/effect/decal/cleanable/generic,
 /turf/simulated/floor/tiled,
@@ -1361,12 +1348,6 @@
 /obj/structure/sign/department/xenolab,
 /turf/simulated/wall/r_wall,
 /area/submap/BorgLab)
-"WK" = (
-/obj/effect/floor_decal/rust,
-/obj/effect/floor_decal/rust,
-/obj/item/broken_gun/laser_retro,
-/turf/simulated/floor/plating,
-/area/submap/BorgLab)
 "WQ" = (
 /turf/simulated/wall/r_wall,
 /area/submap/BorgLab)
@@ -1805,7 +1786,7 @@ YZ
 YD
 VU
 tx
-jR
+HA
 WQ
 WQ
 RG
@@ -2092,7 +2073,7 @@ iY
 RG
 WQ
 WQ
-WK
+TU
 xO
 Vc
 mB
@@ -2121,7 +2102,7 @@ WQ
 WQ
 KX
 Nj
-ub
+Vc
 YD
 iS
 Yk
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/borglabAlt.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/borglabAlt.dmm
index db4cd28fed..17acb9614d 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/borglabAlt.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/borglabAlt.dmm
@@ -567,11 +567,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled,
 /area/submap/BorgLab)
-"wx" = (
-/obj/effect/floor_decal/techfloor/orange,
-/obj/item/broken_gun/ionrifle,
-/turf/simulated/floor/reinforced,
-/area/submap/BorgLab)
 "wY" = (
 /mob/living/simple_mob/mechanical/cyber_horror/cat_cyber_horror,
 /obj/random/trash,
@@ -1006,12 +1001,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/submap/BorgLab)
-"Lj" = (
-/obj/effect/floor_decal/rust,
-/obj/effect/floor_decal/rust,
-/obj/item/broken_gun/laser_retro,
-/turf/simulated/floor/plating,
-/area/submap/BorgLab)
 "Lm" = (
 /obj/structure/table/rack/shelf/steel,
 /obj/item/stack/material/phoron{
@@ -1117,7 +1106,6 @@
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 1
 	},
-/obj/item/broken_gun/laserrifle,
 /turf/simulated/floor/reinforced,
 /area/submap/BorgLab)
 "NM" = (
@@ -1790,7 +1778,7 @@ ZB
 tC
 WS
 pv
-wx
+EV
 iK
 iK
 SL
@@ -2077,7 +2065,7 @@ tt
 SL
 iK
 iK
-Lj
+hp
 Cb
 vS
 pU
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/bountyhunters.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/bountyhunters.dmm
index 4cfb7fab41..b78e1118d7 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/bountyhunters.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/bountyhunters.dmm
@@ -149,7 +149,6 @@
 /area/submap/BountyHunters)
 "rt" = (
 /obj/structure/table/steel,
-/obj/random/projectile,
 /obj/machinery/recharger,
 /obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/concrete,
@@ -188,8 +187,8 @@
 /area/submap/BountyHunters)
 "uu" = (
 /obj/structure/table/steel,
-/obj/random/maintenance/medical,
 /obj/effect/floor_decal/corner/grey/diagonal,
+/obj/random/material/precious,
 /turf/simulated/floor/concrete,
 /area/submap/BountyHunters)
 "uC" = (
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/bountyhunters2.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/bountyhunters2.dmm
index 55aa6dc9ca..eb44e4a7ec 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/bountyhunters2.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/bountyhunters2.dmm
@@ -1,10 +1,9 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "aB" = (
 /obj/structure/table/steel,
-/obj/random/projectile,
 /obj/machinery/recharger,
-/obj/item/gun/projectile/automatic/fal,
 /obj/effect/floor_decal/corner/grey/diagonal,
+/obj/random/material/precious,
 /turf/simulated/floor/concrete,
 /area/submap/BountyHunters)
 "aF" = (
@@ -52,9 +51,8 @@
 /area/submap/BountyHunters)
 "eH" = (
 /obj/structure/table/steel,
-/obj/random/maintenance/medical,
-/obj/item/storage/firstaid/clotting,
 /obj/effect/floor_decal/corner/grey/diagonal,
+/obj/random/material/precious,
 /turf/simulated/floor/concrete,
 /area/submap/BountyHunters)
 "eY" = (
@@ -378,12 +376,6 @@
 	},
 /turf/simulated/floor/outdoors/dirt,
 /area/submap/BountyHunters)
-"KF" = (
-/obj/structure/table/steel,
-/obj/random/maintenance/medical,
-/obj/effect/floor_decal/corner/grey/diagonal,
-/turf/simulated/floor/concrete,
-/area/submap/BountyHunters)
 "Ly" = (
 /obj/structure/grille,
 /obj/structure/grille,
@@ -825,7 +817,7 @@ Wj
 mf
 yz
 aB
-KF
+eH
 Pr
 rC
 rC
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/chasm.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/chasm.dmm
index 8cc6c4e8c5..05b03a28e4 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/chasm.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/chasm.dmm
@@ -4,8 +4,8 @@
 /turf/simulated/floor/outdoors/dirt,
 /area/template_noop)
 "aE" = (
-/obj/item/storage/firstaid/bonemed,
-/turf/simulated/floor/outdoors/rocks{
+/obj/item/storage/firstaid,
+/turf/simulated/floor/outdoors/dirt{
 	outdoors = 0
 	},
 /area/submap/Chasm)
@@ -113,7 +113,8 @@
 /mob/living/simple_mob/vore/jelly{
 	health = 150;
 	maxHealth = 150;
-	name = "Cavern jelly blob"
+	name = "Cavern jelly blob";
+	loot_list = list(/obj/item/storage/firstaid/bonemed = 10)
 	},
 /turf/simulated/floor/plating,
 /area/submap/Chasm)
@@ -362,12 +363,6 @@
 /obj/random/humanoidremains,
 /turf/simulated/floor/plating,
 /area/submap/Chasm)
-"DH" = (
-/mob/living/simple_mob/vore/jelly,
-/turf/simulated/floor/outdoors/rocks{
-	outdoors = 0
-	},
-/area/submap/Chasm)
 "DI" = (
 /obj/random/junk,
 /turf/simulated/floor/outdoors/dirt,
@@ -520,7 +515,6 @@
 /obj/structure/cliff/automatic/corner{
 	dir = 6
 	},
-/obj/effect/landmark/loot_spawn,
 /turf/simulated/floor/outdoors/rocks{
 	outdoors = 0
 	},
@@ -661,12 +655,13 @@
 	},
 /area/submap/Chasm)
 "Zn" = (
+/obj/item/bone/skull,
 /mob/living/simple_mob/vore/jelly{
 	health = 150;
 	maxHealth = 150;
-	name = "Cavern jelly blob"
+	name = "Cavern jelly blob";
+	loot_list = list(/obj/item/storage/firstaid/bonemed = 10)
 	},
-/obj/item/bone/skull,
 /turf/simulated/floor/outdoors/rocks{
 	outdoors = 0
 	},
@@ -675,7 +670,8 @@
 /mob/living/simple_mob/vore/jelly{
 	health = 150;
 	maxHealth = 150;
-	name = "Cavern jelly blob"
+	name = "Cavern jelly blob";
+	loot_list = list(/obj/item/storage/firstaid/bonemed = 10)
 	},
 /turf/simulated/floor/outdoors/rocks{
 	outdoors = 0
@@ -776,7 +772,7 @@ pk
 ua
 ua
 Sc
-DH
+ZS
 Kz
 DI
 cj
@@ -791,7 +787,7 @@ Sc
 Sc
 ua
 ua
-Lt
+aE
 Kv
 Tp
 Aq
@@ -820,7 +816,7 @@ Kv
 Tp
 NU
 Rz
-aE
+Rz
 BU
 Za
 Kv
@@ -1088,7 +1084,7 @@ hR
 hR
 Ee
 Kv
-DH
+ZS
 Sc
 Sc
 ua
@@ -1126,7 +1122,7 @@ ua
 ua
 ua
 Sc
-DH
+ZS
 Kv
 Ee
 cj
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/chemspill2.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/chemspill2.dmm
index 433a81ecb2..0571ecc649 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/chemspill2.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/chemspill2.dmm
@@ -50,10 +50,6 @@
 /obj/item/stack/rods,
 /turf/simulated/floor/water/contaminated,
 /area/submap/ChemSpill2)
-"p" = (
-/obj/random/firstaid,
-/turf/simulated/floor/outdoors/dirt/sif,
-/area/submap/ChemSpill2)
 "q" = (
 /obj/random/tech_supply,
 /obj/random/energy,
@@ -521,7 +517,7 @@ e
 b
 b
 b
-p
+t
 q
 b
 b
@@ -587,7 +583,7 @@ b
 b
 b
 b
-t
+b
 b
 b
 f
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/deathden.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/deathden.dmm
index 1f6a824f8f..e574fb7797 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/deathden.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/deathden.dmm
@@ -26,7 +26,6 @@
 /turf/simulated/floor/wood/sif,
 /area/submap/DeathDen)
 "bk" = (
-/obj/random/maintenance/medical,
 /turf/simulated/floor/wood/sif,
 /area/submap/DeathDen)
 "by" = (
@@ -51,7 +50,6 @@
 /turf/simulated/floor/wood/sif/broken,
 /area/submap/DeathDen)
 "dL" = (
-/obj/random/maintenance/medical,
 /obj/random/junk,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood/sif,
@@ -636,7 +634,6 @@
 /obj/structure/window/reinforced/tinted/frosted{
 	dir = 8
 	},
-/obj/item/gun/projectile/shotgun/doublebarrel/sawn,
 /turf/simulated/floor/tiled/freezer,
 /area/submap/DeathDen)
 "DH" = (
@@ -653,7 +650,6 @@
 	pixel_x = 6;
 	pixel_y = 4
 	},
-/obj/item/gun/projectile/deagle,
 /turf/simulated/floor/wood/sif/broken,
 /area/submap/DeathDen)
 "EL" = (
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/deathdenAlt.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/deathdenAlt.dmm
index 38eed83da4..bde7a799f3 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/deathdenAlt.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/deathdenAlt.dmm
@@ -389,7 +389,6 @@
 	},
 /area/submap/DeathDen)
 "CJ" = (
-/obj/random/maintenance/medical,
 /obj/random/junk,
 /obj/effect/decal/cleanable/dirt,
 /obj/random/maintenance/engineering,
@@ -568,7 +567,6 @@
 /obj/structure/window/reinforced/tinted/frosted{
 	dir = 8
 	},
-/obj/item/gun/projectile/shotgun/doublebarrel/sawn,
 /turf/simulated/floor/tiled/freezer,
 /area/submap/DeathDen)
 "Mz" = (
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/demonpool.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/demonpool.dmm
index cb210fb8f9..f57b30bc54 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/demonpool.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/demonpool.dmm
@@ -109,10 +109,6 @@
 /obj/effect/gibspawner/human/xenochimera,
 /turf/simulated/floor/cult,
 /area/submap/DemonPool)
-"hQ" = (
-/obj/effect/landmark/loot_spawn,
-/turf/simulated/floor/cult,
-/area/submap/DemonPool)
 "hW" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -648,7 +644,6 @@
 "YK" = (
 /obj/structure/table/woodentable,
 /obj/item/pen/fountain,
-/obj/item/stolenpackage,
 /turf/simulated/floor,
 /area/submap/DemonPool)
 "Zc" = (
@@ -1075,7 +1070,7 @@ qQ
 XB
 si
 jt
-hQ
+oi
 Yk
 eR
 Jo
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/derelictengine.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/derelictengine.dmm
index cb880759b6..e84ae056bc 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/derelictengine.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/derelictengine.dmm
@@ -3,7 +3,9 @@
 /obj/effect/floor_decal/techfloor{
 	dir = 1
 	},
-/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/emp,
+/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/emp{
+	loot_list = list(/obj/item/prop/alien/junk = 20, /obj/item/prop/alien/junk = 20)
+	},
 /turf/simulated/floor/tiled/techfloor{
 	temperature = 243.15;
 	oxygen = 20.7263;
@@ -172,10 +174,12 @@
 /turf/template_noop,
 /area/template_noop)
 "cE" = (
-/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser,
 /obj/effect/floor_decal/techfloor{
 	dir = 8
 	},
+/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser{
+	loot_list = list(/obj/item/prop/alien/junk = 20)
+	},
 /turf/simulated/shuttle/floor/alienplating/external,
 /area/submap/DerelictEngine)
 "cH" = (
@@ -348,7 +352,6 @@
 /area/submap/DerelictEngine)
 "fn" = (
 /obj/structure/table/alien/blue,
-/obj/item/storage/belt/utility/alien,
 /turf/simulated/shuttle/floor/alienplating/external,
 /area/submap/DerelictEngine)
 "fp" = (
@@ -874,7 +877,9 @@
 /obj/effect/floor_decal/techfloor{
 	dir = 8
 	},
-/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/radiation,
+/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/radiation{
+	loot_list = list(/obj/item/prop/alien/junk = 20)
+	},
 /turf/simulated/shuttle/floor/alienplating/external,
 /area/submap/DerelictEngine)
 "lV" = (
@@ -1341,7 +1346,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser,
+/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser{
+	loot_list = list(/obj/item/prop/alien/junk = 20)
+	},
 /obj/item/material/shard/phoron{
 	pixel_x = 7;
 	pixel_y = 10
@@ -1663,9 +1670,6 @@
 	dir = 6
 	},
 /obj/structure/closet/alien,
-/obj/item/prop/alien/junk,
-/obj/item/prop/alien/junk,
-/obj/item/prop/alien/junk,
 /obj/item/implanter/adrenalin,
 /turf/simulated/floor/tiled/techfloor{
 	temperature = 243.15;
@@ -1751,10 +1755,11 @@
 	},
 /area/submap/DerelictEngine)
 "vU" = (
-/obj/structure/table/alien/blue,
-/obj/item/prop/alien/junk,
-/turf/simulated/shuttle/floor/alienplating/external,
-/area/submap/DerelictEngine)
+/mob/living/simple_mob/mechanical/hivebot/swarm{
+	loot_list = list(/obj/item/prop/alien/junk = 20)
+	},
+/turf/template_noop,
+/area/template_noop)
 "wd" = (
 /obj/machinery/porta_turret/alien/destroyed,
 /turf/simulated/shuttle/floor/alienplating/external,
@@ -2069,7 +2074,9 @@
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 4
 	},
-/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid,
+/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid{
+	loot_list = list(/obj/item/prop/alien/junk = 20)
+	},
 /turf/simulated/floor/tiled/techfloor{
 	temperature = 243.15;
 	oxygen = 20.7263;
@@ -2309,17 +2316,6 @@
 	nitrogen = 93.7835
 	},
 /area/submap/DerelictEngine)
-"Bo" = (
-/obj/effect/floor_decal/techfloor{
-	dir = 4
-	},
-/obj/item/gun/energy/sniperrifle,
-/turf/simulated/shuttle/floor/alien{
-	nitrogen = 93.7835;
-	oxygen = 20.7263;
-	temperature = 243.15
-	},
-/area/submap/DerelictEngine)
 "Bs" = (
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 8
@@ -2502,7 +2498,9 @@
 	},
 /area/submap/DerelictEngine)
 "Ee" = (
-/mob/living/simple_mob/mechanical/hivebot/ranged_damage/backline,
+/mob/living/simple_mob/mechanical/hivebot/ranged_damage/backline{
+	loot_list = list(/obj/item/prop/alien/junk = 20)
+	},
 /obj/effect/floor_decal/techfloor{
 	dir = 1
 	},
@@ -2577,9 +2575,6 @@
 /obj/effect/floor_decal/techfloor{
 	dir = 8
 	},
-/obj/item/prop/alien/junk,
-/obj/item/prop/alien/junk,
-/obj/item/surgical/bone_clamp/alien,
 /obj/item/surgical/hemostat/alien,
 /obj/item/surgical/scalpel/alien,
 /turf/simulated/shuttle/floor/alienplating/external,
@@ -2681,8 +2676,6 @@
 /area/submap/DerelictEngine)
 "FS" = (
 /obj/structure/closet/alien,
-/obj/item/prop/alien/junk,
-/obj/item/prop/alien/junk,
 /obj/item/shield_projector/line,
 /turf/simulated/floor/tiled/techfloor{
 	temperature = 243.15;
@@ -3049,7 +3042,6 @@
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 4
 	},
-/obj/item/prop/alien/junk,
 /turf/simulated/floor/tiled/techfloor{
 	temperature = 243.15;
 	oxygen = 20.7263;
@@ -3273,7 +3265,9 @@
 /turf/simulated/shuttle/floor/alienplating/external,
 /area/submap/DerelictEngine)
 "Nr" = (
-/mob/living/simple_mob/mechanical/hivebot/swarm,
+/mob/living/simple_mob/mechanical/hivebot/swarm{
+	loot_list = list(/obj/item/prop/alien/junk = 20)
+	},
 /turf/simulated/floor/outdoors/dirt/sif/planetuse,
 /area/template_noop)
 "Ns" = (
@@ -3343,7 +3337,9 @@
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 8
 	},
-/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid,
+/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid{
+	loot_list = list(/obj/item/prop/alien/junk = 20)
+	},
 /obj/effect/decal/remains/xeno,
 /turf/simulated/floor/tiled/techfloor{
 	temperature = 243.15;
@@ -3374,7 +3370,9 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser,
+/mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser{
+	loot_list = list(/obj/item/prop/alien/junk = 20)
+	},
 /turf/simulated/floor/plating{
 	oxygen = 20.7263;
 	temperature = 243.15;
@@ -3611,7 +3609,9 @@
 /obj/effect/floor_decal/techfloor{
 	dir = 4
 	},
-/mob/living/simple_mob/mechanical/hivebot/tank/armored/anti_bullet,
+/mob/living/simple_mob/mechanical/hivebot/tank/armored/anti_bullet{
+	loot_list = list(/obj/item/prop/alien/junk = 20)
+	},
 /turf/simulated/floor/tiled/techfloor{
 	temperature = 243.15;
 	oxygen = 20.7263;
@@ -3699,7 +3699,9 @@
 /area/template_noop)
 "SJ" = (
 /obj/effect/decal/cleanable/generic,
-/mob/living/simple_mob/mechanical/hivebot/precusor/laser,
+/mob/living/simple_mob/mechanical/hivebot/precusor/laser{
+	loot_list = list(/obj/item/prop/alien/junk = 20, /obj/item/prop/alien/junk = 20, /obj/item/storage/belt/utility/alien = 50)
+	},
 /turf/simulated/floor/plating{
 	oxygen = 20.7263;
 	temperature = 243.15;
@@ -3727,10 +3729,12 @@
 	},
 /area/submap/DerelictEngine)
 "SV" = (
-/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid,
 /obj/effect/floor_decal/techfloor{
 	dir = 4
 	},
+/mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid{
+	loot_list = list(/obj/item/prop/alien/junk = 20)
+	},
 /turf/simulated/shuttle/floor/alienplating/external,
 /area/submap/DerelictEngine)
 "SW" = (
@@ -3855,7 +3859,9 @@
 /obj/effect/floor_decal/techfloor{
 	dir = 1
 	},
-/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/radiation,
+/mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/emp{
+	loot_list = list(/obj/item/prop/alien/junk = 20, /obj/item/prop/alien/junk = 20)
+	},
 /turf/simulated/shuttle/floor/alienplating/external,
 /area/submap/DerelictEngine)
 "Um" = (
@@ -4125,9 +4131,12 @@
 	},
 /area/submap/DerelictEngine)
 "Xm" = (
-/obj/structure/table/alien/blue,
-/obj/item/prop/alien/junk,
-/obj/item/prop/alien/junk,
+/obj/effect/floor_decal/techfloor{
+	dir = 1
+	},
+/mob/living/simple_mob/mechanical/hivebot/ranged_damage/backline{
+	loot_list = list(/obj/item/prop/alien/junk = 20)
+	},
 /turf/simulated/shuttle/floor/alienplating/external,
 /area/submap/DerelictEngine)
 "Xp" = (
@@ -4358,7 +4367,7 @@
 SF
 SF
 SF
-ap
+vU
 SF
 SF
 Qv
@@ -4502,7 +4511,7 @@ SF
 SF
 "}
 (4,1,1) = {"
-ap
+vU
 SF
 fJ
 jl
@@ -4760,7 +4769,7 @@ dG
 Vb
 Vb
 Ue
-Bo
+iW
 Vb
 HH
 sG
@@ -5147,7 +5156,7 @@ je
 je
 BR
 je
-Xm
+fn
 fO
 SB
 Ga
@@ -5245,7 +5254,7 @@ jO
 je
 BR
 je
-vU
+fn
 fO
 SB
 lV
@@ -5395,7 +5404,7 @@ mI
 CV
 fO
 DA
-Ee
+Xm
 by
 wh
 xR
@@ -5622,7 +5631,7 @@ Qv
 SF
 SF
 SF
-ap
+vU
 SF
 SF
 SF
@@ -5779,7 +5788,7 @@ SF
 SF
 SF
 SF
-ap
+vU
 SF
 SF
 SF
@@ -5814,7 +5823,7 @@ SF
 SF
 SF
 SF
-ap
+vU
 SF
 Qv
 KU
@@ -5903,7 +5912,7 @@ KU
 KU
 KU
 SF
-ap
+vU
 KU
 SF
 SF
@@ -5929,7 +5938,7 @@ SF
 SF
 SF
 SF
-ap
+vU
 SF
 SF
 SF
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/dogbase.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/dogbase.dmm
index 6e13170da6..d586734908 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/dogbase.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/dogbase.dmm
@@ -131,14 +131,6 @@
 "hp" = (
 /turf/template_noop,
 /area/template_noop)
-"hA" = (
-/obj/structure/table/woodentable,
-/obj/item/stolenpackage,
-/obj/effect/floor_decal/borderfloor{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/dark,
-/area/submap/DogBase)
 "hZ" = (
 /obj/machinery/power/smes/buildable/point_of_interest,
 /obj/structure/cable/green{
@@ -427,7 +419,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/remains/human,
-/obj/random/contraband/nofail,
+/obj/random/contraband,
 /turf/simulated/floor/outdoors/dirt,
 /area/submap/DogBase)
 "yl" = (
@@ -435,7 +427,7 @@
 /obj/effect/decal/remains/deer,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/obj/random/contraband/nofail,
+/obj/random/contraband,
 /turf/simulated/floor/outdoors/dirt,
 /area/submap/DogBase)
 "yx" = (
@@ -462,7 +454,6 @@
 "AY" = (
 /obj/structure/closet/secure_closet/guncabinet,
 /obj/random/projectile,
-/obj/random/projectile,
 /obj/effect/floor_decal/corner/red/border{
 	dir = 1
 	},
@@ -483,7 +474,7 @@
 /area/submap/DogBase)
 "BB" = (
 /obj/structure/table/woodentable,
-/obj/random/cash/big,
+/obj/random/cash,
 /turf/simulated/floor/tiled/dark,
 /area/submap/DogBase)
 "BY" = (
@@ -508,7 +499,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/bone,
-/obj/random/contraband/nofail,
+/obj/random/contraband,
 /turf/simulated/floor/outdoors/dirt,
 /area/submap/DogBase)
 "Dt" = (
@@ -558,7 +549,7 @@
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
 	},
-/obj/random/cash/huge,
+/obj/random/cash,
 /turf/simulated/floor/tiled/dark,
 /area/submap/DogBase)
 "Gf" = (
@@ -578,9 +569,6 @@
 /area/submap/DogBase)
 "GJ" = (
 /obj/structure/closet/secure_closet/guncabinet,
-/obj/random/projectile,
-/obj/random/projectile,
-/obj/effect/landmark/loot_spawn,
 /obj/effect/floor_decal/corner/red/border{
 	dir = 1
 	},
@@ -596,7 +584,7 @@
 /area/submap/DogBase)
 "HM" = (
 /obj/structure/table/woodentable,
-/obj/random/contraband/nofail,
+/obj/random/contraband,
 /turf/simulated/floor/tiled/dark,
 /area/submap/DogBase)
 "Iz" = (
@@ -644,13 +632,6 @@
 /mob/living/simple_mob/mechanical/viscerator/mercenary,
 /turf/simulated/floor/plating,
 /area/submap/DogBase)
-"Lm" = (
-/obj/effect/landmark/loot_spawn,
-/obj/effect/floor_decal/borderfloor{
-	dir = 5
-	},
-/turf/simulated/floor/tiled/dark,
-/area/submap/DogBase)
 "LJ" = (
 /obj/effect/decal/remains/tajaran,
 /turf/template_noop,
@@ -767,12 +748,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/outdoors/dirt,
 /area/template_noop)
-"Rz" = (
-/obj/structure/table/woodentable,
-/obj/item/radio/phone,
-/obj/random/contraband/nofail,
-/turf/simulated/floor/tiled/dark,
-/area/submap/DogBase)
 "RW" = (
 /obj/machinery/light{
 	dir = 8
@@ -850,7 +825,7 @@
 /obj/effect/floor_decal/corner/red/border{
 	dir = 1
 	},
-/obj/random/cash/huge,
+/obj/random/cash,
 /turf/simulated/floor/tiled/dark,
 /area/submap/DogBase)
 "Xz" = (
@@ -1308,7 +1283,7 @@ OS
 Bk
 Yr
 HF
-Rz
+Ok
 wI
 Wq
 Ni
@@ -1329,7 +1304,7 @@ hp
 Hl
 Hl
 Bk
-hA
+lm
 Wq
 Iz
 lX
@@ -1393,7 +1368,7 @@ hp
 Hl
 Hl
 Bk
-hA
+lm
 Wq
 BB
 lX
@@ -1436,7 +1411,7 @@ OS
 Bk
 Yr
 VG
-HM
+Iz
 wI
 lb
 hl
@@ -1498,7 +1473,7 @@ ab
 tz
 qg
 Bk
-Lm
+ec
 se
 se
 se
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm
index 7afcc8bc59..e5abd73d38 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/dogbaseAlt.dmm
@@ -26,7 +26,7 @@
 /obj/effect/decal/remains/deer,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/obj/random/contraband/nofail,
+/obj/random/contraband,
 /turf/simulated/floor/outdoors/dirt/sif/planetuse,
 /area/submap/DogBase)
 "bF" = (
@@ -191,7 +191,6 @@
 /obj/effect/decal/remains/deer,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/obj/random/maintenance/medical,
 /turf/simulated/floor/outdoors/dirt/sif/planetuse,
 /area/submap/DogBase)
 "ja" = (
@@ -230,9 +229,6 @@
 /area/submap/DogBase)
 "lt" = (
 /obj/structure/closet/secure_closet/guncabinet,
-/obj/random/projectile,
-/obj/random/projectile,
-/obj/effect/landmark/loot_spawn,
 /obj/effect/floor_decal/corner/red/border{
 	dir = 1;
 	icon_state = "bordercolor"
@@ -300,13 +296,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/submap/DogBase)
-"pg" = (
-/obj/effect/floor_decal/borderfloor{
-	dir = 9
-	},
-/obj/effect/landmark/loot_spawn,
-/turf/simulated/floor/tiled/dark,
-/area/submap/DogBase)
 "pT" = (
 /obj/machinery/light{
 	dir = 1
@@ -345,7 +334,6 @@
 "sm" = (
 /obj/structure/closet/secure_closet/guncabinet,
 /obj/random/projectile,
-/obj/random/projectile,
 /obj/effect/floor_decal/corner/red/border{
 	dir = 1;
 	icon_state = "bordercolor"
@@ -479,14 +467,6 @@
 	},
 /turf/simulated/floor,
 /area/submap/DogBase)
-"CX" = (
-/obj/structure/table/woodentable,
-/obj/item/stolenpackage,
-/obj/effect/floor_decal/borderfloor{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/dark,
-/area/submap/DogBase)
 "Dz" = (
 /obj/effect/floor_decal/corner/red/border{
 	dir = 1;
@@ -614,7 +594,7 @@
 /area/submap/DogBase)
 "KH" = (
 /obj/structure/table/woodentable,
-/obj/random/contraband/nofail,
+/obj/random/contraband,
 /turf/simulated/floor/tiled/dark,
 /area/submap/DogBase)
 "KW" = (
@@ -631,18 +611,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/outdoors/dirt/sif/planetuse,
 /area/submap/DogBase)
-"LV" = (
-/obj/structure/table/woodentable,
-/obj/item/radio/phone,
-/obj/random/contraband/nofail,
-/turf/simulated/floor/tiled/dark,
-/area/submap/DogBase)
 "MF" = (
 /obj/structure/dogbed,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/bone,
-/obj/random/contraband/nofail,
+/obj/random/contraband,
 /turf/simulated/floor/outdoors/dirt/sif/planetuse,
 /area/submap/DogBase)
 "MW" = (
@@ -701,7 +675,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/remains/human,
-/obj/random/contraband/nofail,
+/obj/random/contraband,
 /turf/simulated/floor/outdoors/dirt/sif/planetuse,
 /area/submap/DogBase)
 "Qj" = (
@@ -816,7 +790,7 @@
 	dir = 1;
 	icon_state = "bordercolor"
 	},
-/obj/random/cash/huge,
+/obj/random/cash,
 /turf/simulated/floor/tiled/dark,
 /area/submap/DogBase)
 "UM" = (
@@ -828,7 +802,7 @@
 /obj/effect/floor_decal/borderfloor{
 	dir = 1
 	},
-/obj/random/cash/huge,
+/obj/random/cash,
 /turf/simulated/floor/tiled/dark,
 /area/submap/DogBase)
 "Vi" = (
@@ -880,7 +854,7 @@
 /area/template_noop)
 "YI" = (
 /obj/structure/table/woodentable,
-/obj/random/cash/big,
+/obj/random/cash,
 /turf/simulated/floor/tiled/dark,
 /area/submap/DogBase)
 "YK" = (
@@ -1247,7 +1221,7 @@ dn
 dp
 Vi
 tE
-pg
+to
 JD
 JD
 ky
@@ -1313,7 +1287,7 @@ XA
 tE
 fP
 kl
-LV
+Zn
 RO
 ja
 ao
@@ -1334,7 +1308,7 @@ Ge
 gW
 gW
 tE
-CX
+NA
 ja
 bb
 Sc
@@ -1398,7 +1372,7 @@ Ge
 gW
 gW
 tE
-CX
+NA
 ja
 YI
 Sc
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/frostoasis.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/frostoasis.dmm
index db3e778adf..49f78b3879 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/frostoasis.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/frostoasis.dmm
@@ -207,7 +207,6 @@
 "EW" = (
 /obj/structure/table/standard,
 /obj/item/gift,
-/obj/item/gun/energy/temperature,
 /turf/simulated/floor/wood/broken,
 /area/submap/FrostOasis)
 "Fl" = (
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/lonewolf.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/lonewolf.dmm
index 2d4a47854b..ba59dd9304 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/lonewolf.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/lonewolf.dmm
@@ -8,7 +8,7 @@
 /area/submap/lonewolf)
 "f" = (
 /obj/effect/decal/remains/ribcage,
-/obj/random/contraband/nofail,
+/obj/random/contraband,
 /turf/simulated/floor/outdoors/dirt,
 /area/submap/lonewolf)
 "g" = (
@@ -17,7 +17,7 @@
 /area/submap/lonewolf)
 "j" = (
 /obj/effect/decal/remains/tajaran,
-/obj/random/contraband/nofail,
+/obj/random/contraband,
 /turf/simulated/floor/outdoors/dirt,
 /area/submap/lonewolf)
 "l" = (
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/spider1.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/spider1.dmm
index 7e3036c058..873a176818 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/spider1.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/spider1.dmm
@@ -14,7 +14,9 @@
 /turf/template_noop,
 /area/submap/spider1)
 "e" = (
-/obj/effect/spider/eggcluster/small/frost,
+/obj/effect/spider/eggcluster/small/frost{
+	faction = "awaymission"
+	},
 /turf/template_noop,
 /area/submap/spider1)
 "f" = (
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/wolfden.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/wolfden.dmm
index 7874c7b5df..9fcb0f18a6 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/wolfden.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/wolfden.dmm
@@ -121,13 +121,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/outdoors/dirt,
 /area/submap/WolfDen)
-"A" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/random/maintenance/security,
-/turf/simulated/floor/outdoors/dirt{
-	outdoors = 0
-	},
-/area/submap/WolfDen)
 "C" = (
 /obj/random/trash_pile,
 /turf/simulated/floor/outdoors/dirt,
@@ -175,7 +168,6 @@
 	},
 /area/submap/WolfDen)
 "O" = (
-/obj/random/gun/random,
 /turf/simulated/floor/outdoors/dirt{
 	outdoors = 0
 	},
@@ -257,7 +249,7 @@ o
 o
 d
 O
-X
+O
 o
 o
 o
@@ -278,7 +270,7 @@ o
 Z
 o
 v
-A
+I
 w
 e
 J
diff --git a/modular_chomp/maps/submaps/surface_submaps/wilderness/xenohive.dmm b/modular_chomp/maps/submaps/surface_submaps/wilderness/xenohive.dmm
index de19fc49a6..521898ccf8 100644
--- a/modular_chomp/maps/submaps/surface_submaps/wilderness/xenohive.dmm
+++ b/modular_chomp/maps/submaps/surface_submaps/wilderness/xenohive.dmm
@@ -14,11 +14,7 @@
 "bq" = (
 /obj/structure/closet/secure_closet/egg/xenomorph,
 /obj/effect/alien/weeds,
-/obj/random/maintenance/medical,
-/obj/random/maintenance/medical,
-/obj/random/maintenance/engineering,
 /obj/random/plushie,
-/obj/item/organ/internal/augment/armmounted,
 /obj/item/organ/internal/intestine,
 /turf/simulated/floor/outdoors/dirt{
 	outdoors = 0
@@ -128,8 +124,10 @@
 /turf/simulated/floor/tiled/steel_dirty,
 /area/submap/XenoHive)
 "jY" = (
-/mob/living/simple_mob/animal/space/alien/queen/empress,
 /obj/effect/alien/weeds,
+/mob/living/simple_mob/animal/space/alien/queen/empress{
+	loot_list = list(/obj/item/storage/backpack/holding = 20)
+	},
 /turf/simulated/floor,
 /area/submap/XenoHive)
 "kl" = (
@@ -401,7 +399,6 @@
 /obj/structure/table,
 /obj/effect/alien/weeds,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/storage/backpack/holding,
 /turf/simulated/floor,
 /area/submap/XenoHive)
 "Ir" = (
@@ -495,7 +492,6 @@
 "QC" = (
 /obj/structure/closet/secure_closet/egg/xenomorph,
 /obj/effect/alien/weeds,
-/obj/item/stolenpackage,
 /obj/item/organ/internal/fruitgland,
 /obj/item/organ/internal/intestine/xeno,
 /turf/simulated/floor/outdoors/rocks{
diff --git a/modular_chomp/sound/items/salvage/salvagedrop.ogg b/modular_chomp/sound/items/salvage/salvagedrop.ogg
new file mode 100644
index 0000000000..1a018cf377
Binary files /dev/null and b/modular_chomp/sound/items/salvage/salvagedrop.ogg differ
diff --git a/modular_chomp/sound/items/salvage/salvagepickup.ogg b/modular_chomp/sound/items/salvage/salvagepickup.ogg
new file mode 100644
index 0000000000..0e9a3d0ea9
Binary files /dev/null and b/modular_chomp/sound/items/salvage/salvagepickup.ogg differ
diff --git a/modular_chomp/sound/items/taperecorder_drop.ogg b/modular_chomp/sound/items/taperecorder_drop.ogg
new file mode 100644
index 0000000000..6e3c151140
Binary files /dev/null and b/modular_chomp/sound/items/taperecorder_drop.ogg differ
diff --git a/modular_chomp/sound/items/taperecorder_pickup.ogg b/modular_chomp/sound/items/taperecorder_pickup.ogg
new file mode 100644
index 0000000000..941640aefd
Binary files /dev/null and b/modular_chomp/sound/items/taperecorder_pickup.ogg differ
diff --git a/vorestation.dme b/vorestation.dme
index 65dd4a1b01..2f443abddd 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -5094,6 +5094,8 @@
 #include "modular_chomp\code\modules\research\designs\weapons.dm"
 #include "modular_chomp\code\modules\research\designs\circuits\circuits.dm"
 #include "modular_chomp\code\modules\research\lathes\protolathe.dm"
+#include "modular_chomp\code\modules\salvage\bags.dm"
+#include "modular_chomp\code\modules\salvage\salvage.dm"
 #include "modular_chomp\code\modules\shieldgen\shield_capacitor.dm"
 #include "modular_chomp\code\modules\shieldgen\shield_gen.dm"
 #include "modular_chomp\code\modules\spells\spells.dm"