From fc5dabe1fbbbea70ddf5ae31fe3b4a3856903974 Mon Sep 17 00:00:00 2001 From: Stokes52 <73205477+Stokes52@users.noreply.github.com> Date: Sat, 8 May 2021 12:05:32 -0700 Subject: [PATCH] Move modulator voice logic out of for loop so it has priority --- code/modules/mob/living/carbon/human/say.dm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 10aaee61dae..de05363cca6 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -165,14 +165,15 @@ S.message = uppertext(S.message) verb = "yells loudly" - if(istype(wear_mask, /obj/item/clothing/mask/gas/voice_modulator)) - var/obj/item/clothing/mask/gas/voice_modulator/VM = wear_mask - var/obj/item/voice_changer/changer = VM.voice_modulator - if (changer.active) - verb = pick("modulates", "drones", "hums", "buzzes") - if(span) S.message = "[S.message]" + + if(istype(wear_mask, /obj/item/clothing/mask/gas/voice_modulator)) + var/obj/item/clothing/mask/gas/voice_modulator/VM = wear_mask + var/obj/item/voice_changer/changer = VM.voice_modulator + if (changer.active) + verb = pick("modulates", "drones", "hums", "buzzes") + return list("verb" = verb) /mob/living/carbon/human/handle_message_mode(message_mode, list/message_pieces, verb, used_radios)