From 5ceceeb1734769e673d3fb5e47b98e566481de6a Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Wed, 2 Feb 2022 10:14:50 +0100
Subject: [PATCH] [MIRROR] Improve trash spawner [MDB IGNORE] (#11226)

* Improve trash spawner (#64538)

* Improve trash spawner

* Fix wrong path for broken bulb

* Add nicotine candy trash and ash to cigbutt spawner

* Improve trash spawner

Co-authored-by: Tim <timothymtorres@gmail.com>
---
 .../objects/effects/spawners/random/trash.dm  | 42 ++++++++++++-------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/code/game/objects/effects/spawners/random/trash.dm b/code/game/objects/effects/spawners/random/trash.dm
index 4ed87631207..99838e313e8 100644
--- a/code/game/objects/effects/spawners/random/trash.dm
+++ b/code/game/objects/effects/spawners/random/trash.dm
@@ -6,25 +6,34 @@
 /obj/effect/spawner/random/trash/garbage
 	name = "garbage spawner"
 	loot = list(
-		/obj/effect/spawner/random/trash/food_packaging = 56,
-		/obj/item/trash/can = 8,
-		/obj/item/shard = 8,
-		/obj/effect/spawner/random/trash/botanical_waste = 8,
-		/obj/effect/spawner/random/trash/cigbutt = 8,
-		/obj/item/reagent_containers/syringe = 5,
-		/obj/item/light/tube/broken = 3,
-		/obj/item/food/deadmouse = 2,
-		/obj/item/light/tube/broken = 1,
+		/obj/effect/spawner/random/trash/food_packaging = 20,
+		/obj/item/trash/can = 15,
+		/obj/item/shard = 10,
+		/obj/effect/spawner/random/trash/cigbutt = 10,
+		/obj/effect/spawner/random/trash/botanical_waste = 5,
+		/obj/item/reagent_containers/glass = 5,
+		/obj/item/broken_bottle = 5,
+		/obj/item/reagent_containers/glass/bowl = 5,
+		/obj/item/light/tube/broken = 5,
+		/obj/item/light/bulb/broken = 5,
+		/obj/item/assembly/mousetrap/armed = 5,
+		/obj/item/stack/cable_coil = 5,
+		/obj/item/food/deadmouse = 1,
 		/obj/item/trash/candle = 1,
+		/obj/item/popsicle_stick = 1,
+		/obj/item/reagent_containers/syringe = 1,
+		/obj/item/reagent_containers/food/drinks/sillycup = 1,
 	)
 
 /obj/effect/spawner/random/trash/cigbutt
 	name = "cigarette butt spawner"
 	loot = list(
-		/obj/item/cigbutt = 50,
-		/obj/item/cigbutt/roach = 30,
-		/obj/item/food/candy_trash = 10,
-		/obj/item/cigbutt/cigarbutt = 10,
+		/obj/item/cigbutt = 25,
+		/obj/item/cigbutt/roach = 25,
+		/obj/effect/decal/cleanable/ash = 25,
+		/obj/item/cigbutt/cigarbutt = 15,
+		/obj/item/food/candy_trash = 5,
+		/obj/item/food/candy_trash/nicotine = 5,
 	)
 
 /obj/effect/spawner/random/trash/food_packaging
@@ -42,12 +51,17 @@
 		/obj/item/trash/boritos/purple = 1,
 		/obj/item/trash/boritos/red = 1,
 		/obj/item/trash/can/food/beans = 1,
+		/obj/item/trash/can/food/peaches = 1,
+		/obj/item/trash/can/food/envirochow = 1,
 		/obj/item/trash/popcorn = 1,
 		/obj/item/trash/energybar = 1,
 		/obj/item/trash/can/food/peaches/maint = 1,
 		/obj/item/trash/semki = 1,
 		/obj/item/trash/cnds = 1,
 		/obj/item/trash/syndi_cakes = 1,
+		/obj/item/trash/shrimp_chips = 1,
+		/obj/item/trash/waffles = 1,
+		/obj/item/trash/tray = 1,
 	)
 
 /obj/effect/spawner/random/trash/botanical_waste
@@ -184,7 +198,7 @@
 	)
 
 
-/obj/effect/spawner/random/structure/bucket
+/obj/effect/spawner/random/trash/bucket
 	name = "bucket spawner"
 	icon_state = "caution"
 	loot = list(