Merge branch 'dev' of https://github.com/Regalis11/Barotrauma.git into unstable-tests

Barotrauma/BarotraumaShared/SharedSource/Map/StructurePrefab.cs

@@ -153,7 +153,10 @@ namespace Barotrauma
             {
                 Name = TextManager.GetWithVariable("wreckeditemformat", "[name]", Name);
             }
-            Name = Name.Fallback(OriginalName);
+            if (!string.IsNullOrEmpty(OriginalName))
+            {
+                Name = Name.Fallback(OriginalName);
+            }
 
             var tags = new HashSet<Identifier>();
             string joinedTags = element.GetAttributeString("tags", "");

Barotrauma/BarotraumaShared/SharedSource/Map/Submarine.cs

@@ -1229,6 +1229,7 @@ namespace Barotrauma
             {
                 if (!connectedSubs.Contains(item.Submarine)) { continue; }
                 if (!item.HasTag("cargocontainer")) { continue; }
+                if (item.NonInteractable || item.HiddenInGame) { continue; }
                 var itemContainer = item.GetComponent<ItemContainer>();
                 if (itemContainer == null) { continue; }
                 int emptySlots = 0;