From d858bd0526205725074f113f6f354b578f0172c8 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 12 Nov 2019 23:45:47 -0700
Subject: [PATCH 1/4] Update radiation_storm.dm

---
 .../weather/weather_types/radiation_storm.dm    | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm
index 6765cdf2cd..fb7ae0aa8e 100644
--- a/code/datums/weather/weather_types/radiation_storm.dm
+++ b/code/datums/weather/weather_types/radiation_storm.dm
@@ -22,27 +22,16 @@
 	target_trait = ZTRAIT_STATION
 
 	immunity_type = "rad"
+	
+	var/radiation_intensity = 150
 
 /datum/weather/rad_storm/telegraph()
 	..()
 	status_alarm(TRUE)
 
-
 /datum/weather/rad_storm/weather_act(mob/living/L)
 	var/resist = L.getarmor(null, "rad")
-	if(prob(40))
-		if(ishuman(L))
-			var/mob/living/carbon/human/H = L
-			if(H.dna && !HAS_TRAIT(H, TRAIT_RADIMMUNE))
-				if(prob(max(0,100-resist)))
-					H.randmuti()
-					if(prob(50))
-						if(prob(90))
-							H.randmutb()
-						else
-							H.randmutg()
-						H.domutcheck()
-		L.rad_act(20)
+	L.rad_act(150 / resist)
 
 /datum/weather/rad_storm/end()
 	if(..())

From 53bfbacbe0a9fbaacc2055891c88b32f5afba46f Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 12 Nov 2019 23:48:39 -0700
Subject: [PATCH 2/4] Update radiation_storm.dm

---
 code/datums/weather/weather_types/radiation_storm.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm
index fb7ae0aa8e..bc3f438e12 100644
--- a/code/datums/weather/weather_types/radiation_storm.dm
+++ b/code/datums/weather/weather_types/radiation_storm.dm
@@ -31,7 +31,7 @@
 
 /datum/weather/rad_storm/weather_act(mob/living/L)
 	var/resist = L.getarmor(null, "rad")
-	L.rad_act(150 / resist)
+	L.rad_act(radiation_intensity / resist)
 
 /datum/weather/rad_storm/end()
 	if(..())

From 690d6f90ec2da46ffcac34766b73156c7346f0db Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 12 Nov 2019 23:50:40 -0700
Subject: [PATCH 3/4] Update radiation_storm.dm

---
 code/datums/weather/weather_types/radiation_storm.dm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm
index bc3f438e12..a8cb8f4307 100644
--- a/code/datums/weather/weather_types/radiation_storm.dm
+++ b/code/datums/weather/weather_types/radiation_storm.dm
@@ -23,7 +23,7 @@
 
 	immunity_type = "rad"
 	
-	var/radiation_intensity = 150
+	var/radiation_intensity = 100
 
 /datum/weather/rad_storm/telegraph()
 	..()
@@ -31,7 +31,8 @@
 
 /datum/weather/rad_storm/weather_act(mob/living/L)
 	var/resist = L.getarmor(null, "rad")
-	L.rad_act(radiation_intensity / resist)
+	var/ratio = 1 - (min(resist, 100) / 100)
+	L.rad_act(radiation_intensity * percent)
 
 /datum/weather/rad_storm/end()
 	if(..())

From 06ae6cde0912894e761d90bc81285ad62c8e8316 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Thu, 14 Nov 2019 01:39:42 -0700
Subject: [PATCH 4/4] Update
 code/datums/weather/weather_types/radiation_storm.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
---
 code/datums/weather/weather_types/radiation_storm.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm
index a8cb8f4307..0d763aa5ad 100644
--- a/code/datums/weather/weather_types/radiation_storm.dm
+++ b/code/datums/weather/weather_types/radiation_storm.dm
@@ -32,7 +32,7 @@
 /datum/weather/rad_storm/weather_act(mob/living/L)
 	var/resist = L.getarmor(null, "rad")
 	var/ratio = 1 - (min(resist, 100) / 100)
-	L.rad_act(radiation_intensity * percent)
+	L.rad_act(radiation_intensity * ratio)
 
 /datum/weather/rad_storm/end()
 	if(..())