From 54bec876d986728657cf6de38db668b7fddcb6d5 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Tue, 23 Apr 2019 20:41:15 -0400 Subject: [PATCH 1/3] Indigestible Collar Adds indigestible collar to loadout, same look as holo-collar. Primarily for those who want to RP out something surviving them no matter what. :> --- code/modules/clothing/under/accessories/accessory_vr.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm index 4c30c2cef8..2adf9557a4 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/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) From f15a6dfa1357a4d34176104afa9bd7ceef54b428 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Tue, 23 Apr 2019 20:42:22 -0400 Subject: [PATCH 2/3] Indigestible Collar Add selectable collar to loadout. --- .../preference_setup/loadout/loadout_accessories_vr.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm index 86ea0381d0..23746cc104 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/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) \ No newline at end of file + gear_tweaks = list(gear_tweak_free_color_choice) From dbf7994fb9ba4887f82be0469451bd4fa637927d Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Tue, 23 Apr 2019 20:43:45 -0400 Subject: [PATCH 3/3] New Listing: Indigestible Collar --- code/modules/vore/eating/digest_act_vr.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/vore/eating/digest_act_vr.dm b/code/modules/vore/eating/digest_act_vr.dm index 20843b0b3d..aa77f113f1 100644 --- a/code/modules/vore/eating/digest_act_vr.dm +++ b/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 /////////////