From 2c3541b95f3a4a7220379543f9f8712f5b778bef Mon Sep 17 00:00:00 2001 From: datlo Date: Sun, 25 Nov 2018 19:04:53 +0000 Subject: [PATCH] Fix a couple of finger gun issues --- code/datums/spells/mime.dm | 12 +++++++----- code/modules/projectiles/guns/projectile/revolver.dm | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/code/datums/spells/mime.dm b/code/datums/spells/mime.dm index 3d2451918e0..7f1ca22b709 100644 --- a/code/datums/spells/mime.dm +++ b/code/datums/spells/mime.dm @@ -92,7 +92,7 @@ /obj/effect/proc_holder/spell/targeted/mime/fingergun name = "Finger Gun" - desc = "Shoot stunning, invisible bullets out of your fingers! 6 bullets available per cast." + desc = "Shoot stunning, invisible bullets out of your fingers! 6 bullets available per cast. Use your fingers to holster them manually." school = "mime" panel = "Mime" clothes_req = 0 @@ -116,7 +116,7 @@ revert_cast(user) /obj/effect/proc_holder/spell/targeted/mime/fingergun/fake - desc = "Pretend you're shooting bullets out of your fingers! 6 bullets available per cast." + desc = "Pretend you're shooting bullets out of your fingers! 6 bullets available per cast. Use your fingers to holster them manually." gun = /obj/item/gun/projectile/revolver/fingergun/fake // Mime Spellbooks @@ -130,9 +130,11 @@ /obj/item/spellbook/oneuse/mime/attack_self(mob/user) var/obj/effect/proc_holder/spell/S = new spell - if(locate(S) in user.mind.spell_list) - to_chat(user, "You've already read this one.") - return + 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(used) recoil(user) else diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 7a11c9a3eb8..2f7a7fc1cd9 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -172,7 +172,7 @@ /obj/item/gun/projectile/revolver/fingergun/afterattack(atom/target, mob/living/user, flag, params) if(!user.mind.miming) - to_chat(usr, "You must dedicate yourself to silence first.") + to_chat(usr, "You must dedicate yourself to silence first. Use your fingers if you wish to holster them.") return ..()