fixed railgun, fixed repairtools radar ping & improved rendering, waypoint bugfixes, inventory bugfixes, syncing wires between clients

2015-07-15 23:34:13 +03:00
parent 44b9a63c94
commit 237df18765
39 changed files with 461 additions and 405 deletions
@@ -734,9 +734,8 @@ namespace Subsurface
            foreach (ItemComponent ic in components)
            {
                if (!ic.HasRequiredSkills(picker)) hasRequiredSkills = false;
-                if ((ic.CanBePicked || ic.CanBeSelected) 
-                    && (ic.HasRequiredEquippedItems(picker, picker == Character.Controlled) || forcePick) 
-                    && ic.Pick(picker))
+                if (!ic.HasRequiredItems(picker, picker == Character.Controlled) && !forcePick) continue;
+                if ((ic.CanBePicked && ic.Pick(picker)) || (ic.CanBeSelected && ic.Select(picker)))                     
                {
                    picked = true;
                    ic.ApplyStatusEffects(ActionType.OnPicked, 1.0f, picker);