Merge pull request #2927 from Baystation12/master

Merging master to BEF
This commit is contained in:
Chinsky
2013-05-31 19:49:13 -07:00
20 changed files with 87 additions and 53 deletions
+1 -1
View File
@@ -21,7 +21,7 @@
//
/datum/event/meteor_shower
startWhen = 6
startWhen = 5
endWhen = 7
var/next_meteor = 6
var/waves = 1