Sanity check for jobban_isbanned() to prevent any antag jobban resulting in a ban from any antag jobs that may be added or renamed or whatever.

Tidied human/examine.dm a bit more.
Can no longer examine mobs while unconscious/blind/whatever. A more extensive fix is in the works.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3313 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
elly1989@rocketmail.com
2012-03-16 22:56:29 +00:00
parent bf061913c7
commit 6ba52d7a0d
6 changed files with 50 additions and 24 deletions

View File

@@ -14,8 +14,8 @@ var
//returns a reason if M is banned from rank, returns 0 otherwise
/proc/jobban_isbanned(mob/M, rank)
if(_jobban_isbanned(M, rank)) return "Reason Unspecified" //for old jobban
if(M)
if(M && rank)
if(_jobban_isbanned(M, rank)) return "Reason Unspecified" //for old jobban
if (guest_jobbans(rank))
if(config.guest_jobban && IsGuestKey(M.key))
return "Guest Job-ban"