From 26b413d24b168f530fda814740f329324753fa56 Mon Sep 17 00:00:00 2001
From: Flipp Syder <76629141+vulppine@users.noreply.github.com>
Date: Mon, 3 Oct 2022 18:14:07 -0700
Subject: [PATCH] Voice mask fixes (#11638)

---
 Content.Server/Clothing/MaskSystem.cs      | 2 +-
 Content.Server/Headset/HeadsetComponent.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Clothing/MaskSystem.cs b/Content.Server/Clothing/MaskSystem.cs
index e1152bc690..beb2c639ff 100644
--- a/Content.Server/Clothing/MaskSystem.cs
+++ b/Content.Server/Clothing/MaskSystem.cs
@@ -103,7 +103,7 @@ namespace Content.Server.Clothing
                 identity.Enabled = !mask.IsToggled;
 
             // toggle voice masking
-            if (TryComp<VoiceMaskComponent>(uid, out var voiceMask))
+            if (TryComp<VoiceMaskComponent>(wearer, out var voiceMask))
                 voiceMask.Enabled = !mask.IsToggled;
 
             // toggle breath tool connection (skip during equip since that is handled in LungSystem)
diff --git a/Content.Server/Headset/HeadsetComponent.cs b/Content.Server/Headset/HeadsetComponent.cs
index a834b82eba..21138b3c95 100644
--- a/Content.Server/Headset/HeadsetComponent.cs
+++ b/Content.Server/Headset/HeadsetComponent.cs
@@ -64,7 +64,7 @@ namespace Content.Server.Headset
 
             if (_entMan.TryGetComponent(source, out VoiceMaskComponent? mask) && mask.Enabled)
             {
-                name = Identity.Name(source, _entMan);
+                name = mask.VoiceName;
             }
 
             message = _chatSystem.TransformSpeech(source, message);