From 933b6dcb8fcf8b4c74b0c1e69a3d0dd09776bc95 Mon Sep 17 00:00:00 2001
From: Evil Factory <36804725+evilfactory@users.noreply.github.com>
Date: Fri, 6 Aug 2021 19:26:16 -0300
Subject: [PATCH] fix killedbytraitor and message icon

---
 .../BarotraumaServer/ServerSource/Characters/Character.cs    | 5 ++++-
 Barotrauma/BarotraumaServer/ServerSource/Lua/LuaClasses.cs   | 3 ++-
 Barotrauma/BarotraumaServer/ServerSource/Lua/LuaSetup.cs     | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Barotrauma/BarotraumaServer/ServerSource/Characters/Character.cs b/Barotrauma/BarotraumaServer/ServerSource/Characters/Character.cs
index acf0f00de..6fd98ff74 100644
--- a/Barotrauma/BarotraumaServer/ServerSource/Characters/Character.cs
+++ b/Barotrauma/BarotraumaServer/ServerSource/Characters/Character.cs
@@ -35,7 +35,10 @@ namespace Barotrauma
                 var owner = GameMain.Server.ConnectedClients.Find(c => c.Character == this);
                 if (owner != null)
                 {
-                    GameMain.Server.SendDirectChatMessage(TextManager.FormatServerMessage("KilledByTraitorNotification"), owner, ChatMessageType.ServerMessageBoxInGame);
+                    if (!GameMain.Lua.game.overrideTraitors)
+                    {
+                        GameMain.Server.SendDirectChatMessage(TextManager.FormatServerMessage("KilledByTraitorNotification"), owner, ChatMessageType.ServerMessageBoxInGame);
+                    }
                 }
             }
             foreach (Client client in GameMain.Server.ConnectedClients)
diff --git a/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaClasses.cs b/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaClasses.cs
index cddd6fbac..c2891e30c 100644
--- a/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaClasses.cs
+++ b/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaClasses.cs
@@ -142,10 +142,11 @@ namespace Barotrauma
 				GameMain.Server.SendTraitorMessage(client, msg, missionid, type);
 			}
 
-			public static void SendDirectChatMessage(string sendername, string text, Character sender, ChatMessageType messageType = ChatMessageType.Private, Client client = null)
+			public static void SendDirectChatMessage(string sendername, string text, Character sender, ChatMessageType messageType = ChatMessageType.Private, Client client = null, string iconStyle = "")
 			{
 
 				ChatMessage cm = ChatMessage.Create(sendername, text, messageType, sender, client);
+				cm.IconStyle = iconStyle;
 
 				GameMain.Server.SendDirectChatMessage(cm, client);
 
diff --git a/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaSetup.cs b/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaSetup.cs
index 04f668747..f49fbceab 100644
--- a/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaSetup.cs
+++ b/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaSetup.cs
@@ -89,7 +89,7 @@ namespace Barotrauma
 			LuaScriptLoader luaScriptLoader = new LuaScriptLoader(this);
 
 			LuaCustomConverters.RegisterAll();
-
+			
 			UserData.RegisterType<TraitorMessageType>();
 			UserData.RegisterType<JobPrefab>();
 			UserData.RegisterType<CharacterInfo>();
@@ -122,6 +122,7 @@ namespace Barotrauma
 			UserData.RegisterType<AnimController>();
 			UserData.RegisterType<Limb>();
 			UserData.RegisterType<Ragdoll>();
+			UserData.RegisterType<ChatMessage>();
 
 			lua = new Script(CoreModules.Preset_SoftSandbox | CoreModules.LoadMethods);