mhm

_maps/RandomRuins/SandRuins/whitesands_surface_camp_combination.dmm

@@ -915,7 +915,7 @@
 /turf/open/floor/wood,
 /area/ruin)
 "HX" = (
-/obj/effect/spawner/random/contraband/armory,
+/obj/effect/spawner/random/exotic/armory,
 /turf/open/floor/plating/asteroid/whitesands/dried{
 	light_range = 2
 	},

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

@@ -51,3 +51,17 @@
 		/obj/item/storage/wallet/random = 1,
 		/obj/item/pda = 1
 	)
+
+/obj/effect/spawner/random/exotic/armory
+	name = "generic armory spawner"
+	spawn_loot_split = TRUE
+	spawn_loot_count = 3
+	spawn_loot_split_pixel_offsets = 4
+
+	loot = list(
+		/obj/item/gun/ballistic/automatic/pistol/ringneck = 8,
+		/obj/item/gun/ballistic/shotgun/automatic/combat = 5,
+		/obj/item/gun/ballistic/automatic/pistol/deagle,
+		/obj/item/gun/ballistic/revolver/mateba
+	)
+

code/game/objects/effects/spawners/random.dm/readme.md

@@ -170,7 +170,7 @@ Sort from top to bottom.  The rarest items for your spawner should be at the bot
 Good:
 
 ```dm
-/obj/effect/spawner/random/contraband/armory
+/obj/effect/spawner/random/exotic/armory
 	name = "armory loot spawner"
 	loot = list(
 		/obj/item/gun/ballistic/automatic/pistol = 8,
@@ -186,7 +186,7 @@ Good:
 Bad:
 
 ```dm
-/obj/effect/spawner/random/contraband/armory
+/obj/effect/spawner/random/exotic/armory
 	name = "armory loot spawner"
 	loot = list(
 		/obj/item/storage/box/syndie_kit/throwing_weapons = 3,
@@ -387,7 +387,7 @@ We don't want copy-cat spawners that are almost identical.  Instead merge spawne
 Good:
 
 ```dm
-/obj/effect/spawner/random/contraband/armory
+/obj/effect/spawner/random/exotic/armory
 	name = "armory loot spawner"
 	icon_state = "pistol"
 	loot = list(

shiptest.dme

@@ -1131,7 +1131,6 @@
 #include "code\game\objects\effects\spawners\structure.dm"
 #include "code\game\objects\effects\spawners\random.dm\ai_module.dm"
 #include "code\game\objects\effects\spawners\random.dm\anomaly.dm"
-#include "code\game\objects\effects\spawners\random.dm\armory.dm"
 #include "code\game\objects\effects\spawners\random.dm\boards.dm"
 #include "code\game\objects\effects\spawners\random.dm\bureaucracy.dm"
 #include "code\game\objects\effects\spawners\random.dm\clothing.dm"

tools/UpdatePaths/Scripts/60522_replace_spawners.txt

@@ -1,83 +1,64 @@
 #comment This replaces the effect/spawner paths to the new refactored paths https://github.com/tgstation/tgstation/pull/60522
 
-/obj/effect/spawner/lootdrop/donut : /obj/effect/spawner/random/food_or_drink/donut
+
 /obj/effect/loot_site_spawner : /obj/effect/spawner/random/structure/crate
-/obj/effect/spawner/lootdrop/costume : /obj/effect/spawner/random/clothing/costume
-/obj/effect/spawner/lootdrop/mafia_outfit : /obj/effect/spawner/random/clothing/mafia_outfit
-/obj/effect/spawner/lootdrop/minor/twentyfive_percent_cyborg_mask : /obj/effect/spawner/random/clothing/twentyfive_percent_cyborg_mask
-/obj/effect/spawner/lootdrop/minor/pirate_or_bandana : /obj/effect/spawner/random/clothing/pirate_or_bandana
-/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears : /obj/effect/spawner/random/clothing/kittyears_or_rabbitears
-/obj/effect/spawner/lootdrop/minor/bowler_or_that : /obj/effect/spawner/random/clothing/bowler_or_that
-/obj/effect/spawner/lootdrop/minor/beret_or_rabbitears : /obj/effect/spawner/random/clothing/beret_or_rabbitears
-/obj/effect/spawner/lootdrop/maint_drugs : /obj/effect/spawner/random/entertainment/drugs
-/obj/effect/spawner/lootdrop/grille_or_trash : /obj/effect/spawner/random/trash/grille_or_waste
+/obj/effect/spawner/lootdrop/aimodule_harmful : /obj/effect/spawner/random/aimodule/harmful
+/obj/effect/spawner/lootdrop/aimodule_harmless : /obj/effect/spawner/random/aimodule/harmless
+/obj/effect/spawner/lootdrop/aimodule_neutral : /obj/effect/spawner/random/aimodule/neutral
+/obj/effect/spawner/lootdrop/arcade_boards : /obj/effect/spawner/random/techstorage/arcade_boards
+/obj/effect/spawner/lootdrop/armory_contraband : /obj/effect/spawner/random/exotic/armory
+/obj/effect/spawner/lootdrop/armory_contraband/donutstation : /obj/effect/spawner/random/exotic/armory
+/obj/effect/spawner/lootdrop/armory_contraband/metastation : /obj/effect/spawner/random/exotic/armory
 /obj/effect/spawner/lootdrop/botanical_waste : /obj/effect/spawner/random/trash/decal/botanical_waste
-/obj/effect/spawner/lootdrop/food_packaging : /obj/effect/spawner/random/trash/decal/food_packaging
 /obj/effect/spawner/lootdrop/cigbutt : /obj/effect/spawner/random/trash/decal/cigbutt
-/obj/effect/spawner/lootdrop/garbage_spawner : /obj/effect/spawner/random/trash/decal/garbage
-/obj/effect/spawner/lootdrop/gambling : /obj/effect/spawner/random/entertainment/gambling
-/obj/effect/spawner/lootdrop/wallet_loot : /obj/effect/spawner/random/entertainment/wallet_storage
-/obj/effect/spawner/lootdrop/organ_spawner : /obj/effect/spawner/random/medical/organs
-/obj/effect/spawner/lootdrop/memeorgans : /obj/effect/spawner/random/medical/memeorgans
-/obj/effect/spawner/lootdrop/two_percent_xeno_egg_spawner : /obj/effect/spawner/random/medical/two_percent_xeno_egg_spawner
-/obj/effect/spawner/lootdrop/three_course_meal : /obj/effect/spawner/random/food_or_drink/three_course_meal
-/obj/effect/spawner/lootdrop/refreshing_beverage : /obj/effect/spawner/random/food_or_drink/refreshing_beverage
-/obj/effect/spawner/lootdrop/donkpockets : /obj/effect/spawner/random/food_or_drink/donkpockets
-/obj/effect/spawner/lootdrop/space/rareseed : /obj/effect/spawner/random/food_or_drink/seed_rare
-/obj/effect/spawner/lootdrop/space/cashmoney : /obj/effect/spawner/random/entertainment/money_large
-/obj/effect/spawner/lootdrop/space/fancytool/raremedicalonly : /obj/effect/spawner/random/medical/surgery_tool_alien
-/obj/effect/spawner/lootdrop/space/fancytool/advmedicalonly : /obj/effect/spawner/random/medical/surgery_tool/advanced
-/obj/effect/spawner/lootdrop/space/fancytool/engineonly : /obj/effect/spawner/random/engineering/tool/advanced
-/obj/effect/spawner/lootdrop/space/material : /obj/effect/spawner/random/engineering/material_rare
+/obj/effect/spawner/lootdrop/costume : /obj/effect/spawner/random/clothing/costume
+/obj/effect/spawner/lootdrop/crate_spawner : /obj/effect/spawner/random/structure/crate_abandoned
+/obj/effect/spawner/lootdrop/decorations_spawner : /obj/effect/spawner/random/decoration/generic
 /obj/effect/spawner/lootdrop/decorative_material : /obj/effect/spawner/random/decoration/material
+/obj/effect/spawner/lootdrop/donkpockets : /obj/effect/spawner/random/food_or_drink/donkpockets
+/obj/effect/spawner/lootdrop/donut : /obj/effect/spawner/random/food_or_drink/donut
+/obj/effect/spawner/lootdrop/food_packaging : /obj/effect/spawner/random/trash/decal/food_packaging
+/obj/effect/spawner/lootdrop/gambling : /obj/effect/spawner/random/entertainment/gambling
+/obj/effect/spawner/lootdrop/garbage_spawner : /obj/effect/spawner/random/trash/decal/garbage
+/obj/effect/spawner/lootdrop/garden/seaweed : /obj/effect/spawner/random/food_or_drink/garden/seaweed
+/obj/effect/spawner/lootdrop/gloves : /obj/effect/spawner/random/clothing/gloves
+/obj/effect/spawner/lootdrop/glowstick : /obj/effect/spawner/random/decoration/glowstick
+/obj/effect/spawner/lootdrop/grille_or_trash : /obj/effect/spawner/random/trash/grille_or_waste
+/obj/effect/spawner/lootdrop/gross_decal_spawner : /obj/effect/spawner/random/trash/decal/mess
+/obj/effect/spawner/lootdrop/lizardboots : /obj/effect/spawner/random/clothing/lizardboots
+/obj/effect/spawner/lootdrop/mafia_outfit : /obj/effect/spawner/random/clothing/mafia_outfit
+/obj/effect/spawner/lootdrop/maint_drugs : /obj/effect/spawner/random/entertainment/drugs
+/obj/effect/spawner/lootdrop/maintenance : /obj/effect/spawner/random/maintenance
 /obj/effect/spawner/lootdrop/maintenance_carpet : /obj/effect/spawner/random/decoration/carpet
-/obj/effect/spawner/lootdrop/decorations_spawner : /obj/effect/spawner/random/decoration/generic
-/obj/effect/spawner/lootdrop/aimodule_harmless : /obj/effect/spawner/random/aimodule/harmless
-/obj/effect/spawner/lootdrop/aimodule_neutral : /obj/effect/spawner/random/aimodule/neutral
-/obj/effect/spawner/lootdrop/aimodule_harmful : /obj/effect/spawner/random/aimodule/harmful
-/obj/effect/spawner/lootdrop/techstorage/service : /obj/effect/spawner/random/techstorage/service_all
-/obj/effect/spawner/lootdrop/techstorage/rnd : /obj/effect/spawner/random/techstorage/rnd_all
-/obj/effect/spawner/lootdrop/techstorage/security : /obj/effect/spawner/random/techstorage/security_all
-/obj/effect/spawner/lootdrop/techstorage/engineering : /obj/effect/spawner/random/techstorage/engineering_all
-/obj/effect/spawner/lootdrop/techstorage/tcomms : /obj/effect/spawner/random/techstorage/tcomms_all
-/obj/effect/spawner/lootdrop/techstorage/medical : /obj/effect/spawner/random/techstorage/medical_all
+/obj/effect/spawner/lootdrop/maintenance/eight : /obj/effect/spawner/random/maintenance/eight
+/obj/effect/spawner/lootdrop/maintenance/five : /obj/effect/spawner/random/maintenance/five
+/obj/effect/spawner/lootdrop/maintenance/four : /obj/effect/spawner/random/maintenance/four
+/obj/effect/spawner/lootdrop/maintenance/seven : /obj/effect/spawner/random/maintenance/seven
+/obj/effect/spawner/lootdrop/maintenance/six : /obj/effect/spawner/random/maintenance/six
+/obj/effect/spawner/lootdrop/maintenance/three : /obj/effect/spawner/random/maintenance/three
+/obj/effect/spawner/lootdrop/maintenance/two : /obj/effect/spawner/random/maintenance/two
+/obj/effect/spawner/lootdrop/memeorgans : /obj/effect/spawner/random/medical/memeorgans
+/obj/effect/spawner/lootdrop/minor/beret_or_rabbitears : /obj/effect/spawner/random/clothing/beret_or_rabbitears
+/obj/effect/spawner/lootdrop/minor/bowler_or_that : /obj/effect/spawner/random/clothing/bowler_or_that
+/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears : /obj/effect/spawner/random/clothing/kittyears_or_rabbitears
+/obj/effect/spawner/lootdrop/minor/pirate_or_bandana : /obj/effect/spawner/random/clothing/pirate_or_bandana
+/obj/effect/spawner/lootdrop/minor/twentyfive_percent_cyborg_mask : /obj/effect/spawner/random/clothing/twentyfive_percent_cyborg_mask
+/obj/effect/spawner/lootdrop/organ_spawner : /obj/effect/spawner/random/medical/organs
+/obj/effect/spawner/lootdrop/prison_contraband : /obj/effect/spawner/random/contraband/prison
+/obj/effect/spawner/lootdrop/ration : /obj/effect/spawner/random/food_or_drink/ration
 /obj/effect/spawner/lootdrop/techstorage/ai : /obj/effect/spawner/random/techstorage/ai_all
 /obj/effect/spawner/lootdrop/techstorage/command : /obj/effect/spawner/random/techstorage/command_all
+/obj/effect/spawner/lootdrop/techstorage/engineering : /obj/effect/spawner/random/techstorage/engineering_all
+/obj/effect/spawner/lootdrop/techstorage/medical : /obj/effect/spawner/random/techstorage/medical_all
+/obj/effect/spawner/lootdrop/techstorage/rnd : /obj/effect/spawner/random/techstorage/rnd_all
 /obj/effect/spawner/lootdrop/techstorage/rnd_secure : /obj/effect/spawner/random/techstorage/rnd_secure_all
-/obj/effect/spawner/lootdrop/prison_contraband : /obj/effect/spawner/random/contraband/prison
-/obj/effect/spawner/lootdrop/armory_contraband : /obj/effect/spawner/random/contraband/armory
-/obj/effect/spawner/lootdrop/armory_contraband/metastation : /obj/effect/spawner/random/contraband/armory
-/obj/effect/spawner/lootdrop/armory_contraband/donutstation : /obj/effect/spawner/random/contraband/armory
-/obj/effect/spawner/lootdrop/gross_decal_spawner : /obj/effect/spawner/random/trash/decal/mess
-/obj/effect/spawner/scatter/grime : /obj/effect/spawner/random/trash/decal/grime
-/obj/effect/spawner/scatter/moisture : /obj/effect/spawner/random/trash/decal/moisture
-/obj/effect/spawner/lootdrop/space/fancytech : /obj/effect/spawner/random/exotic/technology
-/obj/effect/spawner/lootdrop/space/languagebook : /obj/effect/spawner/random/exotic/languagebook
-/obj/effect/spawner/lootdrop/space/syndiecosmetic : /obj/effect/spawner/random/exotic/syndie
-/obj/effect/spawner/lootdrop/space/fancytool : /obj/effect/spawner/random/exotic/tool
+/obj/effect/spawner/lootdrop/techstorage/security : /obj/effect/spawner/random/techstorage/security_all
+/obj/effect/spawner/lootdrop/techstorage/service : /obj/effect/spawner/random/techstorage/service_all
+/obj/effect/spawner/lootdrop/techstorage/tcomms : /obj/effect/spawner/random/techstorage/tcomms_all
+/obj/effect/spawner/lootdrop/three_course_meal : /obj/effect/spawner/random/food_or_drink/three_course_meal
+/obj/effect/spawner/lootdrop/wallet_loot : /obj/effect/spawner/random/entertainment/wallet_storage
+/obj/effect/spawner/lootdrop/waste/trash : /obj/effect/spawner/random/trash/decal
+/obj/effect/spawner/lootdrop/whiteship_cere_ripley : /obj/effect/spawner/random/exotic/ripley
 /obj/effect/spawner/randomarcade : /obj/effect/spawner/random/entertainment/arcade
-/obj/machinery/vending/snack/random : /obj/effect/spawner/random/vending/snack
 /obj/machinery/vending/cola/random : /obj/effect/spawner/random/vending/cola
-/obj/effect/spawner/lootdrop/arcade_boards : /obj/effect/spawner/random/techstorage/arcade_boards
-/obj/effect/spawner/lootdrop/crate_spawner : /obj/effect/spawner/random/structure/crate_abandoned
-/obj/effect/spawner/lootdrop/maintenance : /obj/effect/spawner/random/maintenance
-/obj/effect/spawner/lootdrop/maintenance/two : /obj/effect/spawner/random/maintenance/two
-/obj/effect/spawner/lootdrop/maintenance/three : /obj/effect/spawner/random/maintenance/three
-/obj/effect/spawner/lootdrop/maintenance/four : /obj/effect/spawner/random/maintenance/four
-/obj/effect/spawner/lootdrop/maintenance/five : /obj/effect/spawner/random/maintenance/five
-/obj/effect/spawner/lootdrop/maintenance/six : /obj/effect/spawner/random/maintenance/six
-/obj/effect/spawner/lootdrop/maintenance/seven : /obj/effect/spawner/random/maintenance/seven
-/obj/effect/spawner/lootdrop/maintenance/eight : /obj/effect/spawner/random/maintenance/eight
-/obj/effect/spawner/lootdrop/gloves : /obj/effect/spawner/random/clothing/gloves
-/obj/effect/spawner/lootdrop/glowstick : /obj/effect/spawner/random/decoration/glowstick
-/obj/effect/spawner/lootdrop/lizardboots : /obj/effect/spawner/random/clothing/lizardboots
-/obj/effect/spawner/lootdrop/pizzaparty : /obj/effect/spawner/random/food_or_drink/pizzaparty
-/obj/effect/spawner/lootdrop/snowdin/dungeonlite : /obj/effect/spawner/random/exotic/antag_gear_weak
-/obj/effect/spawner/lootdrop/snowdin/dungeonmid : /obj/effect/spawner/random/exotic/antag_gear
-/obj/effect/spawner/lootdrop/snowdin/dungeonheavy : /obj/effect/spawner/random/exotic/antag_gear_strong
-/obj/effect/spawner/lootdrop/snowdin/dungeonmisc : /obj/effect/spawner/random/exotic/snow_gear
-/obj/effect/spawner/lootdrop/seed_vault : /obj/effect/spawner/random/food_or_drink/seed_vault
-/obj/effect/spawner/lootdrop/whiteship_cere_ripley : /obj/effect/spawner/random/exotic/ripley
-/obj/effect/spawner/lootdrop/garden/seaweed : /obj/effect/spawner/random/food_or_drink/garden/seaweed
-/obj/effect/spawner/lootdrop/waste/trash : /obj/effect/spawner/random/trash/decal
-/obj/effect/spawner/lootdrop/ration : /obj/effect/spawner/random/food_or_drink/ration
+/obj/machinery/vending/snack/random : /obj/effect/spawner/random/vending/snack