Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

2023-10-19 12:18:30 -03:00
parent 966236652a 331565f726
commit 9838cc59ee
613 changed files with 22122 additions and 11481 deletions
@@ -92,7 +92,7 @@ namespace Barotrauma.Items.Components
                repairable.LastActiveTime = (float)Timing.TotalTime + 10.0f;
            }

-            ApplyStatusEffects(ActionType.OnActive, deltaTime, null);
+            ApplyStatusEffects(ActionType.OnActive, deltaTime);

            progressTimer += deltaTime * Math.Min(powerConsumption <= 0.0f ? 1 : Voltage, MaxOverVoltageFactor);