Merge remote-tracking branch 'origin/master' into hardsync-1.5

2025-12-09 16:07:40 +00:00 · 2021-02-16 19:41:53 +08:00
parent 78ef87b012 975c98731e
commit 3f40e353aa
71 changed files with 513 additions and 171 deletions
--- a/tgui/packages/tgui-panel/chat/renderer.js
+++ b/tgui/packages/tgui-panel/chat/renderer.js
@@ -176,7 +176,9 @@ class ChatRenderer {
      this.highlightColor = null;
      return;
    }
-    const allowedRegex = /^[a-z0-9_\-\s]+$/ig;
+    // citadel update - ig changed to i for flags,
+    // to fix issues with highlighting only working for every other word.
+    const allowedRegex = /^[a-z0-9_\-\s]+$/i;
    const lines = String(text)
      .split(',')
      .map(str => str.trim())
--- a/tgui/public/tgui-panel.bundle.js
+++ b/tgui/public/tgui-panel.bundle.js