Merge remote-tracking branch 'upstream/master' into too-many-monkeys-jumping-on-the-bed

code/controllers/configuration.dm

@@ -244,6 +244,9 @@
 
 	//cube monkey limit
 	var/cubemonkeycap = 20
+	
+	// Makes gamemodes respect player limits
+	var/enable_gamemode_player_limit = 0
 
 /datum/configuration/New()
 	for(var/T in subtypesof(/datum/game_mode))
@@ -723,6 +726,8 @@
 					config.developer_express_start = 1
 				if("disable_localhost_admin")
 					config.disable_localhost_admin = 1
+				if("enable_gamemode_player_limit")
+					config.enable_gamemode_player_limit = 1
 				else
 					log_config("Unknown setting in configuration: '[name]'")