Mutiny fixes

Conflicts:
	code/game/gamemodes/mutiny/mutiny.dm
	code/game/objects/items.dm
This commit is contained in:
ZomgPonies
2014-05-15 03:16:48 -04:00
committed by alex-gh
parent 5066000778
commit 9e89c8cdcb
+2 -2
View File
@@ -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")