From 7d90ec14efa9a3c3ef224673d561a47b019db39d Mon Sep 17 00:00:00 2001 From: Incoming Date: Sat, 9 May 2015 02:50:19 -0400 Subject: [PATCH] Fixes a very edgy case where if a server was running up against a hard or extreme population cap it could theoretically reject someone already selected to be an antagonist, which could lead to all sorts of oddities. Not a pressing issue on tgstation servers, as the hard and extreme pop caps exist at higher levels than either server pull on even the highest of traffic days (or they're just off) Note that this check isn't relevent for late join antagonists, they roll for antag after spawning on the station, you couldn't just mash the join button until you managed to roll for antag. --- code/controllers/subsystem/jobs.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm index 565d2f0e7aa..579660008be 100644 --- a/code/controllers/subsystem/jobs.dm +++ b/code/controllers/subsystem/jobs.dm @@ -463,6 +463,8 @@ var/datum/subsystem/job/SSjob return 0 /datum/subsystem/job/proc/RejectPlayer(var/mob/new_player/player) + if(player.mind && player.mind.special_role) + return Debug("Popcap overflow Check observer located, Player: [player]") player << "You have failed to qualify for any job you desired." unassigned -= player