Deduplicate & fix prediction reconciliation test (#18635)

Content.Server/Cargo/Systems/CargoSystem.Orders.cs

@@ -35,7 +35,6 @@ namespace Content.Server.Cargo.Systems
             SubscribeLocalEvent<CargoOrderConsoleComponent, CargoConsoleApproveOrderMessage>(OnApproveOrderMessage);
             SubscribeLocalEvent<CargoOrderConsoleComponent, BoundUIOpenedEvent>(OnOrderUIOpened);
             SubscribeLocalEvent<CargoOrderConsoleComponent, ComponentInit>(OnInit);
-            SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
             Reset();
         }
 
@@ -45,11 +44,6 @@ namespace Content.Server.Cargo.Systems
             UpdateOrderState(uid, station);
         }
 
-        private void Reset(RoundRestartCleanupEvent ev)
-        {
-            Reset();
-        }
-
         private void Reset()
         {
             _timer = 0;

Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs

@@ -369,6 +369,7 @@ public sealed partial class CargoSystem
 
     private void OnRoundRestart(RoundRestartCleanupEvent ev)
     {
+        Reset();
         CleanupCargoShuttle();
 
         if (_cfgManager.GetCVar(CCVars.GridFill))