(990e36132) Merge branch 'human-ai' into dev

This commit is contained in:
Joonas Rikkonen
2019-05-16 05:50:20 +03:00
parent 566f1d16e4
commit ef374ada71
17 changed files with 178 additions and 465 deletions
@@ -1708,6 +1708,10 @@ namespace Barotrauma
{
ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
}
if (!broken)
{
ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
}
ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
if (body == null || !body.Enabled || !inWater || ParentInventory != null || Removed) { return; }