(03ab09991) Load chinese fonts dynamically, removed unnecessary duplicate block from DynamicRenderAtlas

2019-05-16 05:39:25 +03:00
parent c583181e3b
commit 3575c8df52
79 changed files with 1720 additions and 2745 deletions
@@ -26,8 +26,6 @@ namespace Barotrauma.Items.Components
        private bool autoOrientGap;

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

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

        public override bool Pick(Character picker)