From fd4445253d78fc8b4f031ce35bfb24d7ae7805ca Mon Sep 17 00:00:00 2001 From: keronshb <54602815+keronshb@users.noreply.github.com> Date: Wed, 21 Feb 2024 21:53:46 +0100 Subject: [PATCH] Moves muted to shared (#25374) * moves muted to shared * fixes usings * Update MutedComponent.cs funny webedit * Update MutedComponent.cs oops using statement webedit (cherry picked from commit 046c874daeb60609d8880fe27617836d37de1a94) --- Content.Server/Abilities/Mime/MimePowersSystem.cs | 5 +++-- Content.Server/Mobs/CritMobActionsSystem.cs | 1 + Content.Server/Mobs/DeathgaspSystem.cs | 1 + Content.Server/Puppet/VentriloquistPuppetSystem.cs | 1 + Content.Server/Speech/Muting/MutedComponent.cs | 6 ------ Content.Server/Speech/Muting/MutingSystem.cs | 1 + Content.Shared/Speech/Muting/MutedComponent.cs | 10 ++++++++++ 7 files changed, 17 insertions(+), 8 deletions(-) delete mode 100644 Content.Server/Speech/Muting/MutedComponent.cs create mode 100644 Content.Shared/Speech/Muting/MutedComponent.cs diff --git a/Content.Server/Abilities/Mime/MimePowersSystem.cs b/Content.Server/Abilities/Mime/MimePowersSystem.cs index cb0206d64f..c1d2643d6f 100644 --- a/Content.Server/Abilities/Mime/MimePowersSystem.cs +++ b/Content.Server/Abilities/Mime/MimePowersSystem.cs @@ -10,7 +10,8 @@ using Content.Shared.Physics; using Robust.Shared.Containers; using Robust.Shared.Map; using Robust.Shared.Timing; -using Content.Shared.Abilities.Psionics; //Nyano - Summary: Makes Mime psionic. +using Content.Shared.Abilities.Psionics; //Nyano - Summary: Makes Mime psionic. +using Content.Shared.Speech.Muting; namespace Content.Server.Abilities.Mime { @@ -57,7 +58,7 @@ namespace Content.Server.Abilities.Mime EnsureComp(uid); _alertsSystem.ShowAlert(uid, AlertType.VowOfSilence); _actionsSystem.AddAction(uid, ref component.InvisibleWallActionEntity, component.InvisibleWallAction, uid); - //Nyano - Summary: Add Psionic Ability to Mime. + //Nyano - Summary: Add Psionic Ability to Mime. if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) psionic.PsionicAbility = component.InvisibleWallActionEntity; } diff --git a/Content.Server/Mobs/CritMobActionsSystem.cs b/Content.Server/Mobs/CritMobActionsSystem.cs index 8dd8274d10..c897102dca 100644 --- a/Content.Server/Mobs/CritMobActionsSystem.cs +++ b/Content.Server/Mobs/CritMobActionsSystem.cs @@ -7,6 +7,7 @@ using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; using Robust.Server.Console; using Robust.Shared.Player; +using Content.Shared.Speech.Muting; namespace Content.Server.Mobs; diff --git a/Content.Server/Mobs/DeathgaspSystem.cs b/Content.Server/Mobs/DeathgaspSystem.cs index 3919d9a4be..c531784ea6 100644 --- a/Content.Server/Mobs/DeathgaspSystem.cs +++ b/Content.Server/Mobs/DeathgaspSystem.cs @@ -1,6 +1,7 @@ using Content.Server.Chat.Systems; using Content.Server.Speech.Muting; using Content.Shared.Mobs; +using Content.Shared.Speech.Muting; using Robust.Shared.Prototypes; namespace Content.Server.Mobs; diff --git a/Content.Server/Puppet/VentriloquistPuppetSystem.cs b/Content.Server/Puppet/VentriloquistPuppetSystem.cs index 68d660fd1b..3e15a1a06c 100644 --- a/Content.Server/Puppet/VentriloquistPuppetSystem.cs +++ b/Content.Server/Puppet/VentriloquistPuppetSystem.cs @@ -5,6 +5,7 @@ using Content.Shared.Puppet; using Content.Server.Speech.Muting; using Content.Shared.CombatMode; using Content.Shared.Hands; +using Content.Shared.Speech.Muting; namespace Content.Server.Puppet { diff --git a/Content.Server/Speech/Muting/MutedComponent.cs b/Content.Server/Speech/Muting/MutedComponent.cs deleted file mode 100644 index 5b3ae83992..0000000000 --- a/Content.Server/Speech/Muting/MutedComponent.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Content.Server.Speech.Muting -{ - [RegisterComponent] - public sealed partial class MutedComponent : Component - {} -} diff --git a/Content.Server/Speech/Muting/MutingSystem.cs b/Content.Server/Speech/Muting/MutingSystem.cs index b743d9eda8..238d501e24 100644 --- a/Content.Server/Speech/Muting/MutingSystem.cs +++ b/Content.Server/Speech/Muting/MutingSystem.cs @@ -6,6 +6,7 @@ using Content.Server.Speech.EntitySystems; using Content.Shared.Chat.Prototypes; using Content.Shared.Puppet; using Content.Shared.Speech; +using Content.Shared.Speech.Muting; namespace Content.Server.Speech.Muting { diff --git a/Content.Shared/Speech/Muting/MutedComponent.cs b/Content.Shared/Speech/Muting/MutedComponent.cs new file mode 100644 index 0000000000..46e5f2cbd8 --- /dev/null +++ b/Content.Shared/Speech/Muting/MutedComponent.cs @@ -0,0 +1,10 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Speech.Muting +{ + [RegisterComponent, NetworkedComponent] + public sealed partial class MutedComponent : Component + { + + } +}