(133a5b1da) Merge branch 'dev' into human-ai

2019-05-16 05:27:51 +03:00
parent ab49749f8b
commit 3bce90251a
17 changed files with 150 additions and 238 deletions
@@ -227,9 +227,8 @@ namespace Barotrauma.Items.Components
            {
                msg = msg ?? (HasIntegratedButtons ? accessDeniedTxt : cannotOpenText);
            }
-            if (item.Condition <= RepairThreshold) { return true; }
-            //this is a bit pointless atm because if canBePicked is false it won't allow you to do Pick() anyway, however it's still good for future-proofing.
-            return requiredItems.Any() ? base.HasRequiredItems(character, addMessage, msg) : canBePicked;
+            if (isBroken) { return true; }
+            return base.HasRequiredItems(character, addMessage, msg);
        }

        public override bool Pick(Character picker)