Merge branch 'master' into richard_mask

ss220club · Sep 23, 2024 · db15f17 · db15f17
2 parents 2e32ab4 + a01a8c7
commit db15f17
Show file tree

Hide file tree

Showing 16 changed files with 400 additions and 373 deletions.
diff --git a/_maps/map_files220/RandomRuins/LavaRuins/cheesus_temple.dmm b/_maps/map_files220/RandomRuins/LavaRuins/cheesus_temple.dmm
@@ -26,7 +26,7 @@
 /turf/simulated/floor/wood/fancy/oak,
 /area/ruin/powered/cheesus)
 "cr" = (
-/obj/effect/spawner/lootdrop/trash,
+/obj/effect/spawner/random/trash,
 /turf/simulated/floor/wood/fancy/oak,
 /area/ruin/powered/cheesus)
 "cV" = (
@@ -87,7 +87,7 @@
 /area/ruin/powered/cheesus)
 "fK" = (
 /obj/structure/table/wood/fancy/orange,
-/obj/effect/spawner/lootdrop/trash,
+/obj/effect/spawner/random/trash,
 /turf/simulated/floor/wood/fancy/oak,
 /area/ruin/powered/cheesus)
 "gh" = (
@@ -199,7 +199,7 @@
 /obj/effect/turf_decal/siding/yellow{
 	dir = 5
 	},
-/obj/effect/spawner/lootdrop/trash,
+/obj/effect/spawner/random/trash,
 /obj/effect/landmark/damageturf,
 /turf/simulated/floor/wood/fancy/oak,
 /area/ruin/powered/cheesus)

diff --git a/_maps/map_files220/RandomRuins/LavaRuins/scp_facility.dmm b/_maps/map_files220/RandomRuins/LavaRuins/scp_facility.dmm
@@ -459,7 +459,7 @@
 /turf/simulated/floor/plating/lavaland_air,
 /area/ruin/powered/scpfacility)
 "wa" = (
-/obj/effect/spawner/lootdrop/trash,
+/obj/effect/spawner/random/trash,
 /turf/simulated/floor/plasteel/lavaland_air{
 	icon_state = "cmo"
 	},

diff --git a/_maps/map_files220/RandomZLevels/beach.dmm b/_maps/map_files220/RandomZLevels/beach.dmm
@@ -652,8 +652,8 @@
 	pixel_x = 3
 	},
 /obj/structure/closet/crate/can,
-/obj/effect/spawner/lootdrop/trash,
-/obj/effect/spawner/lootdrop/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
 /turf/simulated/floor/plasteel/white{
 	icon_state = "white_large"
 	},
@@ -3594,11 +3594,11 @@
 "Vp" = (
 /obj/machinery/light/directional/north,
 /obj/structure/closet/crate/can,
-/obj/effect/spawner/lootdrop/trash,
-/obj/effect/spawner/lootdrop/trash,
-/obj/effect/spawner/lootdrop/trash,
-/obj/effect/spawner/lootdrop/trash,
-/obj/effect/spawner/lootdrop/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark_diagonal"
 	},
@@ -3998,9 +3998,9 @@
 "ZV" = (
 /obj/item/trash/candy,
 /obj/structure/closet/crate/secure/bin,
-/obj/effect/spawner/lootdrop/trash,
-/obj/effect/spawner/lootdrop/trash,
-/obj/effect/spawner/lootdrop/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
 /turf/simulated/floor/carpet/arcade,
 /area/awaymission/beach)
 "ZZ" = (

diff --git a/_maps/map_files220/RandomZLevels/caves.dmm b/_maps/map_files220/RandomZLevels/caves.dmm
@@ -737,7 +737,7 @@
 /area/awaymission/caves)
 "dp" = (
 /obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/trash,
+/obj/effect/spawner/random/trash,
 /obj/machinery/light_construct/small/west,
 /turf/simulated/floor/plasteel/lavaland_air{
 	icon_state = "dark"

diff --git a/_maps/map_files220/RandomZLevels/gate_lizard.dmm b/_maps/map_files220/RandomZLevels/gate_lizard.dmm
@@ -7685,7 +7685,7 @@
 "jVr" = (
 /obj/structure/closet/crate,
 /obj/effect/spawner/random_spawners/dirt_maybe,
-/obj/effect/spawner/lootdrop/trash,
+/obj/effect/spawner/random/trash,
 /turf/simulated/floor/plasteel,
 /area/awaymission/jungle_planet/inside)
 "jVL" = (