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

2019-03-29 17:24:17 +02:00
parent ca08b803dc
commit ddfd7274e9
22 changed files with 230 additions and 99 deletions
@@ -17,6 +17,8 @@ namespace Barotrauma.Items.Components
        private readonly List<string> fixableEntities;
        private Vector2 pickedPosition;
        private float activeTimer;
+
+        private Vector2 debugRayStartPos, debugRayEndPos;
        
        [Serialize(0.0f, false)]
        public float Range { get; set; }
@@ -247,6 +249,7 @@ namespace Barotrauma.Items.Components

                var levelResource = targetItem.GetComponent<LevelResource>();
                if (levelResource != null && levelResource.IsActive &&
+                    levelResource.requiredItems.Any() &&
                    levelResource.HasRequiredItems(user, addMessage: false))
                {
                    levelResource.DeattachTimer += deltaTime;