(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
@@ -601,8 +601,10 @@ namespace Barotrauma
                        {
                            ((GUIMessageBox)GUIMessageBox.VisibleBox).Close();
                        }
-                        else // Otherwise toggle pausing.
+                        else if ((Character.Controlled?.SelectedConstruction == null || !Character.Controlled.SelectedConstruction.ActiveHUDs.Any(ic => ic.GuiFrame != null))
+                            && Inventory.SelectedSlot == null && CharacterHealth.OpenHealthWindow == null)
                        {
+                            // Otherwise toggle pausing, unless another window/interface is open.
                            GUI.TogglePauseMenu();
                        }
                    }