Merged branch master into master

Subsurface/Source/Networking/NetworkMember.cs

@@ -264,6 +264,7 @@ namespace Barotrauma.Networking
         
         public void AddChatMessage(ChatMessage message)
         {
+
             if (message.Type == ChatMessageType.Radio && 
                 Character.Controlled != null &&
                 message.Sender != null && message.Sender != myCharacter)
@@ -278,6 +279,8 @@ namespace Barotrauma.Networking
                 return;
             }
 
+            GameServer.Log(message.TextWithSender, message.Color);
+
             string displayedText = message.Text;
 
             if (message.Sender != null)
@@ -293,8 +296,6 @@ namespace Barotrauma.Networking
 
             GameMain.NetLobbyScreen.NewChatMessage(message);
 
-            GameServer.Log(message.Text, message.Color);
-
             while (chatBox.CountChildren > 20)
             {
                 chatBox.RemoveChild(chatBox.children[1]);
@@ -304,7 +305,7 @@ namespace Barotrauma.Networking
             {
                 displayedText = message.SenderName + ": " + displayedText;
             }
-
+            
             GUITextBlock msg = new GUITextBlock(new Rectangle(0, 0, 0, 20), displayedText,
                 ((chatBox.CountChildren % 2) == 0) ? Color.Transparent : Color.Black * 0.1f, message.Color,
                 Alignment.Left, null, null, true);