cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5454 from TheFurryFeline/TFF-Nomming_Collars

Browse Source 
Edible Collars
This commit is contained in:
Novacat
2019-07-17 17:36:11 -04:00
committed by GitHub
parent b039eacdd7 ca01048bab
commit ea05ba7d02
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/_helpers/global_lists_vr.dm
View File

@@ -121,6 +121,7 @@ var/global/list/tf_vore_egg_types = list(
"Xenomorph" = /obj/structure/closet/secure_closet/egg/xenomorph) "Xenomorph" = /obj/structure/closet/secure_closet/egg/xenomorph)
var/global/list/edible_trash = list(/obj/item/broken_device, var/global/list/edible_trash = list(/obj/item/broken_device,
/obj/item/clothing/accessory/collar, //TFF 10/7/19 - add option to nom collars,
/obj/item/clothing/mask, /obj/item/clothing/mask,
/obj/item/clothing/glasses, /obj/item/clothing/glasses,
/obj/item/clothing/gloves, /obj/item/clothing/gloves,

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

@@ -641,6 +641,10 @@
to_chat(src, "<span class='notice'>You can taste the flavor of garbage and leftovers. Delicious?</span>") to_chat(src, "<span class='notice'>You can taste the flavor of garbage and leftovers. Delicious?</span>")
else else
to_chat(src, "<span class='notice'>You can taste the flavor of gluttonous waste of food.</span>") to_chat(src, "<span class='notice'>You can taste the flavor of gluttonous waste of food.</span>")
//TFF 10/7/19 - Add custom flavour for collars for trash can trait.
else if (istype(I,/obj/item/clothing/accessory/collar))
visible_message("<span class='warning'>[src] demonstrates their voracious capabilities by swallowing [I] whole!</span>")
to_chat(src, "<span class='notice'>You can taste the submissiveness in the wearer of [I]!</span>")
else else
to_chat(src, "<span class='notice'>You can taste the flavor of garbage. Delicious.</span>") to_chat(src, "<span class='notice'>You can taste the flavor of garbage. Delicious.</span>")
return return