cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4190 from CHOMPStation2/upstream-merge-12859

Browse Source 
[MIRROR] Fixes species with custom MaxHealth being unable to Succumb to death
This commit is contained in:
Nadyr
2022-05-01 18:13:05 -04:00
committed by GitHub
parent 978e9cb5a5 84f80a5c17
commit f365e29ee8
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/mob/living/living.dm
View File

@@ -80,11 +80,15 @@
/mob/living/verb/succumb() /mob/living/verb/succumb()
set hidden = 1 set hidden = 1
if ((src.health < 0 && src.health > (5-src.getMaxHealth()))) // Health below Zero but above 5-away-from-death, as before, but variable // if ((src.health < 0 && src.health > (5-src.getMaxHealth()))) // Health below Zero but above 5-away-from-death, as before, but variable
if (src.health < 0 && stat != DEAD)
src.death() src.death()
to_chat(src, "<font color='blue'>You have given up life and succumbed to death.</font>") to_chat(src, "<font color='blue'>You have given up life and succumbed to death.</font>")
else else
to_chat(src, "<font color='blue'>You are not injured enough to succumb to death!</font>") if(stat == DEAD)
to_chat(src, "<font color='blue'>As much as you'd like, you can't die when already dead</font>")
else
to_chat(src, "<font color='blue'>You are not injured enough to succumb to death!</font>")
/mob/living/proc/updatehealth() /mob/living/proc/updatehealth()
if(status_flags & GODMODE) if(status_flags & GODMODE)