GameMaster Tuning (#6593)

* Actually Game Master but I am an idiot.

code/modules/gamemaster/actions/swarmboarder.dm

@@ -1,7 +1,7 @@
 /datum/gm_action/swarm_boarder
 	name = "swarmer shell"
 	departments = list(ROLE_EVERYONE, ROLE_SECURITY, ROLE_ENGINEERING)
-	chaotic = 30
+	chaotic = 60
 	observers_used = TRUE
 	var/area/target_area	// Chosen target area
 	var/area/target_turf	// Chosen target turf in target_area
@@ -67,7 +67,7 @@
 	new swarmertype(target_turf)
 
 /datum/gm_action/swarm_boarder/get_weight()
-	return -60 + (metric.count_people_in_department(ROLE_SECURITY) * 20 + metric.count_people_in_department(ROLE_SYNTHETIC) * 5 + metric.count_people_in_department(ROLE_EVERYONE) * 1)
+	return max(0, -60 + (metric.count_people_in_department(ROLE_SECURITY) * 10 + metric.count_people_in_department(ROLE_SYNTHETIC) * 5))
 
 /datum/gm_action/swarm_boarder/announce()
 	spawn(rand(5 MINUTES, 15 MINUTES))

code/modules/gamemaster/game_master.dm

@@ -28,6 +28,7 @@
 				config_setup_delay = FALSE
 				if(config.enable_game_master)
 					suspended = FALSE
+					next_action = world.time + rand(15 MINUTES, 25 MINUTES)
 			else
 				sleep(30 SECONDS)
 
@@ -56,6 +57,9 @@
 		return FALSE
 	if(ignore_time_restrictions)
 		return TRUE
+	if(world.time < next_action) // Sanity.
+		log_debug("Game Master unable to start event: Time until next action is approximately [round((next_action - world.time) / (1 MINUTE))] minute(s)")
+		return FALSE
 	// Last minute antagging is bad for humans to do, so the GM will respect the start and end of the round.
 	var/mills = round_duration_in_ticks
 	var/mins = round((mills % 36000) / 600)