From 2d66ab4171c98be010bf869ba3c41886ac2f8f9b Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Fri, 13 Oct 2017 10:26:25 -0500
Subject: [PATCH] Update life.dm

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

diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm
index 7b19f3cb1c..844489d923 100644
--- a/code/modules/mob/living/carbon/monkey/life.dm
+++ b/code/modules/mob/living/carbon/monkey/life.dm
@@ -23,39 +23,12 @@
 				walk_to(src,0)
 
 /mob/living/carbon/monkey/handle_mutations_and_radiation()
-<<<<<<< HEAD
-
-	if (radiation)
-		if (radiation > 100)
-=======
 	if(radiation)
-		if(radiation > RAD_MOB_KNOCKDOWN)
->>>>>>> 456cd10... Radiation rework and subsystem (#30909)
+		if(radiation > RAD_MOB_KNOCKDOWN
 			if(!IsKnockdown())
 				emote("collapse")
 			Knockdown(200)
 			to_chat(src, "<span class='danger'>You feel weak.</span>")
-<<<<<<< HEAD
-		if(radiation > 30 && prob((radiation - 30) * (radiation - 30) * 0.0002))
-			gorillize()
-			return
-		switch(radiation)
-
-			if(50 to 75)
-				if(prob(5))
-					if(!IsKnockdown())
-						emote("collapse")
-					Knockdown(60)
-					to_chat(src, "<span class='danger'>You feel weak.</span>")
-
-			if(75 to 100)
-				if(prob(1))
-					to_chat(src, "<span class='danger'>You mutate!</span>")
-					randmutb()
-					emote("gasp")
-					domutcheck()
-		..()
-=======
 		if(radiation > RAD_MOB_MUTATE)
 			if(prob(1))
 				to_chat(src, "<span class='danger'>You mutate!</span>")
@@ -67,7 +40,6 @@
 					gorillize()
 					return
 	return ..()
->>>>>>> 456cd10... Radiation rework and subsystem (#30909)
 
 /mob/living/carbon/monkey/handle_breath_temperature(datum/gas_mixture/breath)
 	if(abs(310.15 - breath.temperature) > 50)