(1762f02b3) Merge branch 'dev' into human-ai

This commit is contained in:
Joonas Rikkonen
2019-05-16 05:08:22 +03:00
parent 4797f6b0d3
commit 454dda56c7
91 changed files with 1138 additions and 744 deletions
@@ -21,9 +21,9 @@ namespace Barotrauma
{
if (!Enabled) { return 1000.0f; }
if (recipient.Character == null)
if (recipient.Character == null || recipient.Character.IsDead)
{
return 0.1f;
return 0.2f;
}
else
{