Unstable 0.1400.7.0 (Coronavirus edition)

2021-07-23 21:01:17 +03:00
parent ee5308b39f
commit 47707c824a
133 changed files with 1310 additions and 533 deletions
@@ -42,7 +42,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;