Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

2023-10-19 12:18:30 -03:00
parent 966236652a 331565f726
commit 9838cc59ee
613 changed files with 22122 additions and 11481 deletions
@@ -42,6 +42,7 @@ namespace Barotrauma.Networking
            DoSProtection,
            Karma,
            Talent,
+            Traitors,
            Error,
        }

@@ -59,6 +60,7 @@ namespace Barotrauma.Networking
            { MessageType.DoSProtection, Color.OrangeRed },
            { MessageType.Karma, new Color(75, 88, 255) },
            { MessageType.Talent, new Color(125, 125, 255) },
+            { MessageType.Traitors, new Color(107, 69, 158) },
            { MessageType.Error, Color.Red }
        };

@@ -76,6 +78,7 @@ namespace Barotrauma.Networking
            { MessageType.DoSProtection, "DoSProtection" },
            { MessageType.Karma, "Karma" },
            { MessageType.Talent, "Talent" },
+            { MessageType.Traitors, "Traitors" },
            { MessageType.Error, "Error" }
        };