rahhhhhgh

code/__DEFINES/devices.dm

@@ -1,6 +1,5 @@
 // Role disk defines
 
-#define DISK_POWER (1<<0)
 #define DISK_ATMOS (1<<1)
 #define DISK_MED (1<<2)
 #define DISK_CHEM (1<<3)

code/datums/mutations/radioactive.dm

@@ -6,13 +6,23 @@
 	difficulty = 8
 	power_coeff = 1
 
+	COOLDOWN_DECLARE(last_radioactive_pulse)
+
 /datum/mutation/radioactive/New(class_ = MUT_OTHER, timer, datum/mutation/copymut)
 	..()
 	if(!(type in visual_indicators))
 		visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "radiation"))
 
 /datum/mutation/radioactive/on_life()
-	radiation_pulse(owner, 20 * GET_MUTATION_POWER(src))
+	if (!COOLDOWN_FINISHED(src, last_radioactive_pulse))
+		return
+
+	COOLDOWN_START(src, last_radioactive_pulse, 5 SECONDS)
+	radiation_pulse(
+		owner,
+		max_range = 1 * (GET_MUTATION_POWER(src) * 2),
+		threshold = RAD_MEDIUM_INSULATION,
+	)
 
 /datum/mutation/radioactive/get_visual_indicator()
 	return visual_indicators[type][1]

code/datums/weather/weather_types/radiation_storm.dm

@@ -30,20 +30,28 @@
 
 
 /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.easy_randmut(NEGATIVE+MINOR_NEGATIVE)
-						else
-							H.easy_randmut(POSITIVE)
-						H.domutcheck()
-		L.rad_act(20)
+	if(!prob(40))
+		return
+
+	if(!ishuman(L))
+		return
+
+	var/mob/living/carbon/human/H = L
+	if(!H.dna || HAS_TRAIT(H, TRAIT_GENELESS))
+		return
+
+	if (SSradiation.wearing_rad_protected_clothing(H))
+		return
+
+	H.random_mutate_unique_identity()
+	H.random_mutate_unique_features()
+
+	if(prob(50))
+		if(prob(90))
+			H.easy_random_mutate(NEGATIVE+MINOR_NEGATIVE)
+		else
+			H.easy_random_mutate(POSITIVE)
+		H.domutcheck()
 
 /datum/weather/rad_storm/end()
 	if(..())

code/game/atoms.dm

@@ -944,14 +944,6 @@
 	if(!SEND_SIGNAL(src, COMSIG_ATOM_SHOULD_EMAG, user))
 		SEND_SIGNAL(src, COMSIG_ATOM_ON_EMAG, user, hacker)
 
-/**
-  * Respond to a radioactive wave hitting this atom
-  *
-  * Default behaviour is to send COMSIG_ATOM_RAD_ACT and return
-  */
-/atom/proc/rad_act(strength)
-	SEND_SIGNAL(src, COMSIG_ATOM_RAD_ACT, strength)
-
 /**
   * Respond to narsie eating our atom
   *
@@ -1247,7 +1239,6 @@
 	VV_DROPDOWN_OPTION(VV_HK_ADD_REAGENT, "Add Reagent")
 	VV_DROPDOWN_OPTION(VV_HK_TRIGGER_EMP, "EMP Pulse")
 	VV_DROPDOWN_OPTION(VV_HK_TRIGGER_EXPLOSION, "Explosion")
-	VV_DROPDOWN_OPTION(VV_HK_RADIATE, "Radiate")
 	VV_DROPDOWN_OPTION(VV_HK_EDIT_FILTERS, "Edit Filters")
 	VV_DROPDOWN_OPTION(VV_HK_EDIT_COLOR_MATRIX, "Edit Color as Matrix")
 	VV_DROPDOWN_OPTION(VV_HK_ADD_AI, "Add AI controller")
@@ -1300,11 +1291,6 @@
 	if(href_list[VV_HK_TRIGGER_EMP] && check_rights(R_FUN))
 		usr.client.cmd_admin_emp(src)
 
-	if(href_list[VV_HK_RADIATE] && check_rights(R_FUN))
-		var/strength = input(usr, "Choose the radiation strength.", "Choose the strength.") as num|null
-		if(!isnull(strength))
-			AddComponent(/datum/component/radioactive, strength, src)
-
 	if(href_list[VV_HK_MODIFY_TRANSFORM] && check_rights(R_VAREDIT))
 		var/result = input(usr, "Choose the transformation to apply","Transform Mod") as null|anything in list("Scale","Translate","Rotate")
 		var/matrix/M = transform