Merge branch 'master' into upstream-merge-29885

code/game/gamemodes/cult/runes.dm

@@ -538,7 +538,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 		mob_to_revive = input(user, "Choose a cultist to revive.", "Cultist to Revive") as null|anything in potential_revive_mobs
 	else
 		mob_to_revive = potential_revive_mobs[1]
-	if(!src || QDELETED(src) || rune_in_use || !validness_checks(mob_to_revive, user))
+	if(QDELETED(src) || !validness_checks(mob_to_revive, user))
 		rune_in_use = FALSE
 		return
 	if(user.name == "Herbert West")

code/game/gamemodes/game_mode.dm

@@ -120,7 +120,7 @@
 	var/list/datum/game_mode/runnable_modes = config.get_runnable_midround_modes(living_crew.len)
 	var/list/datum/game_mode/usable_modes = list()
 	for(var/datum/game_mode/G in runnable_modes)
-		if(G.reroll_friendly)
+		if(G.reroll_friendly && living_crew >= G.required_players)
 			usable_modes += G
 		else
 			qdel(G)