From cc1f7a7301c0117e9dc019f7c407b804aec5763e Mon Sep 17 00:00:00 2001 From: Artorp Date: Sun, 8 Feb 2015 23:54:52 +0100 Subject: [PATCH] Fixes artificer spell being removed --- code/datums/mind.dm | 2 +- code/game/gamemodes/wizard/spellbook.dm | 2 +- code/game/gamemodes/wizard/wizard.dm | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index d03909fefbe..7bcb54660e8 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -792,7 +792,7 @@ datum/mind if(src in ticker.mode.wizards) ticker.mode.wizards -= src special_role = null - current.spellremove(current, config.feature_object_spell_system? "object":"verb") + current.spellremove(current) current.faction = list("Station") current << "\red You have been brainwashed! You are no longer a wizard!" log_admin("[key_name_admin(usr)] has de-wizard'ed [current].") diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 21f9352f841..d546970870d 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -192,7 +192,7 @@ var/area/wizard_station/A = locate() if(usr in A.contents) uses = max_uses - H.spellremove(usr) + H.spellremove(usr,0) temp = "All spells have been removed. You may now memorize a new set of spells." feedback_add_details("wizard_spell_learned","UM") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells else diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index efd37412bb7..cd59d23d0b5 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -273,8 +273,9 @@ //OTHER PROCS //To batch-remove wizard spells. Linked to mind.dm. -/mob/proc/spellremove(var/mob/M as mob) +/mob/proc/spellremove(var/mob/M as mob, var/removeallspells=1) for(var/obj/effect/proc_holder/spell/wizard/spell_to_remove in src.spell_list) + if (spell_to_remove.name == "Artificer" && !removeallspells) continue del(spell_to_remove) update_power_buttons()