Revert "Refactors lootdroppers (shiptest-ss13#3526)"

This reverts commit 94cb62b.
generalthrax · Oct 26, 2024 · 5ba3bf7 · 5ba3bf7
1 parent 9b6933b
commit 5ba3bf7
Show file tree

Hide file tree

Showing 224 changed files with 5,518 additions and 4,584 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm b/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
@@ -1144,7 +1144,7 @@
 /turf/open/floor/concrete/slab_1,
 /area/ruin/beach/complex/wall)
 "sa" = (
-/obj/effect/spawner/random/food_or_drink/garden/seaweed,
+/obj/effect/spawner/lootdrop/garden/seaweed,
 /turf/open/water/beach,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "so" = (

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/food_or_drink/donut,
+/obj/effect/spawner/lootdrop/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
@@ -113,7 +113,7 @@
 	},
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "bs" = (
-/obj/effect/spawner/random/vending/cola,
+/obj/machinery/vending/cola/random,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ruin/beach/oceantown/shop)
 "bu" = (
@@ -412,9 +412,9 @@
 /area/ruin/beach/oceantown)
 "fn" = (
 /obj/structure/rack,
-/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,
+/obj/effect/spawner/lootdrop/donut/slimejelly,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/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/food_or_drink/donut/slimejelly,
-/obj/effect/spawner/random/food_or_drink/donut,
+/obj/effect/spawner/lootdrop/donut/slimejelly,
+/obj/effect/spawner/lootdrop/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/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,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut/slimejelly,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ruin/beach/oceantown/shop)
 "ur" = (
@@ -3367,8 +3367,8 @@
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "NX" = (
 /obj/structure/rack,
-/obj/effect/spawner/random/food_or_drink/donut/jelly,
-/obj/effect/spawner/random/food_or_drink/donut/jelly,
+/obj/effect/spawner/lootdrop/donut/jelly,
+/obj/effect/spawner/lootdrop/donut/jelly,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ruin/beach/oceantown/shop)
 "Oe" = (
@@ -3541,7 +3541,7 @@
 /area/ruin/beach/oceantown)
 "PF" = (
 /obj/structure/rack,
-/obj/effect/spawner/random/food_or_drink/donut/slimejelly,
+/obj/effect/spawner/lootdrop/donut/slimejelly,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ruin/beach/oceantown/shop)
 "PH" = (
@@ -3569,7 +3569,7 @@
 /turf/open/water/beach,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "Qf" = (
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ruin/beach/oceantown/shop)
 "Qm" = (
@@ -3733,10 +3733,10 @@
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "SS" = (
 /obj/structure/rack,
-/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,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut,
+/obj/effect/spawner/lootdrop/donut/slimejelly,
+/obj/effect/spawner/lootdrop/donut/jelly,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ruin/beach/oceantown/shop)
 "SY" = (
@@ -3906,7 +3906,7 @@
 /area/ruin/beach/oceantown/bar)
 "Vr" = (
 /obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
 /turf/open/floor/carpet,
 /area/ruin/beach/oceantown)
 "VI" = (
@@ -3945,9 +3945,9 @@
 /area/ruin/beach/oceantown/shop)
 "VQ" = (
 /obj/structure/rack,
-/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/lootdrop/donut/jelly,
+/obj/effect/spawner/lootdrop/donut/jelly,
+/obj/effect/spawner/lootdrop/donut/jelly,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ruin/beach/oceantown/shop)
 "VS" = (
@@ -4112,11 +4112,11 @@
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "XQ" = (
 /obj/structure/rack,
-/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,
+/obj/effect/spawner/lootdrop/donut/jelly,
+/obj/effect/spawner/lootdrop/donut/jelly,
+/obj/effect/spawner/lootdrop/donut/jelly,
+/obj/effect/spawner/lootdrop/donut/slimejelly,
+/obj/effect/spawner/lootdrop/donut/jelly,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ruin/beach/oceantown/shop)
 "XS" = (

diff --git a/_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm b/_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm
@@ -1111,7 +1111,7 @@
 /obj/structure/closet/crate,
 /obj/effect/turf_decal/box,
 /obj/item/stack/cable_coil/red,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating,
 /area/ruin/beach/piratecrash/shuttle)
@@ -1350,7 +1350,7 @@
 "Pf" = (
 /obj/effect/turf_decal/box,
 /obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance/two,
+/obj/effect/spawner/lootdrop/maintenance/two,
 /obj/item/stack/sheet/mineral/gold/five,
 /obj/item/stack/sheet/mineral/silver/five,
 /obj/item/stack/sheet/mineral/silver/five,
@@ -1433,9 +1433,9 @@
 "QG" = (
 /obj/effect/turf_decal/box,
 /obj/structure/closet/crate,
-/obj/effect/spawner/random/circuit/machine/rare,
-/obj/effect/spawner/random/maintenance/four,
-/obj/effect/spawner/random/circuit/machine/common,
+/obj/effect/spawner/lootdrop/random_machine_circuit_rare,
+/obj/effect/spawner/lootdrop/maintenance/four,
+/obj/effect/spawner/lootdrop/random_machine_circuit_common,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating/rust,

diff --git a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
@@ -35,7 +35,7 @@
 "bI" = (
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/machinery/light/small/directional/north,
-/obj/effect/spawner/random/decoration/glowstick,
+/obj/effect/spawner/lootdrop/glowstick,
 /turf/open/floor/concrete/slab_1,
 /area/ruin/beach/treasure_cove)
 "bN" = (
@@ -53,7 +53,7 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/decoration/glowstick,
+/obj/effect/spawner/lootdrop/glowstick,
 /turf/open/floor/plating/dirt/jungle,
 /area/ruin/unpowered)
 "cJ" = (
@@ -543,7 +543,7 @@
 	pixel_x = -10;
 	pixel_y = 4
 	},
-/obj/effect/spawner/random/decoration/glowstick,
+/obj/effect/spawner/lootdrop/glowstick,
 /turf/open/floor/wood,
 /area/ruin/beach/treasure_cove)
 "rA" = (

diff --git a/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm b/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm
@@ -473,7 +473,9 @@
 /obj/structure/bed/double{
 	dir = 1
 	},
-/obj/effect/spawner/random/bedsheet/double,
+/obj/item/bedsheet/dorms/double{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ruin/unpowered/crashed_holemaker)
 "iN" = (
@@ -672,7 +674,7 @@
 /area/ruin/unpowered/crashed_holemaker)
 "lt" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/structure/crate_abandoned,
+/obj/effect/spawner/lootdrop/crate_spawner,
 /turf/open/floor/plating,
 /area/ruin/unpowered/crashed_holemaker)
 "lu" = (
@@ -741,7 +743,7 @@
 	},
 /obj/item/radio/intercom/directional/north,
 /obj/structure/closet/cabinet,
-/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/lootdrop/maintenance,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/dark,
 /area/ruin/unpowered/crashed_holemaker)
@@ -1439,7 +1441,7 @@
 /turf/open/floor/carpet,
 /area/ruin/unpowered/crashed_holemaker)
 "ze" = (
-/obj/effect/spawner/random/structure/crate_abandoned,
+/obj/effect/spawner/lootdrop/crate_spawner,
 /turf/open/floor/plating,
 /area/ruin/unpowered/crashed_holemaker)
 "zh" = (
@@ -2387,7 +2389,7 @@
 /turf/open/floor/plasteel/icemoon,
 /area/ruin/unpowered/crashed_holemaker)
 "RL" = (
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
 /obj/effect/turf_decal/spline/fancy/transparent/neutral/corner{
 	dir = 4
 	},

diff --git a/_maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm b/_maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm
@@ -337,7 +337,7 @@
 /turf/open/floor/concrete/slab_3/icemoon,
 /area/overmap_encounter/planetoid/cave/explored)
 "fe" = (
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/random,
 /obj/effect/turf_decal/siding/wood,
 /obj/structure/bed{
 	icon_state = "dirty_mattress"
@@ -1256,10 +1256,10 @@
 /obj/item/clothing/head/frontier,
 /obj/item/clothing/gloves/color/latex,
 /obj/item/clothing/mask/surgical,
-/obj/effect/spawner/random/medical/chem_jug,
-/obj/effect/spawner/random/medical/chem_jug,
-/obj/effect/spawner/random/medical/chem_jug,
-/obj/effect/spawner/random/medical/chem_jug,
+/obj/effect/spawner/lootdrop/chem_jug,
+/obj/effect/spawner/lootdrop/chem_jug,
+/obj/effect/spawner/lootdrop/chem_jug,
+/obj/effect/spawner/lootdrop/chem_jug,
 /obj/effect/turf_decal/corner/opaque/blue,
 /obj/effect/turf_decal/corner/opaque/neutral{
 	dir = 4
@@ -1659,7 +1659,7 @@
 /area/ruin/powered/icemoon/lodge/mainhall)
 "wD" = (
 /obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/random,
 /obj/effect/turf_decal/siding/wood{
 	dir = 10
 	},
@@ -1771,7 +1771,7 @@
 /turf/open/floor/wood/maple,
 /area/ruin/powered/icemoon/lodge/mainhall)
 "yi" = (
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/random,
 /obj/effect/turf_decal/siding/wood{
 	dir = 6
 	},
@@ -1968,9 +1968,9 @@
 /obj/effect/turf_decal/spline/fancy/wood{
 	dir = 8
 	},
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
-/obj/effect/spawner/random/food_or_drink/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
 /turf/open/floor/wood/mahogany{
 	icon_state = "wood-broken6"
 	},
@@ -2677,7 +2677,7 @@
 /turf/closed/wall/mineral/wood,
 /area/ruin/powered/icemoon/lodge/residential)
 "Nq" = (
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/random,
 /obj/effect/turf_decal/siding/wood,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/bed{

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
@@ -40,7 +40,7 @@
 "fD" = (
 /obj/structure/bed,
 /obj/effect/decal/cleanable/blood/bubblegum,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
 /turf/open/floor/wood,
 /area/ruin/powered)
 "fQ" = (
@@ -459,7 +459,7 @@
 /area/overmap_encounter/planetoid/cave/explored)
 "LZ" = (
 /obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
 /turf/open/floor/wood,
 /area/ruin/powered)
 "Nq" = (
@@ -477,7 +477,7 @@
 /turf/open/floor/carpet,
 /area/ruin/powered)
 "Pp" = (
-/obj/effect/spawner/random/vending/snack,
+/obj/machinery/vending/snack/random,
 /turf/open/floor/holofloor/wood,
 /area/ruin/powered)
 "PQ" = (
@@ -554,7 +554,7 @@
 "WH" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
+/obj/item/bedsheet/dorms,
 /turf/open/floor/wood,
 /area/ruin/powered)
 "Ze" = (

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_brazillianlab.dmm
@@ -478,7 +478,7 @@
 /area/overmap_encounter/planetoid/cave/explored)
 "xN" = (
 /obj/structure/rack,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/ruin/unpowered)
 "xQ" = (
@@ -1028,7 +1028,7 @@
 /obj/structure/rack,
 /obj/item/hatchet,
 /obj/item/hatchet,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/ruin/unpowered)
 "Ul" = (
@@ -1086,7 +1086,7 @@
 /obj/item/ammo_casing/shotgun/improvised,
 /obj/item/ammo_casing/shotgun/improvised,
 /obj/item/ammo_casing/shotgun/improvised,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/ruin/unpowered)
 "WH" = (
@@ -1181,7 +1181,7 @@
 "Yx" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/rack_parts,
-/obj/effect/spawner/random/maintenance/three,
+/obj/effect/spawner/lootdrop/maintenance/three,
 /turf/open/floor/wood{
 	icon_state = "wood-broken3";
 	initial_gas_mix = "ICEMOON_ATMOS"