From d1642ad85a4a11888ec669c504ce9531a25eb598 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Tue, 30 Aug 2016 22:09:59 +0100 Subject: [PATCH 1/3] Fixes changeling revive not working when you're missing a limb --- code/game/gamemodes/changeling/powers/revive.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm index 3953caa5252..f4965be8984 100644 --- a/code/game/gamemodes/changeling/powers/revive.dm +++ b/code/game/gamemodes/changeling/powers/revive.dm @@ -36,8 +36,9 @@ H.update_body(1) for(var/limb in H.organs_by_name) var/obj/item/organ/external/current_limb = H.organs_by_name[limb] - current_limb.undislocate() - current_limb.open = 0 + if(current_limb) + current_limb.undislocate() + current_limb.open = 0 C.halloss = 0 C.shock_stage = 0 //Pain From e8978d30b939862a93cd1ecb05b69b7d2ea5633c Mon Sep 17 00:00:00 2001 From: Yoshax Date: Tue, 30 Aug 2016 22:35:30 +0100 Subject: [PATCH 2/3] Fixes #860 --- code/game/gamemodes/changeling/powers/rapid_regen.dm | 1 + code/game/gamemodes/changeling/powers/revive.dm | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/changeling/powers/rapid_regen.dm b/code/game/gamemodes/changeling/powers/rapid_regen.dm index 1688c81f317..7df99753d4b 100644 --- a/code/game/gamemodes/changeling/powers/rapid_regen.dm +++ b/code/game/gamemodes/changeling/powers/rapid_regen.dm @@ -33,6 +33,7 @@ C.adjustCloneLoss(-healing_amount) C.adjustBrainLoss(-healing_amount) C.restore_blood() + C.species.create_organs(C) C.restore_all_organs() C.blinded = 0 C.eye_blind = 0 diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm index f4965be8984..2f0b9c57e75 100644 --- a/code/game/gamemodes/changeling/powers/revive.dm +++ b/code/game/gamemodes/changeling/powers/revive.dm @@ -27,9 +27,10 @@ C.radiation = 0 C.heal_overall_damage(C.getBruteLoss(), C.getFireLoss()) C.reagents.clear_reagents() - C.restore_all_organs(ignore_prosthetic_prefs=1) //Covers things like fractures and other things not covered by the above. if(ishuman(C)) var/mob/living/carbon/human/H = src + H.species.create_organs(H) + H.restore_all_organs(ignore_prosthetic_prefs=1) //Covers things like fractures and other things not covered by the above. H.restore_blood() H.mutations.Remove(HUSK) H.status_flags -= DISFIGURED From 79f924444c6492b5ee1996d3ef40cb789b85ffd7 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Tue, 30 Aug 2016 22:37:41 +0100 Subject: [PATCH 3/3] Adds changelog --- html/changelogs/Yoshax - Regen.yml | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 html/changelogs/Yoshax - Regen.yml diff --git a/html/changelogs/Yoshax - Regen.yml b/html/changelogs/Yoshax - Regen.yml new file mode 100644 index 00000000000..023b98a3ae3 --- /dev/null +++ b/html/changelogs/Yoshax - Regen.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Yosh + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Changeling regenerative stasis will now properly regrow limbs." + - bugfix: "Changeling regenerative stasis will no longer runtime and refuse to work when you have a missing limb."