Merge pull request #3306 from Citadel-Station-13/upstream-merge-31449

[MIRROR] Datum antag wizard.
2017-10-12 07:15:53 -04:00
parent 945f76bd34 7390bd82fd
commit e15c337851
19 changed files with 658 additions and 602 deletions
@@ -382,7 +382,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	switch(new_character.mind.special_role)
 		if("Wizard")
 			new_character.forceMove(pick(GLOB.wizardstart))
-			SSticker.mode.equip_wizard(new_character)
+			var/datum/antagonist/wizard/A = new_character.mind.has_antag_datum(/datum/antagonist/wizard,TRUE)
+			A.equip_wizard()
 		if("Syndicate")
 			new_character.forceMove(pick(GLOB.nukeop_start))
 			call(/datum/game_mode/proc/equip_syndicate)(new_character)