shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update radiation_storm.dm

Browse Source
This commit is contained in:
LetterJay
2017-09-11 15:57:15 -05:00
committed by GitHub
parent 57343fa712
commit 12f17ecbe7
1 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/radiation_storm.dm
+1 -24
View File
@@ -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 /datum/round_event_control/radiation_storm
name = "Radiation Storm" name = "Radiation Storm"
typepath = /datum/round_event/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 //sound not longer matches the text, but an audible warning is probably good
/datum/round_event/radiation_storm/start() /datum/round_event/radiation_storm/start()
SSweather.run_weather("radiation storm",ZLEVEL_STATION_PRIMARY) SSweather.run_weather("radiation storm",ZLEVEL_STATION_PRIMARY)
>>>>>>> 10a3238... Makes the station Z level into a list instead of a single define (#30297)