datums folder

code/datums/weather/weather_types/radiation_storm.dm

@@ -25,7 +25,7 @@
 
 /datum/weather/rad_storm/telegraph()
 	..()
-	status_alarm("alert")
+	status_alarm(TRUE)
 
 
 /datum/weather/rad_storm/weather_act(mob/living/L)
@@ -49,24 +49,19 @@
 	if(..())
 		return
 	priority_announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert")
-	status_alarm()
-	sleep(300)
-	revoke_maint_all_access() // Need to make this a timer at some point.
-
-/datum/weather/rad_storm/proc/status_alarm(command)	//Makes the status displays show the radiation warning for those who missed the announcement.
-	var/datum/radio_frequency/frequency = SSradio.return_frequency(1435)
+	status_alarm(FALSE)
 
+/datum/weather/rad_storm/proc/status_alarm(active)	//Makes the status displays show the radiation warning for those who missed the announcement.
+	var/datum/radio_frequency/frequency = SSradio.return_frequency(FREQ_STATUS_DISPLAYS)
 	if(!frequency)
 		return
 
-	var/datum/signal/status_signal = new
-	var/atom/movable/virtualspeaker/virt = new /atom/movable/virtualspeaker(null)
-	status_signal.source = virt
-	status_signal.transmission_method = 1
-	status_signal.data["command"] = "shuttle"
+	var/datum/signal/signal = new
+	if (active)
+		signal.data["command"] = "alert"
+		signal.data["picture_state"] = "radiation"
+	else
+		signal.data["command"] = "shuttle"
 
-	if(command == "alert")
-		status_signal.data["command"] = "alert"
-		status_signal.data["picture_state"] = "radiation"
-
-	frequency.post_signal(src, status_signal)
+	var/atom/movable/virtualspeaker/virt = new(null)
+	frequency.post_signal(virt, signal)