Merge pull request #2543 from ZomgPonies/meteors

Fixes to Meteor Gamemode
This commit is contained in:
TheDZD
2015-11-16 17:21:19 -05:00
+9 -10
View File
@@ -3,7 +3,7 @@
config_tag = "meteor"
var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds)
var/const/waittime_h = 1800 //upper bound on time before intercept arrives (in tenths of seconds)
var/const/initialmeteordelay = 3000
var/const/initialmeteordelay = 6000
var/nometeors = 1
required_players = 0
@@ -18,7 +18,7 @@
/datum/game_mode/meteor/post_setup()
spawn (rand(waittime_l, waittime_h))
send_intercept()
command_announcement.Announce("The station is on the path of an incoming wave of meteors. Reinforce the hull and prepare damage control parties.", "Incoming Meteors", 'sound/effects/siren.ogg')
spawn(initialmeteordelay)
nometeors = 0
..()
@@ -31,14 +31,13 @@
/datum/game_mode/meteor/proc/sendmeteors()
nometeors = 1
spawn()
var/waveduration = world.time + rand(3000,9000)
var/waitduration = rand(3000,9000)
while(waveduration - world.time > 0)
sleep(20)
spawn() spawn_meteors(6, meteors_normal)
sleep(waitduration)
nometeors = 0
var/waveduration = world.time + rand(1500,3000)
var/waitduration = rand(3000,9000)
while(waveduration - world.time > 0)
sleep(20)
spawn() spawn_meteors(6, meteors_normal)
sleep(waitduration)
nometeors = 0
/datum/game_mode/meteor/declare_completion()
var/text