Merge remote-tracking branch 'upstream/master' into ed-28-07-2024-upstream

# Conflicts:
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/Traits/categories.yml
#	Resources/Prototypes/Traits/disabilities.yml

Content.Client/Arcade/BlockGameMenu.cs

@@ -380,7 +380,7 @@ namespace Content.Client.Arcade
             {
                 PanelOverride = back,
                 HorizontalExpand = true,
-                SizeFlagsStretchRatio = 60
+                SizeFlagsStretchRatio = 34.25f
             };
             var backgroundPanel = new PanelContainer
             {

Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs

@@ -17,6 +17,7 @@ public sealed class BlockGameBoundUserInterface : BoundUserInterface
         base.Open();
 
         _menu = this.CreateWindow<BlockGameMenu>();
+        _menu.OnAction += SendAction;
     }
 
     protected override void ReceiveMessage(BoundUserInterfaceMessage message)

Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs

@@ -25,6 +25,7 @@ public sealed class SpaceVillainArcadeBoundUserInterface : BoundUserInterface
         base.Open();
 
         _menu = this.CreateWindow<SpaceVillainArcadeMenu>();
+        _menu.OnPlayerAction += SendAction;
     }
 
     protected override void ReceiveMessage(BoundUserInterfaceMessage message)

Content.Client/Mech/Ui/MechMenu.xaml.cs

@@ -12,7 +12,7 @@ public sealed partial class MechMenu : FancyWindow
 {
     [Dependency] private readonly IEntityManager _ent = default!;
 
-    private readonly EntityUid _mech;
+    private EntityUid _mech;
 
     public event Action<EntityUid>? OnRemoveButtonPressed;
 
@@ -25,6 +25,7 @@ public sealed partial class MechMenu : FancyWindow
     public void SetEntity(EntityUid uid)
     {
         MechView.SetEntity(uid);
+        _mech = uid;
     }
 
     public void UpdateMechStats()

Content.Client/Replay/Spectator/ReplaySpectatorSystem.Position.cs

@@ -170,11 +170,12 @@ public sealed partial class ReplaySpectatorSystem
         {
             var size = grid.LocalAABB.Size.LengthSquared();
 
-            if (maxSize is not null && size < maxSize)
-                continue;
-
             var station = HasComp<StationMemberComponent>(uid);
 
+            //We want the first station grid to overwrite any previous non-station grids no matter the size, in case the vgroid was found first
+            if (maxSize is not null && size < maxSize && !(!stationFound && station))
+                continue;
+
             if (!station && stationFound)
                continue;
 
@@ -183,7 +184,6 @@ public sealed partial class ReplaySpectatorSystem
 
             if (station)
                 stationFound = true;
-
         }
 
         coords = new EntityCoordinates(maxUid ?? default, default);