Fix masks not toggling voice mask component (#22506)

diff --git a/Content.Server/Nutrition/EntitySystems/IngestionBlockerSystem.cs b/Content.Server/Nutrition/EntitySystems/IngestionBlockerSystem.cs
index 5c34df4b383c663d21b76f5c6412008d1ad7963a..ede1c21680c4a8446f1286bc332d534f790fc57e 100644 (file)
--- 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 621ab4e39506f74f3add430a75c560f672be6891..8e1c2c66f2f7d5d414d84280f52dd80d09c9ca16 100644 (file)
--- 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 b4c1224ce91d73abd8c9614878a853014a3c4612..bb31c568e021952628e54f239eb26495a12e187e 100644 (file)
--- 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);