From d222bcb17746735de9f93d5b106252de69a9b800 Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Fri, 19 Apr 2024 10:18:10 +0300 Subject: [PATCH] [MIRROR] immortal heart attack fix (#2069) (#2953) * immortal heart attack fix (#82738) ## About The Pull Request cybernetic hearts no longer permanently break when you die, as they would try to restart after you get revived but then the proc to stop the heart attack would get early returned because the heart is immune to heart attacks ## Why It's Good For The Game having to explode to revive because of surplus heart seems like a bug ## Changelog :cl: fix: being revived with a cyber-heart now properly restarts the cyber heart /:cl: --------- * immortal heart attack fix --------- Co-authored-by: NovaBot <154629622+NovaBot13@users.noreply.github.com> Co-authored-by: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> --- code/modules/mob/living/carbon/life.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index d80a91d0af8..9efa25f6d22 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -823,7 +823,7 @@ * Returns TRUE if heart status was changed (heart attack -> no heart attack, or visa versa) */ /mob/living/carbon/proc/set_heartattack(status) - if(!can_heartattack()) + if(status && !can_heartattack()) return FALSE var/obj/item/organ/internal/heart/heart = get_organ_slot(ORGAN_SLOT_HEART)