Merge pull request #3031 from Citadel-Station-13/upstream-merge-31117

[MIRROR] Fixes liches losing spells
2017-10-01 15:42:12 -04:00
parent e346321413 c1acb412e6
commit 40f541b9da
3 changed files with 5 additions and 12 deletions
@@ -211,7 +211,7 @@
 /datum/mind/proc/remove_wizard()
 	if(src in SSticker.mode.wizards)
 		SSticker.mode.wizards -= src
-		current.spellremove(current)
+		RemoveAllSpells()
 	special_role = null
 	remove_antag_equip()

@@ -1505,6 +1505,10 @@
 			spell_list -= S
 			qdel(S)

+/datum/mind/proc/RemoveAllSpells()
+	for(var/obj/effect/proc_holder/S in spell_list)
+		RemoveSpell(S)
+
 /datum/mind/proc/transfer_martial_arts(mob/living/new_character)
 	if(!ishuman(new_character))
 		return