Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into ok-whats-going-on-here

2016-12-26 10:29:30 -05:00
parent 26086f3910 a2e71f15b2
commit e3e89fd78b
2 changed files with 4 additions and 2 deletions
@@ -161,4 +161,5 @@
 /datum/weather/rad_storm/end()
 	if(..())
 		return
-	priority_announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert")
+	priority_announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert")
+	spawn(300) revoke_maint_all_access()
@@ -16,4 +16,5 @@
 	//sound not longer matches the text, but an audible warning is probably good

 /datum/round_event/radiation_storm/start()
-	SSweather.run_weather("radiation storm",1)
+	SSweather.run_weather("radiation storm",1)
+	make_maint_all_access()