(1762f02b3) Merge branch 'dev' into human-ai

2019-05-16 05:08:22 +03:00
parent 4797f6b0d3
commit 454dda56c7
91 changed files with 1138 additions and 744 deletions
@@ -122,10 +122,12 @@ namespace Barotrauma.Items.Components
                        foreach (Item subItem in containedSubItems)
                        {
                            projectile = subItem.GetComponent<Projectile>();
-
                            //apply OnUse statuseffects to the container in case it has to react to it somehow
                            //(play a sound, spawn more projectiles, reduce condition...)
-                            subItem.GetComponent<ItemContainer>()?.Item.ApplyStatusEffects(ActionType.OnUse, deltaTime);
+                            if (subItem.Condition > 0.0f)
+                            {
+                                subItem.GetComponent<ItemContainer>()?.Item.ApplyStatusEffects(ActionType.OnUse, deltaTime);
+                            }
                            if (projectile != null) break;
                        }
                    }