From 8ec33904dcda98138e20f55711f2b1690f5ab224 Mon Sep 17 00:00:00 2001
From: Chinsky <krauchinsky@gmail.com>
Date: Fri, 15 Mar 2013 02:20:49 +0400
Subject: [PATCH] Moved ruptured lung effects into lung processing

---
 code/modules/mob/living/carbon/human/life.dm | 12 +++---------
 code/modules/organs/organ_internal.dm        |  9 +++++++++
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 64013983331..7ce5d2a454e 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -256,20 +256,14 @@
 		if(reagents.has_reagent("lexorin")) return
 		if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) return
 
-		var/lung_ruptured = is_lung_ruptured()
-
-		if(lung_ruptured && prob(2))
-			spawn emote("me", 1, "coughs up blood!")
-			src.drip(10)
+		var/datum/organ/internal/lungs/L = internal_organs["lungs"]
+		L.process()
 
 		var/datum/gas_mixture/environment = loc.return_air()
 		var/datum/gas_mixture/breath
 		// HACK NEED CHANGING LATER
 		if(health < 0)
 			losebreath++
-		if(lung_ruptured && prob(4))
-			spawn emote("me", 1, "gasps for air!")
-			losebreath += 5
 		if(losebreath>0) //Suffocating so do not take a breath
 			losebreath--
 			if (prob(10)) //Gasp per 10 ticks? Sounds about right.
@@ -299,7 +293,7 @@
 					breath = loc.remove_air(breath_moles)
 
 
-					if(!lung_ruptured)
+					if(!is_lung_ruptured())
 						if(!breath || breath.total_moles < BREATH_MOLES / 5 || breath.total_moles > BREATH_MOLES * 5)
 							if(prob(5))
 								rupture_lung()
diff --git a/code/modules/organs/organ_internal.dm b/code/modules/organs/organ_internal.dm
index b7245a9b7fd..431804dd98e 100644
--- a/code/modules/organs/organ_internal.dm
+++ b/code/modules/organs/organ_internal.dm
@@ -46,6 +46,15 @@
 	name = "lungs"
 	parent_organ = "chest"
 
+	process()
+		if(is_bruised())
+			if(prob(2))
+				spawn owner.emote("me", 1, "coughs up blood!")
+				owner.drip(10)
+			if(prob(4))
+				spawn owner.emote("me", 1, "gasps for air!")
+				owner.losebreath += 5
+
 /datum/organ/internal/liver
 	name = "liver"
 	parent_organ = "chest"