409d4d9...aeafa16 (merge human-ai)

2019-03-18 22:52:17 +02:00
parent 80ab27df22
commit 3301bed442
88 changed files with 2334 additions and 1657 deletions
@@ -108,7 +108,7 @@ namespace Barotrauma.Items.Components
                var progressBar = user.UpdateHUDProgressBar(
                    targetItem,
                    progressBarPos,
-                    targetItem.Prefab.Health <= 0.0f ? 0.0f : targetItem.Condition / targetItem.Prefab.Health,
+                    targetItem.Condition / item.MaxCondition,
                    Color.Red, Color.Green);
                if (progressBar != null) { progressBar.Size = new Vector2(60.0f, 20.0f); }
            }