Merge pull request #648 from TheFurryFeline/TFF-Indigestable_Collar

Indigestible Collar

code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm

@@ -30,6 +30,11 @@
 	display_name = "collar, holo"
 	path = /obj/item/clothing/accessory/collar/holo
 
+//TFF 23/4/19: Indigestible collar addition
+/datum/gear/collar/holo/indigestible
+	display_name = "collar, holo (indigestible)"
+	path = /obj/item/clothing/accessory/collar/holo/indigestible
+
 /datum/gear/accessory/white_drop_pouches
 	allowed_roles = list("Paramedic","Chief Medical Officer","Medical Doctor","Chemist")
 
@@ -53,4 +58,4 @@
 
 /datum/gear/accessory/flops/New()
 	..()
-	gear_tweaks = list(gear_tweak_free_color_choice)
+	gear_tweaks = list(gear_tweak_free_color_choice)

code/modules/clothing/under/accessories/accessory_vr.dm

@@ -165,6 +165,15 @@
 	overlay_state = "collar_holo_overlay"
 	matter = list(DEFAULT_WALL_MATERIAL = 50)
 
+//TFF 23/4/19: Indigestible collar addition
+/obj/item/clothing/accessory/collar/holo/indigestible
+	name = "Holo-collar"
+	desc = "A special variety of the holo-collar that seems to be made of a very durable fabric that fits around the neck."
+	icon_state = "collar_holo"
+	item_state = "collar_holo_overlay"
+	overlay_state = "collar_holo_overlay"
+	matter = list(DEFAULT_WALL_MATERIAL = 50)
+
 // Chompstation edit - Deprecated, implementing a custom method of renaming collars.
 /*
 /obj/item/clothing/accessory/collar/holo/attack_self(mob/user as mob)

code/modules/vore/eating/digest_act_vr.dm

@@ -39,7 +39,9 @@
 	return FALSE //Sorta important to not digest your own beacons.
 /obj/item/weapon/storage/glass_ornament/digest_act(...)
 	return FALSE
-
+//TFF 23/4/19: Indigestible collar addition
+/obj/item/clothing/accessory/collar/holo/indigestible/digest_act(...)
+	return FALSE
 /////////////
 // Some special treatment
 /////////////