Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2

# Conflicts:
#	code/game/gamemodes/events.dm
#	code/modules/awaymissions/bluespaceartillery.dm

code/modules/events/alien_infestation.dm

@@ -1,5 +1,3 @@
-/var/global/sent_aliens_to_station = 0
-
 /datum/event/alien_infestation
 	announceWhen	= 400
 	var/spawncount = 1
@@ -7,8 +5,8 @@
 
 /datum/event/alien_infestation/setup()
 	announceWhen = rand(announceWhen, announceWhen + 50)
-	spawncount = rand(1, 2)
-	sent_aliens_to_station = 1
+	if(prob(50))
+		spawncount++
 
 /datum/event/alien_infestation/announce()
 	if(successSpawn)