From 182a477a5747a4062a21fac8f01882993c993bf5 Mon Sep 17 00:00:00 2001
From: Erol509 <konradosowski338@gmail.com>
Date: Sat, 5 Oct 2024 12:18:09 +0200
Subject: [PATCH 1/7] Somewhat ok

---
 .../Speech/Components/CatAccentComponent.cs   |   8 +
 .../Speech/EntitySystems/CatAccentSystem.cs   |  38 ++++
 .../Locale/en-US/_NF/accent/cat_accent.ftl    | 202 ++++++++++++++++++
 Resources/Locale/en-US/_NF/traits/traits.ftl  |   5 +-
 Resources/Prototypes/_NF/Traits/speech.yml    |   9 +
 5 files changed, 261 insertions(+), 1 deletion(-)
 create mode 100644 Content.Server/_NF/Speech/Components/CatAccentComponent.cs
 create mode 100644 Content.Server/_NF/Speech/EntitySystems/CatAccentSystem.cs
 create mode 100644 Resources/Locale/en-US/_NF/accent/cat_accent.ftl

diff --git a/Content.Server/_NF/Speech/Components/CatAccentComponent.cs b/Content.Server/_NF/Speech/Components/CatAccentComponent.cs
new file mode 100644
index 00000000000..95ee556750f
--- /dev/null
+++ b/Content.Server/_NF/Speech/Components/CatAccentComponent.cs
@@ -0,0 +1,8 @@
+using Content.Server._NF.Speech.EntitySystems;
+
+namespace Content.Server._NF.Speech.Components;
+
+[RegisterComponent]
+[Access(typeof(CatAccentSystem))]
+public sealed partial class CatAccentComponent : Component
+{ }
diff --git a/Content.Server/_NF/Speech/EntitySystems/CatAccentSystem.cs b/Content.Server/_NF/Speech/EntitySystems/CatAccentSystem.cs
new file mode 100644
index 00000000000..a045f7146c8
--- /dev/null
+++ b/Content.Server/_NF/Speech/EntitySystems/CatAccentSystem.cs
@@ -0,0 +1,38 @@
+using Content.Server._NF.Speech.Components;
+using Content.Server.Speech;
+using Content.Server.Speech.EntitySystems;
+using System.Text.RegularExpressions;
+
+namespace Content.Server._NF.Speech.EntitySystems;
+
+public sealed class CatAccentSystem : EntitySystem
+{
+    private static readonly Regex RegexAn = new(@"\b(\w*an)\b", RegexOptions.IgnoreCase); // Words ending in "an"
+    private static readonly Regex RegexEr = new(@"(\w*[^pPfF])er\b", RegexOptions.IgnoreCase); // Words ending in "er"
+    private static readonly Regex RegexTion = new(@"\b(\w*tion)\b", RegexOptions.IgnoreCase); // Words ending in "tion"
+    private static readonly Regex RegexSion = new(@"\b(\w*sion)\b", RegexOptions.IgnoreCase); // Words ending in "sion"
+    private static readonly Regex RegexR = new(@"r", RegexOptions.IgnoreCase); // Regex to match 'r'
+
+    [Dependency] private readonly ReplacementAccentSystem _replacement = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<CatAccentComponent, AccentGetEvent>(OnAccent);
+    }
+
+    private void OnAccent(EntityUid uid, CatAccentComponent component, AccentGetEvent args)
+    {
+        var message = args.Message;
+
+        message = _replacement.ApplyReplacements(message, "cat_accent");
+
+        message = RegexAn.Replace(message, "$1nyan"); // Replace words ending with "an" -> "nyan"
+        message = RegexEr.Replace(message, "$1ah"); // Replace "er" with "ah"
+        message = RegexTion.Replace(message, "$1nyation"); // Replace "tion" with "nyation"
+        message = RegexSion.Replace(message, "$1nyation"); // Replace "sion" with "nyation"
+        message = RegexR.Replace(message, "rrr"); // Replace 'r' with 'rrr' for purring effect
+
+        args.Message = message;
+    }
+}
diff --git a/Resources/Locale/en-US/_NF/accent/cat_accent.ftl b/Resources/Locale/en-US/_NF/accent/cat_accent.ftl
new file mode 100644
index 00000000000..8eb86f7ced2
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/accent/cat_accent.ftl
@@ -0,0 +1,202 @@
+accent-cat-words-1 = Howdy
+accent-cat-words-2 = Hello
+accent-cat-words-3 = Hey
+accent-cat-words-4 = Yes
+accent-cat-words-5 = No
+accent-cat-words-6 = Okay
+accent-cat-words-7 = Please
+accent-cat-words-8 = Friend
+accent-cat-words-9 = You
+accent-cat-words-10 = Me
+accent-cat-words-11 = Now
+accent-cat-words-12 = Bye
+accent-cat-words-13 = Stop
+accent-cat-words-14 = Wait
+accent-cat-words-15 = Good
+accent-cat-words-16 = Bad
+accent-cat-words-17 = Thank you
+accent-cat-words-18 = Wow
+accent-cat-words-19 = Help
+accent-cat-words-20 = Oops
+accent-cat-words-21 = Sullivan
+accent-cat-words-22 = Dog
+accent-cat-words-23 = Fish
+accent-cat-words-24 = Food
+accent-cat-words-25 = Water
+accent-cat-words-26 = Happy
+accent-cat-words-27 = Sad
+accent-cat-words-28 = Love
+accent-cat-words-29 = Play
+accent-cat-words-30 = Sleep
+accent-cat-words-31 = Run
+accent-cat-words-32 = Jump
+accent-cat-words-33 = Dance
+accent-cat-words-34 = Sing
+accent-cat-words-35 = Watch
+accent-cat-words-36 = Work
+accent-cat-words-37 = Together
+accent-cat-words-38 = Always
+accent-cat-words-39 = Never
+accent-cat-words-40 = Smart
+accent-cat-words-41 = Loveable
+accent-cat-words-42 = Cute
+accent-cat-words-43 = Funny
+accent-cat-words-44 = Happy
+accent-cat-words-45 = Angry
+accent-cat-words-46 = Sad
+accent-cat-words-47 = Smart
+accent-cat-words-48 = Sneaky
+accent-cat-words-49 = Brave
+accent-cat-words-50 = Tired
+accent-cat-words-51 = Quiet
+accent-cat-words-52 = Loud
+accent-cat-words-53 = Chill
+accent-cat-words-54 = Cool
+accent-cat-words-55 = Cranky
+accent-cat-words-56 = Sleepy
+accent-cat-words-57 = Dream
+accent-cat-words-58 = Gift
+accent-cat-words-59 = Treat
+accent-cat-words-60 = Snack
+accent-cat-words-61 = Playful
+accent-cat-words-62 = Gentle
+accent-cat-words-63 = Clumsy
+accent-cat-words-64 = Clever
+accent-cat-words-65 = Friendly
+accent-cat-words-66 = Shy
+accent-cat-words-67 = Bold
+accent-cat-words-68 = Sweet
+accent-cat-words-69 = Spicy
+accent-cat-words-70 = Silly
+accent-cat-words-71 = Gloomy
+accent-cat-words-72 = Grumpy
+accent-cat-words-73 = Cozy
+accent-cat-words-74 = Fluffy
+accent-cat-words-75 = Huggable
+accent-cat-words-76 = Cuddly
+accent-cat-words-77 = Bright
+accent-cat-words-78 = Lucky
+accent-cat-words-79 = Joyful
+accent-cat-words-80 = Creative
+accent-cat-words-81 = Happy
+accent-cat-words-82 = Angry
+accent-cat-words-83 = Sad
+accent-cat-words-84 = Excited
+accent-cat-words-85 = Bored
+accent-cat-words-86 = Tired
+accent-cat-words-87 = Witty
+accent-cat-words-88 = Sneaky
+accent-cat-words-89 = Brave
+accent-cat-words-90 = Silly
+accent-cat-words-91 = Friendly
+accent-cat-words-92 = Curious
+accent-cat-words-93 = Nervous
+accent-cat-words-94 = Sassy
+accent-cat-words-95 = Peaceful
+accent-cat-words-96 = Artistic
+accent-cat-words-97 = Romantic
+accent-cat-words-98 = Adventurous
+accent-cat-words-99 = Compassionate
+accent-cat-words-100 = Generous
+
+
+accent-cat-words-replace-1 = Meowdy
+accent-cat-words-replace-2 = Mewllo
+accent-cat-words-replace-3 = Mew
+accent-cat-words-replace-4 = Nyaa
+accent-cat-words-replace-5 = Nyo
+accent-cat-words-replace-6 = Nyokay
+accent-cat-words-replace-7 = Purrlease
+accent-cat-words-replace-8 = Furriend
+accent-cat-words-replace-9 = Mew
+accent-cat-words-replace-10 = Mewself
+accent-cat-words-replace-11 = Meow
+accent-cat-words-replace-12 = Meow-bye
+accent-cat-words-replace-13 = Nyap
+accent-cat-words-replace-14 = Paws
+accent-cat-words-replace-15 = Purrfect
+accent-cat-words-replace-16 = Pawful
+accent-cat-words-replace-17 = Nyank you
+accent-cat-words-replace-18 = Meow-wow
+accent-cat-words-replace-19 = Hisselp
+accent-cat-words-replace-20 = Uh-oh-mew
+accent-cat-words-replace-21 = Sullinyan
+accent-cat-words-replace-22 = Doggo
+accent-cat-words-replace-23 = Fishy
+accent-cat-words-replace-24 = Noms
+accent-cat-words-replace-25 = Meowter
+accent-cat-words-replace-26 = Purrfect
+accent-cat-words-replace-27 = Nyansad
+accent-cat-words-replace-28 = Nyolove
+accent-cat-words-replace-29 = Purrlay
+accent-cat-words-replace-30 = Naps
+accent-cat-words-replace-31 = Meowrun
+accent-cat-words-replace-32 = Nyump
+accent-cat-words-replace-33 = Purrdance
+accent-cat-words-replace-34 = Neko sing
+accent-cat-words-replace-35 = Meowtch
+accent-cat-words-replace-36 = Nyawork
+accent-cat-words-replace-37 = Togethers
+accent-cat-words-replace-38 = Alwaysnya
+accent-cat-words-replace-39 = Nyenever
+accent-cat-words-replace-40 = Smurt
+accent-cat-words-replace-41 = Lovable
+accent-cat-words-replace-42 = Kawaii
+accent-cat-words-replace-43 = Meowny
+accent-cat-words-replace-44 = Purrfectly
+accent-cat-words-replace-45 = Meowgry
+accent-cat-words-replace-46 = Nyansad
+accent-cat-words-replace-47 = Purrsmart
+accent-cat-words-replace-48 = Sneaksy
+accent-cat-words-replace-49 = Braffy
+accent-cat-words-replace-50 = Nyired
+accent-cat-words-replace-51 = Nyquiet
+accent-cat-words-replace-52 = Loudny
+accent-cat-words-replace-53 = Chillax
+accent-cat-words-replace-54 = Coolny
+accent-cat-words-replace-55 = Cranky
+accent-cat-words-replace-56 = Sleapy
+accent-cat-words-replace-57 = Dreamy
+accent-cat-words-replace-58 = Gifty
+accent-cat-words-replace-59 = Treated
+accent-cat-words-replace-60 = Nyack
+accent-cat-words-replace-61 = Playny
+accent-cat-words-replace-62 = Purrgentle
+accent-cat-words-replace-63 = Clumsynyan
+accent-cat-words-replace-64 = Clevernyan
+accent-cat-words-replace-65 = Furriendly
+accent-cat-words-replace-66 = Shynyan
+accent-cat-words-replace-67 = Boldny
+accent-cat-words-replace-68 = Sweetny
+accent-cat-words-replace-69 = Spicynyan
+accent-cat-words-replace-70 = Sillynya
+accent-cat-words-replace-71 = Gloomy
+accent-cat-words-replace-72 = Grumpynyan
+accent-cat-words-replace-73 = Cozy
+accent-cat-words-replace-74 = Fluffynya
+accent-cat-words-replace-75 = Huggles
+accent-cat-words-replace-76 = Cuddlypaws
+accent-cat-words-replace-77 = Brightny
+accent-cat-words-replace-78 = Luckynya
+accent-cat-words-replace-79 = Joyny
+accent-cat-words-replace-80 = Creativny
+accent-cat-words-replace-81 = Nyaappy
+accent-cat-words-replace-82 = Meowgry
+accent-cat-words-replace-83 = Nyansad
+accent-cat-words-replace-84 = Nyaexcited
+accent-cat-words-replace-85 = Bore-nyan
+accent-cat-words-replace-86 = Nyired
+accent-cat-words-replace-87 = Wittynya
+accent-cat-words-replace-88 = Sneaky
+accent-cat-words-replace-89 = Bravepaw
+accent-cat-words-replace-90 = Sillypaws
+accent-cat-words-replace-91 = Furrriend
+accent-cat-words-replace-92 = Curiousnyan
+accent-cat-words-replace-93 = Nervousnyan
+accent-cat-words-replace-94 = Sassynyan
+accent-cat-words-replace-95 = Peacefurr
+accent-cat-words-replace-96 = Artisny
+accent-cat-words-replace-97 = Romantnyan
+accent-cat-words-replace-98 = Advennyture
+accent-cat-words-replace-99 = Compa-nyon
+accent-cat-words-replace-100 = Genero-sque
diff --git a/Resources/Locale/en-US/_NF/traits/traits.ftl b/Resources/Locale/en-US/_NF/traits/traits.ftl
index e574d7d162f..9f63a8c8016 100644
--- a/Resources/Locale/en-US/_NF/traits/traits.ftl
+++ b/Resources/Locale/en-US/_NF/traits/traits.ftl
@@ -9,6 +9,9 @@ trait-stinky-in-range-self = Something smells foul!
 trait-goblin-accent-name = Goblin cant
 trait-goblin-accent-desc = You speak in secret language many find annoying and not that secretive.
 
+trait-cat-accent-name = Cat Talk
+trait-cat-accent-desc = You speak the langue of REDACTED, you must be crazy to understand it.
+
 trait-pious-name = Pious
 trait-pious-desc = You are in touch with the gods, but your vows keep you from striking in anger.
 
@@ -20,4 +23,4 @@ trait-clumsy-desc = You are very clumsy! Certain actions, like shooting, are mor
 
 # These traits are bound to be replaced with a slider, but they live here for now.
 trait-tall-name = Tall
-trait-short-name = Short
\ No newline at end of file
+trait-short-name = Short
diff --git a/Resources/Prototypes/_NF/Traits/speech.yml b/Resources/Prototypes/_NF/Traits/speech.yml
index d1b6b99acc1..09ccc8f329b 100644
--- a/Resources/Prototypes/_NF/Traits/speech.yml
+++ b/Resources/Prototypes/_NF/Traits/speech.yml
@@ -19,3 +19,12 @@
   cost: 2
   components:
     - type: GoblinAccent
+
+- type: trait
+  id: CatAccent
+  name: trait-cat-accent-name
+  description: trait-cat-accent-desc
+  category: SpeechTraits
+  cost: 2
+  components:
+    - type: CatAccent

From fe22334f71118a4fa75e2cc257cdc24014bfb642 Mon Sep 17 00:00:00 2001
From: Erol509 <konradosowski338@gmail.com>
Date: Sat, 5 Oct 2024 12:28:46 +0200
Subject: [PATCH 2/7] Update CatAccentSystem.cs

---
 Content.Server/_NF/Speech/EntitySystems/CatAccentSystem.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Content.Server/_NF/Speech/EntitySystems/CatAccentSystem.cs b/Content.Server/_NF/Speech/EntitySystems/CatAccentSystem.cs
index a045f7146c8..068339184d0 100644
--- a/Content.Server/_NF/Speech/EntitySystems/CatAccentSystem.cs
+++ b/Content.Server/_NF/Speech/EntitySystems/CatAccentSystem.cs
@@ -28,7 +28,6 @@ private void OnAccent(EntityUid uid, CatAccentComponent component, AccentGetEven
         message = _replacement.ApplyReplacements(message, "cat_accent");
 
         message = RegexAn.Replace(message, "$1nyan"); // Replace words ending with "an" -> "nyan"
-        message = RegexEr.Replace(message, "$1ah"); // Replace "er" with "ah"
         message = RegexTion.Replace(message, "$1nyation"); // Replace "tion" with "nyation"
         message = RegexSion.Replace(message, "$1nyation"); // Replace "sion" with "nyation"
         message = RegexR.Replace(message, "rrr"); // Replace 'r' with 'rrr' for purring effect

From 4e6759126fda04c3b05c1bb82b517f8832cf32b3 Mon Sep 17 00:00:00 2001
From: Erol509 <konradosowski338@gmail.com>
Date: Sat, 5 Oct 2024 12:42:45 +0200
Subject: [PATCH 3/7] Changes based purring effect or neko w replacement

---
 .../_NF/Speech/EntitySystems/CatAccentSystem.cs   | 15 ++++++++++++---
 Resources/Locale/en-US/_NF/accent/cat_accent.ftl  |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Content.Server/_NF/Speech/EntitySystems/CatAccentSystem.cs b/Content.Server/_NF/Speech/EntitySystems/CatAccentSystem.cs
index 068339184d0..34e2c75c387 100644
--- a/Content.Server/_NF/Speech/EntitySystems/CatAccentSystem.cs
+++ b/Content.Server/_NF/Speech/EntitySystems/CatAccentSystem.cs
@@ -1,5 +1,6 @@
 using Content.Server._NF.Speech.Components;
 using Content.Server.Speech;
+using Robust.Shared.Random;
 using Content.Server.Speech.EntitySystems;
 using System.Text.RegularExpressions;
 
@@ -10,10 +11,12 @@ public sealed class CatAccentSystem : EntitySystem
     private static readonly Regex RegexAn = new(@"\b(\w*an)\b", RegexOptions.IgnoreCase); // Words ending in "an"
     private static readonly Regex RegexEr = new(@"(\w*[^pPfF])er\b", RegexOptions.IgnoreCase); // Words ending in "er"
     private static readonly Regex RegexTion = new(@"\b(\w*tion)\b", RegexOptions.IgnoreCase); // Words ending in "tion"
-    private static readonly Regex RegexSion = new(@"\b(\w*sion)\b", RegexOptions.IgnoreCase); // Words ending in "sion"
+    private static readonly Regex RegexErn = new(@"\b(\w*ern)\b", RegexOptions.IgnoreCase); // Words ending in "ern"
+    private static readonly Regex RegexOr = new(@"\b(\w*or)\b", RegexOptions.IgnoreCase); // Words ending in "or"
     private static readonly Regex RegexR = new(@"r", RegexOptions.IgnoreCase); // Regex to match 'r'
 
     [Dependency] private readonly ReplacementAccentSystem _replacement = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
 
     public override void Initialize()
     {
@@ -29,8 +32,14 @@ private void OnAccent(EntityUid uid, CatAccentComponent component, AccentGetEven
 
         message = RegexAn.Replace(message, "$1nyan"); // Replace words ending with "an" -> "nyan"
         message = RegexTion.Replace(message, "$1nyation"); // Replace "tion" with "nyation"
-        message = RegexSion.Replace(message, "$1nyation"); // Replace "sion" with "nyation"
-        message = RegexR.Replace(message, "rrr"); // Replace 'r' with 'rrr' for purring effect
+        message = RegexErn.Replace(message, "ewn");
+        message = RegexOr.Replace(message, "ow");
+
+        foreach (Match match in RegexR.Matches(message))
+            if (_random.Prob(0.5f))
+                message = RegexR.Replace(message, "rrr"); // Replace 'r' with 'rrr' for purring effect
+            else
+                message = RegexR.Replace(message, "w");
 
         args.Message = message;
     }
diff --git a/Resources/Locale/en-US/_NF/accent/cat_accent.ftl b/Resources/Locale/en-US/_NF/accent/cat_accent.ftl
index 8eb86f7ced2..e01cb602148 100644
--- a/Resources/Locale/en-US/_NF/accent/cat_accent.ftl
+++ b/Resources/Locale/en-US/_NF/accent/cat_accent.ftl
@@ -101,7 +101,7 @@ accent-cat-words-100 = Generous
 
 
 accent-cat-words-replace-1 = Meowdy
-accent-cat-words-replace-2 = Mewllo
+accent-cat-words-replace-2 = Hewwo
 accent-cat-words-replace-3 = Mew
 accent-cat-words-replace-4 = Nyaa
 accent-cat-words-replace-5 = Nyo

From 1a333c4d43d2a68104d1cd291b668e4415a71230 Mon Sep 17 00:00:00 2001
From: Erol509 <konradosowski338@gmail.com>
Date: Sat, 5 Oct 2024 13:05:29 +0200
Subject: [PATCH 4/7] Update CatAccentSystem.cs

---
 Content.Server/_NF/Speech/EntitySystems/CatAccentSystem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Server/_NF/Speech/EntitySystems/CatAccentSystem.cs b/Content.Server/_NF/Speech/EntitySystems/CatAccentSystem.cs
index 34e2c75c387..a15426bc3c8 100644
--- a/Content.Server/_NF/Speech/EntitySystems/CatAccentSystem.cs
+++ b/Content.Server/_NF/Speech/EntitySystems/CatAccentSystem.cs
@@ -32,8 +32,8 @@ private void OnAccent(EntityUid uid, CatAccentComponent component, AccentGetEven
 
         message = RegexAn.Replace(message, "$1nyan"); // Replace words ending with "an" -> "nyan"
         message = RegexTion.Replace(message, "$1nyation"); // Replace "tion" with "nyation"
-        message = RegexErn.Replace(message, "ewn");
-        message = RegexOr.Replace(message, "ow");
+        message = RegexErn.Replace(message, "ewn"); // replace words ending with "ern" -> "ewn"
+        message = RegexOr.Replace(message, "ow"); // replace words ending with "or" -> "ow"
 
         foreach (Match match in RegexR.Matches(message))
             if (_random.Prob(0.5f))

From a207fe207830f9e2410d32e622eb43eb2e5f812d Mon Sep 17 00:00:00 2001
From: Erol509 <konradosowski338@gmail.com>
Date: Sat, 5 Oct 2024 14:08:59 +0200
Subject: [PATCH 5/7] Better

---
 .../Speech/EntitySystems/CatAccentSystem.cs   |  27 +++--
 .../Locale/en-US/_NF/accent/cat_accent.ftl    |  10 +-
 .../_NF/Accents/word_replacements.yml         | 104 ++++++++++++++++++
 3 files changed, 124 insertions(+), 17 deletions(-)

diff --git a/Content.Server/_NF/Speech/EntitySystems/CatAccentSystem.cs b/Content.Server/_NF/Speech/EntitySystems/CatAccentSystem.cs
index a15426bc3c8..222d6c31151 100644
--- a/Content.Server/_NF/Speech/EntitySystems/CatAccentSystem.cs
+++ b/Content.Server/_NF/Speech/EntitySystems/CatAccentSystem.cs
@@ -8,9 +8,7 @@ namespace Content.Server._NF.Speech.EntitySystems;
 
 public sealed class CatAccentSystem : EntitySystem
 {
-    private static readonly Regex RegexAn = new(@"\b(\w*an)\b", RegexOptions.IgnoreCase); // Words ending in "an"
     private static readonly Regex RegexEr = new(@"(\w*[^pPfF])er\b", RegexOptions.IgnoreCase); // Words ending in "er"
-    private static readonly Regex RegexTion = new(@"\b(\w*tion)\b", RegexOptions.IgnoreCase); // Words ending in "tion"
     private static readonly Regex RegexErn = new(@"\b(\w*ern)\b", RegexOptions.IgnoreCase); // Words ending in "ern"
     private static readonly Regex RegexOr = new(@"\b(\w*or)\b", RegexOptions.IgnoreCase); // Words ending in "or"
     private static readonly Regex RegexR = new(@"r", RegexOptions.IgnoreCase); // Regex to match 'r'
@@ -29,17 +27,22 @@ private void OnAccent(EntityUid uid, CatAccentComponent component, AccentGetEven
         var message = args.Message;
 
         message = _replacement.ApplyReplacements(message, "cat_accent");
-
-        message = RegexAn.Replace(message, "$1nyan"); // Replace words ending with "an" -> "nyan"
-        message = RegexTion.Replace(message, "$1nyation"); // Replace "tion" with "nyation"
-        message = RegexErn.Replace(message, "ewn"); // replace words ending with "ern" -> "ewn"
-        message = RegexOr.Replace(message, "ow"); // replace words ending with "or" -> "ow"
-
-        foreach (Match match in RegexR.Matches(message))
-            if (_random.Prob(0.5f))
-                message = RegexR.Replace(message, "rrr"); // Replace 'r' with 'rrr' for purring effect
+        message = RegexErn.Replace(message, "$ewn"); // replace words ending with "ern" -> "ewn"
+        message = RegexOr.Replace(message, "$ow"); // replace words ending with "or" -> "ow"
+
+        // Replace 'r' with 'rrr' or 'w' based on random chance, while preserving case
+        message = RegexR.Replace(message, match =>
+        {
+            // Check if the matched character is uppercase
+            if (char.IsUpper(match.Value[0]))
+            {
+                return _random.Prob(0.5f) ? "RRR" : "W"; // Uppercase replacement
+            }
             else
-                message = RegexR.Replace(message, "w");
+            {
+                return _random.Prob(0.5f) ? "rrr" : "w"; // Lowercase replacement
+            }
+        });
 
         args.Message = message;
     }
diff --git a/Resources/Locale/en-US/_NF/accent/cat_accent.ftl b/Resources/Locale/en-US/_NF/accent/cat_accent.ftl
index e01cb602148..bd6d61792dd 100644
--- a/Resources/Locale/en-US/_NF/accent/cat_accent.ftl
+++ b/Resources/Locale/en-US/_NF/accent/cat_accent.ftl
@@ -96,19 +96,19 @@ accent-cat-words-95 = Peaceful
 accent-cat-words-96 = Artistic
 accent-cat-words-97 = Romantic
 accent-cat-words-98 = Adventurous
-accent-cat-words-99 = Compassionate
+accent-cat-words-99 = Them
 accent-cat-words-100 = Generous
 
 
 accent-cat-words-replace-1 = Meowdy
 accent-cat-words-replace-2 = Hewwo
-accent-cat-words-replace-3 = Mew
-accent-cat-words-replace-4 = Nyaa
+accent-cat-words-replace-3 = Mewo
+accent-cat-words-replace-4 = Ya
 accent-cat-words-replace-5 = Nyo
 accent-cat-words-replace-6 = Nyokay
 accent-cat-words-replace-7 = Purrlease
 accent-cat-words-replace-8 = Furriend
-accent-cat-words-replace-9 = Mew
+accent-cat-words-replace-9 = Youw
 accent-cat-words-replace-10 = Mewself
 accent-cat-words-replace-11 = Meow
 accent-cat-words-replace-12 = Meow-bye
@@ -198,5 +198,5 @@ accent-cat-words-replace-95 = Peacefurr
 accent-cat-words-replace-96 = Artisny
 accent-cat-words-replace-97 = Romantnyan
 accent-cat-words-replace-98 = Advennyture
-accent-cat-words-replace-99 = Compa-nyon
+accent-cat-words-replace-99 = Nyem
 accent-cat-words-replace-100 = Genero-sque
diff --git a/Resources/Prototypes/_NF/Accents/word_replacements.yml b/Resources/Prototypes/_NF/Accents/word_replacements.yml
index 0ec10d0f083..1652f81c5e0 100644
--- a/Resources/Prototypes/_NF/Accents/word_replacements.yml
+++ b/Resources/Prototypes/_NF/Accents/word_replacements.yml
@@ -777,3 +777,107 @@
     accent-streetpunk-replaced-341: accent-streetpunk-replacement-341
     accent-streetpunk-replaced-342: accent-streetpunk-replacement-342
     accent-streetpunk-replaced-343: accent-streetpunk-replacement-343
+
+- type: accent
+  id: cat_accent
+  wordReplacements:
+    accent-cat-words-1: accent-cat-words-replace-1
+    accent-cat-words-2: accent-cat-words-replace-2
+    accent-cat-words-3: accent-cat-words-replace-3
+    accent-cat-words-4: accent-cat-words-replace-4
+    accent-cat-words-5: accent-cat-words-replace-5
+    accent-cat-words-6: accent-cat-words-replace-6
+    accent-cat-words-7: accent-cat-words-replace-7
+    accent-cat-words-8: accent-cat-words-replace-8
+    accent-cat-words-9: accent-cat-words-replace-9
+    accent-cat-words-10: accent-cat-words-replace-10
+    accent-cat-words-11: accent-cat-words-replace-11
+    accent-cat-words-12: accent-cat-words-replace-12
+    accent-cat-words-13: accent-cat-words-replace-13
+    accent-cat-words-14: accent-cat-words-replace-14
+    accent-cat-words-15: accent-cat-words-replace-15
+    accent-cat-words-16: accent-cat-words-replace-16
+    accent-cat-words-17: accent-cat-words-replace-17
+    accent-cat-words-18: accent-cat-words-replace-18
+    accent-cat-words-19: accent-cat-words-replace-19
+    accent-cat-words-20: accent-cat-words-replace-20
+    accent-cat-words-21: accent-cat-words-replace-21
+    accent-cat-words-22: accent-cat-words-replace-22
+    accent-cat-words-23: accent-cat-words-replace-23
+    accent-cat-words-24: accent-cat-words-replace-24
+    accent-cat-words-25: accent-cat-words-replace-25
+    accent-cat-words-26: accent-cat-words-replace-26
+    accent-cat-words-27: accent-cat-words-replace-27
+    accent-cat-words-28: accent-cat-words-replace-28
+    accent-cat-words-29: accent-cat-words-replace-29
+    accent-cat-words-30: accent-cat-words-replace-30
+    accent-cat-words-31: accent-cat-words-replace-31
+    accent-cat-words-32: accent-cat-words-replace-32
+    accent-cat-words-33: accent-cat-words-replace-33
+    accent-cat-words-34: accent-cat-words-replace-34
+    accent-cat-words-35: accent-cat-words-replace-35
+    accent-cat-words-36: accent-cat-words-replace-36
+    accent-cat-words-37: accent-cat-words-replace-37
+    accent-cat-words-38: accent-cat-words-replace-38
+    accent-cat-words-39: accent-cat-words-replace-39
+    accent-cat-words-40: accent-cat-words-replace-40
+    accent-cat-words-41: accent-cat-words-replace-41
+    accent-cat-words-42: accent-cat-words-replace-42
+    accent-cat-words-43: accent-cat-words-replace-43
+    accent-cat-words-44: accent-cat-words-replace-44
+    accent-cat-words-45: accent-cat-words-replace-45
+    accent-cat-words-46: accent-cat-words-replace-46
+    accent-cat-words-47: accent-cat-words-replace-47
+    accent-cat-words-48: accent-cat-words-replace-48
+    accent-cat-words-49: accent-cat-words-replace-49
+    accent-cat-words-50: accent-cat-words-replace-50
+    accent-cat-words-51: accent-cat-words-replace-51
+    accent-cat-words-52: accent-cat-words-replace-52
+    accent-cat-words-53: accent-cat-words-replace-53
+    accent-cat-words-54: accent-cat-words-replace-54
+    accent-cat-words-55: accent-cat-words-replace-55
+    accent-cat-words-56: accent-cat-words-replace-56
+    accent-cat-words-57: accent-cat-words-replace-57
+    accent-cat-words-58: accent-cat-words-replace-58
+    accent-cat-words-59: accent-cat-words-replace-59
+    accent-cat-words-60: accent-cat-words-replace-60
+    accent-cat-words-61: accent-cat-words-replace-61
+    accent-cat-words-62: accent-cat-words-replace-62
+    accent-cat-words-63: accent-cat-words-replace-63
+    accent-cat-words-64: accent-cat-words-replace-64
+    accent-cat-words-65: accent-cat-words-replace-65
+    accent-cat-words-66: accent-cat-words-replace-66
+    accent-cat-words-67: accent-cat-words-replace-67
+    accent-cat-words-68: accent-cat-words-replace-68
+    accent-cat-words-69: accent-cat-words-replace-69
+    accent-cat-words-70: accent-cat-words-replace-70
+    accent-cat-words-71: accent-cat-words-replace-71
+    accent-cat-words-72: accent-cat-words-replace-72
+    accent-cat-words-73: accent-cat-words-replace-73
+    accent-cat-words-74: accent-cat-words-replace-74
+    accent-cat-words-75: accent-cat-words-replace-75
+    accent-cat-words-76: accent-cat-words-replace-76
+    accent-cat-words-77: accent-cat-words-replace-77
+    accent-cat-words-78: accent-cat-words-replace-78
+    accent-cat-words-79: accent-cat-words-replace-79
+    accent-cat-words-80: accent-cat-words-replace-80
+    accent-cat-words-81: accent-cat-words-replace-81
+    accent-cat-words-82: accent-cat-words-replace-82
+    accent-cat-words-83: accent-cat-words-replace-83
+    accent-cat-words-84: accent-cat-words-replace-84
+    accent-cat-words-85: accent-cat-words-replace-85
+    accent-cat-words-86: accent-cat-words-replace-86
+    accent-cat-words-87: accent-cat-words-replace-87
+    accent-cat-words-88: accent-cat-words-replace-88
+    accent-cat-words-89: accent-cat-words-replace-89
+    accent-cat-words-90: accent-cat-words-replace-90
+    accent-cat-words-91: accent-cat-words-replace-91
+    accent-cat-words-92: accent-cat-words-replace-92
+    accent-cat-words-93: accent-cat-words-replace-93
+    accent-cat-words-94: accent-cat-words-replace-94
+    accent-cat-words-95: accent-cat-words-replace-95
+    accent-cat-words-96: accent-cat-words-replace-96
+    accent-cat-words-97: accent-cat-words-replace-97
+    accent-cat-words-98: accent-cat-words-replace-98
+    accent-cat-words-99: accent-cat-words-replace-99
+    accent-cat-words-100: accent-cat-words-replace-100

From b9127ade3713d8f2da3b13ad6f267652d16871e5 Mon Sep 17 00:00:00 2001
From: Erol509 <konradosowski338@gmail.com>
Date: Sat, 5 Oct 2024 14:10:06 +0200
Subject: [PATCH 6/7] Update cat_accent.ftl

---
 .../Locale/en-US/_NF/accent/cat_accent.ftl     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Resources/Locale/en-US/_NF/accent/cat_accent.ftl b/Resources/Locale/en-US/_NF/accent/cat_accent.ftl
index bd6d61792dd..3610a761fd0 100644
--- a/Resources/Locale/en-US/_NF/accent/cat_accent.ftl
+++ b/Resources/Locale/en-US/_NF/accent/cat_accent.ftl
@@ -70,7 +70,7 @@ accent-cat-words-69 = Spicy
 accent-cat-words-70 = Silly
 accent-cat-words-71 = Gloomy
 accent-cat-words-72 = Grumpy
-accent-cat-words-73 = Cozy
+accent-cat-words-73 = Smuggler
 accent-cat-words-74 = Fluffy
 accent-cat-words-75 = Huggable
 accent-cat-words-76 = Cuddly
@@ -97,7 +97,7 @@ accent-cat-words-96 = Artistic
 accent-cat-words-97 = Romantic
 accent-cat-words-98 = Adventurous
 accent-cat-words-99 = Them
-accent-cat-words-100 = Generous
+accent-cat-words-100 = Outpost
 
 
 accent-cat-words-replace-1 = Meowdy
@@ -112,8 +112,8 @@ accent-cat-words-replace-9 = Youw
 accent-cat-words-replace-10 = Mewself
 accent-cat-words-replace-11 = Meow
 accent-cat-words-replace-12 = Meow-bye
-accent-cat-words-replace-13 = Nyap
-accent-cat-words-replace-14 = Paws
+accent-cat-words-replace-13 = Stop it
+accent-cat-words-replace-14 = Wait a meowment
 accent-cat-words-replace-15 = Purrfect
 accent-cat-words-replace-16 = Pawful
 accent-cat-words-replace-17 = Nyank you
@@ -130,16 +130,16 @@ accent-cat-words-replace-27 = Nyansad
 accent-cat-words-replace-28 = Nyolove
 accent-cat-words-replace-29 = Purrlay
 accent-cat-words-replace-30 = Naps
-accent-cat-words-replace-31 = Meowrun
+accent-cat-words-replace-31 = Meow-wun
 accent-cat-words-replace-32 = Nyump
 accent-cat-words-replace-33 = Purrdance
 accent-cat-words-replace-34 = Neko sing
 accent-cat-words-replace-35 = Meowtch
 accent-cat-words-replace-36 = Nyawork
-accent-cat-words-replace-37 = Togethers
+accent-cat-words-replace-37 = Togethews
 accent-cat-words-replace-38 = Alwaysnya
 accent-cat-words-replace-39 = Nyenever
-accent-cat-words-replace-40 = Smurt
+accent-cat-words-replace-40 = Smuwt
 accent-cat-words-replace-41 = Lovable
 accent-cat-words-replace-42 = Kawaii
 accent-cat-words-replace-43 = Meowny
@@ -172,7 +172,7 @@ accent-cat-words-replace-69 = Spicynyan
 accent-cat-words-replace-70 = Sillynya
 accent-cat-words-replace-71 = Gloomy
 accent-cat-words-replace-72 = Grumpynyan
-accent-cat-words-replace-73 = Cozy
+accent-cat-words-replace-73 = Smuwgler
 accent-cat-words-replace-74 = Fluffynya
 accent-cat-words-replace-75 = Huggles
 accent-cat-words-replace-76 = Cuddlypaws
@@ -199,4 +199,4 @@ accent-cat-words-replace-96 = Artisny
 accent-cat-words-replace-97 = Romantnyan
 accent-cat-words-replace-98 = Advennyture
 accent-cat-words-replace-99 = Nyem
-accent-cat-words-replace-100 = Genero-sque
+accent-cat-words-replace-100 = Catpost

From 72898f4db74948e50e6ad01b014e60b1abbb1a97 Mon Sep 17 00:00:00 2001
From: Erol509 <konradosowski338@gmail.com>
Date: Sat, 5 Oct 2024 14:40:17 +0200
Subject: [PATCH 7/7] Update cat_accent.ftl

---
 Resources/Locale/en-US/_NF/accent/cat_accent.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Locale/en-US/_NF/accent/cat_accent.ftl b/Resources/Locale/en-US/_NF/accent/cat_accent.ftl
index 3610a761fd0..29b64fa7c13 100644
--- a/Resources/Locale/en-US/_NF/accent/cat_accent.ftl
+++ b/Resources/Locale/en-US/_NF/accent/cat_accent.ftl
@@ -137,7 +137,7 @@ accent-cat-words-replace-34 = Neko sing
 accent-cat-words-replace-35 = Meowtch
 accent-cat-words-replace-36 = Nyawork
 accent-cat-words-replace-37 = Togethews
-accent-cat-words-replace-38 = Alwaysnya
+accent-cat-words-replace-38 = Nyalways
 accent-cat-words-replace-39 = Nyenever
 accent-cat-words-replace-40 = Smuwt
 accent-cat-words-replace-41 = Lovable