From 02457fc55b0d37236b5ecf9c21fca9d943e2ab87 Mon Sep 17 00:00:00 2001 From: cib Date: Mon, 6 Aug 2012 14:21:34 -0700 Subject: [PATCH] Fixed up bloodloss a bit more. --- code/modules/mob/living/carbon/human/life.dm | 10 +++++----- code/modules/mob/organ/organ.dm | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 3e9077e5e97..6cfc650cc53 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -986,11 +986,11 @@ B.volume = max(min(10 + blood_volume,560), 0) F.volume -= 1 else - var/blood_regen = 0.1 + var/blood_regen = 0.3 if(B.volume < 400) - blood_regen = 0.2 + blood_regen = 0.6 if(B.volume < 200) - blood_regen = 0.3 + blood_regen = 1 B.volume = max(min(B.volume + blood_regen,560), 0) @@ -1120,9 +1120,9 @@ var/datum/organ/external/temp = organs[name] if(!(temp.status & ORGAN_BLEEDING) || temp.status & ORGAN_ROBOT) continue - blood_max += 2 + blood_max += 0.5 * (temp.brute_dam + temp.burn_dam) / 5 if(temp.status & ORGAN_DESTROYED && !(temp.status & ORGAN_GAUZED)) - blood_max += 10 //Yer missing a fucking limb. + blood_max += 3 //Yer missing a fucking limb. drip(blood_max) if (eye_blind) eye_blind-- diff --git a/code/modules/mob/organ/organ.dm b/code/modules/mob/organ/organ.dm index 138d034718c..8e2580908e2 100644 --- a/code/modules/mob/organ/organ.dm +++ b/code/modules/mob/organ/organ.dm @@ -57,8 +57,6 @@ // whether this wound needs a bandage/salve to heal at all var/needs_treatment = 0 - // is the wound bleeding? - var/tmp/bleeding = 0 // is the wound bandaged? var/tmp/bandaged = 0 // is the wound salved? @@ -398,7 +396,7 @@ else if(W.damage_type == BURN) burn_dam += W.damage - if(W.bleeding && !W.bandaged) + if(!W.bandaged && W.damage > 4) status |= ORGAN_BLEEDING proc/update_wounds()