(d88b2f1f7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-29 21:08:16 +03:00
parent b3b1d1851d
commit c5452048d7
20 changed files with 66 additions and 58 deletions
@@ -793,7 +793,7 @@ namespace Barotrauma

            base.Draw(spriteBatch);
            
-            if (hideButton != null && hideButton.Visible)
+            if (hideButton != null && hideButton.Visible && !Locked)
            {
                hideButton.DrawManually(spriteBatch, alsoChildren: true);
            }
@@ -835,6 +835,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;