From bc1703323e1ba8da8eefc1e9510a734e9559fd8f Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Fri, 28 Jun 2024 10:08:09 +1000
Subject: [PATCH] Revert "Make wearing an Ushanka also apply accent to your
 name" (#29524)

Revert "Make wearing an Ushanka also apply accent to your name (#29111)"

This reverts commit e5a85e2a1359968ab71c4bcd79bfc834a8b3cb5a.
---
 .../AccentWearerNameClothingComponent.cs      | 10 -----
 .../AccentWearerNameClothingSystem.cs         | 39 -------------------
 .../speech/accent-wearer-name-clothing.ftl    |  1 -
 .../Entities/Clothing/Head/hats.yml           |  2 -
 4 files changed, 52 deletions(-)
 delete mode 100644 Content.Server/Speech/Components/AccentWearerNameClothingComponent.cs
 delete mode 100644 Content.Server/Speech/EntitySystems/AccentWearerNameClothingSystem.cs
 delete mode 100644 Resources/Locale/en-US/speech/accent-wearer-name-clothing.ftl

diff --git a/Content.Server/Speech/Components/AccentWearerNameClothingComponent.cs b/Content.Server/Speech/Components/AccentWearerNameClothingComponent.cs
deleted file mode 100644
index 288eaa8dcbe..00000000000
--- a/Content.Server/Speech/Components/AccentWearerNameClothingComponent.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using Content.Server.Speech.EntitySystems;
-
-namespace Content.Server.Speech.Components;
-
-/// <summary>
-/// Applies any accent components on this item to the name of the wearer while worn.
-/// </summary>
-[RegisterComponent]
-[Access(typeof(AccentWearerNameClothingSystem))]
-public sealed partial class AccentWearerNameClothingComponent : Component;
diff --git a/Content.Server/Speech/EntitySystems/AccentWearerNameClothingSystem.cs b/Content.Server/Speech/EntitySystems/AccentWearerNameClothingSystem.cs
deleted file mode 100644
index fc381c59985..00000000000
--- a/Content.Server/Speech/EntitySystems/AccentWearerNameClothingSystem.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using Content.Server.Speech.Components;
-using Content.Shared.Clothing;
-using Content.Shared.Inventory;
-using Content.Shared.NameModifier.EntitySystems;
-
-namespace Content.Server.Speech.EntitySystems;
-
-/// <inheritdoc cref="AccentWearerNameClothingComponent"/>
-public sealed class AccentWearerNameClothingSystem : EntitySystem
-{
-    [Dependency] private readonly NameModifierSystem _nameMod = default!;
-
-    public override void Initialize()
-    {
-        base.Initialize();
-
-        SubscribeLocalEvent<AccentWearerNameClothingComponent, ClothingGotEquippedEvent>(OnGotEquipped);
-        SubscribeLocalEvent<AccentWearerNameClothingComponent, ClothingGotUnequippedEvent>(OnGotUnequipped);
-        SubscribeLocalEvent<AccentWearerNameClothingComponent, InventoryRelayedEvent<RefreshNameModifiersEvent>>(OnRefreshNameModifiers);
-    }
-
-    private void OnGotEquipped(Entity<AccentWearerNameClothingComponent> ent, ref ClothingGotEquippedEvent args)
-    {
-        _nameMod.RefreshNameModifiers(args.Wearer);
-    }
-
-    private void OnGotUnequipped(Entity<AccentWearerNameClothingComponent> ent, ref ClothingGotUnequippedEvent args)
-    {
-        _nameMod.RefreshNameModifiers(args.Wearer);
-    }
-
-    private void OnRefreshNameModifiers(Entity<AccentWearerNameClothingComponent> ent, ref InventoryRelayedEvent<RefreshNameModifiersEvent> args)
-    {
-        var ev = new AccentGetEvent(ent, args.Args.BaseName);
-        RaiseLocalEvent(ent, ev);
-        // Use a negative priority since we're going to bulldoze any earlier changes
-        args.Args.AddModifier("comp-accent-wearer-name-clothing-format", -1, ("accentedName", ev.Message));
-    }
-}
diff --git a/Resources/Locale/en-US/speech/accent-wearer-name-clothing.ftl b/Resources/Locale/en-US/speech/accent-wearer-name-clothing.ftl
deleted file mode 100644
index 49b0fb31aac..00000000000
--- a/Resources/Locale/en-US/speech/accent-wearer-name-clothing.ftl
+++ /dev/null
@@ -1 +0,0 @@
-comp-accent-wearer-name-clothing-format = {$accentedName}
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index e2786f70f06..d220d55f1f5 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -495,8 +495,6 @@
   - type: Appearance
   - type: AddAccentClothing
     accent: RussianAccent
-  - type: RussianAccent
-  - type: AccentWearerNameClothing
   - type: Foldable
     canFoldInsideContainer: true
   - type: FoldableClothing