Add codeword highlighting

Content.Client/Roles/RoleCodewordComponent.cs

@@ -0,0 +1,23 @@
+namespace Content.Client.Roles;
+
+/// <summary>
+/// 
+/// </summary>
+[RegisterComponent]
+public sealed partial class RoleCodewordComponent : Component
+{
+    [DataField]
+    public Dictionary<string, CodewordsData> RoleCodewords = new();
+}
+
+public struct CodewordsData
+{
+    public Color Color;
+    public List<string> Codewords;
+
+    public CodewordsData(Color color, List<string> codewords)
+    {
+        Color = color;
+        Codewords = codewords;
+    }
+}

Content.Client/Roles/RoleCodewordSystem.cs

@@ -0,0 +1,20 @@
+using Content.Shared.Roles;
+
+namespace Content.Client.Roles;
+public sealed class RoleCodewordSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeNetworkEvent<RoleCodewordEvent>(SetRoleCodewords);
+    }
+
+    private void SetRoleCodewords(RoleCodewordEvent args)
+    {
+        EntityUid mindId = GetEntity(args.Entity);
+
+        var comp = EnsureComp<RoleCodewordComponent>(mindId);
+        comp.RoleCodewords[args.RoleKey] = new CodewordsData(args.Color, args.Codewords);
+    }
+}

Content.Client/UserInterface/Systems/Chat/ChatUIController.cs

@@ -9,6 +9,8 @@
 using Content.Client.Examine;
 using Content.Client.Gameplay;
 using Content.Client.Ghost;
+using Content.Client.Mind;
+using Content.Client.Roles;
 using Content.Client.Stylesheets;
 using Content.Client.UserInterface.Screens;
 using Content.Client.UserInterface.Systems.Chat.Widgets;
@@ -60,6 +62,7 @@ public sealed class ChatUIController : UIController
     [UISystemDependency] private readonly TypingIndicatorSystem? _typingIndicator = default;
     [UISystemDependency] private readonly ChatSystem? _chatSys = default;
     [UISystemDependency] private readonly TransformSystem? _transform = default;
+    [UISystemDependency] private readonly MindSystem? _mindSystem = default!;
 
     [ValidatePrototypeId<ColorPalettePrototype>]
     private const string ChatNamePalette = "ChatNames";
@@ -819,6 +822,19 @@ public void ProcessChatMessage(ChatMessage msg, bool speechBubble = true)
                 msg.WrappedMessage = SharedChatSystem.InjectTagInsideTag(msg, "Name", "color", GetNameColor(SharedChatSystem.GetStringInsideTag(msg, "Name")));
         }
 
+        // Color any codewords for minds that have roles that use them
+        if (_player.LocalUser != null && _mindSystem != null)
+        {
+            if (_mindSystem.TryGetMind(_player.LocalUser.Value, out var mindId) && _ent.TryGetComponent(mindId, out RoleCodewordComponent? codewordComp))
+            {
+                foreach (var (_, codewordData) in codewordComp.RoleCodewords)
+                {
+                    foreach (string codeword in codewordData.Codewords)
+                        msg.WrappedMessage = SharedChatSystem.InjectTagAroundString(msg, codeword, "color", codewordData.Color.ToHex());
+                }
+            }
+        }
+
         // Log all incoming chat to repopulate when filter is un-toggled
         if (!msg.HideChat)
         {

Content.Server/GameTicking/Rules/TraitorRuleSystem.cs

@@ -10,6 +10,7 @@
 using Content.Shared.NPC.Systems;
 using Content.Shared.Objectives.Components;
 using Content.Shared.PDA;
+using Content.Shared.Radio;
 using Content.Shared.Roles;
 using Content.Shared.Roles.Jobs;
 using Robust.Shared.Prototypes;
@@ -21,6 +22,9 @@ namespace Content.Server.GameTicking.Rules;
 
 public sealed class TraitorRuleSystem : GameRuleSystem<TraitorRuleComponent>
 {
+    private static readonly Color TraitorFallbackColor = Color.FromHex("#8f4a4b");
+    private static readonly string TraitorRadioChannel = "Syndicate";
+
     [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
@@ -97,6 +101,14 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component, bool
 
         _antag.SendBriefing(traitor, GenerateBriefing(component.Codewords, code, issuer), null, component.GreetSoundNotification);
 
+        // Send codewords to only the traitor client
+        var color = TraitorFallbackColor; // Fall back to a dark red Syndicate color if a prototype is not found
+        if (_prototypeManager.TryIndex(TraitorRadioChannel, out RadioChannelPrototype? syndieChannel))
+        {
+            color = syndieChannel.Color;
+        }
+        RaiseNetworkEvent(new RoleCodewordEvent(GetNetEntity(mindId), color, "traitor", component.Codewords.ToList()), traitor);
+
         component.TraitorMinds.Add(mindId);
 
         // Assign briefing

Content.Shared/Chat/SharedChatSystem.cs

@@ -1,4 +1,5 @@
 using System.Collections.Frozen;
+using System.Text.RegularExpressions;
 using Content.Shared.Popups;
 using Content.Shared.Radio;
 using Content.Shared.Speech;
@@ -237,6 +238,17 @@ public static string InjectTagInsideTag(ChatMessage message, string outerTag, st
 
         return rawmsg;
     }
+
+    /// <summary>
+    /// Injects a tag around all found instances of a specific string in a ChatMessage.
+    /// </summary>
+    public static string InjectTagAroundString(ChatMessage message, string targetString, string tag, string? tagParameter)
+    {
+        var rawmsg = message.WrappedMessage;
+        rawmsg = Regex.Replace(rawmsg, "(?i)(" + targetString + ")(?-i)", $"[{tag}={tagParameter}]$1[/{tag}]");
+        return rawmsg;
+    }
+
     public static string GetStringInsideTag(ChatMessage message, string tag)
     {
         var rawmsg = message.WrappedMessage;

Content.Shared/Roles/RoleCodewordEvent.cs

@@ -0,0 +1,30 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Roles;
+
+/// <summary>
+/// Raised on the server and sent to a client to record traitor codewords without exposing them to other clients.
+/// </summary>
+[Serializable, NetSerializable]
+public sealed class RoleCodewordEvent : EntityEventArgs
+{
+    public NetEntity Entity;
+    public Color Color;
+    public string RoleKey;
+    public List<string> Codewords;
+
+    /// <summary>
+    /// Raised on the server and sent to a client to record traitor codewords without exposing them to other clients.
+    /// </summary>
+    /// <param name="entity">The entity which the codewords should be assigned to.</param>
+    /// <param name="color">The color the keywords should be highlighted in.</param>
+    /// <param name="roleKey">The key used to distinguish the codewords for a specific role.</param>
+    /// <param name="codewords">The list of codewords.</param>
+    public RoleCodewordEvent(NetEntity entity, Color color, string roleKey, List<string> codewords)
+    {
+        Codewords = codewords;
+        Color = color;
+        RoleKey = roleKey;
+        Entity = entity;
+    }
+}

Resources/Prototypes/Datasets/verbs.yml

@@ -1,4 +1,4 @@
-- type: dataset
+- type: dataset
   id: verbs
   values:
   - accept
@@ -97,9 +97,7 @@
   - coach
   - coil
   - collect
-  - colour
   - comb
-  - command
   - communicate
   - compare
   - compete
@@ -544,7 +542,6 @@
   - suffer
   - suggest
   - suit
-  - supply
   - support
   - suppose
   - surprise
@@ -616,7 +613,6 @@
   - whine
   - whip
   - whirl
-  - whisper
   - whistle
   - wink
   - wipe