From 10795c9c7ae1c31cfa95a2900305c6930c86e5f6 Mon Sep 17 00:00:00 2001 From: Certhic Date: Thu, 25 Oct 2018 00:10:10 +0200 Subject: [PATCH 1/2] fixes a rejuvenate runtime --- code/modules/mob/living/status_procs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm index 8fdeec94679..e9253f78d59 100644 --- a/code/modules/mob/living/status_procs.dm +++ b/code/modules/mob/living/status_procs.dm @@ -572,7 +572,7 @@ CureIfHasDisability(TWITCHBLOCK) /mob/living/proc/CureIfHasDisability(block) - if(dna.GetSEState(block)) + if(dna && dna.GetSEState(block)) dna.SetSEState(block, 0, 1) //Fix the gene genemutcheck(src, block,null, MUTCHK_FORCED) dna.UpdateSE() From 27b0b7939fd3b1afe102eb0405a05816b3f9c7a6 Mon Sep 17 00:00:00 2001 From: Certhic Date: Thu, 25 Oct 2018 00:36:42 +0200 Subject: [PATCH 2/2] fixes borg healing --- code/modules/mob/living/silicon/robot/robot_damage.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/mob/living/silicon/robot/robot_damage.dm b/code/modules/mob/living/silicon/robot/robot_damage.dm index ef7734c1e0d..e2a93fa0167 100644 --- a/code/modules/mob/living/silicon/robot/robot_damage.dm +++ b/code/modules/mob/living/silicon/robot/robot_damage.dm @@ -117,6 +117,9 @@ parts -= picked + if(updating_health) + updatehealth("heal overall damage") + /mob/living/silicon/robot/take_overall_damage(brute = 0, burn = 0, updating_health = TRUE, used_weapon = null, sharp = 0) if(status_flags & GODMODE) return //godmode var/list/datum/robot_component/parts = get_damageable_components()