(39b4d0859) Merge branch 'dev' into human-ai

This commit is contained in:
Joonas Rikkonen
2019-05-16 05:08:56 +03:00
parent 616efac2bf
commit 3a3d55d780
13 changed files with 139 additions and 62 deletions
@@ -86,12 +86,12 @@ namespace Barotrauma
return;
}
}
if (repairTool == null)
{
FindRepairTool();
}
if (character.CanInteractWith(Item))
{
if (repairTool == null)
{
FindRepairTool();
}
if (repairTool != null)
{
OperateRepairTool(deltaTime);