diff --git a/code/datums/station_traits/negative_traits.dm b/code/datums/station_traits/negative_traits.dm
index 861a5fac587..620e9fe7610 100644
--- a/code/datums/station_traits/negative_traits.dm
+++ b/code/datums/station_traits/negative_traits.dm
@@ -458,6 +458,11 @@
 	var/list/shielding = list()
 
 /datum/station_trait/nebula/hostile/process(seconds_per_tick)
+	// SKYRAT EDIT ADDITION START
+	if(!storms_enabled)
+		get_shielding_level() // So shields still produce tritium
+		return
+	// SKYRAT EDIT ADDITION END
 	calculate_nebula_strength()
 
 	apply_nebula_effect(nebula_intensity - get_shielding_level())
@@ -624,6 +629,7 @@
 	new /obj/effect/pod_landingzone (get_safe_random_station_turf(), new /obj/structure/closet/supplypod/centcompod (), new /obj/machinery/nebula_shielding/emergency/radiation ())
 
 /datum/station_trait/nebula/hostile/radiation/send_instructions()
+	/* SKYRAT EDIT REMOVAL START - No more radiation storms on station
 	var/obj/machinery/nebula_shielding/shielder = /obj/machinery/nebula_shielding/radiation
 	var/obj/machinery/gravity_generator/main/innate_shielding = /obj/machinery/gravity_generator/main
 	//How long do we have untill the first shielding unit needs to be up?
@@ -642,6 +648,12 @@
 		You have [deadline] before the nebula enters the station. \
 		Every shielding unit will provide an additional [shielder_time] of protection, fully protecting the station with [max_shielders] shielding units.
 	"}
+	SKYRAT EDIT REMOVAL END */
+	// SKYRAT EDIT CHANGE START - ORIGINAL: See above
+	var/announcement = {"Your station has been constructed inside a radioactive nebula. \
+		Standard spacesuits will not protect against the nebula and using them is strongly discouraged.
+	"}
+	// SKYRAT EDIT CHANGE END
 
 	priority_announce(announcement, sound = 'sound/misc/notice1.ogg')
 
diff --git a/modular_skyrat/master_files/code/datums/station_traits/negative_traits.dm b/modular_skyrat/master_files/code/datums/station_traits/negative_traits.dm
new file mode 100644
index 00000000000..d3337b3f225
--- /dev/null
+++ b/modular_skyrat/master_files/code/datums/station_traits/negative_traits.dm
@@ -0,0 +1,8 @@
+/datum/station_trait/nebula/hostile/
+	/// Radiation storms are disabled by default
+	var/storms_enabled
+
+/// Allows an admin to turn on/off the radiation storms.
+/datum/station_trait/nebula/hostile/proc/toggle_storms()
+	storms_enabled = !storms_enabled
+	message_admins("Radiation storms have been [storms_enabled ? "enabled" : "disabled"]!")
diff --git a/tgstation.dme b/tgstation.dme
index 5079712ce35..e84c57e0b8b 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -6127,6 +6127,7 @@
 #include "modular_skyrat\master_files\code\datums\quirks\negative.dm"
 #include "modular_skyrat\master_files\code\datums\quirks\neutral.dm"
 #include "modular_skyrat\master_files\code\datums\records\record.dm"
+#include "modular_skyrat\master_files\code\datums\station_traits\negative_traits.dm"
 #include "modular_skyrat\master_files\code\datums\storage\storage.dm"
 #include "modular_skyrat\master_files\code\datums\storage\subtypes\pockets.dm"
 #include "modular_skyrat\master_files\code\datums\traits\good.dm"