(4ca668169) Fixed: Conflict

2019-05-16 05:58:48 +03:00
parent 0a67590572
commit cb83984e80
80 changed files with 2036 additions and 1859 deletions
@@ -26,6 +26,8 @@ namespace Barotrauma.Items.Components
        private bool autoOrientGap;

        private bool isStuck;
+        public bool IsStuck => isStuck;
+
        private float resetPredictionTimer;

        private Rectangle doorRect;
@@ -227,8 +229,7 @@ namespace Barotrauma.Items.Components
            {
                msg = msg ?? (HasIntegratedButtons ? accessDeniedTxt : cannotOpenText);
            }
-            if (isBroken) { return true; }
-            return base.HasRequiredItems(character, addMessage, msg);
+            return isBroken || base.HasRequiredItems(character, addMessage, msg);
        }

        public override bool Pick(Character picker)