From 1e309deac0b23178c64a73ef2da03572b446a554 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 3 Oct 2017 01:20:46 -0500 Subject: [PATCH] [MIRROR] Wizard can't cast shout or whisper spells when he is unable to speak (#2965) * Wizard being mute now blocks touch attacks from activating (can still be cast) * Wizard can't cast shout or whisper spells when he is unable to speak --- code/modules/spells/spell_types/godhand.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm index 455f5ef165..33f947408a 100644 --- a/code/modules/spells/spell_types/godhand.dm +++ b/code/modules/spells/spell_types/godhand.dm @@ -49,6 +49,9 @@ /obj/item/melee/touch_attack/disintegrate/afterattack(atom/target, mob/living/carbon/user, proximity) if(!proximity || target == user || !ismob(target) || !iscarbon(user) || user.lying || user.handcuffed) //exploding after touching yourself would be bad return + if(!user.can_speak_vocal()) + to_chat(user, "You can't get the words out!") + return var/mob/M = target do_sparks(4, FALSE, M.loc) M.gib() @@ -68,6 +71,9 @@ if(user.lying || user.handcuffed) to_chat(user, "You can't reach out!") return + if(!user.can_speak_vocal()) + to_chat(user, "You can't get the words out!") + return var/mob/living/M = target M.Stun(40) M.petrify()