From 330ce5d0881afc2b2edde3b7e11e92814a7adad0 Mon Sep 17 00:00:00 2001 From: Hubblenaut Date: Thu, 14 Aug 2014 01:55:30 +0200 Subject: [PATCH] Fixes rejuvenation ignoring infections --- code/modules/mob/living/living.dm | 1 + code/modules/organs/organ_external.dm | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 4cfad2504a5..e3de2419807 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -309,6 +309,7 @@ dead_mob_list -= src living_mob_list += src tod = null + timeofdeath = 0 // restore us to conciousness stat = CONSCIOUS diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index d1bf4f170de..083089b3aaa 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -155,14 +155,14 @@ // sync the organ's damage with its wounds src.update_damages() - + //If limb took enough damage, try to cut or tear it off if(body_part != UPPER_TORSO && body_part != LOWER_TORSO) //as hilarious as it is, getting hit on the chest too much shouldn't effectively gib you. if(config.limbs_can_break && brute_dam >= max_damage * config.organ_health_multiplier) if( (edge && prob(5 * brute)) || (brute > 20 && prob(2 * brute)) ) droplimb(1) return - + owner.updatehealth() var/result = update_icon() @@ -206,6 +206,9 @@ This function completely restores a damaged organ to perfect condition. perma_injury = 0 brute_dam = 0 burn_dam = 0 + germ_level = 0 + wounds.Cut() + number_wounds = 0 // handle internal organs for(var/datum/organ/internal/current_organ in internal_organs)