Merge pull request #4906 from PrismaticGynoid/acceptyourfate

Succumb changes
This commit is contained in:
Anewbe
2018-03-04 16:03:40 -06:00
committed by GitHub
2 changed files with 7 additions and 3 deletions

View File

@@ -172,10 +172,10 @@ default behaviour is:
/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
src.adjustOxyLoss(src.health + src.getMaxHealth() * 2) // Deal 2x health in OxyLoss damage, as before but variable.
src.health = src.getMaxHealth() - src.getOxyLoss() - src.getToxLoss() - src.getFireLoss() - src.getBruteLoss()
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>")
/mob/living/proc/updatehealth()
if(status_flags & GODMODE)