From 881cf66e4e7707d0c7d1c226187d49c9765f76ed Mon Sep 17 00:00:00 2001
From: vitopigno <vitopigno@gmail.com>
Date: Sun, 8 Jun 2025 02:25:21 +0200
Subject: [PATCH 1/3] Correct grammar and modify user-excluding highlight

---
 .../Systems/Chat/ChatUIController.Highlighting.cs             | 2 +-
 Resources/Locale/en-US/chat/ui/chat-box.ftl                   | 2 +-
 Resources/Locale/en-US/escape-menu/ui/options-menu.ftl        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.Highlighting.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.Highlighting.cs
index e413999b2c..cc0eff4056 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.Highlighting.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.Highlighting.cs
@@ -112,7 +112,7 @@ public sealed partial class ChatUIController : IOnSystemChanged<CharacterInfoSys
             }
 
             // Make sure any name tagged as ours gets highlighted only when others say it.
-            keyword = Regex.Replace(keyword, "^@", "(?<=(?<=/name.*)|(?<=,.*\"\".*))");
+            keyword = Regex.Replace(keyword, "^@", @"(?<=(?<=,.*"".*)|(?<!\[Name].*))");
 
             _highlights.Add(keyword);
         }
diff --git a/Resources/Locale/en-US/chat/ui/chat-box.ftl b/Resources/Locale/en-US/chat/ui/chat-box.ftl
index 7a3c33ad43..e00eae702a 100644
--- a/Resources/Locale/en-US/chat/ui/chat-box.ftl
+++ b/Resources/Locale/en-US/chat/ui/chat-box.ftl
@@ -37,6 +37,6 @@ hud-chatbox-highlights-button = Submit
 hud-chatbox-highlights-tooltip = The words need to be separated by a newline,
                                  if wrapped around " they will be highlighted
                                  only if separated by spaces or punctuation.
-hud-chatbox-highlights-placeholder = McHands
+hud-chatbox-highlights-placeholder = @McHands
                                      "Judge"
                                      Medical
diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
index 027b65667b..3451bf5d7b 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -50,8 +50,8 @@ ui-options-interface-label = Interface
 
 
 ui-options-auto-fill-highlights = Auto-fill the highlights with the character's information
-ui-options-highlights-color = Highlighs color:
-ui-options-highlights-color-example = This is an highlighted text!
+ui-options-highlights-color = Highlights color:
+ui-options-highlights-color-example = This is a highlighted text!
 ui-options-show-held-item = Show held item next to cursor
 ui-options-show-combat-mode-indicators = Show combat mode indicators with cursor
 ui-options-opaque-storage-window = Opaque storage window

From c42ee5ee6f08c59c593fb3fbdbaf4db2ecf2716e Mon Sep 17 00:00:00 2001
From: vitopigno <vitopigno@gmail.com>
Date: Tue, 10 Jun 2025 00:23:51 +0200
Subject: [PATCH 2/3] Improve color picker example and minor code comments
 changes

---
 .../Systems/Chat/ChatUIController.Highlighting.cs              | 3 ++-
 Resources/Locale/en-US/escape-menu/ui/options-menu.ftl         | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.Highlighting.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.Highlighting.cs
index cc0eff4056..809713ddf7 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.Highlighting.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.Highlighting.cs
@@ -111,7 +111,8 @@ public sealed partial class ChatUIController : IOnSystemChanged<CharacterInfoSys
                 keyword = Regex.Replace(keyword, "^\"|(?<=^@)\"", "(?<!\\w)");
             }
 
-            // Make sure any name tagged as ours gets highlighted only when others say it.
+            // Make sure the character's name is highlighted only when mentioned directly (eg. it's said by someone),
+            // for example in 'Name Surname says, "..."' 'Name Surname' won't be highlighted.
             keyword = Regex.Replace(keyword, "^@", @"(?<=(?<=,.*"".*)|(?<!\[Name].*))");
 
             _highlights.Add(keyword);
diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
index 3451bf5d7b..6d727ec76e 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -51,7 +51,7 @@ ui-options-interface-label = Interface
 
 ui-options-auto-fill-highlights = Auto-fill the highlights with the character's information
 ui-options-highlights-color = Highlights color:
-ui-options-highlights-color-example = This is a highlighted text!
+ui-options-highlights-color-example = This is highlighted text.
 ui-options-show-held-item = Show held item next to cursor
 ui-options-show-combat-mode-indicators = Show combat mode indicators with cursor
 ui-options-opaque-storage-window = Opaque storage window

From 6a1c1f3f5088ef3e5bdaf213d5889e893ef0c2ac Mon Sep 17 00:00:00 2001
From: vitopigno <vitopigno@gmail.com>
Date: Sun, 22 Jun 2025 00:56:20 +0200
Subject: [PATCH 3/3] Remove user-excluding highlights from emotes while
 keeping (L)OOC support

User-excluding highlights now get highlighted either when they're:
1. Present between double quotes;
2. Starting with LOOC/OOC
2. Having a newline before it.

This is due to CC, and Station announcements always having a newline before the actual message.
---
 .../UserInterface/Systems/Chat/ChatUIController.Highlighting.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.Highlighting.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.Highlighting.cs
index dd73e3dd66..46e06865cf 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.Highlighting.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.Highlighting.cs
@@ -118,7 +118,7 @@ public sealed partial class ChatUIController : IOnSystemChanged<CharacterInfoSys
 
             // Make sure the character's name is highlighted only when mentioned directly (eg. it's said by someone),
             // for example in 'Name Surname says, "..."' 'Name Surname' won't be highlighted.
-            keyword = StartAtSign.Replace(keyword, @"(?<=(?<=,.*"".*)|(?<!\[Name].*))");
+            keyword = StartAtSign.Replace(keyword, @"(?<=(?<=^.?OOC:.*:.*)|(?<=,.*"".*)|(?<=\n.*))");
 
             _highlights.Add(keyword);
         }