From 9160dfa3fe2a1ee2d93105362b283fe38d6eabee Mon Sep 17 00:00:00 2001
From: Stokes52 <73205477+Stokes52@users.noreply.github.com>
Date: Sat, 8 May 2021 11:48:27 -0700
Subject: [PATCH] Implement fixes to modulator mask from code review

---
 code/datums/uplink_item.dm                  | 2 +-
 code/modules/mob/living/carbon/human/say.dm | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index 90b0d5f1b97..4e59d8ad6dd 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -1179,7 +1179,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 	desc = "A syndicate tactical mask equipped with chameleon technology and a sound modulator for disguising your voice. \
 			While the mask is active, your voice will sound unrecognizable to others"
 	reference = "CVMM"
-	item = /obj/item/clothing/mask/gas/voice_modulator
+	item = /obj/item/clothing/mask/gas/voice_modulator/chameleon
 	cost = 1
 	excludefrom = list(/datum/game_mode/nuclear)
 
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index c7b0e2f02ef..10aaee61dae 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -166,10 +166,10 @@
 				verb = "yells loudly"
 
 		if(istype(wear_mask, /obj/item/clothing/mask/gas/voice_modulator))
-			var/obj/item/voice_changer/changer = locate() in wear_mask
-			if (!changer.active)
-				continue
-			verb = pick("modulates", "drones", "hums", "buzzes")
+			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 = "<span class='[span]'>[S.message]</span>"