(5a377a8ee) Unstable v0.9.1000.0

2020-05-13 12:55:42 -03:00
parent b143329701
commit a1ca41aa5d
426 changed files with 14384 additions and 5708 deletions
@@ -38,7 +38,9 @@ namespace Barotrauma

                    if (item.Submarine == null)
                    {
-                        if (!(item.ParentInventory?.Owner is Character)) { continue; }
+                        //items outside the sub don't count as destroyed if they're still in the traitor's inventory
+                        bool carriedByTraitor = Traitors.Any(traitor => item.IsOwnedBy(traitor.Character));
+                        if (!carriedByTraitor) { continue; }
                    }
                    else
                    {