From 889132b87869ea92ec92e822fd9df486012c3db2 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 20 Nov 2013 18:32:00 +1030 Subject: [PATCH 1/3] Increased REQUIRE_LIGHT min level to 5, removed burn damage from healing from RAD_ABSORB. --- code/modules/mob/living/carbon/human/life.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index a3ec4cbecdd..dad8c2af584 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -262,7 +262,7 @@ var/rads = radiation/25 radiation -= rads nutrition += rads - heal_overall_damage(rads,rads) + adjustBruteLoss(-(rads)) adjustOxyLoss(-(rads)) adjustToxLoss(-(rads)) updatehealth() @@ -923,8 +923,8 @@ if(nutrition > 500) nutrition = 500 - if(light_amount > 2) //if there's enough light, heal - heal_overall_damage(1,1) + if(light_amount > 5) //if there's enough light, heal + adjustBruteLoss(-1) adjustToxLoss(-1) adjustOxyLoss(-1) if(dna && dna.mutantrace == "shadow") From 063394c7bf84253ba770c987e8dfffdae4922429 Mon Sep 17 00:00:00 2001 From: alex-gh Date: Sat, 14 Dec 2013 23:08:31 +0100 Subject: [PATCH 2/3] Re-Added burn damage healing to RAD_ABSORB --- code/modules/mob/living/carbon/human/life.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index dad8c2af584..72fdff90290 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -262,7 +262,7 @@ var/rads = radiation/25 radiation -= rads nutrition += rads - adjustBruteLoss(-(rads)) + heal_overall_damage(rads,rads) adjustOxyLoss(-(rads)) adjustToxLoss(-(rads)) updatehealth() From d03717d49c9115e9bfd314eecf408f66da7516c6 Mon Sep 17 00:00:00 2001 From: volas Date: Sat, 30 Nov 2013 15:45:53 +0400 Subject: [PATCH 3/3] brainmob fix: decapitated head is now really dead --- code/modules/organs/organ_external.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index a87fa3b160a..d610f3bb833 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -891,8 +891,8 @@ obj/item/weapon/organ/head/New(loc, mob/living/carbon/human/H) H.regenerate_icons() - H.stat = 2 - H.death() + brainmob.stat = 2 + brainmob.death() obj/item/weapon/organ/head/proc/transfer_identity(var/mob/living/carbon/human/H)//Same deal as the regular brain proc. Used for human-->head brainmob = new(src)