(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
@@ -64,6 +64,7 @@ namespace Barotrauma.Items.Components
                attack = new Attack(subElement, item.Name + ", MeleeWeapon");
            }
            item.IsShootable = true;
+            // TODO: should define this in xml if we have melee weapons that don't require aim to use
            item.RequireAimToUse = true;
        }

@@ -58,6 +58,7 @@ namespace Barotrauma.Items.Components
            : base(item, element)
        {
            item.IsShootable = true;
+            // TODO: should define this in xml if we have ranged weapons that don't require aim to use
            item.RequireAimToUse = true;
        }

@@ -80,6 +80,7 @@ namespace Barotrauma.Items.Components
                }
            }
            item.IsShootable = true;
+            // TODO: should define this in xml if we have repair tools that don't require aim to use
            item.RequireAimToUse = true;
            InitProjSpecific(element);
        }