(b5250291f) Merge branch 'dev' into human-ai

2019-05-16 05:15:16 +03:00
parent b02565796a
commit 108e42edb0
32 changed files with 574 additions and 360 deletions
@@ -795,7 +795,7 @@ namespace Barotrauma

            base.Draw(spriteBatch);
            
-            if (hideButton != null && hideButton.Visible)
+            if (hideButton != null && hideButton.Visible && !Locked)
            {
                hideButton.DrawManually(spriteBatch, alsoChildren: true);
            }
@@ -837,6 +837,7 @@ namespace Barotrauma
                    color = Color.White;
                    highlightedQuickUseSlot = slots[i];
                }
+                if (Locked) { color *= 0.3f; }

                var quickUseIndicator = Items[i].AllowedSlots.Any(a => a == InvSlotType.Any) ?
                    EquipIndicator : DropIndicator;