(a2943d8b7) Merge branch 'dev' into human-ai

Barotrauma/BarotraumaClient/Source/Networking/ChatMessage.cs

@@ -61,7 +61,7 @@ namespace Barotrauma.Networking
                 {
                     orderOption = order.Options[optionIndex];
                 }
-                txt = order.GetChatMessage(targetCharacter?.Name, senderCharacter?.CurrentHull?.RoomName, givingOrderToSelf: targetCharacter == senderCharacter, orderOption: orderOption);
+                txt = order.GetChatMessage(targetCharacter?.Name, senderCharacter?.CurrentHull?.DisplayName, givingOrderToSelf: targetCharacter == senderCharacter, orderOption: orderOption);
 
                 if (order.TargetAllCharacters)
                 {

Barotrauma/BarotraumaClient/Source/Networking/SteamManager.cs

@@ -598,6 +598,8 @@ namespace Barotrauma.Steam
 
             if (!allowFileOverwrite)
             {
+                // TODO: If you create a new mod via the workshop interface and enable it, it will show the error msg, but still allows you to enable the content.
+
                 if (File.Exists(newContentPackagePath))
                 {
                     errorMsg = TextManager.Get("WorkshopErrorOverwriteOnEnable")