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

2024-04-26 12:31:21 -03:00
parent bfca2816c3 848113b8cb
commit b98dec4c3b
16 changed files with 97 additions and 50 deletions
@@ -1735,7 +1735,7 @@ namespace Barotrauma
                    if (!ItemAndAllContainersInteractable(subItem)) { continue; }
                    //don't list items in a character inventory (the ones in a crew member's inventory are counted below)
                    var rootInventoryOwner = subItem.GetRootInventoryOwner();
-                    if (rootInventoryOwner != null) { continue; }
+                    if (rootInventoryOwner is Character) { continue; }
                    AddOwnedItem(subItem);
                }
            }