From 12f17ecbe7ccb79092df11a9f4e4b0e9f14fb8a0 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 11 Sep 2017 15:57:15 -0500 Subject: [PATCH] Update radiation_storm.dm --- code/modules/events/radiation_storm.dm | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm index 54f7532923..b1b6195f51 100644 --- a/code/modules/events/radiation_storm.dm +++ b/code/modules/events/radiation_storm.dm @@ -1,25 +1,3 @@ -<<<<<<< HEAD -/datum/round_event_control/radiation_storm - name = "Radiation Storm" - typepath = /datum/round_event/radiation_storm - max_occurrences = 1 - -/datum/round_event/radiation_storm - - -/datum/round_event/radiation_storm/setup() - startWhen = 3 - endWhen = startWhen + 1 - announceWhen = 1 - -/datum/round_event/radiation_storm/announce() - priority_announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", 'sound/ai/radiation.ogg') - //sound not longer matches the text, but an audible warning is probably good - -/datum/round_event/radiation_storm/start() - SSweather.run_weather("radiation storm",ZLEVEL_STATION) - make_maint_all_access() -======= /datum/round_event_control/radiation_storm name = "Radiation Storm" typepath = /datum/round_event/radiation_storm @@ -38,5 +16,4 @@ //sound not longer matches the text, but an audible warning is probably good /datum/round_event/radiation_storm/start() - SSweather.run_weather("radiation storm",ZLEVEL_STATION_PRIMARY) ->>>>>>> 10a3238... Makes the station Z level into a list instead of a single define (#30297) + SSweather.run_weather("radiation storm",ZLEVEL_STATION_PRIMARY)