From 6dbb9082c4573a0295e8eabeaa2a5d7e2c2e8db4 Mon Sep 17 00:00:00 2001
From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com>
Date: Fri, 5 Apr 2024 16:25:49 +0300
Subject: [PATCH] [MIRROR] `heal_and_revive` restarts hearts (#2736)

* `heal_and_revive` restarts hearts (#82418)

## About The Pull Request

The intent of this proc is to make sure the guy can survive after being
revived and having your heart stopped kinda works against that

## Changelog

:cl: Melbert
fix: Heretic sac restarts your heart
/:cl:

* `heal_and_revive` restarts hearts

---------

Co-authored-by: NovaBot <154629622+NovaBot13@users.noreply.github.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
---
 code/modules/mob/living/carbon/carbon.dm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 13c3912bca2..53d867cd148 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -895,7 +895,11 @@
 	if(!HAS_TRAIT(src, TRAIT_LIVERLESS_METABOLISM) && !isnull(dna?.species.mutantliver) && !get_organ_slot(ORGAN_SLOT_LIVER))
 		return FALSE
 
-	return ..()
+	. = ..()
+	if(.) // if revived successfully
+		set_heartattack(FALSE)
+
+	return .
 
 /mob/living/carbon/fully_heal(heal_flags = HEAL_ALL)