Merge branch 'final-version' into upupup

2024-02-05 10:24:33 +03:00
parent 4eeb4b1725 e79d2b5561
commit 22db173b81
1189 changed files with 31542 additions and 354012 deletions
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -81,7 +81,7 @@ public sealed partial class ChatSystem : SharedChatSystem
    private bool _deadLoocEnabled;
    private bool _critLoocEnabled;
    private const bool AdminLoocEnabled = true;
-    private const string ChatNamePalette = "Material";
+    private const string ChatNamePalette = "ChatNames";

    [ValidatePrototypeId<ColorPalettePrototype>]
    private string[] _chatNameColors = default!;