cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conflict Resolution

Browse Source
This commit is contained in:
Unknown
2020-07-24 09:07:41 -04:00
parent a940d19a13
commit 5d7afad7c3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_helpers/global_lists_vr.dm
View File

@@ -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,

2
code/modules/vore/eating/living_vr.dm
View File

@@ -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