Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

2023-05-10 11:55:46 -03:00
parent 768a1f309c 235d42b34f
commit 2c45c3d020
273 changed files with 5739 additions and 2421 deletions
@@ -267,7 +267,7 @@ namespace Barotrauma.Items.Components
            itemList.Enabled = true;
            if (amountInput != null)
            {
-                amountInput.Enabled = true;
+                amountInput.Enabled = amountTextMax.Enabled;
            }
            RefreshActivateButtonText();
 #endif