diff --git a/Subsurface/Source/Characters/Character.cs b/Subsurface/Source/Characters/Character.cs
index f2abe4374..5e3b47dd2 100644
--- a/Subsurface/Source/Characters/Character.cs
+++ b/Subsurface/Source/Characters/Character.cs
@@ -1328,7 +1328,7 @@ namespace Barotrauma
                             {
                                 isStillCountdown = 15;
                             }
-                            DebugConsole.NewMessage(Convert.ToString(memInput.Count), Color.Lime);
+                            //DebugConsole.NewMessage(Convert.ToString(memInput.Count), Color.Lime);
                         }
                         else
                         {
diff --git a/Subsurface/Source/Networking/GameServer.cs b/Subsurface/Source/Networking/GameServer.cs
index e05cca670..9ecdb1859 100644
--- a/Subsurface/Source/Networking/GameServer.cs
+++ b/Subsurface/Source/Networking/GameServer.cs
@@ -1200,8 +1200,19 @@ namespace Barotrauma.Networking
                 if (c.Character != traitor) continue;
                 traitorClient = c;
                 break;
-            }
-            
+            }           
+        }
+
+        public override void SendChatMessage(string message, ChatMessageType? type = null)
+        {
+            type = ChatMessageType.Default;
+
+            ChatMessage chatMessage = ChatMessage.Create(
+                gameStarted && myCharacter != null ? myCharacter.Name : name,
+                message, (ChatMessageType)type, gameStarted ? myCharacter : null);
+
+
+            AddChatMessage(chatMessage);        
         }
 
         public override void Draw(Microsoft.Xna.Framework.Graphics.SpriteBatch spriteBatch)
diff --git a/Subsurface/Source/Networking/NetEntityEvent/NetEntityEventManager.cs b/Subsurface/Source/Networking/NetEntityEvent/NetEntityEventManager.cs
index 9df9f32b8..3ba54cd6e 100644
--- a/Subsurface/Source/Networking/NetEntityEvent/NetEntityEventManager.cs
+++ b/Subsurface/Source/Networking/NetEntityEvent/NetEntityEventManager.cs
@@ -52,7 +52,7 @@ namespace Barotrauma.Networking
         /// <summary>
         /// Read the events from the message, ignoring ones we've already received
         /// </summary>
-        protected void Read(NetIncomingMessage msg, float sendingTime, ref UInt32 lastReceivedID)
+        protected void Read(NetIncomingMessage msg, float sendingTime, ref UInt32 lastReceivedID, Client sender = null)
         {
             UInt32 firstEventID = msg.ReadUInt32();
             int eventCount      = msg.ReadByte();
@@ -75,7 +75,7 @@ namespace Barotrauma.Networking
                 {
                     DebugConsole.NewMessage("received msg "+thisEventID, Microsoft.Xna.Framework.Color.Green);
                     lastReceivedID++;
-                    ReadEvent(msg, entity, sendingTime);
+                    ReadEvent(msg, entity, sendingTime, sender);
                 }
                 msg.ReadPadBits();
             }            
diff --git a/Subsurface/Source/Networking/NetEntityEvent/ServerEntityEventManager.cs b/Subsurface/Source/Networking/NetEntityEvent/ServerEntityEventManager.cs
index 720c2491c..c0fe0d818 100644
--- a/Subsurface/Source/Networking/NetEntityEvent/ServerEntityEventManager.cs
+++ b/Subsurface/Source/Networking/NetEntityEvent/ServerEntityEventManager.cs
@@ -12,10 +12,14 @@ namespace Barotrauma.Networking
         private List<ServerEntityEvent> events;
 
         private UInt32 ID;
+
+        private GameServer server;
         
         public ServerEntityEventManager(GameServer server) 
         {
             events = new List<ServerEntityEvent>();
+
+            this.server = server;
         }
 
         public void CreateEvent(IServerSerializable entity, object[] extraData = null)
@@ -91,7 +95,7 @@ namespace Barotrauma.Networking
 
         public void Read(NetIncomingMessage msg, Client client)
         {
-            base.Read(msg, 0.0f, ref client.lastSentEntityEventID);
+            base.Read(msg, 0.0f, ref client.lastSentEntityEventID, client);
         }
 
         public void Clear()