From 7e82d9064c6c28aec036ebae3666eeac9718b0a8 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Mon, 11 Mar 2013 04:59:24 +0400 Subject: [PATCH] Head blows now can cause brain damage. --- code/datums/organs/organ_internal.dm | 6 ++++- code/modules/mob/living/carbon/human/human.dm | 25 +------------------ .../mob/living/carbon/human/human_damage.dm | 9 +++++++ 3 files changed, 15 insertions(+), 25 deletions(-) diff --git a/code/datums/organs/organ_internal.dm b/code/datums/organs/organ_internal.dm index f670b39420f..38599ec3cbf 100644 --- a/code/datums/organs/organ_internal.dm +++ b/code/datums/organs/organ_internal.dm @@ -113,4 +113,8 @@ /datum/organ/internal/kidney name = "kidney" - parent_organ = "chest" \ No newline at end of file + parent_organ = "chest" + +/datum/organ/internal/brain + name = "brain" + parent_organ = "head" \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 2c0c8051d4e..e070e84b393 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -42,32 +42,9 @@ new/datum/organ/internal/lungs(src) new/datum/organ/internal/liver(src) new/datum/organ/internal/kidney(src) + new/datum/organ/internal/brain(src) - // connect feet to legs and hands to arms -/* var/datum/organ/external/organ = organs_by_name["l_hand"] - organ.parent = organs_by_name["l_arm"] - organ = organs_by_name["r_hand"] - organ.parent = organs_by_name["r_arm"] - organ = organs_by_name["l_foot"] - organ.parent = organs_by_name["l_leg"] - organ = organs_by_name["r_foot"] - organ.parent = organs_by_name["r_leg"] - organ = organs_by_name["r_foot"] - organ.parent = organs_by_name["r_leg"] - organ = organs_by_name["head"] - organ.parent = organs_by_name["chest"] - organ = organs_by_name["groin"] - organ.parent = organs_by_name["chest"] - organ = organs_by_name["r_leg"] - organ.parent = organs_by_name["groin"] - organ = organs_by_name["l_leg"] - organ.parent = organs_by_name["groin"] - organ = organs_by_name["r_arm"] - organ.parent = organs_by_name["chest"] - organ = organs_by_name["l_arm"] - organ.parent = organs_by_name["chest"] - */ for(var/name in organs_by_name) organs += organs_by_name[name] diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index d62a99eff65..c12dc980240 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -15,6 +15,15 @@ ChangeToHusk() return +/mob/living/carbon/human/getBrainLoss() + var/res = brainloss + var/datum/organ/internal/brain/sponge = internal_organs["brain"] + if (sponge.is_bruised()) + res += 20 + if (sponge.is_broken()) + res += 50 + res = min(res,maxHealth*2) + return res //These procs fetch a cumulative total damage from all organs /mob/living/carbon/human/getBruteLoss()