From a16f05b5e6ca143962734a8a5610c4ba459bcd7e Mon Sep 17 00:00:00 2001 From: Alberyk Date: Sat, 7 Oct 2017 02:43:29 -0300 Subject: [PATCH] Fixes species that cannot take oxygen damage being unable to succumb (#3546) --- code/modules/mob/living/living.dm | 3 +-- html/changelogs/alberyk-PR-3546.yml | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/alberyk-PR-3546.yml diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 303cde4b05e..9b11de6bdeb 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -165,8 +165,7 @@ default behaviour is: /mob/living/verb/succumb() set hidden = 1 if ((src.health < 0 && src.health > -95.0)) - src.adjustOxyLoss(src.health + 200) - src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.getFireLoss() - src.getBruteLoss() + src.death() src << "You have given up life and succumbed to death." else src << "You are not injured enough to succumb to death!" diff --git a/html/changelogs/alberyk-PR-3546.yml b/html/changelogs/alberyk-PR-3546.yml new file mode 100644 index 00000000000..1ecc9578552 --- /dev/null +++ b/html/changelogs/alberyk-PR-3546.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - tweak: "IPCs, dionae and other races that could not suffer oxygen damage, should be able to succumb now."