Unstable 0.1400.0.0

2021-05-11 15:47:47 +03:00
parent 3f324b14e8
commit 92f0264af2
247 changed files with 8238 additions and 1911 deletions
@@ -910,7 +910,7 @@ namespace Barotrauma
                else if (allowEquip) //doubleclicked and no other inventory is selected
                {
                    //not equipped -> attempt to equip
-                    if (!character.HasEquippedItem(item))
+                    if (!character.HasEquippedItem(item) || item.GetComponents<Pickable>().Count() > 1)
                    {
                        return QuickUseAction.Equip;
                    }