From aca8b5ca0fbae3d5d53b397d4bdb6ee8fb1628cc Mon Sep 17 00:00:00 2001 From: datlo Date: Sat, 24 Nov 2018 16:08:47 +0000 Subject: [PATCH] changes vow of silence/spell adding checks --- code/datums/spells/mime.dm | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/code/datums/spells/mime.dm b/code/datums/spells/mime.dm index 1ee2699bb46..3d2451918e0 100644 --- a/code/datums/spells/mime.dm +++ b/code/datums/spells/mime.dm @@ -130,11 +130,9 @@ /obj/item/spellbook/oneuse/mime/attack_self(mob/user) var/obj/effect/proc_holder/spell/S = new spell - for(var/obj/effect/proc_holder/spell/knownspell in user.mind.spell_list) - if(knownspell.type == S.type) - if(user.mind) - to_chat(user, "You've already read this one.") - return + if(locate(S) in user.mind.spell_list) + to_chat(user, "You've already read this one.") + return if(used) recoil(user) else @@ -148,12 +146,9 @@ /obj/item/spellbook/oneuse/mime/onlearned(mob/user) used = 1 - var/obj/effect/proc_holder/spell/S = new /obj/effect/proc_holder/spell/targeted/mime/speak - for(var/obj/effect/proc_holder/spell/knownspell in user.mind.spell_list) - if(knownspell.type == S.type) - return - user.mind.AddSpell(S) //add vow of silence if not known by user - to_chat(user, "You have learned how to use silence to improve your performance.") + if(!locate(/obj/effect/proc_holder/spell/targeted/mime/speak) in user.mind.spell_list) //add vow of silence if not known by user + user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mime/speak) + to_chat(user, "You have learned how to use silence to improve your performance.") /obj/item/spellbook/oneuse/mime/fingergun spell = /obj/effect/proc_holder/spell/targeted/mime/fingergun