Cherrypick - Week 3 - March 15th to March 21th

_maps/RandomRuins/SpaceRuins/spacemall.dmm

@@ -2146,7 +2146,7 @@
 /area/ruin/space/has_grav/spacemall)
 "iu" = (
 /obj/effect/turf_decal/box,
-/obj/effect/spawner/random/salvage_machine,
+/obj/effect/spawner/random/salvage/machine,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/spacemall/shuttle)
 "iv" = (

_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm

@@ -3094,7 +3094,7 @@
 /area/ruin/wasteplanet/abandoned_mechbay/crewquarters)
 "KH" = (
 /obj/machinery/porta_turret/ruin/ramzi/light{
-	dir = 9;
+	dir = 9
 	},
 /turf/closed/wall/concrete/reinforced,
 /area/ruin/wasteplanet/abandoned_mechbay/commandcontrol)

_maps/RandomRuins/WasteRuins/wasteplanet_icwbase.dmm

@@ -887,10 +887,7 @@
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ruin/wasteplanet/wasteplanet_icwbase/eng)
 "ds" = (
-/obj/effect/spawner/random/salvage/metal{
-	pixel_x = -10;
-	pixel_y = 5
-	},
+/obj/effect/spawner/random/salvage/ore/metal,
 /turf/open/floor/plating/wasteplanet/lit{
 	icon_state = "plastitanium_dam2"
 	},
@@ -1008,10 +1005,7 @@
 /obj/effect/turf_decal/corner/opaque/syndiered/border{
 	dir = 8
 	},
-/obj/effect/spawner/random/salvage/metal{
-	pixel_x = -5;
-	pixel_y = 0
-	},
+/obj/effect/spawner/random/salvage/ore/metal,
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable{
 	icon_state = "0-2"
@@ -1534,10 +1528,7 @@
 	},
 /obj/structure/girder/reinforced,
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/salvage/metal{
-	pixel_x = -4;
-	pixel_y = 4
-	},
+/obj/effect/spawner/random/salvage/ore/metal,
 /turf/open/floor/plating/wasteplanet/lit,
 /area/overmap_encounter/planetoid/wasteplanet/explored)
 "fT" = (
@@ -1693,10 +1684,7 @@
 /area/ruin/wasteplanet/wasteplanet_icwbase/hab)
 "gs" = (
 /obj/structure/girder/reinforced,
-/obj/effect/spawner/random/salvage/metal{
-	pixel_x = 0;
-	pixel_y = -5
-	},
+/obj/effect/spawner/random/salvage/ore/metal,
 /turf/open/floor/plating/wasteplanet/lit,
 /area/overmap_encounter/planetoid/wasteplanet/explored)
 "gu" = (
@@ -2793,10 +2781,7 @@
 	},
 /obj/structure/girder/reinforced,
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/salvage/metal{
-	pixel_x = 2;
-	pixel_y = -5
-	},
+/obj/effect/spawner/random/salvage/ore/metal,
 /turf/open/floor/plating/wasteplanet/lit{
 	icon_state = "damaged5"
 	},
@@ -4037,10 +4022,7 @@
 	},
 /obj/structure/girder/displaced,
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/salvage/metal{
-	pixel_x = -6;
-	pixel_y = 2
-	},
+/obj/effect/spawner/random/salvage/ore/metal,
 /turf/open/floor/plating/wasteplanet/lit{
 	icon_state = "damaged5"
 	},
@@ -4624,10 +4606,7 @@
 /turf/open/floor/engine/waste/lit,
 /area/overmap_encounter/planetoid/wasteplanet/explored)
 "rV" = (
-/obj/effect/spawner/random/salvage/metal{
-	pixel_x = 6;
-	pixel_y = 3
-	},
+/obj/effect/spawner/random/salvage/ore/metal,
 /turf/open/floor/plating/wasteplanet/lit{
 	icon_state = "plastitanium_dam5"
 	},
@@ -5512,10 +5491,7 @@
 	dir = 1
 	},
 /obj/structure/girder/displaced,
-/obj/effect/spawner/random/salvage/metal{
-	pixel_x = -2;
-	pixel_y = -3
-	},
+/obj/effect/spawner/random/salvage/ore/metal,
 /turf/open/floor/plating/wasteplanet/lit,
 /area/overmap_encounter/planetoid/wasteplanet/explored)
 "vJ" = (
@@ -6025,10 +6001,7 @@
 /area/ruin/wasteplanet/wasteplanet_icwbase/tcom1)
 "xE" = (
 /obj/structure/girder/reinforced,
-/obj/effect/spawner/random/salvage/metal{
-	pixel_x = 9;
-	pixel_y = -3
-	},
+/obj/effect/spawner/random/salvage/ore/metal,
 /turf/open/floor/plating/wasteplanet/lit{
 	icon_state = "damaged5"
 	},
@@ -9255,10 +9228,7 @@
 /turf/open/floor/plasteel/mono/dark,
 /area/ruin/wasteplanet/wasteplanet_icwbase/cybersun)
 "Kx" = (
-/obj/effect/spawner/random/salvage/metal{
-	pixel_x = 7;
-	pixel_y = -8
-	},
+/obj/effect/spawner/random/salvage/ore/metal,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plating/wasteplanet/lit{
 	icon_state = "platingdmg2"
@@ -9354,10 +9324,7 @@
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 4
 	},
-/obj/effect/spawner/random/salvage/metal{
-	pixel_x = -5;
-	pixel_y = 0
-	},
+/obj/effect/spawner/random/salvage/ore/metal,
 /obj/machinery/light/broken/directional/east,
 /turf/open/floor/mineral/plastitanium/red/wasteplanet,
 /area/ruin/wasteplanet/wasteplanet_icwbase/cic)
@@ -10400,10 +10367,7 @@
 /area/ruin/wasteplanet/wasteplanet_icwbase/hab)
 "Pq" = (
 /obj/structure/girder/displaced,
-/obj/effect/spawner/random/salvage/metal{
-	pixel_x = -8;
-	pixel_y = 9
-	},
+/obj/effect/spawner/random/salvage/ore/metal,
 /turf/open/floor/plating/wasteplanet/lit{
 	icon_state = "platingdmg2"
 	},
@@ -10738,10 +10702,7 @@
 	dir = 4
 	},
 /obj/structure/girder/reinforced,
-/obj/effect/spawner/random/salvage/metal{
-	pixel_x = -6;
-	pixel_y = -4
-	},
+/obj/effect/spawner/random/salvage/ore/metal,
 /turf/open/floor/plating/wasteplanet/lit{
 	icon_state = "platingdmg2"
 	},
@@ -11475,7 +11436,7 @@
 /turf/open/floor/plasteel/mono/dark,
 /area/ruin/wasteplanet/wasteplanet_icwbase/hab)
 "TM" = (
-/obj/effect/spawner/random/salvage/metal,
+/obj/effect/spawner/random/salvage/ore/metal,
 /obj/effect/decal/cleanable/blood/gibs/old{
 	pixel_x = -18;
 	pixel_y = 16
@@ -11844,10 +11805,7 @@
 /obj/effect/turf_decal/corner/opaque/syndiered/bordercorner{
 	dir = 8
 	},
-/obj/effect/spawner/random/salvage/metal{
-	pixel_x = 11;
-	pixel_y = -3
-	},
+/obj/effect/spawner/random/salvage/ore/metal,
 /obj/effect/decal/cleanable/blood/old{
 	pixel_x = 3;
 	pixel_y = -10;

_maps/outpost/indie_space.dmm

@@ -330,7 +330,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 10
 	},
-/obj/effect/spawner/random/salvage/metal,
+/obj/effect/spawner/random/salvage/ore/metal,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/outpost/maintenance/central)
 "bN" = (
@@ -1507,7 +1507,7 @@
 "hK" = (
 /obj/structure/rack,
 /obj/effect/spawner/random/salvage_laser,
-/obj/effect/spawner/random/salvage_capacitor,
+/obj/effect/spawner/random/salvage/part/capacitor,
 /turf/open/floor/plating,
 /area/outpost/maintenance/fore)
 "hL" = (
@@ -6324,7 +6324,7 @@
 /obj/effect/turf_decal/corner_techfloor_gray{
 	dir = 9
 	},
-/obj/effect/spawner/random/salvage/metal,
+/obj/effect/spawner/random/salvage/ore/metal,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/outpost/maintenance/fore)
@@ -8101,7 +8101,7 @@
 /obj/structure/table/wood,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/reagent_containers/food/snacks/grown/citrus/orange,
-/obj/effect/spawner/random/salvage_capacitor,
+/obj/effect/spawner/random/salvage/part/capacitor,
 /turf/open/floor/plating,
 /area/outpost/maintenance/fore)
 "NV" = (

_maps/shuttles/independent/independent_scarab.dmm

@@ -1050,7 +1050,7 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering)
 "ma" = (
-/obj/effect/spawner/random/salvage_machine,
+/obj/effect/spawner/random/salvage/machine,
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "mr" = (
@@ -1417,7 +1417,7 @@
 /obj/structure/sign/poster/random{
 	pixel_x = 32
 	},
-/obj/effect/spawner/random/salvage_machine{
+/obj/effect/spawner/random/salvage/machine{
 	dir = 8
 	},
 /turf/open/floor/plating,
@@ -3328,9 +3328,7 @@
 /obj/structure/cable/green{
 	icon_state = "4-5"
 	},
-/obj/effect/spawner/random/salvage_machine{
-	dir = 1
-	},
+/obj/effect/spawner/random/salvage/machine,
 /obj/structure/railing{
 	dir = 4
 	},

_maps/shuttles/inteq/inteq_talos.dmm

@@ -572,7 +572,7 @@
 /turf/open/floor/plating,
 /area/ship/crew/dorm/dormtwo)
 "dQ" = (
-/obj/effect/spawner/random/salvage_machine{
+/obj/effect/spawner/random/salvage/machine{
 	dir = 1
 	},
 /turf/open/floor/plating,
@@ -4278,7 +4278,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/hallway/central)
 "zp" = (
-/obj/effect/spawner/random/salvage_machine{
+/obj/effect/spawner/random/salvage/machine{
 	dir = 8
 	},
 /obj/structure/sign/poster/random{
@@ -5385,7 +5385,7 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/port)
 "GP" = (
-/obj/effect/spawner/random/salvage_machine{
+/obj/effect/spawner/random/salvage/machine{
 	dir = 8
 	},
 /turf/open/floor/plating,
@@ -6434,7 +6434,7 @@
 /turf/open/floor/engine/hull/reinforced,
 /area/ship/external/dark)
 "Nu" = (
-/obj/effect/spawner/random/salvage_machine{
+/obj/effect/spawner/random/salvage/machine{
 	dir = 1
 	},
 /turf/open/floor/plating,

code/_globalvars/lists/maintenance_loot.dm

@@ -101,7 +101,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items
 		) = 1,
 
 	list(//construction and crafting
-		/obj/item/stack/cable_coil/random = 1, //Random from WS Smartwire Revert
+		/obj/item/stack/cable_coil/random = 1,
 		/obj/item/stock_parts/cell = 1,
 		/obj/item/stack/rods/twentyfive = 1,
 		/obj/item/stack/sheet/metal/twenty = 1,
@@ -169,7 +169,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
 		/obj/item/grenade/iedcasing/spawned = 1,
 		/obj/item/melee/baton/cattleprod = 1,
 		/obj/item/throwing_star = 1,
-		/obj/item/gun/ballistic/derringer = 1, //WS - Derringer
+		/obj/item/gun/ballistic/derringer = 1,
 		) = 8,
 
 	list(//equipment
@@ -230,36 +230,34 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items
 			/obj/item/storage/box/donkpockets/donkpocketteriyaki = 1,
 			/obj/item/storage/box/donkpockets/donkpocketpizza = 1,
 			/obj/item/storage/box/donkpockets/donkpocketberry = 1,
-			/obj/item/storage/box/donkpockets/donkpockethonk = 1,
 			) = 1,
 		/obj/item/reagent_containers/food/snacks/monkeycube = 1,
 		/obj/effect/spawner/random/food_or_drink/ration = 1,
 		) = 8,
-
-	list(//fakeout items, keep this list at low relative weight
-		/obj/item/dice/d20 = 1,	//To balance out the stealth die of fates in oddities
-		/obj/item/clothing/shoes/jackboots = 1,
-		) = 1,
 ))
 
 GLOBAL_LIST_INIT(oddity_loot, list(//oddity: strange or crazy items
 		/obj/item/clothing/gloves/color/yellow = 1,
-		/obj/item/clothing/head/helmet/abductor = 1,
-		/obj/item/clothing/head/helmet/justice =1,
-		/obj/item/clothing/suit/space/hardsuit/carp = 1,
-		/obj/item/dice/d20/fate/stealth/one_use = 1,	//Looks like a d20, keep the d20 in the uncommon pool.
-		/obj/item/dice/d20/fate/stealth/cursed = 1, 	//Only rolls 1
-		/obj/item/clothing/shoes/jackboots/fast = 1,
-		/obj/item/clothing/suit/armor/reactive/table = 1,
-		/obj/item/storage/box/donkpockets/donkpocketgondola = 1,
-		/obj/item/melee/sword/greyking = 1 //WS - Meth Sword
+		/obj/item/toy/sprayoncan = 1,
+		/obj/item/clothing/head/helmet/justice/escape = 1,
+		/obj/item/clothing/suit/space/hardsuit/carp/old = 1,
+		/obj/item/clothing/suit/armor/reactive/repulse = 1,
+		/obj/item/melee/axe/fire = 1,
+		/obj/item/gun/ballistic/rocketlauncher/oneshot = 1,
+		/mob/living/simple_animal/crab = 1,
+		/obj/item/melee/baton/boomerang = 1,
+		/obj/item/circular_saw/best = 1,
+		/obj/item/gun/ballistic/shotgun/doublebarrel/brazil = 1,
+		/obj/item/toner/extreme = 1,
+		/obj/item/twenty_pounds_of_ice = 1,
+		/obj/item/toy/plush/among = 1,
 	))
 
 //Maintenance loot spawner pools
 #define maint_trash_weight 4499
 #define maint_common_weight 4500
 #define maint_uncommon_weight 1000
-#define maint_oddity_weight 1 //1 out of 10,000 would give metastation (180 spawns) a 2 in 111 chance of spawning an oddity per round, similar to xeno egg
+#define maint_oddity_weight 1 //1 out of 10,000
 
 //Loot pool used by default maintenance loot spawners
 GLOBAL_LIST_INIT(maintenance_loot, list(
@@ -268,21 +266,3 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	GLOB.uncommon_loot = maint_uncommon_weight,
 	GLOB.oddity_loot = maint_oddity_weight,
 	))
-
-GLOBAL_LIST_INIT(ratking_trash, list(//Garbage: used by the regal rat mob when spawning garbage.
-			/obj/item/cigbutt,
-			/obj/item/trash/cheesie,
-			/obj/item/trash/candy,
-			/obj/item/trash/chips,
-			/obj/item/trash/pistachios,
-			/obj/item/trash/plate,
-			/obj/item/trash/popcorn,
-			/obj/item/trash/raisins,
-			/obj/item/trash/sosjerky,
-			/obj/item/trash/syndi_cakes))
-
-GLOBAL_LIST_INIT(ratking_coins, list(//Coins: Used by the regal rat mob when spawning coins.
-			/obj/item/coin/iron,
-			/obj/item/coin/silver,
-			/obj/item/coin/plastic,
-			/obj/item/coin/titanium))

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

@@ -31,7 +31,6 @@
 		/obj/item/flashlight/lamp = 35,
 		/obj/item/flashlight/lamp/green = 35,
 		/obj/item/flashlight/lantern = 10,
-		/obj/item/flashlight/lamp/bananalamp = 5,
 	)
 /obj/effect/spawner/random/decoration/glowstick
 	name = "random colored glowstick"