From 1b3cf4c1dcdb7d2ace48939ca2c3acfeb7d66163 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 2 Dec 2023 00:00:07 +0100 Subject: [PATCH] [MIRROR] fix parrots sometimes not appearing dead [MDB IGNORE] (#25373) * fix parrots sometimes not appearing dead (#80055) ## About The Pull Request sometimes parrots will not appear dead ## Why It's Good For The Game parrots will now appear dead ## Changelog :cl: fix: fix parrots not appearing dead sometimes /:cl: * fix parrots sometimes not appearing dead --------- Co-authored-by: Ben10Omintrix <138636438+Ben10Omintrix@users.noreply.github.com> --- code/modules/mob/living/basic/pets/parrot/_parrot.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/basic/pets/parrot/_parrot.dm b/code/modules/mob/living/basic/pets/parrot/_parrot.dm index 42aa0884816..6dd5a9a4051 100644 --- a/code/modules/mob/living/basic/pets/parrot/_parrot.dm +++ b/code/modules/mob/living/basic/pets/parrot/_parrot.dm @@ -185,10 +185,9 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list( /mob/living/basic/parrot/update_icon_state() . = ..() - if(HAS_TRAIT(src, TRAIT_PARROT_PERCHED)) - icon_state = icon_sit - else - icon_state = icon_living + if(stat == DEAD) + return + icon_state = HAS_TRAIT(src, TRAIT_PARROT_PERCHED) ? icon_sit : icon_living /// Proc that we just use to see if we're rightclicking something for perch behavior or dropping the item we currently ahve /mob/living/basic/parrot/proc/on_click(mob/living/basic/source, atom/target, params)