From 9100dc2fcd6d11c4b56594359ef116ae629e6a51 Mon Sep 17 00:00:00 2001
From: S34NW <12197162+S34NW@users.noreply.github.com>
Date: Wed, 9 Jun 2021 14:48:42 +0100
Subject: [PATCH] Non-SM rads are a danger. Delam gives more rads.

---
 code/__DEFINES/radiation.dm                   | 2 ++
 code/modules/mob/living/living.dm             | 2 ++
 code/modules/power/supermatter/supermatter.dm | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/__DEFINES/radiation.dm b/code/__DEFINES/radiation.dm
index 9f7ea16f7b2..a13ec73a57c 100644
--- a/code/__DEFINES/radiation.dm
+++ b/code/__DEFINES/radiation.dm
@@ -53,3 +53,5 @@ Ask ninjanomnom if they're around
 
 #define RAD_GEIGER_MEASURE_SMOOTHING 5
 #define RAD_GEIGER_GRACE_PERIOD 2
+
+#define RAD_DAMAGE_MULTIPLIER 10					// This brings pre-refactor rad values in line with the current danger values
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 23f4d829d43..415635d2906 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1005,6 +1005,8 @@
 
 	amount -= RAD_BACKGROUND_RADIATION // This will always be at least 1 because of how skin protection is calculated
 
+	amount *= RAD_DAMAGE_MULTIPLIER
+
 	var/blocked = getarmor(null, "rad")
 
 	if(amount > RAD_BURN_THRESHOLD)
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 0cc682eae32..de626d139fb 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -312,7 +312,7 @@
 				//Hilariously enough, running into a closet should make you get hit the hardest.
 				var/mob/living/carbon/human/H = mob
 				H.hallucination += max(50, min(300, DETONATION_HALLUCINATION * sqrt(1 / (get_dist(mob, src) + 1))))
-			var/rads = DETONATION_RADS * sqrt(1 / (get_dist(L, src) + 1))
+			var/rads = DETONATION_RADS * sqrt(1 / (get_dist(L, src) + 1)) * sqrt(power/5) / RAD_DAMAGE_MULTIPLIER
 			L.rad_act(rads)
 
 	var/turf/T = get_turf(src)
@@ -525,7 +525,7 @@
 			l.hallucination += power * hallucination_power * D
 			l.hallucination = clamp(l.hallucination, 0, 200)
 	for(var/mob/living/l in range(src, round((power / 100) ** 0.25)))
-		var/rads = (power / 10) * sqrt( 1 / max(get_dist(l, src), 1) )
+		var/rads = ((power / 10) * sqrt( 1 / max(get_dist(l, src), 1) )) / RAD_DAMAGE_MULTIPLIER //RAD_DAMAGE_MULTIPLIER division ensures consistency with other rad sources.
 		l.rad_act(rads)
 
 	//Transitions between one function and another, one we use for the fast inital startup, the other is used to prevent errors with fusion temperatures.