From 1d420ec053a14f3830d43cd3fe5cd12af230cf9f Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Thu, 20 Apr 2023 15:51:10 +1000
Subject: [PATCH] Expedition loc + timer fixes (#15561)

---
 Content.Server/Salvage/SalvageSystem.Runner.cs                | 2 +-
 .../Salvage/Expeditions/Modifiers/SalvageTimeMod.cs           | 4 ++--
 Resources/Locale/en-US/procedural/expeditions.ftl             | 1 +
 Resources/Prototypes/Procedural/salvage_mods.yml              | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Content.Server/Salvage/SalvageSystem.Runner.cs b/Content.Server/Salvage/SalvageSystem.Runner.cs
index 9cb56aeee9..19c4a3dcad 100644
--- a/Content.Server/Salvage/SalvageSystem.Runner.cs
+++ b/Content.Server/Salvage/SalvageSystem.Runner.cs
@@ -187,7 +187,7 @@ public sealed partial class SalvageSystem
 
             if (structureAnnounce)
             {
-                Announce(uid, Loc.GetString("salvage-expedition-structures-remaining", ("count", structure.Structures.Count)));
+                Announce(uid, Loc.GetString("salvage-expedition-structure-remaining", ("count", structure.Structures.Count)));
             }
         }
     }
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTimeMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTimeMod.cs
index 4f1ab80b7c..689f5763eb 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTimeMod.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTimeMod.cs
@@ -16,8 +16,8 @@ public sealed class SalvageTimeMod : IPrototype, ISalvageMod
     public float Cost { get; } = 0f;
 
     [DataField("minDuration")]
-    public int MinDuration = 600;
+    public int MinDuration = 1080;
 
     [DataField("maxDuration")]
-    public int MaxDuration = 660;
+    public int MaxDuration = 1200;
 }
diff --git a/Resources/Locale/en-US/procedural/expeditions.ftl b/Resources/Locale/en-US/procedural/expeditions.ftl
index 126f284176..b5cd2f2837 100644
--- a/Resources/Locale/en-US/procedural/expeditions.ftl
+++ b/Resources/Locale/en-US/procedural/expeditions.ftl
@@ -1,4 +1,5 @@
 salvage-expedition-structure-examine = This is a [color=#B02E26]destruction[/color] objective
+salvage-expedition-structure-remaining = {$count} structures remaining.
 
 salvage-expedition-window-title = Salvage expeditions
 salvage-expedition-window-difficulty = Difficulty:
diff --git a/Resources/Prototypes/Procedural/salvage_mods.yml b/Resources/Prototypes/Procedural/salvage_mods.yml
index d9e36a998d..fdc8fe443a 100644
--- a/Resources/Prototypes/Procedural/salvage_mods.yml
+++ b/Resources/Prototypes/Procedural/salvage_mods.yml
@@ -75,8 +75,8 @@
 - type: salvageTimeMod
   id: RushTime
   desc: Rush
-  minDuration: 480
-  maxDuration: 540
+  minDuration: 900
+  maxDuration: 1020
   cost: 1
 
 # Misc mods
-- 
2.51.2