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

2019-06-12 16:45:24 +03:00
parent dce98349ea
commit adab8589da
14 changed files with 119 additions and 78 deletions
@@ -1553,7 +1553,7 @@ namespace Barotrauma

        public void Use(float deltaTime, Character character = null, Limb targetLimb = null)
        {
-            if (RequireAimToUse && !character.IsKeyDown(InputType.Aim))
+            if (RequireAimToUse && (character == null || !character.IsKeyDown(InputType.Aim)))
            {
                return;
            }