From 922888c7537eb5b3219f8e889c40958f0a824229 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Sat, 8 Jul 2017 00:13:57 -0400
Subject: [PATCH] Human Radiation Rework

---
 code/modules/mob/living/carbon/human/life.dm | 59 ++++++++++++--------
 1 file changed, 37 insertions(+), 22 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index cba5e4eb458..7ac32621853 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -195,47 +195,62 @@
 
 	if(!(species.flags & RADIMMUNE))
 		if(radiation)
-			if(radiation > 100)
-				if(!weakened)
-					emote("collapse")
-				Weaken(10)
-				to_chat(src, "<span class='danger'>You feel weak.</span>")
-
-			radiation = Clamp(radiation, 0, 100)
+			radiation = Clamp(radiation, 0, 200)
 
 			var/autopsy_damage = 0
 			switch(radiation)
-				if(0 to 50)
+				if(1 to 49)
 					radiation = max(radiation-1, 0)
 					if(prob(25))
 						adjustToxLoss(1)
-						autopsy_damage = 1
+						adjustFireLoss(1)
+						autopsy_damage = 2
 
-				if(50 to 75)
+				if(50 to 74)
 					radiation = max(radiation-2, 0)
 					adjustToxLoss(1)
-					autopsy_damage = 1
+					adjustFireLoss(1)
+					autopsy_damage = 2
 					if(prob(5))
 						radiation = max(radiation-5, 0)
-						if(!weakened)
-							emote("collapse")
 						Weaken(3)
 						to_chat(src, "<span class='danger'>You feel weak.</span>")
+						emote("collapse")
 
 				if(75 to 100)
-					radiation = max(radiation-3, 0)
-					adjustToxLoss(3)
-					autopsy_damage = 3
-					if(prob(1))
+					radiation = max(radiation-2, 0)
+					adjustToxLoss(2)
+					adjustFireLoss(2)
+					autopsy_damage = 4
+					if(prob(2))
 						to_chat(src, "<span class='danger'>You mutate!</span>")
 						randmutb(src)
 						domutcheck(src, null)
-						emote("gasp")
 
-			if(autopsy_damage && bodyparts.len)
-				var/obj/item/organ/external/O = pick(bodyparts)
-				if(istype(O))
-					O.add_autopsy_data("Radiation Poisoning", autopsy_damage)
+				if(101 to 150)
+					radiation = max(radiation-3, 0)
+					adjustToxLoss(2)
+					adjustFireLoss(3)
+					autopsy_damage = 5
+					if(prob(4))
+						to_chat(src, "<span class='danger'>You mutate!</span>")
+						randmutb(src)
+						domutcheck(src, null)
+
+				if(151 to INFINITY)
+					radiation = max(radiation-3, 0)
+					adjustToxLoss(2)
+					adjustFireLoss(3)
+					autopsy_damage = 5
+					if(prob(6))
+						to_chat(src, "<span class='danger'>You mutate!</span>")
+						randmutb(src)
+						domutcheck(src, null)
+
+			if(autopsy_damage)
+				var/obj/item/organ/external/chest/chest = get_organ("chest")
+				if(chest)
+					chest.add_autopsy_data("Radiation Poisoning", autopsy_damage)
 
 /mob/living/carbon/human/breathe()