From 9e89c8cdcb3faa8a9c90a8e709eabf5f7994f6b6 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Thu, 15 May 2014 03:16:48 -0400 Subject: [PATCH] Mutiny fixes Conflicts: code/game/gamemodes/mutiny/mutiny.dm code/game/objects/items.dm --- code/game/gamemodes/mutiny/mutiny.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/mutiny/mutiny.dm b/code/game/gamemodes/mutiny/mutiny.dm index 2c3ca26a6c4..b58b805ada2 100644 --- a/code/game/gamemodes/mutiny/mutiny.dm +++ b/code/game/gamemodes/mutiny/mutiny.dm @@ -340,7 +340,7 @@ datum/game_mode/mutiny log_admin("[src]([src.ckey]) attempted to recruit [M] as a loyalist.") message_admins("\red [src]([src.ckey]) attempted to recruit [M] as a loyalist.") - var/choice = alert(M, "Asked by [src]: Will you help me complete Directive X?", "Loyalist recruitment", "No", "Yes") + var/choice = alert(M, "Asked by [src]: Will you help me complete Directive X?", "Loyalist recruitment", "Yes", "No") if(choice == "Yes") mode.add_loyalist(M.mind) else if(choice == "No") @@ -377,7 +377,7 @@ datum/game_mode/mutiny log_admin("[src]([src.ckey]) attempted to recruit [M] as a mutineer.") message_admins("\red [src]([src.ckey]) attempted to recruit [M] as a mutineer.") - var/choice = alert(M, "Asked by [src]: Will you help me stop Directive X?", "Mutineer recruitment", "No", "Yes") + var/choice = alert(M, "Asked by [src]: Will you help me stop Directive X?", "Mutineer recruitment", "Yes", "No") if(choice == "Yes") mode.add_mutineer(M.mind) else if(choice == "No")