that should catch most of them

FalloutFalcon · Oct 10, 2024 · 9ba9638 · 9ba9638
1 parent c9ee62f
commit 9ba9638
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 38 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm b/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm
@@ -825,7 +825,7 @@
 	dir = 1
 	},
 /obj/item/candle,
-/obj/effect/spawner/random/donut,
+/obj/effect/spawner/random/food_or_drink/donut,
 /turf/open/floor/wood{
 	light_range = 2
 	},

diff --git a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
@@ -412,9 +412,9 @@
 /area/ruin/beach/oceantown)
 "fn" = (
 /obj/structure/rack,
-/obj/effect/spawner/random/donut/slimejelly,
-/obj/effect/spawner/random/donut,
-/obj/effect/spawner/random/donut,
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
+/obj/effect/spawner/random/food_or_drink/donut,
+/obj/effect/spawner/random/food_or_drink/donut,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ruin/beach/oceantown/shop)
 "fp" = (
@@ -711,8 +711,8 @@
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "ix" = (
 /obj/structure/rack,
-/obj/effect/spawner/random/donut/slimejelly,
-/obj/effect/spawner/random/donut,
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
+/obj/effect/spawner/random/food_or_drink/donut,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ruin/beach/oceantown/shop)
 "iz" = (
@@ -1560,11 +1560,11 @@
 /area/ruin/beach/oceantown/bar)
 "un" = (
 /obj/structure/rack,
-/obj/effect/spawner/random/donut,
-/obj/effect/spawner/random/donut,
-/obj/effect/spawner/random/donut,
-/obj/effect/spawner/random/donut,
-/obj/effect/spawner/random/donut/slimejelly,
+/obj/effect/spawner/random/food_or_drink/donut,
+/obj/effect/spawner/random/food_or_drink/donut,
+/obj/effect/spawner/random/food_or_drink/donut,
+/obj/effect/spawner/random/food_or_drink/donut,
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ruin/beach/oceantown/shop)
 "ur" = (
@@ -3371,8 +3371,8 @@
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "NX" = (
 /obj/structure/rack,
-/obj/effect/spawner/random/donut/jelly,
-/obj/effect/spawner/random/donut/jelly,
+/obj/effect/spawner/random/food_or_drink/donut/jelly,
+/obj/effect/spawner/random/food_or_drink/donut/jelly,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ruin/beach/oceantown/shop)
 "Oe" = (
@@ -3545,7 +3545,7 @@
 /area/ruin/beach/oceantown)
 "PF" = (
 /obj/structure/rack,
-/obj/effect/spawner/random/donut/slimejelly,
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ruin/beach/oceantown/shop)
 "PH" = (
@@ -3737,10 +3737,10 @@
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "SS" = (
 /obj/structure/rack,
-/obj/effect/spawner/random/donut,
-/obj/effect/spawner/random/donut,
-/obj/effect/spawner/random/donut/slimejelly,
-/obj/effect/spawner/random/donut/jelly,
+/obj/effect/spawner/random/food_or_drink/donut,
+/obj/effect/spawner/random/food_or_drink/donut,
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
+/obj/effect/spawner/random/food_or_drink/donut/jelly,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ruin/beach/oceantown/shop)
 "SY" = (
@@ -3949,9 +3949,9 @@
 /area/ruin/beach/oceantown/shop)
 "VQ" = (
 /obj/structure/rack,
-/obj/effect/spawner/random/donut/jelly,
-/obj/effect/spawner/random/donut/jelly,
-/obj/effect/spawner/random/donut/jelly,
+/obj/effect/spawner/random/food_or_drink/donut/jelly,
+/obj/effect/spawner/random/food_or_drink/donut/jelly,
+/obj/effect/spawner/random/food_or_drink/donut/jelly,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ruin/beach/oceantown/shop)
 "VS" = (
@@ -4116,11 +4116,11 @@
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "XQ" = (
 /obj/structure/rack,
-/obj/effect/spawner/random/donut/jelly,
-/obj/effect/spawner/random/donut/jelly,
-/obj/effect/spawner/random/donut/jelly,
-/obj/effect/spawner/random/donut/slimejelly,
-/obj/effect/spawner/random/donut/jelly,
+/obj/effect/spawner/random/food_or_drink/donut/jelly,
+/obj/effect/spawner/random/food_or_drink/donut/jelly,
+/obj/effect/spawner/random/food_or_drink/donut/jelly,
+/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
+/obj/effect/spawner/random/food_or_drink/donut/jelly,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ruin/beach/oceantown/shop)
 "XS" = (

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
@@ -2746,7 +2746,6 @@
 "WY" = (
 /obj/structure/frame/computer{
 	dir = 1;
-
 	},
 /obj/effect/turf_decal/corner/opaque/red/diagonal,
 /turf/open/floor/plasteel/tech/techmaint,

diff --git a/_maps/outpost/indie_space.dmm b/_maps/outpost/indie_space.dmm
@@ -1188,7 +1188,7 @@
 /area/outpost/maintenance/central)
 "hZ" = (
 /obj/structure/table/wood,
-/obj/effect/spawner/random/donut,
+/obj/effect/spawner/random/food_or_drink/donut,
 /turf/open/floor/wood,
 /area/outpost/crew/bar)
 "ib" = (
@@ -6454,7 +6454,7 @@
 /area/outpost/cargo/office)
 "No" = (
 /obj/structure/table,
-/obj/effect/spawner/random/donut/jelly,
+/obj/effect/spawner/random/food_or_drink/donut/jelly,
 /obj/effect/turf_decal/floordetail/tiled,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/outpost/security)

diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm
@@ -4646,7 +4646,7 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/donut,
+/obj/effect/spawner/random/food_or_drink/donut,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "Qn" = (

diff --git a/_maps/shuttles/pirate/pirate_tortuga.dmm b/_maps/shuttles/pirate/pirate_tortuga.dmm
@@ -1549,7 +1549,7 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "ti" = (
-/obj/effect/spawner/random/donut,
+/obj/effect/spawner/random/food_or_drink/donut,
 /turf/open/floor/plating/airless{
 	icon_state = "plating_rust"
 	},

diff --git a/code/game/objects/effects/spawners/random.dm/vending.dm b/code/game/objects/effects/spawners/random.dm/vending.dm
@@ -2,7 +2,7 @@
 	name = "machinery spawner"
 	desc = "Randomized electronics for extra fun."
 
-/obj/effect/spawner/random/vending/snackvend
+/obj/effect/spawner/random/vending/snack
 	name = "spawn random snack vending machine"
 	desc = "Automagically transforms into a random snack vendor. If you see this while in a shift, please create a bug report."
 	icon_state = "snack"

diff --git a/tools/UpdatePaths/Scripts/60522_replace_spawners.txt b/tools/UpdatePaths/Scripts/60522_replace_spawners.txt
@@ -1,5 +1,6 @@
 #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
@@ -8,8 +9,6 @@
 /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/bundle/hobo_squat : /obj/effect/spawner/random/trash/decal/hobo_squat
-/obj/effect/spawner/bundle/moisture_trap : /obj/effect/spawner/random/trash/decal/moisture_trap
 /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/botanical_waste : /obj/effect/spawner/random/trash/decal/botanical_waste
@@ -27,8 +26,8 @@
 /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/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/decorative_material : /obj/effect/spawner/random/decoration/material
 /obj/effect/spawner/lootdrop/maintenance_carpet : /obj/effect/spawner/random/decoration/carpet
@@ -57,8 +56,8 @@
 /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/randomarcade : /obj/effect/spawner/random/entertainment/arcade
-/obj/effect/spawner/randomsnackvend : /obj/effect/spawner/random/vending/snackvend
-/obj/effect/spawner/randomcolavend : /obj/effect/spawner/random/vending/colavend
+/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
@@ -79,3 +78,6 @@
 /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