From 6e58250369b610d0a834b675d8fcf68328efe5db Mon Sep 17 00:00:00 2001
From: Jabkas <kzt084238@gmail.com>
Date: Sun, 31 Mar 2024 02:38:57 +0300
Subject: [PATCH] - fix: Expedition

Daite deneg
---
 Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs | 6 ++++++
 Content.Server/Salvage/SalvageSystem.Expeditions.cs       | 4 +++-
 Resources/Locale/ru-RU/procedural/expeditions.ftl         | 6 ++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs b/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
index f7f3718208..2c5c7350dc 100644
--- a/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
+++ b/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;
diff --git a/Content.Server/Salvage/SalvageSystem.Expeditions.cs b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
index 1eb1cc3027..01044c2d7f 100644
--- a/Content.Server/Salvage/SalvageSystem.Expeditions.cs
+++ b/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);
     }
 
diff --git a/Resources/Locale/ru-RU/procedural/expeditions.ftl b/Resources/Locale/ru-RU/procedural/expeditions.ftl
index 86a260bcbb..cc9da009b4 100644
--- a/Resources/Locale/ru-RU/procedural/expeditions.ftl
+++ b/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 = Собирайте ресурсы внутри этого района.