From a346ece1c47376b46363d27e7c2d826f2f656600 Mon Sep 17 00:00:00 2001 From: TheDZD Date: Tue, 9 Feb 2016 22:14:33 -0500 Subject: [PATCH] You'd have to be blind to miss this. --- code/game/gamemodes/cult/cult.dm | 3 --- code/game/gamemodes/game_mode.dm | 5 ++++- interface/stylesheet.dm | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 2b44d364c00..d96e3376b53 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -16,8 +16,6 @@ return 0 if(iscultist(mind.current)) return 1 //If they're already in the cult, assume they are convertable - if(jobban_isbanned(mind.current, "cultist") || jobban_isbanned(mind.current, "Syndicate")) - return 0 if(ishuman(mind.current) && (mind.assigned_role in list("Captain", "Chaplain"))) return 0 if(ishuman(mind.current)) @@ -189,7 +187,6 @@ cult_mind.current.attack_log += "\[[time_stamp()]\] Has been converted to the cult!" if(jobban_isbanned(cult_mind.current, ROLE_CULTIST)) replace_jobbaned_player(cult_mind.current, ROLE_CULTIST, ROLE_CULTIST) - return 1 diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 7f538f83e8d..08e8f74b312 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -455,4 +455,7 @@ proc/get_nt_opposed() M << "Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!" message_admins("[key_name_admin(theghost)] has taken control of ([key_name_admin(M)]) to replace a jobbanned player.") M.ghostize() - M.key = theghost.key \ No newline at end of file + M.key = theghost.key + else + message_admins("[M] ([M.key] has been converted into [role_type] with an active antagonist jobban for said role since no ghost has volunteered to take their place.") + M << "You have been converted into [role_type] with an active jobban. Any further violations of the rules on your part are likely to result in a permanent ban." \ No newline at end of file diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index 3c8a80bab91..1950aa40fcb 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -56,6 +56,7 @@ h1.alert, h2.alert {color: #000000;} .disarm {color: #990000;} .passive {color: #660000;} +.biggerdanger {color: #ff0000; font-weight: bold; font-size: 5;} .userdanger {color: #ff0000; font-weight: bold; font-size: 3;} .danger {color: #ff0000; font-weight: bold;} .warning {color: #ff0000; font-style: italic;}