From e6af3afd428555fc0c6ebae246c0491fa341f173 Mon Sep 17 00:00:00 2001 From: cib Date: Wed, 21 Nov 2012 20:33:24 +0100 Subject: [PATCH 1/3] Fix to breathing inside objects. --- 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 c4a5ab3fa3..0f0f739b04 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -528,7 +528,7 @@ if(!breath) if(isobj(loc)) var/obj/location_as_object = loc - breath = location_as_object.handle_internal_lifeform(src, BREATH_VOLUME) + breath = location_as_object.handle_internal_lifeform(src, BREATH_MOLES) else if(isturf(loc)) var/breath_moles = 0 /*if(environment.return_pressure() > ONE_ATMOSPHERE) From a6c1b5356cda2c0103eaa0bbb5538158abe1a23f Mon Sep 17 00:00:00 2001 From: cib Date: Wed, 21 Nov 2012 20:41:50 +0100 Subject: [PATCH 2/3] Lungs now can only be damaged when breathing from a turf. --- code/modules/mob/living/carbon/human/life.dm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 0f0f739b04..e52f2d133e 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -539,6 +539,13 @@ breath_moles = environment.total_moles()*BREATH_PERCENTAGE breath = loc.remove_air(breath_moles) + + + if(!lung_ruptured) + if(!breath || breath.total_moles < BREATH_MOLES / 5 || breath.total_moles > BREATH_MOLES * 5) + if(prob(5)) + rupture_lung() + // Handle chem smoke effect -- Doohl var/block = 0 if(wear_mask) @@ -566,12 +573,6 @@ var/obj/location_as_object = loc location_as_object.handle_internal_lifeform(src, 0) - - if(!lung_ruptured && breath) - if(breath.total_moles < BREATH_MOLES / 5 || breath.total_moles > BREATH_MOLES * 5) - if(prob(5)) - rupture_lung() - handle_breath(breath) if(breath) From 966f78f1ab13e1b69858d9f9d924d86faadcde66 Mon Sep 17 00:00:00 2001 From: cib Date: Wed, 21 Nov 2012 20:51:57 +0100 Subject: [PATCH 3/3] Fixes #1993 Bleeders now stay dead after being killed by blood loss.. --- code/modules/mob/living/carbon/human/life.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index e52f2d133e..b6a31f764e 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -187,6 +187,7 @@ var/word = pick("dizzy","woosey","faint") src << "\red You feel extremely [word]" if(0 to 122) + toxloss += 200 death()