From af3a1e5900dad2ae807ce1ed34a1c304083a88d9 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date: Thu, 14 Dec 2023 17:39:11 -0800
Subject: [PATCH] Fix masks not toggling voice mask component (#22506)

---
 .../Nutrition/EntitySystems/IngestionBlockerSystem.cs      | 7 ++++---
 Content.Server/VoiceMask/VoiceMaskSystem.cs                | 4 ++--
 Content.Shared/Clothing/ClothingEvents.cs                  | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Content.Server/Nutrition/EntitySystems/IngestionBlockerSystem.cs b/Content.Server/Nutrition/EntitySystems/IngestionBlockerSystem.cs
index 5c34df4b38..ede1c21680 100644
--- a/Content.Server/Nutrition/EntitySystems/IngestionBlockerSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/IngestionBlockerSystem.cs
@@ -1,4 +1,5 @@
-using Content.Shared.Clothing;
+using Content.Server.Nutrition.Components;
+using Content.Shared.Clothing;
 
 namespace Content.Server.Nutrition.EntitySystems;
 
@@ -8,10 +9,10 @@ public sealed class IngestionBlockerSystem : EntitySystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<Components.IngestionBlockerComponent, ItemMaskToggledEvent>(OnBlockerMaskToggled);
+        SubscribeLocalEvent<IngestionBlockerComponent, ItemMaskToggledEvent>(OnBlockerMaskToggled);
     }
 
-    private void OnBlockerMaskToggled(Entity<Components.IngestionBlockerComponent> ent, ref ItemMaskToggledEvent args)
+    private void OnBlockerMaskToggled(Entity<IngestionBlockerComponent> ent, ref ItemMaskToggledEvent args)
     {
         ent.Comp.Enabled = !args.IsToggled;
     }
diff --git a/Content.Server/VoiceMask/VoiceMaskSystem.cs b/Content.Server/VoiceMask/VoiceMaskSystem.cs
index 621ab4e395..8e1c2c66f2 100644
--- a/Content.Server/VoiceMask/VoiceMaskSystem.cs
+++ b/Content.Server/VoiceMask/VoiceMaskSystem.cs
@@ -22,7 +22,7 @@ public sealed partial class VoiceMaskSystem : EntitySystem
     {
         SubscribeLocalEvent<VoiceMaskComponent, TransformSpeakerNameEvent>(OnSpeakerNameTransform);
         SubscribeLocalEvent<VoiceMaskComponent, VoiceMaskChangeNameMessage>(OnChangeName);
-        SubscribeLocalEvent<VoiceMaskComponent, ItemMaskToggledEvent>(OnMaskToggled);
+        SubscribeLocalEvent<VoiceMaskComponent, WearerMaskToggledEvent>(OnMaskToggled);
         SubscribeLocalEvent<VoiceMaskerComponent, GotEquippedEvent>(OnEquip);
         SubscribeLocalEvent<VoiceMaskerComponent, GotUnequippedEvent>(OnUnequip);
         SubscribeLocalEvent<VoiceMaskSetNameEvent>(OnSetName);
@@ -69,7 +69,7 @@ public sealed partial class VoiceMaskSystem : EntitySystem
         }
     }
 
-    private void OnMaskToggled(Entity<VoiceMaskComponent> ent, ref ItemMaskToggledEvent args)
+    private void OnMaskToggled(Entity<VoiceMaskComponent> ent, ref WearerMaskToggledEvent args)
     {
         ent.Comp.Enabled = !args.IsToggled;
     }
diff --git a/Content.Shared/Clothing/ClothingEvents.cs b/Content.Shared/Clothing/ClothingEvents.cs
index b4c1224ce9..bb31c568e0 100644
--- a/Content.Shared/Clothing/ClothingEvents.cs
+++ b/Content.Shared/Clothing/ClothingEvents.cs
@@ -70,4 +70,4 @@ public readonly record struct ItemMaskToggledEvent(EntityUid Wearer, bool IsTogg
 ///     Event raised on the entity wearing the mask when it is toggled.
 /// </summary>
 [ByRefEvent]
-public readonly record struct WearerMaskToggledEvent(bool Enabled);
+public readonly record struct WearerMaskToggledEvent(bool IsToggled);
-- 
2.51.2