Merge remote-tracking branch 'upstream/master' into develop

2024-10-22 12:42:35 -03:00
parent 3e4b649162 a29662c074
commit 30a8f0c561
417 changed files with 17171 additions and 5895 deletions
@@ -155,7 +155,7 @@ namespace Barotrauma.Items.Components
            if (DisplayName.IsNullOrEmpty())
            {
 #if DEBUG
-                DebugConsole.ThrowError("Missing display name in connection " + item.Name + ": " + Name);
+                DebugConsole.ThrowError($"Could not find a display name for the connection {Name} in the item {item.Name} (submarine: {item.Submarine?.Info?.Name ?? "none"})");
 #endif
                DisplayName = Name;
            }