From 65c40a51f297fe16d10807005e08f1f74426b4c9 Mon Sep 17 00:00:00 2001
From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Wed, 14 Jul 2021 17:17:44 +0100
Subject: [PATCH] trash ELEMENT

---
 code/_globalvars/lists/maintenance_loot.dm |  1 +
 code/datums/elements/trash.dm              | 18 ++++++++++++++++++
 code/game/objects/items/cigs_lighters.dm   |  4 ++++
 code/game/objects/items/trash.dm           | 17 +++--------------
 tgstation.dme                              |  1 +
 5 files changed, 27 insertions(+), 14 deletions(-)
 create mode 100644 code/datums/elements/trash.dm

diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
index b41b7356a8..daa4f5879d 100644
--- a/code/_globalvars/lists/maintenance_loot.dm
+++ b/code/_globalvars/lists/maintenance_loot.dm
@@ -112,6 +112,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	/obj/item/storage/box/marshmallow = 2,
 	/obj/item/clothing/gloves/tackler/offbrand = 1,
 	/obj/item/stack/sticky_tape = 1,
+	/obj/effect/spawner/lootdrop/grille_or_trash = 15,
 	"" = 3
 	))
 
diff --git a/code/datums/elements/trash.dm b/code/datums/elements/trash.dm
new file mode 100644
index 0000000000..e685f2ad22
--- /dev/null
+++ b/code/datums/elements/trash.dm
@@ -0,0 +1,18 @@
+/datum/element/trash
+	element_flags = ELEMENT_BESPOKE|ELEMENT_DETACH
+
+/datum/element/trash/Attach(datum/target)
+	RegisterSignal(target, COMSIG_ITEM_ATTACK, .proc/UseFromHand)
+
+/datum/element/trash/proc/UseFromHand(obj/item/source, mob/living/M, mob/living/user)
+	if((M == user || user.vore_flags & TRASH_FORCEFEED) && ishuman(user))
+		var/mob/living/carbon/human/H = user
+		if(HAS_TRAIT(H, TRAIT_TRASHCAN))
+			playsound(H.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
+			if(H.vore_selected)
+				H.visible_message("<span class='notice'>[H] [H.vore_selected.vore_verb]s the [source] into their [H.vore_selected]</span>",
+					"<span class='notice'>You [H.vore_selected.vore_verb]s the [source] into your [H.vore_selected]</span>")
+				source.forceMove(H.vore_selected)
+			else
+				H.visible_message("<span class='notice'>[H] consumes the [source].")
+				qdel(source)
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index 4280e7105f..16ebe20e51 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -387,6 +387,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	throwforce = 0
 	grind_results = list(/datum/reagent/carbon = 2)
 
+/obj/item/cigbutt/Initialize()
+	. = ..()
+	AddElement(/datum/element/trash)
+
 /obj/item/cigbutt/cigarbutt
 	name = "cigar butt"
 	desc = "A manky old cigar butt."
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index c0ff958612..1dc0378ea1 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -7,6 +7,9 @@
 	w_class = WEIGHT_CLASS_TINY
 	resistance_flags = FLAMMABLE
 
+/obj/item/trash/Initialize()
+	AddElement(/datum/element/trash)
+
 /obj/item/trash/raisins
 	name = "\improper 4no raisins"
 	icon_state= "4no_raisins"
@@ -80,17 +83,3 @@
 	name = "boritos bag"
 	icon_state = "boritos"
 	grind_results = list(/datum/reagent/aluminium = 1) //from the mylar bag
-
-/obj/item/trash/attack(mob/M, mob/living/user)
-	if((M == user || user.vore_flags & TRASH_FORCEFEED) && ishuman(user))
-		var/mob/living/carbon/human/H = user
-		if(HAS_TRAIT(H, TRAIT_TRASHCAN))
-			playsound(H.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
-			if(H.vore_selected)
-				H.visible_message("<span class='notice'>[H] [H.vore_selected.vore_verb]s the [src] into their [H.vore_selected]</span>",
-					"<span class='notice'>You [H.vore_selected.vore_verb]s the [src] into your [H.vore_selected]</span>")
-				forceMove(H.vore_selected)
-			else
-				H.visible_message("<span class='notice'>[H] consumes the [src].")
-				qdel(src)
-
diff --git a/tgstation.dme b/tgstation.dme
index ed85c32cc4..59a4f99b64 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -639,6 +639,7 @@
 #include "code\datums\elements\swimming.dm"
 #include "code\datums\elements\sword_point.dm"
 #include "code\datums\elements\tactical.dm"
+#include "code\datums\elements\trash.dm"
 #include "code\datums\elements\turf_transparency.dm"
 #include "code\datums\elements\update_icon_blocker.dm"
 #include "code\datums\elements\update_icon_updates_onmob.dm"