From 726d04d8a12fd4239d83012625f59f95f77dd1f2 Mon Sep 17 00:00:00 2001 From: PrismaticGynoid Date: Tue, 20 Feb 2018 20:13:44 -0800 Subject: [PATCH] Succumb changes Succumb now works on sufficiently-injured mobs that are unable to take oxyloss damage, like prometheans, FBPs, and dionaea. You're also now given a notification if you try to succumb when you're not injured enough for it. --- code/modules/mob/living/living.dm | 6 +++--- html/changelogs/PrismaticGynoid-acceptyourfate.yml | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/PrismaticGynoid-acceptyourfate.yml diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 6c35871ab95..228fa7853de 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -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, "You have given up life and succumbed to death.") - + else + to_chat(src, "You are not injured enough to succumb to death!") /mob/living/proc/updatehealth() if(status_flags & GODMODE) diff --git a/html/changelogs/PrismaticGynoid-acceptyourfate.yml b/html/changelogs/PrismaticGynoid-acceptyourfate.yml new file mode 100644 index 00000000000..e6ca8cb139b --- /dev/null +++ b/html/changelogs/PrismaticGynoid-acceptyourfate.yml @@ -0,0 +1,4 @@ +author: PrismaticGynoid +delete-after: True +changes: + - bugfix: "The succumb verb will now work on species that can't take oxyloss damage."