stuff

FalloutFalcon · Oct 10, 2024 · c9ee62f · c9ee62f
1 parent 34f44a4
commit c9ee62f
Show file tree

Hide file tree

Showing 12 changed files with 76 additions and 95 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm b/_maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
@@ -374,7 +374,6 @@
 	},
 /obj/item/gun/energy/lasercannon{
 	pixel_y = 5;
-
 	},
 /obj/item/gun/energy/lasercannon,
 /obj/effect/turf_decal/industrial/hatch,

diff --git a/_maps/outpost/hangar/nt_asteroid_40x20.dmm b/_maps/outpost/hangar/nt_asteroid_40x20.dmm
@@ -861,7 +861,7 @@
 	},
 /area/hangar)
 "vh" = (
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating{
 	planetary_atmos = 1

diff --git a/_maps/outpost/indie_space.dmm b/_maps/outpost/indie_space.dmm
@@ -113,7 +113,7 @@
 /obj/effect/turf_decal/spline/fancy/opaque/lightgrey{
 	dir = 8
 	},
-/obj/effect/spawner/random/plushie{
+/obj/effect/spawner/random/entertainment/plushie{
 	pixel_x = 16;
 	pixel_y = 4
 	},
@@ -287,7 +287,7 @@
 /turf/open/floor/plasteel,
 /area/outpost/hallway/port)
 "bS" = (
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /obj/effect/turf_decal/corner_techfloor_grid{
 	dir = 8
 	},
@@ -1001,7 +1001,7 @@
 /turf/open/floor/plating,
 /area/outpost/maintenance/central)
 "gS" = (
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /turf/open/floor/plating,
 /area/outpost/maintenance/fore)
 "gT" = (
@@ -3791,7 +3791,7 @@
 /turf/open/floor/plasteel,
 /area/outpost/hallway/port)
 "xu" = (
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/outpost/maintenance/fore)
@@ -4984,7 +4984,7 @@
 /turf/open/floor/plating,
 /area/outpost/maintenance/fore)
 "ER" = (
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /turf/open/floor/plating,
 /area/outpost/maintenance/central)
 "EV" = (
@@ -5189,7 +5189,7 @@
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/outpost/vacant_rooms/office)
 "Gj" = (
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
@@ -7400,7 +7400,7 @@
 /turf/open/floor/plating,
 /area/outpost/maintenance/fore)
 "Ta" = (
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /obj/effect/decal/cleanable/oil,
 /obj/effect/turf_decal/steeldecal/steel_decals9,
 /turf/open/floor/plating,

diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm
@@ -2337,7 +2337,7 @@
 /area/outpost/vacant_rooms)
 "iW" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /obj/structure/sign/poster/contraband/random{
 	pixel_x = 32;
 	pixel_y = -32
@@ -5481,7 +5481,7 @@
 /turf/open/floor/plasteel/dark,
 /area/outpost/operations)
 "tD" = (
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating{
 	icon_state = "panelscorched"
@@ -10560,7 +10560,7 @@
 /area/outpost/hallway/starboard)
 "KW" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /turf/open/floor/plating,
 /area/outpost/maintenance/aft)
 "KX" = (
@@ -11767,7 +11767,7 @@
 "Pb" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /obj/item/stack/sheet/mineral/wood{
 	pixel_x = -6
 	},
@@ -14038,7 +14038,7 @@
 /obj/structure/railing{
 	layer = 3.1
 	},
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /obj/item/trash/can{
 	pixel_x = -8;
 	pixel_y = -6

diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm
@@ -2736,11 +2736,11 @@
 /obj/effect/turf_decal/corner/opaque/yellow/half,
 /obj/structure/closet/crate/large,
 /obj/effect/turf_decal/industrial/warning,
-/obj/effect/spawner/random/plushie,
-/obj/effect/spawner/random/plushie,
-/obj/effect/spawner/random/plushie,
-/obj/effect/spawner/random/plushie,
-/obj/effect/spawner/random/plushie,
+/obj/effect/spawner/random/entertainment/plushie,
+/obj/effect/spawner/random/entertainment/plushie,
+/obj/effect/spawner/random/entertainment/plushie,
+/obj/effect/spawner/random/entertainment/plushie,
+/obj/effect/spawner/random/entertainment/plushie,
 /obj/structure/cable/cyan{
 	icon_state = "1-2"
 	},

diff --git a/_maps/shuttles/independent/independent_junker.dmm b/_maps/shuttles/independent/independent_junker.dmm
@@ -1610,7 +1610,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 6
 	},
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "Df" = (
@@ -2730,7 +2730,7 @@
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /obj/machinery/door/firedoor,
 /turf/open/floor/plating,
 /area/ship/maintenance/port)

diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm
@@ -1640,7 +1640,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /turf/open/floor/plating/airless,
 /area/ship/maintenance/starboard)
 "kD" = (
@@ -2132,7 +2132,7 @@
 /area/ship/storage)
 "nF" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /turf/open/floor/plating/airless,
 /area/ship/storage/port)
 "nH" = (
@@ -2638,7 +2638,7 @@
 "qp" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/cobweb,
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /turf/open/floor/plating/airless,
 /area/ship/maintenance/port)
 "qr" = (
@@ -2881,7 +2881,7 @@
 /area/ship/security)
 "rN" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /turf/open/floor/plating/airless,
 /area/ship/maintenance/starboard)
 "rP" = (
@@ -3030,7 +3030,7 @@
 /area/ship/maintenance/port)
 "sD" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
@@ -4083,7 +4083,7 @@
 /area/ship/maintenance/port)
 "zg" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /turf/open/floor/plating/airless,
 /area/ship/maintenance/port)
 "zh" = (
@@ -4239,7 +4239,7 @@
 "Aa" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /turf/open/floor/plating/airless,
 /area/ship/storage/port)
 "Ag" = (
@@ -4501,7 +4501,7 @@
 /area/ship/crew/canteen)
 "BN" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /turf/open/floor/plating/airless,
 /area/ship/storage/starboard)
 "BP" = (
@@ -5214,7 +5214,7 @@
 	icon_state = "1-8"
 	},
 /obj/effect/decal/cleanable/blood/old,
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /turf/open/floor/plating/airless,
 /area/ship/maintenance/starboard)
 "GR" = (
@@ -5288,7 +5288,7 @@
 "Ho" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /turf/open/floor/plating/airless,
 /area/ship/storage/starboard)
 "Hp" = (
@@ -6303,7 +6303,7 @@
 "OP" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /turf/open/floor/plating/airless,
 /area/ship/maintenance/port)
 "Pf" = (
@@ -6646,7 +6646,7 @@
 /area/ship/hallway/central)
 "Ri" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /turf/open/floor/plating/airless,
 /area/ship/maintenance/port)
 "Rp" = (
@@ -7157,7 +7157,7 @@
 /area/ship/storage/starboard)
 "Uy" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /turf/open/floor/plating/airless,
 /area/ship/storage/port)
 "UD" = (
@@ -7694,7 +7694,7 @@
 /area/ship/maintenance/starboard)
 "YZ" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/spawner/random/trash/decal/grille_or_waste,
+/obj/effect/spawner/random/trash/grille_or_waste,
 /turf/open/floor/plating/airless,
 /area/ship/maintenance/starboard)
 "Zb" = (