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] 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);
         }