Skip to content

Commit

Permalink
[MIRROR] heal_and_revive restarts hearts (#2736)
Browse files Browse the repository at this point in the history
* `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 <[email protected]>
Co-authored-by: MrMelbert <[email protected]>
  • Loading branch information
3 people authored Apr 5, 2024
1 parent 6f3ba30 commit 6dbb908
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion code/modules/mob/living/carbon/carbon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 6dbb908

Please sign in to comment.