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

This commit is contained in:
Joonas Rikkonen
2019-05-18 17:52:26 +03:00
parent 3a0d8bbb8a
commit a01729514b
12 changed files with 14 additions and 25 deletions
@@ -239,7 +239,8 @@ namespace Barotrauma
CloseEnough = 150,
AllowGoingOutside = true,
IgnoreIfTargetDead = true,
FollowControlledCharacter = orderGiver == character
followControlledCharacter = orderGiver == character,
mimic = true
};
break;
case "wait":