(ae643deeb) Added alive checks to a couple of diving gear status effects (don't consume tanks when dead)

2019-04-01 22:47:22 +03:00
parent ec7e23061b
commit 2eaf22683d
129 changed files with 2451 additions and 1336 deletions
@@ -155,13 +155,14 @@ namespace Barotrauma.Items.Components
        {
            if (item.Container != null) { return false; }

-            if (AutoInteractWithContained)
+            if (AutoInteractWithContained && character.SelectedConstruction == null)
            {
                foreach (Item contained in Inventory.Items)
                {
                    if (contained == null) continue;
                    if (contained.TryInteract(character))
                    {
+                        character.FocusedItem = contained;
                        return false;
                    }
                }
@@ -178,6 +179,7 @@ namespace Barotrauma.Items.Components
                    if (contained == null) continue;
                    if (contained.TryInteract(picker))
                    {
+                        picker.FocusedItem = contained;
                        return true;
                    }
                }