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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Dwarf

Browse Source
This commit is contained in:
r4d6
2020-02-08 23:23:28 -05:00
parent 5316cc3665 a840b16c87
commit e6398815b6
4 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/meteor_wave.dm
+1 -1
View File
@@ -22,7 +22,7 @@
/datum/round_event/meteor_wave/setup()
announceWhen = 1
startWhen = rand(60, 90) //Yeah for SOME REASON this is measured in seconds and not deciseconds???
startWhen = rand(90, 180) // Apparently it is by 2 seconds, so 90 is actually 180 seconds, and 180 is 360 seconds. So this is 3-6 minutes
if(GLOB.singularity_counter)
startWhen *= 1 - min(GLOB.singularity_counter * SINGULO_BEACON_DISTURBANCE, SINGULO_BEACON_MAX_DISTURBANCE)
endWhen = startWhen + 60