- fix: Expedition

Daite deneg

Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs

@@ -1,3 +1,4 @@
+using System.Linq;
 using Content.Shared.Procedural;
 using Content.Shared.Salvage.Expeditions;
 
@@ -15,6 +16,11 @@ public sealed partial class SalvageSystem
         if (!data.Missions.TryGetValue(args.Index, out var missionparams))
             return;
 
+        if (data.Missions.Values.Any(m => m.Index == args.Index))
+        {
+            return;
+        }
+
         SpawnMission(missionparams, station.Value);
 
         data.ActiveMission = args.Index;

Content.Server/Salvage/SalvageSystem.Expeditions.cs

@@ -157,7 +157,9 @@ public sealed partial class SalvageSystem
 
     private SalvageExpeditionConsoleState GetState(SalvageExpeditionDataComponent component)
     {
-        var missions = component.Missions.Values.ToList();
+
+        var missions = component.Missions.Values.Distinct().ToList();
+
         return new SalvageExpeditionConsoleState(component.NextOffer, component.Claimed, component.Cooldown, component.ActiveMission, missions);
     }
 

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

@@ -5,6 +5,7 @@ salvage-expedition-structure-remaining =
        *[other] { $count } структур осталось.
     }
 salvage-expedition-megafauna-remaining = { $count } мегафауны остаётся.
+salvage-expedition-difficulty-players = Рекомендовано утилизаторов:
 salvage-expedition-window-title = Экспедиции
 salvage-expedition-window-difficulty = Сложность:
 salvage-expedition-window-details = Подробности:
@@ -15,8 +16,9 @@ salvage-expedition-window-modifiers = Модификаторы:
 salvage-expedition-window-rewards = Награды:
 salvage-expedition-window-loot = Добыча:
 salvage-expedition-window-none = Н/А
-salvage-expedition-window-claimed = Получено
-salvage-expedition-window-claim = Получить
+offering-window-claimed = = Получено
+offering-window-claim = Получить
+salvage-expedition-type = Миссии
 salvage-expedition-window-next = Следующее предложение
 # Expedition descriptions
 salvage-expedition-desc-mining = Собирайте ресурсы внутри этого района.