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

2019-04-06 17:49:31 +03:00
parent 45c1ed499a
commit 14d0daf16d
18 changed files with 333 additions and 180 deletions
@@ -86,7 +86,10 @@ namespace Barotrauma

                    character.AIController.SteeringManager.Reset();
                    character.CursorPosition = fs.Position;
-                    character.SetInput(InputType.Aim, false, true);
+                    if (extinguisher.Item.RequireAimToUse)
+                    {
+                        character.SetInput(InputType.Aim, false, true);
+                    }
                    extinguisher.Use(deltaTime, character);

                    if (!targetHull.FireSources.Contains(fs))