From ca15929d85efbeb44c713ed887f6e4e650a2f1ba Mon Sep 17 00:00:00 2001
From: korczoczek <danielkorczok@gmail.com>
Date: Fri, 18 Sep 2026 22:35:22 +0000
Subject: [PATCH] Un-hardcode full replacement punctuation (#45815)

* change system

* but like for real

* adjust replacement words

* remove stray newline

* pls no paradox clone haisen

* minor changes

---------

Co-authored-by: Pok245 <113675512+Pok27@users.noreply.github.com>
---
 .../EntitySystems/ReplacementAccentSystem.cs  |  17 +-
 .../Prototypes/ReplacementAccentPrototype.cs  |   6 +
 Resources/Locale/en-US/accent/accents.ftl     | 209 ++++++++----------
 .../Prototypes/Accents/full_replacements.yml  |  29 +--
 4 files changed, 124 insertions(+), 137 deletions(-)

diff --git a/Content.Shared/Speech/EntitySystems/ReplacementAccentSystem.cs b/Content.Shared/Speech/EntitySystems/ReplacementAccentSystem.cs
index 854e37b958..bcaf885ade 100644
--- a/Content.Shared/Speech/EntitySystems/ReplacementAccentSystem.cs
+++ b/Content.Shared/Speech/EntitySystems/ReplacementAccentSystem.cs
@@ -19,6 +19,11 @@ public sealed partial class ReplacementAccentSystem : RelayAccentSystem<Replacem
     [Dependency] private IGameTiming _timing = default!;
     [Dependency] private IRobustRandom _random = default!;
 
+    /// <summary>
+    /// Matches between 1 and 3 .?! punctuation marks at the end of a string.
+    /// </summary>
+    private static readonly Regex PunctuationRegex = new("[!?.]{1,3}$", RegexOptions.Compiled);
+
     private readonly Dictionary<ProtoId<ReplacementAccentPrototype>, (Regex regex, string replacement)[]>
         _cachedReplacements = new();
 
@@ -74,7 +79,17 @@ public sealed partial class ReplacementAccentSystem : RelayAccentSystem<Replacem
         // ideally both aren't used at the same time (but we don't have a way to enforce that in serialization yet)
         if (prototype.FullReplacements != null)
         {
-            return prototype.FullReplacements.Length != 0 ? Loc.GetString(random.Pick(prototype.FullReplacements)) : "";
+            if (prototype.FullReplacements.Length == 0)
+                return "";
+
+            var replacement = Loc.GetString(random.Pick(prototype.FullReplacements));
+            var punctuation = PunctuationRegex.Match(message).Value;
+
+            // no special punctuation
+            if (string.IsNullOrEmpty(punctuation) || punctuation == ".")
+                return replacement + prototype.DefaultPunctuation;
+
+            return replacement + punctuation;
         }
 
         // Prohibition of repeated word replacements.
diff --git a/Content.Shared/Speech/Prototypes/ReplacementAccentPrototype.cs b/Content.Shared/Speech/Prototypes/ReplacementAccentPrototype.cs
index dc541e0a1b..0faa129290 100644
--- a/Content.Shared/Speech/Prototypes/ReplacementAccentPrototype.cs
+++ b/Content.Shared/Speech/Prototypes/ReplacementAccentPrototype.cs
@@ -16,6 +16,12 @@ public sealed partial class ReplacementAccentPrototype : IPrototype
     [DataField]
     public string[]? FullReplacements;
 
+    /// <summary>
+    /// Default to use with <see cref="FullReplacements"/> if the text doesn't end with special punctuation.
+    /// </summary>
+    [DataField]
+    public string DefaultPunctuation = ".";
+
     /// <summary>
     /// If this dictionary is non-null and <see cref="FullReplacements"/> is null, any keys surrounded by spaces
     /// (words) will be replaced by the value, attempting to intelligently keep capitalization.
diff --git a/Resources/Locale/en-US/accent/accents.ftl b/Resources/Locale/en-US/accent/accents.ftl
index 75644c8b2e..0cd645e5cd 100644
--- a/Resources/Locale/en-US/accent/accents.ftl
+++ b/Resources/Locale/en-US/accent/accents.ftl
@@ -1,155 +1,134 @@
 # Cat accent
-accent-words-cat-1 = Meow!
-accent-words-cat-2 = Mow.
-accent-words-cat-3 = Mrrrow!
-accent-words-cat-4 = Hhsss!
-accent-words-cat-5 = Brrow.
-accent-words-cat-6 = Meow?
-accent-words-cat-7 = Miau.
+accent-words-cat-1 = Meow
+accent-words-cat-2 = Mow
+accent-words-cat-3 = Mrrrow
+accent-words-cat-4 = Hhsss
+accent-words-cat-5 = Brrow
+accent-words-cat-6 = Miau
 
 # Dog accent
-accent-words-dog-1 = Bark!
-accent-words-dog-2 = Bork!
-accent-words-dog-3 = Woof!
-accent-words-dog-4 = Arf.
-accent-words-dog-5 = Grrr.
+accent-words-dog-1 = Bark
+accent-words-dog-2 = Bork
+accent-words-dog-3 = Woof
+accent-words-dog-4 = Arf
+accent-words-dog-5 = Grrr
 
 # Mouse
-accent-words-mouse-1 = Squeak!
-accent-words-mouse-2 = Piep!
-accent-words-mouse-3 = Chuu!
-accent-words-mouse-4 = Eeee!
-accent-words-mouse-5 = Pip!
-accent-words-mouse-6 = Fwiep!
-accent-words-mouse-7 = Heep!
+accent-words-mouse-1 = Squeak
+accent-words-mouse-2 = Piep
+accent-words-mouse-3 = Chuu
+accent-words-mouse-4 = Eeee
+accent-words-mouse-5 = Pip
+accent-words-mouse-6 = Fwiep
+accent-words-mouse-7 = Heep
 
 # Mumble
-accent-words-mumble-1 = Mmfph!
-accent-words-mumble-2 = Mmmf mrrfff!
-accent-words-mumble-3 = Mmmf mnnf!
+accent-words-mumble-1 = Mmfph
+accent-words-mumble-2 = Mmmf mrrfff
+accent-words-mumble-3 = Mmmf mnnf
 
 # Silicon
-accent-words-silicon-1 = Beep.
-accent-words-silicon-2 = Boop.
-accent-words-silicon-3 = Whirr.
-accent-words-silicon-4 = Beep-boop.
+accent-words-silicon-1 = Beep
+accent-words-silicon-2 = Boop
+accent-words-silicon-3 = Whirr
+accent-words-silicon-4 = Beep-boop
 
 # Xeno
-accent-words-xeno-1 = Hiss.
-accent-words-xeno-2 = Hisssss!
-accent-words-xeno-3 = Hisssuuu...
-accent-words-xeno-4 = Hiss...!
+accent-words-xeno-1 = Hiss
+accent-words-xeno-2 = Hisssss
+accent-words-xeno-3 = Hisssuuu
+accent-words-xeno-4 = Hiss
 
 # Zombie
-accent-words-zombie-1 = Gruaahhhh...
-accent-words-zombie-2 = Mmuaaaa..
-accent-words-zombie-3 = Braainnssss...
-accent-words-zombie-4 = Grrrrr...
-accent-words-zombie-5 = Ouuaahhhhh...
-accent-words-zombie-6 = Graaaaaooohhlll...
-accent-words-zombie-7 = Brainsss... Braaaiiinnsss..
-accent-words-zombie-8 = Braughhh...
-accent-words-zombie-9 = Breshhhh...
-accent-words-zombie-10 = Graaaaaa...
+accent-words-zombie-1 = Gruaahhhh
+accent-words-zombie-2 = Mmuaaaa
+accent-words-zombie-3 = Braainnssss
+accent-words-zombie-4 = Grrrrr
+accent-words-zombie-5 = Ouuaahhhhh
+accent-words-zombie-6 = Graaaaaooohhlll
+accent-words-zombie-7 = Brainsss... Braaaiiinnsss
+accent-words-zombie-8 = Braughhh
+accent-words-zombie-9 = Breshhhh
+accent-words-zombie-10 = Graaaaaa
 
 # Moth Zombie
-accent-words-zombie-moth-1 = Clothessss...
-accent-words-zombie-moth-2 = Shooooesss...
-accent-words-zombie-moth-3 = Liiiiight...
-accent-words-zombie-moth-4 = Laaamps...
-accent-words-zombie-moth-5 = Haaaatsss... Hatttssss...
-accent-words-zombie-moth-6 = Scarffsss...
+accent-words-zombie-moth-1 = Clothessss
+accent-words-zombie-moth-2 = Shooooesss
+accent-words-zombie-moth-3 = Liiiiight
+accent-words-zombie-moth-4 = Laaamps
+accent-words-zombie-moth-5 = Haaaatsss... Hatttssss
+accent-words-zombie-moth-6 = Scarffsss
 
 # Generic Aggressive
-accent-words-generic-aggressive-1 = Grr!
-accent-words-generic-aggressive-2 = Rrrr!
-accent-words-generic-aggressive-3 = Grr...
-accent-words-generic-aggressive-4 = Grrow!!
+accent-words-generic-aggressive-1 = Grr
+accent-words-generic-aggressive-2 = Rrrr
+accent-words-generic-aggressive-3 = Grrow
 
 # Duck
-accent-words-duck-1 = Quack!
-accent-words-duck-2 = Quack.
-accent-words-duck-3 = Quack?
-accent-words-duck-4 = Quack quack!
+accent-words-duck-1 = Quack
+accent-words-duck-2 = Quack quack
+accent-words-duck-3 = Quack quack quack
 
 # Chicken
-accent-words-chicken-1 = Cluck!
-accent-words-chicken-2 = Cluck.
-accent-words-chicken-3 = Cluck?
-accent-words-chicken-4 = Cluck cluck!
+accent-words-chicken-1 = Cluck
+accent-words-chicken-2 = Cluck cluck
+accent-words-chicken-3 = Cluck cluck cluck
 
 # Pig
-accent-words-pig-1 = Oink.
-accent-words-pig-2 = Oink?
-accent-words-pig-3 = Oink!
-accent-words-pig-4 = Oink oink!
+accent-words-pig-1 = Oink
+accent-words-pig-2 = Oink oink
+accent-words-pig-3 = Oink oink oink
 
 # Kangaroo
-accent-words-kangaroo-1 = Grr!
-accent-words-kangaroo-2 = Hisss!
-accent-words-kangaroo-3 = Shreak!
-accent-words-kangaroo-4 = Chuu!
+accent-words-kangaroo-1 = Grr
+accent-words-kangaroo-2 = Hisss
+accent-words-kangaroo-3 = Shreak
+accent-words-kangaroo-4 = Chuu
 
 # Slimes
-accent-words-slimes-1 = Blyump.
-accent-words-slimes-2 = Blimpuf?
-accent-words-slimes-3 = Blump!
-accent-words-slimes-4 = Bluuump...
-accent-words-slimes-5 = Blabl blump!
+accent-words-slimes-1 = Blyump
+accent-words-slimes-2 = Blimpuf
+accent-words-slimes-3 = Blump
+accent-words-slimes-4 = Bluuump
+accent-words-slimes-5 = Blabl blump
 
 # Mothroach
-accent-words-mothroach-1 = Chirp!
+accent-words-mothroach-1 = Chirp
 
 # Crab
-accent-words-crab-1 = Click.
-accent-words-crab-2 = Click-clack!
-accent-words-crab-3 = Clack?
-accent-words-crab-4 = Tipi-tap!
-accent-words-crab-5 = Clik-tap.
-accent-words-crab-6 = Cliliick.
+accent-words-crab-1 = Click
+accent-words-crab-2 = Click-clack
+accent-words-crab-3 = Clack
+accent-words-crab-4 = Tipi-tap
+accent-words-crab-5 = Clik-tap
+accent-words-crab-6 = Cliliick
 
 # Kobold
-accent-words-kobold-1 = Yip!
-accent-words-kobold-2 = Grrar.
-accent-words-kobold-3 = Yap!
-accent-words-kobold-4 = Bip.
-accent-words-kobold-5 = Screet?
-accent-words-kobold-6 = Gronk!
-accent-words-kobold-7 = Hiss!
-accent-words-kobold-8 = Eeee!
-accent-words-kobold-9 = Yip.
+accent-words-kobold-1 = Yip
+accent-words-kobold-2 = Grrar
+accent-words-kobold-3 = Yap
+accent-words-kobold-4 = Bip
+accent-words-kobold-5 = Screet
+accent-words-kobold-6 = Gronk
+accent-words-kobold-7 = Hiss
+accent-words-kobold-8 = Eeee
 
 # Nymph
-accent-words-nymph-1 = Chirp!
-accent-words-nymph-2 = Churr...
-accent-words-nymph-3 = Cheep?
-accent-words-nymph-4 = Chrrup!
+accent-words-nymph-1 = Chirp
+accent-words-nymph-2 = Churr
+accent-words-nymph-3 = Cheep
+accent-words-nymph-4 = Chrrup
 
 # TomatoKiller
-accent-words-tomato-1 = Totato!
+accent-words-tomato-1 = Totato
 accent-words-tomato-2 = Trotect
-accent-words-tomato-3 = Mastet?
-accent-words-tomato-4 = Reaty!
-accent-words-tomato-5 = Water...
+accent-words-tomato-3 = Mastet
+accent-words-tomato-4 = Reaty
+accent-words-tomato-5 = Water
 
 # Scurret
-accent-words-scurret-1 = Wa!
-accent-words-scurret-2 = Wa?
-accent-words-scurret-3 = Wa.
-accent-words-scurret-4 = Wa...
-accent-words-scurret-5 = Wawa!
-accent-words-scurret-6 = Wawa?
-accent-words-scurret-7 = Wawa.
-accent-words-scurret-8 = Wawa...
-accent-words-scurret-9 = Wa wawa!
-accent-words-scurret-10 = Wa wawa?
-accent-words-scurret-11 = Wa wawa.
-accent-words-scurret-12 = Wa wawa...
-accent-words-scurret-13 = Wawa wa!
-accent-words-scurret-14 = Wawa wa?
-accent-words-scurret-15 = Wawa wa.
-accent-words-scurret-16 = Wawa wa...
-accent-words-scurret-17 = Waaaaaa.
-accent-words-scurret-18 = Waaaaaa!
-accent-words-scurret-19 = Waaaaaa?
-accent-words-scurret-20 = Waaaaaa...
+accent-words-scurret-1 = Wa
+accent-words-scurret-2 = Wawa
+accent-words-scurret-3 = Wa wawa
+accent-words-scurret-4 = Wawa wa
+accent-words-scurret-5 = Waaaaaa
diff --git a/Resources/Prototypes/Accents/full_replacements.yml b/Resources/Prototypes/Accents/full_replacements.yml
index 3ac30fabca..cfc6f68b4d 100644
--- a/Resources/Prototypes/Accents/full_replacements.yml
+++ b/Resources/Prototypes/Accents/full_replacements.yml
@@ -9,7 +9,6 @@
   - accent-words-cat-4
   - accent-words-cat-5
   - accent-words-cat-6
-  - accent-words-cat-7
 
 - type: accent
   id: dog
@@ -19,6 +18,7 @@
   - accent-words-dog-3
   - accent-words-dog-4
   - accent-words-dog-5
+  defaultPunctuation: '!'
 
 - type: accent
   id: mouse
@@ -30,6 +30,7 @@
   - accent-words-mouse-5
   - accent-words-mouse-6
   - accent-words-mouse-7
+  defaultPunctuation: '!'
 
 - type: accent
   id: mothroach
@@ -39,6 +40,7 @@
   - accent-words-mouse-2
   - accent-words-mouse-3
   - accent-words-mouse-4
+  defaultPunctuation: '!'
 
 - type: accent
   id: mumble
@@ -46,6 +48,7 @@
   - accent-words-mumble-1
   - accent-words-mumble-2
   - accent-words-mumble-3
+  defaultPunctuation: '!'
 
 - type: accent
   id: silicon
@@ -76,6 +79,7 @@
   - accent-words-zombie-8
   - accent-words-zombie-9
   - accent-words-zombie-10
+  defaultPunctuation: '...'
 
 - type: accent
   id: zombieMoth
@@ -94,6 +98,7 @@
   - accent-words-zombie-8
   - accent-words-zombie-9
   - accent-words-zombie-10
+  defaultPunctuation: '...'
 
 - type: accent
   id: genericAggressive
@@ -101,7 +106,7 @@
   - accent-words-generic-aggressive-1
   - accent-words-generic-aggressive-2
   - accent-words-generic-aggressive-3
-  - accent-words-generic-aggressive-4
+  defaultPunctuation: '!'
 
 - type: accent
   id: duck
@@ -109,7 +114,6 @@
   - accent-words-duck-1
   - accent-words-duck-2
   - accent-words-duck-3
-  - accent-words-duck-4
 
 - type: accent
   id: chicken
@@ -117,7 +121,6 @@
   - accent-words-chicken-1
   - accent-words-chicken-2
   - accent-words-chicken-3
-  - accent-words-chicken-4
 
 - type: accent
   id: pig
@@ -125,7 +128,6 @@
   - accent-words-pig-1
   - accent-words-pig-2
   - accent-words-pig-3
-  - accent-words-pig-4
 
 - type: accent
   id: kangaroo
@@ -134,6 +136,7 @@
   - accent-words-kangaroo-2
   - accent-words-kangaroo-3
   - accent-words-kangaroo-4
+  defaultPunctuation: '!'
 
 - type: accent
   id: slimes
@@ -165,7 +168,6 @@
   - accent-words-kobold-6
   - accent-words-kobold-7
   - accent-words-kobold-8
-  - accent-words-kobold-9
 
 - type: accent
   id: nymph
@@ -192,18 +194,3 @@
   - accent-words-scurret-3
   - accent-words-scurret-4
   - accent-words-scurret-5
-  - accent-words-scurret-6
-  - accent-words-scurret-7
-  - accent-words-scurret-8
-  - accent-words-scurret-9
-  - accent-words-scurret-10
-  - accent-words-scurret-11
-  - accent-words-scurret-12
-  - accent-words-scurret-13
-  - accent-words-scurret-14
-  - accent-words-scurret-15
-  - accent-words-scurret-16
-  - accent-words-scurret-17
-  - accent-words-scurret-18
-  - accent-words-scurret-19
-  - accent-words-scurret-20