(684bcee1a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

Barotrauma/BarotraumaShared/Source/Characters/Character.cs

@@ -1898,7 +1898,7 @@ namespace Barotrauma
                 //cannot be protected from pressure when below crush depth
                 protectedFromPressure = protectedFromPressure && WorldPosition.Y > CharacterHealth.CrushDepth;
                 //implode if not protected from pressure, and either outside or in a high-pressure hull
-                if (!protectedFromPressure && 
+                if (!protectedFromPressure &&
                     (AnimController.CurrentHull == null || AnimController.CurrentHull.LethalPressure >= 80.0f))
                 {
                     if (CharacterHealth.PressureKillDelay <= 0.0f)
@@ -1913,7 +1913,7 @@ namespace Barotrauma
 
                     if (PressureTimer >= 100.0f)
                     {
-                        if (Controlled == this) cam.Zoom = 5.0f;
+                        if (Controlled == this) { cam.Zoom = 5.0f; }
                         if (GameMain.NetworkMember == null || !GameMain.NetworkMember.IsClient)
                         {
                             Implode();

Barotrauma/BarotraumaShared/Source/Characters/Health/CharacterHealth.cs

@@ -103,6 +103,7 @@ namespace Barotrauma
         }
 
         public float CrushDepth { get; private set; }
+        public float PressureKillDelay { get; private set; } = 5.0f;
 
         public float Vitality { get; private set; }