From caefd58dc7e820079843c12dfb1cf178738bd4f5 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Wed, 6 Dec 2017 13:23:36 -0500
Subject: [PATCH] Update life.dm

---
 code/modules/mob/living/carbon/life.dm | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 77bc8fbfc0..deded8b247 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -13,17 +13,11 @@
 		handle_blood()
 
 	if(stat != DEAD)
-<<<<<<< HEAD
-		for(var/V in internal_organs)
-			var/obj/item/organ/O = V
-			O.on_life()
-=======
 		handle_brain_damage()
 
 	if(stat != DEAD)
 		handle_liver()
 
->>>>>>> 550d711... Brain Traumas (#31727)
 	if(stat == DEAD)
 		stop_sound_channel(CHANNEL_HEARTBEAT)
 
@@ -461,4 +455,4 @@
 		death()
 		var/obj/item/organ/brain/B = getorganslot(ORGAN_SLOT_BRAIN)
 		if(B)
-			B.damaged_brain = TRUE
\ No newline at end of file
+			B.damaged_brain = TRUE