Expedition early finish fix

Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs

@@ -101,7 +101,7 @@ private void OnSalvageFinishMessage(EntityUid entity, SalvageExpeditionConsoleCo
         if (!TryComp<SalvageExpeditionComponent>(map, out var expedition))
             return;
 
-        var newEndTime = _timing.CurTime + TimeSpan.FromSeconds(10);
+        var newEndTime = _timing.CurTime + TimeSpan.FromSeconds(20);
 
         if (expedition.EndTime <= newEndTime)
             return;

Content.Server/Salvage/SalvageSystem.Expeditions.cs

@@ -23,6 +23,7 @@
 using Robust.Shared.GameStates;
 using Robust.Shared.Random;
 using Robust.Shared.Map;
+using Content.Server.Shuttles.Components;
 
 namespace Content.Server.Salvage;
 
@@ -168,8 +169,11 @@ private void UpdateExpeditions()
             if (comp.NextOffer > currentTime || comp.Claimed)
                 continue;
 
-            comp.Cooldown = false;
+            if (!HasComp<FTLComponent>(_station.GetLargestGrid(Comp<StationDataComponent>(uid))))
+                comp.Cooldown = false;
+
             comp.NextOffer += TimeSpan.FromSeconds(_cooldown);
+
             GenerateMissions(comp);
             UpdateConsoles(comp);
         }

Content.Server/Salvage/SalvageSystem.Runner.cs

@@ -175,7 +175,7 @@ private void UpdateRunner()
                 Dirty(uid, comp);
                 Announce(uid, Loc.GetString("salvage-expedition-announcement-countdown-seconds", ("duration", TimeSpan.FromSeconds(45).Seconds)));
             }
-            else if (comp.Stream == null && remaining < audioLength)
+            else if (comp.Stage < ExpeditionStage.MusicCountdown && comp.Stream == null && remaining < audioLength)
             {
                 var audio = _audio.PlayPvs(comp.Sound, uid).Value;
                 comp.Stream = audio.Entity;

Resources/Locale/ru-RU/procedural/expeditions.ftl

@@ -34,6 +34,7 @@ salvage-expedition-difficulty-Minor = Лёгкая
 offering-window-claimed = Принято
 offering-window-claim = Принять
 salvage-expedition-window-next = Следующее предложение
+salvage-expedition-window-finish = Завершить экспедицию
 # Expedition descriptions
 salvage-expedition-difficulty-players = Рекомендовано утилизаторов:
 #  С вас удержат налог в размере { $tax }% от добытых ресурсов.
@@ -55,7 +56,7 @@ salvage-expedition-announcement-countdown-seconds =
         [few] секунды
        *[other] секунд
     }.
+salvage-expedition-announcement-early-finish = Экспедиция завершена досрочно.
 salvage-expedition-reward-description = Награда за завершение миссии
 salvage-expedition-announcement-dungeon = Подземелье расположено от вас на { $direction }.
-salvage-expedition-completed = Экспедиция окончена.
-salvage-expedition-announcement-early-finish = Экспедиция завершена вручную.
+salvage-expedition-completed = Миссия выполнена.