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

Merge branch 'master' into hugbox_meteor_time

Browse Source
This commit is contained in:
Ghom
2020-01-29 02:28:12 +01:00
committed by GitHub
parent 54f9df9f88 754fb126f5
commit 44c141f009
280 changed files with 2160 additions and 2364 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/meteor_wave.dm
+1 -1
View File
@@ -71,7 +71,7 @@
directionstring = " towards starboard"
if(WEST)
directionstring = " towards port"
priority_announce("Meteors have been detected on collision course with the station[directionstring]. Estimated time until impact: [round(startWhen/60)] minutes.[GLOB.singularity_counter ? " Warning: Anomalous gravity pulse detected, Syndicate technology interference likely." : ""]", "Meteor Alert", "meteors")
priority_announce("Meteors have been detected on collision course with the station[directionstring]. Estimated time until impact: [round((startWhen * SSevents.wait) / 10, 0.1)] seconds.[GLOB.singularity_counter ? " Warning: Anomalous gravity pulse detected, Syndicate technology interference likely." : ""]", "Meteor Alert", "meteors")
/datum/round_event/meteor_wave/tick()
if(ISMULTIPLE(activeFor, 3))