From fe2ada2c2cb531d2ecf3ee697039b097e8b2be63 Mon Sep 17 00:00:00 2001 From: KasparoVy Date: Sun, 4 Dec 2016 03:12:32 -0500 Subject: [PATCH 1/2] Fixes a bug with Changeling Regenerative Stasis Changelings who initiated the stasis while they were alive and were 'killed' during the waiting period for regenerative readiness will now regenerate properly. --- code/game/gamemodes/changeling/powers/revive.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm index 2585287528c..f6a7dde1c69 100644 --- a/code/game/gamemodes/changeling/powers/revive.dm +++ b/code/game/gamemodes/changeling/powers/revive.dm @@ -8,7 +8,7 @@ if(user.stat == DEAD) dead_mob_list -= user living_mob_list |= user - user.stat = CONSCIOUS + user.setToxLoss(0) user.setOxyLoss(0) user.setCloneLoss(0) @@ -63,6 +63,9 @@ IO.damage = 0 IO.trace_chemicals = list() H.updatehealth() + + user.stat = CONSCIOUS + to_chat(user, "We have regenerated.") user.regenerate_icons() From 90b7c69a46c5c3252ce66bde82a303c8c62de5de Mon Sep 17 00:00:00 2001 From: KasparoVy Date: Sun, 4 Dec 2016 17:34:48 -0500 Subject: [PATCH 2/2] Changes the direct setting of stat to a more sane one called enacted through a proc. --- code/game/gamemodes/changeling/powers/revive.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm index f6a7dde1c69..8cb58d8dbe0 100644 --- a/code/game/gamemodes/changeling/powers/revive.dm +++ b/code/game/gamemodes/changeling/powers/revive.dm @@ -5,10 +5,6 @@ //Revive from regenerative stasis /obj/effect/proc_holder/changeling/revive/sting_action(var/mob/living/carbon/user) - if(user.stat == DEAD) - dead_mob_list -= user - living_mob_list |= user - user.setToxLoss(0) user.setOxyLoss(0) user.setCloneLoss(0) @@ -64,14 +60,12 @@ IO.trace_chemicals = list() H.updatehealth() - user.stat = CONSCIOUS - to_chat(user, "We have regenerated.") user.regenerate_icons() user.status_flags &= ~(FAKEDEATH) - user.update_canmove() + user.update_revive() //Handle waking up the changeling after the regenerative stasis has completed. user.mind.changeling.purchasedpowers -= src user.med_hud_set_status() user.med_hud_set_health()