From 8d131e664e3d6b3003ecb6f3aa462257e2fc150c Mon Sep 17 00:00:00 2001 From: Alex6511 Date: Sat, 15 Aug 2015 04:04:02 -0400 Subject: [PATCH] Update wizard.dm --- code/game/gamemodes/wizard/wizard.dm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 7c38d931a94..e9b12d95879 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -42,7 +42,7 @@ /datum/game_mode/wizard/pre_setup() for(var/datum/mind/wiz in wizards) - wiz.current.loc = pick(wizardstart) + wiz.current.loc = pick(wizardstart)io return 1 @@ -81,17 +81,6 @@ escape_objective.owner = wizard wizard.objectives += escape_objective if(31 to 60) - var/datum/objective/steal/steal_objective = new - steal_objective.owner = wizard - steal_objective.find_target() - wizard.objectives += steal_objective - - if (!(locate(/datum/objective/hijack) in wizard.objectives)) - var/datum/objective/hijack/hijack_objective = new - hijack_objective.owner = wizard - wizard.objectives += hijack_objective - - if(61 to 85) var/datum/objective/assassinate/kill_objective = new kill_objective.owner = wizard kill_objective.find_target() @@ -107,6 +96,17 @@ survive_objective.owner = wizard wizard.objectives += survive_objective + if(61 to 85) + var/datum/objective/steal/steal_objective = new + steal_objective.owner = wizard + steal_objective.find_target() + wizard.objectives += steal_objective + + if (!(locate(/datum/objective/hijack) in wizard.objectives)) + var/datum/objective/hijack/hijack_objective = new + hijack_objective.owner = wizard + wizard.objectives += hijack_objective + else var/datum/objective/steal/steal_objective = new steal_objective.owner = wizard