From 778bf1777b758589043a0736e7b7b37afdfb7087 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Mon, 28 Feb 2022 22:01:57 +0000 Subject: [PATCH] fixes coiling issue (#15530) * why * new signals for resting and stop pulling these are to be used as signals that will cancel the coiling * Create coiling.dm * Update coiling.dm * adds sprite accessory for coiled naga * main changes that apply the actual visuals to the coiling mechanics * adds message to coiling, fixes offset, adds action icon * coil offset was using old direction * reordering * fixes coil sprite not disappearing * fixes offsets, solves loadout issue * follows lin's suggestion and adds support for slimes by making it entirely handled in handle mutant * fix * Update preferences.dm * no slimes you're not allowed the hidden sprite --- code/modules/client/preferences.dm | 2 ++ .../dead/new_player/sprite_accessories/_sprite_accessories.dm | 2 +- .../mob/living/carbon/human/innate_abilities/customization.dm | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 3cec5c3e50..3f31540fe2 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -2136,6 +2136,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/datum/sprite_accessory/S = instance if(!show_mismatched_markings && S.recommended_species && !S.recommended_species.Find(pref_species.id)) continue + if(S.ignore) + continue if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey))) snowflake_taur_list[S.name] = path var/new_taur diff --git a/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm index f5e1c2e113..08ae75d728 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm @@ -29,7 +29,7 @@ if(path == prototype && skip_prototype) continue var/datum/sprite_accessory/P = path - if((roundstart && initial(P.locked)) || initial(P.ignore)) + if((roundstart && initial(P.locked))) continue var/datum/sprite_accessory/D = new path() diff --git a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm index 363f6ecbb2..463cdfde1e 100644 --- a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm +++ b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm @@ -135,6 +135,8 @@ var/datum/sprite_accessory/taur/instance = GLOB.taur_list[path] if(istype(instance, /datum/sprite_accessory)) var/datum/sprite_accessory/S = instance + if(S.ignore) + continue if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(H.client.ckey))) snowflake_taur_list[S.name] = path var/new_taur