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

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Reactor.cs

@@ -554,6 +554,8 @@ namespace Barotrauma.Items.Components
             fissionRateScrollBar.BarScroll = targetFissionRate / 100.0f;
             turbineOutputScrollBar.BarScroll = targetTurbineOutput / 100.0f;
             onOffSwitch.BarScroll = shutDown ? Math.Max(onOffSwitch.BarScroll, 0.55f) : Math.Min(onOffSwitch.BarScroll, 0.45f);
+
+            IsActive = true;
         }
     }
 }

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Sonar.cs

@@ -439,11 +439,14 @@ namespace Barotrauma.Items.Components
             {
                 var mission = GameMain.GameSession.Mission;
 
-                if (!string.IsNullOrWhiteSpace(mission.SonarLabel) && mission.SonarPosition != Vector2.Zero)
+                if (!string.IsNullOrWhiteSpace(mission.SonarLabel))
                 {
-                    DrawMarker(spriteBatch,
-                        mission.SonarLabel,
-                        mission.SonarPosition - transducerCenter, displayScale, center, (rect.Width * 0.47f));
+                    foreach (Vector2 sonarPosition in mission.SonarPositions)
+                    {
+                        DrawMarker(spriteBatch,
+                            mission.SonarLabel,
+                            sonarPosition - transducerCenter, displayScale, center, (rect.Width * 0.47f));
+                    }
                 }
             }