Merge pull request #9 from Regalis11/master

0.14.9.0
2021-08-25 13:18:02 -03:00
parent 5ffe372908 265a2e7ab3
commit 970ee8a93f
140 changed files with 1448 additions and 621 deletions
@@ -44,7 +44,7 @@ namespace Barotrauma.Items.Components
        protected bool canBeCombined;
        protected bool removeOnCombined;

-        public bool WasUsed;
+        public bool WasUsed, WasSecondaryUsed;

        public readonly Dictionary<ActionType, List<StatusEffect>> statusEffectLists;