Chatmessage GUITextBlock height matches the height of the message (-> multi-line messages don't overlap), fixed the name of the server being added to server chatmessages if there are no recipients

Subsurface/Source/Networking/GameServer.cs

@@ -1409,7 +1409,7 @@ namespace Barotrauma.Networking
 
             UpdateVoteStatus();
 
-            AddChatMessage(msg, ChatMessageType.Server);
+            SendChatMessage(msg, ChatMessageType.Server);
 
             UpdateCrewFrame();
 
@@ -1544,6 +1544,12 @@ namespace Barotrauma.Networking
                     break;
             }
             
+            if (type == ChatMessageType.Server)
+            {
+                senderName = null;
+                senderCharacter = null;
+            }
+
             //check which clients can receive the message and apply distance effects
             foreach (Client client in ConnectedClients)
             {
@@ -1572,12 +1578,6 @@ namespace Barotrauma.Networking
                         break;
                 }
                 
-                if (type == ChatMessageType.Server)
-                {
-                    senderName = null;
-                    senderCharacter = null;
-                }
-
                 var chatMsg = ChatMessage.Create(
                     senderName,
                     modifiedMessage, 

Subsurface/Source/Networking/NetworkMember.cs

@@ -248,7 +248,7 @@ namespace Barotrauma.Networking
                 displayedText = message.SenderName + ": " + displayedText;
             }
             
-            GUITextBlock msg = new GUITextBlock(new Rectangle(0, 0, 0, 20), displayedText,
+            GUITextBlock msg = new GUITextBlock(new Rectangle(0, 0, chatBox.Rect.Width, 0), displayedText,
                 ((chatBox.CountChildren % 2) == 0) ? Color.Transparent : Color.Black * 0.1f, message.Color,
                 Alignment.Left, null, null, true);
             msg.Font = GUI.SmallFont;

Subsurface/Source/Screens/NetLobbyScreen.cs

@@ -1046,7 +1046,7 @@ namespace Barotrauma
                 chatBox.RemoveChild(chatBox.children[1]);
             }
 
-            GUITextBlock msg = new GUITextBlock(new Rectangle(0, 0, 0, 20),
+            GUITextBlock msg = new GUITextBlock(new Rectangle(0, 0, chatBox.Rect.Width, 0),
                 message.TextWithSender, 
                 ((chatBox.CountChildren % 2) == 0) ? Color.Transparent : Color.Black*0.1f, message.Color, 
                 Alignment.Left, GUI.Style, null, true);