From 6fbff77163684ce1257173d56e12b45b0b295811 Mon Sep 17 00:00:00 2001 From: cib Date: Wed, 21 Nov 2012 22:41:35 +0100 Subject: [PATCH] Re-nerf lung capacity due to problems with internals. --- code/datums/organs/organ_external.dm | 6 +++++- code/modules/mob/living/carbon/human/life.dm | 5 ++++- code/setup.dm | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/code/datums/organs/organ_external.dm b/code/datums/organs/organ_external.dm index 9806f1d0ac..c4fdf573ca 100644 --- a/code/datums/organs/organ_external.dm +++ b/code/datums/organs/organ_external.dm @@ -189,6 +189,8 @@ // internal wounds get worse over time W.open_wound(0.1 * wound_update_accuracy) owner.vessel.remove_reagent("blood",0.07 * W.damage * wound_update_accuracy) + if(prob(1 * wound_update_accuracy)) + owner.custom_pain("You feel a stabbing pain in your [display_name]!",1) if(W.bandaged || W.salved) // slow healing @@ -489,7 +491,9 @@ W = new wound_type(damage) // Possibly trigger an internal wound, too. - if(damage > 10 && prob(damage) && type != BURN) + var/local_damage = brute_dam + burn_dam + damage + var/min_bleeding_damage = min(max_damage / 3, 20) + if(damage > 10 && type != BURN && local_damage >= min_bleeding_damage && prob(damage)) var/datum/wound/internal_bleeding/I = new (15) wounds += I diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index b6a31f764e..161e21d478 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -187,7 +187,10 @@ var/word = pick("dizzy","woosey","faint") src << "\red You feel extremely [word]" if(0 to 122) - toxloss += 200 + // There currently is a strange bug here. If the mob is not below -100 health + // when death() is called, apparently they will be just fine, and this way it'll + // spam deathgasp. Adjusting toxloss ensures the mob will stay dead. + toxloss += 300 // just to be safe! death() diff --git a/code/setup.dm b/code/setup.dm index f7935d741d..39a9b4b06f 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -19,7 +19,7 @@ #define MOLES_PLASMA_VISIBLE 0.7 //Moles in a standard cell after which plasma is visible #define MIN_PLASMA_DAMAGE 20 -#define BREATH_VOLUME 5 //liters in a normal breath +#define BREATH_VOLUME 0.5 //liters in a normal breath #define BREATH_MOLES (ONE_ATMOSPHERE * BREATH_VOLUME /(T20C*R_IDEAL_GAS_EQUATION)) #define BREATH_PERCENTAGE BREATH_MOLES/MOLES_CELLSTANDARD //Amount of air to take a from a tile