(b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test

2019-04-04 11:10:29 +03:00
parent b08a31a68f
commit cc122f2bbf
52 changed files with 601 additions and 786 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; }