From 026bb3e85960d52e61e9107270b39b7a3662105e Mon Sep 17 00:00:00 2001 From: chuga-git <98280110+chuga-git@users.noreply.github.com> Date: Mon, 1 Dec 2025 11:03:16 -0600 Subject: [PATCH] tails stop wagging when putting on a suit that hides them (#31158) --- code/modules/clothing/clothing.dm | 3 --- code/modules/mob/living/carbon/human/human_update_icons.dm | 5 ++++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 10392eb776c..9853cd71cf4 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -851,9 +851,6 @@ /obj/item/clothing/suit/equipped(mob/living/carbon/human/user, slot) //Handle tail-hiding on a by-species basis. ..() if(ishuman(user) && hide_tail_by_species && slot == ITEM_SLOT_OUTER_SUIT) - if(user.tail_wagging) - user.stop_tail_wagging() - return if("modsuit" in hide_tail_by_species) return if(user.dna.species.sprite_sheet_name in hide_tail_by_species) diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index 7d9fe470437..87f5448398c 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -1177,7 +1177,10 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/proc/update_tail_layer() // If the tail is currently wagging, don't stop wagging. if(tail_wagging) - start_tail_wagging() + if(wear_suit?.flags_inv & HIDETAIL) + stop_tail_wagging() + else + start_tail_wagging() return remove_overlay(TAIL_UNDERLIMBS_LAYER) // SEW direction icons, overlayed by LIMBS_LAYER. remove_overlay(TAIL_LAYER) /* This will be one of two things: