From 8e53457041f173adf61ea3e2478eddc6e2b68e79 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Sat, 27 Apr 2024 02:47:58 +0200
Subject: [PATCH] [MIRROR] immortal heart attack fix (#27382)

* 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:

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@ users.noreply.github.com>

* immortal heart attack fix

---------

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 ebf86019242..6f6e2fa63ac 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)