Merge remote-tracking branch 'upstream/dev' into 150605-Meteors

Conflicts:
	code/game/gamemodes/meteor/meteors.dm

code/game/gamemodes/cult/narsie.dm

@@ -70,8 +70,6 @@ var/global/list/narsie_list = list()
 		mezzer()
 
 /obj/singularity/narsie/large/eat()
-	set background = BACKGROUND_ENABLED
-
 	for (var/turf/A in orange(consume_range, src))
 		consume(A)
 
@@ -355,8 +353,6 @@ var/global/list/narsie_list = list()
 	grav_pull = 0
 
 /obj/singularity/narsie/wizard/eat()
-	set background = BACKGROUND_ENABLED
-
 	for (var/turf/T in trange(consume_range, src))
 		consume(T)
 

code/game/gamemodes/events.dm

@@ -102,6 +102,8 @@
 		if(15)
 			communications_blackout()
 */
+var/eventchance = 10 // Percent chance per 5 minutes.
+var/hadevent    = 0
 
 /proc/appendicitis()
 	for(var/mob/living/carbon/human/H in living_mob_list)

code/game/gamemodes/events/miniblob.dm

@@ -1,3 +1,5 @@
+var/blobevent   = 0
+
 /proc/mini_blob_event()
 
 	var/turf/T = pick(blobstart)

code/game/gamemodes/gameticker.dm

@@ -51,7 +51,7 @@ var/global/datum/controller/gameticker/ticker
 			for(var/i=0, i<10, i++)
 				sleep(1)
 				vote.process()
-			if(going)
+			if(round_progressing)
 				pregame_timeleft--
 			if(pregame_timeleft == config.vote_autogamemode_timeleft)
 				if(!vote.time_remaining)