From ea378b3bb5204664327a57c6d7951e84bda9fd26 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sun, 27 Jul 2014 23:32:36 +0200 Subject: [PATCH] Attempts to ensure that the captain (or the head loyalist to be precise, whomever he might be) is not a candidate for the directives. Conflicts: code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm --- .../game/gamemodes/mutiny/directives/alien_fraud_directive.dm | 4 ++-- .../mutiny/directives/bluespace_contagion_directive.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm b/code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm index 5047909e0ea..6df5a22050c 100644 --- a/code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm +++ b/code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm @@ -11,8 +11,8 @@ datum/directive/terminations/alien_fraud datum/directive/terminations/alien_fraud/get_crew_to_terminate() var/list/aliens[0] for(var/mob/M in player_list) - if (M.is_ready() && is_alien(M)) - aliens+=(M) + if (M.is_ready() && is_alien(M) && M != mode.head_loyalist.current) + aliens.Add(M) return aliens datum/directive/terminations/alien_fraud/get_description() diff --git a/code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm b/code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm index dd767019ace..f3291602ef5 100644 --- a/code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm +++ b/code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm @@ -6,8 +6,8 @@ datum/directive/bluespace_contagion proc/get_infection_candidates() var/list/candidates[0] for(var/mob/M in player_list) - if (M.is_ready() && !M.is_mechanical()) - candidates+=(M) + if (M.is_ready() && !M.is_mechanical() && M != mode.head_loyalist.current) + candidates.Add(M) return candidates datum/directive/bluespace_contagion/get_description()