From fa3412d2c1715b929d1ece9df2947fb6089ddf88 Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Sat, 14 Nov 2015 17:19:00 -0500
Subject: [PATCH 1/2] Fixes and Balances Meteor Gamemode

---
 code/game/gamemodes/meteor/meteor.dm | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm
index c5af55acef9..dd93230e73d 100644
--- a/code/game/gamemodes/meteor/meteor.dm
+++ b/code/game/gamemodes/meteor/meteor.dm
@@ -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

From 0beb8e0156aa685f138e34c933cba20d5d930e6c Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Sat, 14 Nov 2015 17:33:24 -0500
Subject: [PATCH 2/2] Sends proper initial warning to crew to give them time to
 prepare

---
 code/game/gamemodes/meteor/meteor.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm
index dd93230e73d..1574234911f 100644
--- a/code/game/gamemodes/meteor/meteor.dm
+++ b/code/game/gamemodes/meteor/meteor.dm
@@ -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
 	..()