Skip to content

Commit

Permalink
[MIRROR] fix parrots sometimes not appearing dead [MDB IGNORE] (#25373)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
2 people authored and FFMirrorBot committed Dec 1, 2023
1 parent adc7832 commit 1b3cf4c
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions code/modules/mob/living/basic/pets/parrot/_parrot.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 1b3cf4c

Please sign in to comment.