Fix body bags not taking humans (#6125)

2022-01-11 17:55:27 +13:00
parent 552e04d7ea
commit 05df798f11
2 changed files with 19 additions and 4 deletions
--- a/Content.Server/Foldable/FoldableSystem.cs
+++ b/Content.Server/Foldable/FoldableSystem.cs
@@ -48,9 +48,13 @@ namespace Content.Server.Foldable
            if (TryComp(uid, out StrapComponent? strap) && strap.BuckledEntities.Any())
                return false;

-            // Also check if this entity is "open" (e.g., body bags)
-            return !TryComp(uid, out EntityStorageComponent? storage) || !storage.Open;
+            if (!TryComp(uid, out EntityStorageComponent? storage))
+                return true;

+            if (storage.Open)
+                return false;
+
+            return !storage.Contents.ContainedEntities.Any();
        }

        /// <summary>