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

2019-04-03 16:24:20 +03:00
parent 516159fe43
commit 64bec6d3b9
7 changed files with 29 additions and 70 deletions
@@ -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; }