From 5d7afad7c327e19088c9af0ef78a9745eeed8994 Mon Sep 17 00:00:00 2001
From: Unknown <RedKerensky@Gmail.com>
Date: Fri, 24 Jul 2020 09:07:41 -0400
Subject: [PATCH] Conflict Resolution

---
 code/_helpers/global_lists_vr.dm      | 2 +-
 code/modules/vore/eating/living_vr.dm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm
index 498f497a7c..b2dfae0544 100644
--- a/code/_helpers/global_lists_vr.dm
+++ b/code/_helpers/global_lists_vr.dm
@@ -154,7 +154,7 @@ var/global/list/edible_trash = list(/obj/item/broken_device,
 				/obj/item/weapon/bone,
 				/obj/item/weapon/broken_bottle,
 				/obj/item/weapon/card/emag_broken,
-				/obj/item/weapon/cigbutt,
+				/obj/item/trash/cigbutt,
 				/obj/item/weapon/circuitboard/broken,
 				/obj/item/weapon/clipboard,
 				/obj/item/weapon/corncob,
diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm
index cf11871d1a..82030314a0 100644
--- a/code/modules/vore/eating/living_vr.dm
+++ b/code/modules/vore/eating/living_vr.dm
@@ -640,7 +640,7 @@
 			to_chat(src, "<span class='notice'>You can taste the flavor of spicy cardboard.</span>")
 		else if(istype(I,/obj/item/device/flashlight/glowstick))
 			to_chat(src, "<span class='notice'>You found out the glowy juice only tastes like regret.</span>")
-		else if(istype(I,/obj/item/weapon/cigbutt))
+		else if(istype(I,/obj/item/trash/cigbutt))
 			to_chat(src, "<span class='notice'>You can taste the flavor of bitter ash. Classy.</span>")
 		else if(istype(I,/obj/item/clothing/mask/smokable))
 			var/obj/item/clothing/mask/smokable/C = I