cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-28 01:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12859 from Runa-Dacino/teshari_succumb_bugfix

Browse Source 
Fixes species with custom MaxHealth being unable to Succumb to death
This commit is contained in:
Casey
2022-04-30 23:07:50 -04:00
committed by GitHub
parent 8a68e2bd53 6b33681b35
commit 17c0a98087
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()
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()
to_chat(src, "<font color='blue'>You have given up life and succumbed to death.</font>")
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()
if(status_flags & GODMODE)