diff --git a/Content.Server/Speech/Components/AccentWearerNameClothingComponent.cs b/Content.Server/Speech/Components/AccentWearerNameClothingComponent.cs deleted file mode 100644 index 288eaa8dcb..0000000000 --- a/Content.Server/Speech/Components/AccentWearerNameClothingComponent.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Content.Server.Speech.EntitySystems; - -namespace Content.Server.Speech.Components; - -/// -/// Applies any accent components on this item to the name of the wearer while worn. -/// -[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 fc381c5998..0000000000 --- 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; - -/// -public sealed class AccentWearerNameClothingSystem : EntitySystem -{ - [Dependency] private readonly NameModifierSystem _nameMod = default!; - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnGotEquipped); - SubscribeLocalEvent(OnGotUnequipped); - SubscribeLocalEvent>(OnRefreshNameModifiers); - } - - private void OnGotEquipped(Entity ent, ref ClothingGotEquippedEvent args) - { - _nameMod.RefreshNameModifiers(args.Wearer); - } - - private void OnGotUnequipped(Entity ent, ref ClothingGotUnequippedEvent args) - { - _nameMod.RefreshNameModifiers(args.Wearer); - } - - private void OnRefreshNameModifiers(Entity ent, ref InventoryRelayedEvent 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 49b0fb31aa..0000000000 --- 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 c539054624..07272df5b3 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -502,8 +502,6 @@ - type: Appearance - type: AddAccentClothing accent: RussianAccent - - type: RussianAccent - - type: AccentWearerNameClothing - type: Foldable canFoldInsideContainer: true - type: FoldableClothing