From 21aec6ec038c9812a9d5273c7116d9b482d9da22 Mon Sep 17 00:00:00 2001 From: Stokes52 <73205477+Stokes52@users.noreply.github.com> Date: Thu, 1 Jul 2021 19:04:39 -0700 Subject: [PATCH] Move mask verb change down so it takes precedence --- code/modules/mob/living/carbon/human/say.dm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 0e086398762..76211cf3198 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -145,11 +145,6 @@ if(silent || HAS_TRAIT(src, TRAIT_MUTE)) S.message = "" - if(wear_mask) - var/speech_verb_when_masked = wear_mask.change_speech_verb() - if(speech_verb_when_masked) - verb = speech_verb_when_masked - if(istype(wear_mask, /obj/item/clothing/mask/horsehead)) var/obj/item/clothing/mask/horsehead/hoers = wear_mask if(hoers.voicechange) @@ -172,6 +167,10 @@ if(span) S.message = "[S.message]" + if(wear_mask) + var/speech_verb_when_masked = wear_mask.change_speech_verb() + if(speech_verb_when_masked) + verb = speech_verb_when_masked return list("verb" = verb)