Merge pull request #4440 from Ikarrus/antagjobbans_actually_worth_a_damn

Players Jobbanned from Antagonist Roles cannot be spawned as, or converted to, them
This commit is contained in:
Remie Richards
2014-09-19 16:00:29 +01:00
13 changed files with 157 additions and 168 deletions
+15 -2
View File
@@ -84,8 +84,21 @@
// if(M.mind.has_been_rev)
// revsafe = 2
if(!revsafe)
M.mind.has_been_rev = 1
ticker.mode.add_revolutionary(M.mind)
if(jobban_isbanned(M, "Syndicate") || jobban_isbanned(M, "revolutionary"))
M << "<span class='userdanger'>You are currently jobbanned from Revolutionary.</span>"
user << "<span class='warning'>This mind was unable to survive the rigors of conversion and has been wiped clean!</span>"
M.ghostize(0) //Jobbanned players are force ghosted
M.resting = 1
spawn(0)
var/client/C = pick_from_candidates(BE_REV) //Try to find a suitable observer to replace the jobbanned player
if(C)
M.key = C.key
M << "<span class='warning'>Who are you? How did you get here? You can't seem to remember anything but...</span>"
M.mind.has_been_rev = 1
ticker.mode.add_revolutionary(M.mind)
else
M.mind.has_been_rev = 1
ticker.mode.add_revolutionary(M.mind)
else if(revsafe == 1)
user << "<span class='warning'>Something seems to be blocking the flash!</span>"
else