Skip to content

Commit

Permalink
[MIRROR] immortal heart attack fix (#2069)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>

* immortal heart attack fix

---------

Co-authored-by: TheRyeGuyWhoWillNowDie <[email protected]>
Co-authored-by: MrMelbert <[email protected]>
  • Loading branch information
3 people authored and StealsThePRs committed Apr 19, 2024
1 parent cd8ed59 commit 383346e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/life.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 383346e

Please sign in to comment.