From 347b3327aa402187aad03b0d6133182f244d20ff Mon Sep 17 00:00:00 2001 From: themias Date: Mon, 13 Jan 2025 16:23:39 -0500 Subject: [PATCH 1/3] Fix muzzle accent --- .../Components/MumbleAccentComponent.cs | 9 ++++++ .../EntitySystems/MumbleAccentSystem.cs | 29 +++++++++++++++++++ .../Entities/Clothing/Masks/masks.yml | 3 +- 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 Content.Server/Speech/Components/MumbleAccentComponent.cs create mode 100644 Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs diff --git a/Content.Server/Speech/Components/MumbleAccentComponent.cs b/Content.Server/Speech/Components/MumbleAccentComponent.cs new file mode 100644 index 000000000000..0ad174cc3d82 --- /dev/null +++ b/Content.Server/Speech/Components/MumbleAccentComponent.cs @@ -0,0 +1,9 @@ +using Robust.Shared.Audio; + +namespace Content.Server.Speech.Components; + +[RegisterComponent] +public sealed partial class MumbleAccentComponent : Component +{ + +} diff --git a/Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs b/Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs new file mode 100644 index 000000000000..cbb3cd98b23f --- /dev/null +++ b/Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs @@ -0,0 +1,29 @@ +using Content.Server.Speech.Components; + +namespace Content.Server.Speech.EntitySystems; + +public sealed class MumbleAccentSystem : EntitySystem +{ + [Dependency] private readonly ReplacementAccentSystem _replacement = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnAccentGet); + } + + public string Accentuate(string message, MumbleAccentComponent component) + { + var msg = message; + + msg = _replacement.ApplyReplacements(msg, "mumble"); + + return msg; + } + + private void OnAccentGet(EntityUid uid, MumbleAccentComponent component, AccentGetEvent args) + { + args.Message = Accentuate(args.Message, component); + } +} diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 8317f8af897f..5a742a20e7d1 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -319,8 +319,7 @@ unequipDelay: 3 - type: IngestionBlocker - type: AddAccentClothing - accent: ReplacementAccent - replacement: mumble + accent: MumbleAccent - type: Construction graph: Muzzle node: muzzle From 8c41735d55d20dbe6896898cfb47e4c2eca2db30 Mon Sep 17 00:00:00 2001 From: themias Date: Mon, 13 Jan 2025 16:54:41 -0500 Subject: [PATCH 2/3] remove unused import --- Content.Server/Speech/Components/MumbleAccentComponent.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/Content.Server/Speech/Components/MumbleAccentComponent.cs b/Content.Server/Speech/Components/MumbleAccentComponent.cs index 0ad174cc3d82..0681ebab2f87 100644 --- a/Content.Server/Speech/Components/MumbleAccentComponent.cs +++ b/Content.Server/Speech/Components/MumbleAccentComponent.cs @@ -1,5 +1,3 @@ -using Robust.Shared.Audio; - namespace Content.Server.Speech.Components; [RegisterComponent] From 1476625b2a61d915548d0a057ba4788239d1c08d Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Tue, 14 Jan 2025 16:27:09 -0500 Subject: [PATCH 3/3] Update Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs Co-authored-by: Tayrtahn --- Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs b/Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs index cbb3cd98b23f..757f31ad9ea2 100644 --- a/Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/MumbleAccentSystem.cs @@ -15,11 +15,7 @@ public override void Initialize() public string Accentuate(string message, MumbleAccentComponent component) { - var msg = message; - - msg = _replacement.ApplyReplacements(msg, "mumble"); - - return msg; + return _replacement.ApplyReplacements(message, "mumble"); } private void OnAccentGet(EntityUid uid, MumbleAccentComponent component, AccentGetEvent args)