diff --git a/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs b/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs
index bc6b4689af6..8f7d0fea243 100644
--- a/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs
+++ b/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs
@@ -8,189 +8,301 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
 using System.Linq;
+using Content.Client.Computer;
 using Content.Client.Stylesheets;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.CCVar;
-using Content.Shared.Procedural;
+using Content.Shared.Parallax.Biomes;
+using Content.Shared.Salvage;
 using Content.Shared.Salvage.Expeditions;
 using Content.Shared.Salvage.Expeditions.Modifiers;
-using JetBrains.Annotations;
+using Content.Shared.Shuttles.BUIStates;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
 
 namespace Content.Client.Salvage.UI;
 
-[UsedImplicitly]
-public sealed class SalvageExpeditionConsoleBoundUserInterface : BoundUserInterface
+[GenerateTypedNameReferences]
+public sealed partial class SalvageExpeditionWindow : FancyWindow,
+    IComputerWindow<EmergencyConsoleBoundUserInterfaceState>
 {
-    [ViewVariables]
-    private OfferingWindow? _window;
+    private readonly IConfigurationManager _cfgManager;
+    private readonly IGameTiming _timing;
+    private readonly IPrototypeManager _prototype;
+    private readonly SharedSalvageSystem _salvage;
 
-    [Dependency] private readonly IConfigurationManager _cfgManager = default!;
-    [Dependency] private readonly IEntityManager _entManager = default!;
-    [Dependency] private readonly IPrototypeManager _protoManager = default!;
+    public event Action<ushort>? ClaimMission;
+    private bool _claimed;
+    private bool _cooldown;
+    private TimeSpan _nextOffer;
 
-    public SalvageExpeditionConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    public SalvageExpeditionWindow()
     {
-        IoCManager.InjectDependencies(this);
+        RobustXamlLoader.Load(this);
+        _cfgManager = IoCManager.Resolve<IConfigurationManager>();
+        _timing = IoCManager.Resolve<IGameTiming>();
+        _prototype = IoCManager.Resolve<IPrototypeManager>();
+        _salvage = IoCManager.Resolve<IEntityManager>().EntitySysManager.GetEntitySystem<SharedSalvageSystem>();
     }
 
-    protected override void Open()
+    public void UpdateState(SalvageExpeditionConsoleState state)
     {
-        base.Open();
-        _window = this.CreateWindowCenteredLeft<OfferingWindow>();
-        _window.Title = Loc.GetString("salvage-expedition-window-title");
-    }
-
-    protected override void UpdateState(BoundUserInterfaceState state)
-    {
-        base.UpdateState(state);
-
-        if (state is not SalvageExpeditionConsoleState current || _window == null)
-            return;
-
-        _window.Progression = null;
-        _window.Cooldown = TimeSpan.FromSeconds(_cfgManager.GetCVar(CCVars.SalvageExpeditionCooldown));
-        _window.NextOffer = current.NextOffer;
-        _window.Claimed = current.Claimed;
-        _window.ClearOptions();
-        var salvage = _entManager.System<SalvageSystem>();
+        _claimed = state.Claimed;
+        _cooldown = state.Cooldown;
+        _nextOffer = state.NextOffer;
+        Container.DisposeAllChildren();
 
-        for (var i = 0; i < current.Missions.Count; i++)
+        for (var i = 0; i < state.Missions.Count; i++)
         {
-            var missionParams = current.Missions[i];
+            var missionParams = state.Missions[i];
+            var config = missionParams.MissionType;
+            var mission = _salvage.GetMission(missionParams.MissionType, missionParams.Difficulty, missionParams.Seed);
 
-            var offering = new OfferingWindowOption();
-            offering.Title = Loc.GetString($"salvage-expedition-type");
+            // Mission title
+            var missionStripe = new StripeBack()
+            {
+                Margin = new Thickness(0f, -5f, 0f, 0f)
+            };
 
-            var difficultyId = "Moderate";
-            var difficultyProto = _protoManager.Index<SalvageDifficultyPrototype>(difficultyId);
-            // TODO: Selectable difficulty soon.
-            var mission = salvage.GetMission(difficultyProto, missionParams.Seed);
+            missionStripe.AddChild(new Label()
+            {
+                Text = Loc.GetString($"salvage-expedition-type-{config.ToString()}"),
+                HorizontalAlignment = HAlignment.Center,
+                Margin = new Thickness(0f, 5f, 0f, 5f),
+            });
+
+            var lBox = new BoxContainer()
+            {
+                Orientation = BoxContainer.LayoutOrientation.Vertical
+            };
 
             // Difficulty
             // Details
-            offering.AddContent(new Label()
+            lBox.AddChild(new Label()
             {
                 Text = Loc.GetString("salvage-expedition-window-difficulty")
             });
 
-            var difficultyColor = difficultyProto.Color;
+            Color difficultyColor;
+
+            switch (missionParams.Difficulty)
+            {
+                case DifficultyRating.Minimal:
+                    difficultyColor = Color.FromHex("#52B4E996");
+                    break;
+                case DifficultyRating.Minor:
+                    difficultyColor = Color.FromHex("#9FED5896");
+                    break;
+                case DifficultyRating.Moderate:
+                    difficultyColor = Color.FromHex("#EFB34196");
+                    break;
+                case DifficultyRating.Hazardous:
+                    difficultyColor = Color.FromHex("#DE3A3A96");
+                    break;
+                case DifficultyRating.Extreme:
+                    difficultyColor = Color.FromHex("#D381C996");
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
 
-            offering.AddContent(new Label
+            lBox.AddChild(new Label
             {
-                Text = Loc.GetString("salvage-expedition-difficulty-Moderate"),
+                Text = Loc.GetString($"salvage-expedition-difficulty-{missionParams.Difficulty.ToString()}"),
                 FontColorOverride = difficultyColor,
-                HorizontalAlignment = Control.HAlignment.Left,
+                HorizontalAlignment = HAlignment.Left,
                 Margin = new Thickness(0f, 0f, 0f, 5f),
             });
 
-            offering.AddContent(new Label
+            // Details
+            var details = _salvage.GetMissionDescription(mission);
+
+            lBox.AddChild(new Label
             {
-                Text = Loc.GetString("salvage-expedition-difficulty-players"),
-                HorizontalAlignment = Control.HAlignment.Left,
+                Text = Loc.GetString("salvage-expedition-window-details")
             });
 
-            offering.AddContent(new Label
+            lBox.AddChild(new Label
             {
-                Text = difficultyProto.RecommendedPlayers.ToString(),
+                Text = details,
                 FontColorOverride = StyleNano.NanoGold,
-                HorizontalAlignment = Control.HAlignment.Left,
+                HorizontalAlignment = HAlignment.Left,
                 Margin = new Thickness(0f, 0f, 0f, 5f),
             });
 
             // Details
-            offering.AddContent(new Label
+            lBox.AddChild(new Label
             {
                 Text = Loc.GetString("salvage-expedition-window-hostiles")
             });
 
             var faction = mission.Faction;
 
-            offering.AddContent(new Label
+            lBox.AddChild(new Label
             {
-                Text = string.IsNullOrWhiteSpace(Loc.GetString(_protoManager.Index<SalvageFactionPrototype>(faction).Description))
-                        ? LogAndReturnDefaultFactionDescription(faction)
-                        : Loc.GetString(_protoManager.Index<SalvageFactionPrototype>(faction).Description),
+                Text = faction,
                 FontColorOverride = StyleNano.NanoGold,
-                HorizontalAlignment = Control.HAlignment.Left,
+                HorizontalAlignment = HAlignment.Left,
                 Margin = new Thickness(0f, 0f, 0f, 5f),
             });
 
-            string LogAndReturnDefaultFactionDescription(string faction)
-            {
-                Logger.Error($"Description is null or white space for SalvageFactionPrototype: {faction}");
-                return Loc.GetString(_protoManager.Index<SalvageFactionPrototype>(faction).ID);
-            }
-
-
             // Duration
-            offering.AddContent(new Label
+            lBox.AddChild(new Label
             {
                 Text = Loc.GetString("salvage-expedition-window-duration")
             });
 
-            offering.AddContent(new Label
+            lBox.AddChild(new Label
             {
                 Text = mission.Duration.ToString(),
                 FontColorOverride = StyleNano.NanoGold,
-                HorizontalAlignment = Control.HAlignment.Left,
+                HorizontalAlignment = HAlignment.Left,
                 Margin = new Thickness(0f, 0f, 0f, 5f),
             });
 
             // Biome
-            offering.AddContent(new Label
+            lBox.AddChild(new Label
             {
                 Text = Loc.GetString("salvage-expedition-window-biome")
             });
 
             var biome = mission.Biome;
 
-            offering.AddContent(new Label
+            lBox.AddChild(new Label
             {
-                Text = string.IsNullOrWhiteSpace(Loc.GetString(_protoManager.Index<SalvageBiomeModPrototype>(biome).Description))
-                        ? LogAndReturnDefaultBiomDescription(biome)
-                        : Loc.GetString(_protoManager.Index<SalvageBiomeModPrototype>(biome).Description),
+                Text = Loc.GetString(_prototype.Index<SalvageBiomeMod>(biome).ID),
                 FontColorOverride = StyleNano.NanoGold,
-                HorizontalAlignment = Control.HAlignment.Left,
+                HorizontalAlignment = HAlignment.Left,
                 Margin = new Thickness(0f, 0f, 0f, 5f),
             });
 
-            string LogAndReturnDefaultBiomDescription(string biome)
-            {
-                Logger.Error($"Description is null or white space for SalvageBiomeModPrototype: {biome}");
-                return Loc.GetString(_protoManager.Index<SalvageBiomeModPrototype>(biome).ID);
-            }
-
             // Modifiers
-            offering.AddContent(new Label
+            lBox.AddChild(new Label
             {
                 Text = Loc.GetString("salvage-expedition-window-modifiers")
             });
 
             var mods = mission.Modifiers;
 
-            offering.AddContent(new Label
+            lBox.AddChild(new Label
             {
                 Text = string.Join("\n", mods.Select(o => "- " + o)).TrimEnd(),
                 FontColorOverride = StyleNano.NanoGold,
-                HorizontalAlignment = Control.HAlignment.Left,
+                HorizontalAlignment = HAlignment.Left,
                 Margin = new Thickness(0f, 0f, 0f, 5f),
             });
 
-            offering.ClaimPressed += args =>
+            lBox.AddChild(new Label()
+            {
+                Text = Loc.GetString("salvage-expedition-window-rewards")
+            });
+
+            var rewards = new Dictionary<string, int>();
+            foreach (var reward in mission.Rewards)
+            {
+                var name = _prototype.Index<EntityPrototype>(reward).Name;
+                var count = rewards.GetOrNew(name);
+                count++;
+                rewards[name] = count;
+            }
+
+            // there will always be 3 or more rewards so no need for 0 check
+            lBox.AddChild(new Label()
+            {
+                Text = string.Join("\n", rewards.Select(o => "- " + o.Key + (o.Value > 1 ? $" x {o.Value}" : ""))).TrimEnd(),
+                FontColorOverride = StyleNano.ConcerningOrangeFore,
+                HorizontalAlignment = HAlignment.Left,
+                Margin = new Thickness(0f, 0f, 0f, 5f)
+            });
+
+            // Claim
+            var claimButton = new Button()
+            {
+                HorizontalExpand = true,
+                VerticalAlignment = VAlignment.Bottom,
+                Pressed = state.ActiveMission == missionParams.Index,
+                ToggleMode = true,
+                Disabled = state.Claimed || state.Cooldown,
+            };
+
+            claimButton.Label.Margin = new Thickness(0f, 5f);
+
+            claimButton.OnPressed += args =>
+            {
+                ClaimMission?.Invoke(missionParams.Index);
+            };
+
+            if (state.ActiveMission == missionParams.Index)
+            {
+                claimButton.Text = Loc.GetString("salvage-expedition-window-claimed");
+                claimButton.AddStyleClass(StyleBase.ButtonCaution);
+            }
+            else
+            {
+                claimButton.Text = Loc.GetString("salvage-expedition-window-claim");
+            }
+
+            var box = new PanelContainer
             {
-                SendMessage(new ClaimSalvageMessage()
+                PanelOverride = new StyleBoxFlat(new Color(30, 30, 34)),
+                HorizontalExpand = true,
+                Margin = new Thickness(5f, 0f),
+                Children =
                 {
-                    Index = missionParams.Index,
-                });
+                    new BoxContainer
+                    {
+                        Orientation = BoxContainer.LayoutOrientation.Vertical,
+                        Children =
+                        {
+                            missionStripe,
+                            lBox,
+                            new Control() {VerticalExpand = true},
+                            claimButton,
+                        },
+                        Margin = new Thickness(5f, 5f)
+                    }
+                }
             };
 
-            offering.Claimed = current.ActiveMission == missionParams.Index;
-            offering.Disabled = current.Claimed || current.Cooldown;
+            LayoutContainer.SetAnchorPreset(box, LayoutContainer.LayoutPreset.Wide);
+
+            Container.AddChild(box);
+        }
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        base.FrameUpdate(args);
+
+        if (_claimed)
+        {
+            NextOfferBar.Value = 0f;
+            NextOfferText.Text = "00:00";
+            return;
+        }
+
+        var remaining = _nextOffer - _timing.CurTime;
+
+        if (remaining < TimeSpan.Zero)
+        {
+            NextOfferBar.Value = 1f;
+            NextOfferText.Text = "00:00";
+        }
+        else
+        {
+            var cooldown = _cooldown
+                ? TimeSpan.FromSeconds(_cfgManager.GetCVar(CCVars.SalvageExpeditionFailedCooldown))
+                : TimeSpan.FromSeconds(_cfgManager.GetCVar(CCVars.SalvageExpeditionCooldown));
 
-            _window.AddOption(offering);
+            NextOfferBar.Value = 1f - (float) (remaining / cooldown);
+            NextOfferText.Text = $"{remaining.Minutes:00}:{remaining.Seconds:00}";
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Client/Salvage/UI/SalvageExpeditionWindow.xaml b/Content.Client/Salvage/UI/SalvageExpeditionWindow.xaml
new file mode 100644
index 00000000000..e5920b02277
--- /dev/null
+++ b/Content.Client/Salvage/UI/SalvageExpeditionWindow.xaml
@@ -0,0 +1,40 @@
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                      xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                      Title="{Loc 'salvage-expedition-window-title'}"
+                      MinSize="800 360">
+    <BoxContainer Orientation="Vertical">
+        <BoxContainer Orientation="Horizontal" Name="ProgressionBox" Visible="False">
+            <Label Name="ProgressionLabel"
+                   Text="{Loc 'salvage-expedition-window-progression'}"
+                   SetWidth="96"
+                   Margin="5"/>
+            <ProgressBar Name="ProgressionBar"
+                         HorizontalExpand="True"
+                         MinValue="0"
+                         MaxValue="1"
+                         SetHeight="25"/>
+            <Label Name="ProgressionText" Text="00:00"
+                   Margin="5"/>
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
+            <Label Name="NextOfferLabel"
+                   Text="{Loc 'salvage-expedition-window-next'}"
+                   SetWidth="96"
+                   Margin="5"/>
+            <ProgressBar Name="NextOfferBar"
+                         HorizontalExpand="True"
+                         MinValue="0"
+                         MaxValue="1"
+                         SetHeight="25"/>
+            <Label Name="NextOfferText" Text="0.00"
+                   Margin="5"/>
+        </BoxContainer>
+        <controls:HLine Color="#404040" Thickness="2" Margin="0 5 0 5"/>
+        <BoxContainer Name="Container"
+                      Orientation="Horizontal"
+                      Margin="5 0 5 0"/>
+        <Button Name="Finish"
+                Text="{Loc 'salvage-expedition-window-finish'}"
+                HorizontalAlignment="Right"/>
+    </BoxContainer>
+</controls:FancyWindow>
diff --git a/Content.Server/Salvage/Expeditions/SalvageEliminationExpeditionComponent.cs b/Content.Server/Salvage/Expeditions/SalvageEliminationExpeditionComponent.cs
new file mode 100644
index 00000000000..a3ec66ff302
--- /dev/null
+++ b/Content.Server/Salvage/Expeditions/SalvageEliminationExpeditionComponent.cs
@@ -0,0 +1,16 @@
+using Content.Shared.Salvage;
+
+namespace Content.Server.Salvage.Expeditions.Structure;
+
+/// <summary>
+/// Tracks expedition data for <see cref="SalvageMissionType.Elimination"/>
+/// </summary>
+[RegisterComponent, Access(typeof(SalvageSystem), typeof(SpawnSalvageMissionJob))]
+public sealed partial class SalvageEliminationExpeditionComponent : Component
+{
+    /// <summary>
+    /// List of mobs that need to be killed for the mission to be complete.
+    /// </summary>
+    [DataField("megafauna")]
+    public List<EntityUid> Megafauna = new();
+}
diff --git a/Content.Server/Salvage/Expeditions/SalvageExpeditionComponent.cs b/Content.Server/Salvage/Expeditions/SalvageExpeditionComponent.cs
index 2ac369eaaf6..a7e304ec19c 100644
--- a/Content.Server/Salvage/Expeditions/SalvageExpeditionComponent.cs
+++ b/Content.Server/Salvage/Expeditions/SalvageExpeditionComponent.cs
@@ -18,6 +18,10 @@
 using Content.Shared.Salvage.Expeditions;
 using Robust.Shared.Audio;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+using Content.Shared.Salvage.Expeditions.Modifiers;
+using Content.Shared.Salvage;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Salvage.Expeditions;
 
@@ -70,4 +74,14 @@ public sealed partial class SalvageExpeditionComponent : SharedSalvageExpedition
     /// </summary>
     [DataField]
     public ResolvedSoundSpecifier SelectedSong;
-}
\ No newline at end of file
+    /// The difficulty this mission had or, in the future, was selected.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField("difficulty")]
+    public DifficultyRating Difficulty;
+
+    /// <summary>
+    /// List of items to order on mission completion
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField("rewards", customTypeSerializer: typeof(PrototypeIdListSerializer<EntityPrototype>))]
+    public List<string> Rewards = default!;
+}
diff --git a/Content.Server/Salvage/Expeditions/SalvageMiningExpeditionComponent.cs b/Content.Server/Salvage/Expeditions/SalvageMiningExpeditionComponent.cs
new file mode 100644
index 00000000000..b9a1379aab9
--- /dev/null
+++ b/Content.Server/Salvage/Expeditions/SalvageMiningExpeditionComponent.cs
@@ -0,0 +1,16 @@
+using Content.Shared.Salvage;
+
+namespace Content.Server.Salvage.Expeditions;
+
+/// <summary>
+/// Tracks expedition data for <see cref="SalvageMissionType.Mining"/>
+/// </summary>
+[RegisterComponent, Access(typeof(SalvageSystem))]
+public sealed partial class SalvageMiningExpeditionComponent : Component
+{
+    /// <summary>
+    /// Entities that were present on the shuttle and match the loot tax.
+    /// </summary>
+    [DataField("exemptEntities")]
+    public List<EntityUid> ExemptEntities = new();
+}
diff --git a/Content.Server/Salvage/Expeditions/SalvageStructureExpeditionComponent.cs b/Content.Server/Salvage/Expeditions/SalvageStructureExpeditionComponent.cs
new file mode 100644
index 00000000000..0dec1f81adf
--- /dev/null
+++ b/Content.Server/Salvage/Expeditions/SalvageStructureExpeditionComponent.cs
@@ -0,0 +1,13 @@
+using Content.Shared.Salvage;
+
+namespace Content.Server.Salvage.Expeditions.Structure;
+
+/// <summary>
+/// Tracks expedition data for <see cref="SalvageMissionType.Structure"/>
+/// </summary>
+[RegisterComponent, Access(typeof(SalvageSystem), typeof(SpawnSalvageMissionJob))]
+public sealed partial class SalvageStructureExpeditionComponent : Component
+{
+    [DataField("structures")]
+    public List<EntityUid> Structures = new();
+}
diff --git a/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs b/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
index 25bed3b63af..36bc225ddc5 100644
--- a/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
+++ b/Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
@@ -10,6 +10,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
 using Content.Shared.Procedural;
+using Content.Shared.Salvage;
 using Content.Shared.Salvage.Expeditions;
 using Content.Shared.Dataset;
 using Robust.Shared.Prototypes;
@@ -31,17 +32,40 @@ private void OnSalvageClaimMessage(EntityUid uid, SalvageExpeditionConsoleCompon
         if (!data.Missions.TryGetValue(args.Index, out var missionparams))
             return;
 
-        var cdUid = Spawn(CoordinatesDisk, Transform(uid).Coordinates);
-        SpawnMission(missionparams, station.Value, cdUid);
+        // On Frontier, FTL travel is currently restricted to expeditions and such, and so we need to put this here
+        // until FTL changes for us in some way.
+        if (!TryComp<StationDataComponent>(station, out var stationData))
+            return;
+        if (_station.GetLargestGrid(stationData) is not {Valid : true} grid)
+            return;
+        if (!TryComp<MapGridComponent>(grid, out var gridComp))
+            return;
 
-        data.ActiveMission = args.Index;
-        var mission = GetMission(_prototypeManager.Index<SalvageDifficultyPrototype>(missionparams.Difficulty), missionparams.Seed);
-        data.NextOffer = _timing.CurTime + mission.Duration + TimeSpan.FromSeconds(1);
+        var xform = Transform(grid);
+        var bounds = xform.WorldMatrix.TransformBox(gridComp.LocalAABB).Enlarged(ShuttleFTLRange);
+        var bodyQuery = GetEntityQuery<PhysicsComponent>();
+        foreach (var other in _mapManager.FindGridsIntersecting(xform.MapID, bounds))
+        {
+            if (grid == other.Owner ||
+                !bodyQuery.TryGetComponent(other.Owner, out var body) ||
+                body.Mass < ShuttleFTLMassThreshold)
+            {
+                continue;
+            }
+
+            PlayDenySound(uid, component);
+            _popupSystem.PopupEntity(Loc.GetString("shuttle-ftl-proximity"), uid, PopupType.MediumCaution);
+            UpdateConsoles(data);
+            return;
+        }
+        // end of Frontier proximity check
 
-        _labelSystem.Label(cdUid, GetFTLName(_prototypeManager.Index(PlanetNames), missionparams.Seed));
-        _audio.PlayPvs(component.PrintSound, uid);
+        SpawnMission(missionparams, station.Value);
 
-        UpdateConsoles((station.Value, data));
+        data.ActiveMission = args.Index;
+        var mission = GetMission(missionparams.MissionType, missionparams.Difficulty, missionparams.Seed);
+        data.NextOffer = _timing.CurTime + mission.Duration + TimeSpan.FromSeconds(1);
+        UpdateConsoles(data);
     }
 
     private void OnSalvageConsoleInit(Entity<SalvageExpeditionConsoleComponent> console, ref ComponentInit args)
@@ -54,7 +78,7 @@ private void OnSalvageConsoleParent(Entity<SalvageExpeditionConsoleComponent> co
         UpdateConsole(console);
     }
 
-    private void UpdateConsoles(Entity<SalvageExpeditionDataComponent> component)
+    private void UpdateConsoles(SalvageExpeditionDataComponent component)
     {
         var state = GetState(component);
 
@@ -86,4 +110,4 @@ private void UpdateConsole(Entity<SalvageExpeditionConsoleComponent> component)
 
         _ui.SetUiState(component.Owner, SalvageConsoleUiKey.Expedition, state);
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Server/Salvage/SalvageSystem.Expeditions.cs b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
index 45c747e3e3f..ad894e2b099 100644
--- a/Content.Server/Salvage/SalvageSystem.Expeditions.cs
+++ b/Content.Server/Salvage/SalvageSystem.Expeditions.cs
@@ -32,6 +32,15 @@
 using Robust.Shared.Audio;
 using Robust.Shared.CPUJob.JobQueues;
 using Robust.Shared.CPUJob.JobQueues.Queues;
+using Content.Server.Shuttles.Systems;
+using Content.Server.Station.Components;
+using Content.Server.Station.Systems;
+using Content.Shared.Coordinates;
+using Content.Shared.Procedural;
+using System.Linq;
+using System.Threading;
+using Content.Shared.Salvage;
+using Content.Shared.Salvage.Expeditions;
 using Robust.Shared.GameStates;
 
 namespace Content.Server.Salvage;
@@ -49,6 +58,7 @@ public sealed partial class SalvageSystem
     private const double SalvageJobTime = 0.002;
 
     private float _cooldown;
+    private float _failedCooldown;
 
     private void InitializeExpeditions()
     {
@@ -63,7 +73,9 @@ private void InitializeExpeditions()
         SubscribeLocalEvent<SalvageStructureComponent, ExaminedEvent>(OnStructureExamine);
 
         _cooldown = _configurationManager.GetCVar(CCVars.SalvageExpeditionCooldown);
-        Subs.CVar(_configurationManager, CCVars.SalvageExpeditionCooldown, SetCooldownChange);
+        _failedCooldown = _configurationManager.GetCVar(CCVars.SalvageExpeditionFailedCooldown);
+        _configurationManager.OnValueChanged(CCVars.SalvageExpeditionCooldown, SetCooldownChange);
+        _configurationManager.OnValueChanged(CCVars.SalvageExpeditionFailedCooldown, SetFailedCooldownChange);
     }
 
     private void OnExpeditionGetState(EntityUid uid, SalvageExpeditionComponent component, ref ComponentGetState args)
@@ -74,6 +86,12 @@ private void OnExpeditionGetState(EntityUid uid, SalvageExpeditionComponent comp
         };
     }
 
+    private void ShutdownExpeditions()
+    {
+        _configurationManager.UnsubValueChanged(CCVars.SalvageExpeditionCooldown, SetCooldownChange);
+        _configurationManager.UnsubValueChanged(CCVars.SalvageExpeditionFailedCooldown, SetFailedCooldownChange);
+    }
+
     private void SetCooldownChange(float obj)
     {
         // Update the active cooldowns if we change it.
@@ -93,6 +111,19 @@ private void OnExpeditionMapInit(EntityUid uid, SalvageExpeditionComponent compo
     {
         component.SelectedSong = _audio.ResolveSound(component.Sound);
     }
+    private void SetFailedCooldownChange(float obj)
+    {
+        var diff = obj - _failedCooldown;
+
+        var query = AllEntityQuery<SalvageExpeditionDataComponent>();
+
+        while (query.MoveNext(out var comp))
+        {
+            comp.NextOffer += TimeSpan.FromSeconds(diff);
+        }
+
+        _failedCooldown = obj;
+    }
 
     private void OnExpeditionShutdown(EntityUid uid, SalvageExpeditionComponent component, ComponentShutdown args)
     {
@@ -122,7 +153,7 @@ private void OnExpeditionShutdown(EntityUid uid, SalvageExpeditionComponent comp
         // Finish mission
         if (TryComp<SalvageExpeditionDataComponent>(component.Station, out var data))
         {
-            FinishExpedition((component.Station, data), uid);
+            FinishExpedition(data, uid, component, null);
         }
     }
 
@@ -151,34 +182,116 @@ private void UpdateExpeditions()
             comp.Cooldown = false;
             comp.NextOffer += TimeSpan.FromSeconds(_cooldown);
             GenerateMissions(comp);
-            UpdateConsoles((uid, comp));
+            UpdateConsoles(comp);
         }
     }
 
-    private void FinishExpedition(Entity<SalvageExpeditionDataComponent> expedition, EntityUid uid)
+    private void FinishExpedition(SalvageExpeditionDataComponent component, EntityUid uid, SalvageExpeditionComponent expedition, EntityUid? shuttle)
     {
-        var component = expedition.Comp;
         component.NextOffer = _timing.CurTime + TimeSpan.FromSeconds(_cooldown);
-        Announce(uid, Loc.GetString("salvage-expedition-completed"));
+        Announce(uid, Loc.GetString("salvage-expedition-mission-completed"));
+        // Finish mission cleanup.
+        switch (expedition.MissionParams.MissionType)
+        {
+            // Handles the mining taxation.
+            case SalvageMissionType.Mining:
+                expedition.Completed = true;
+
+                if (shuttle != null && TryComp<SalvageMiningExpeditionComponent>(uid, out var mining))
+                {
+                    var xformQuery = GetEntityQuery<TransformComponent>();
+                    var entities = new List<EntityUid>();
+                    MiningTax(entities, shuttle.Value, mining, xformQuery);
+
+                    var tax = GetMiningTax(expedition.MissionParams.Difficulty);
+                    _random.Shuffle(entities);
+
+                    // TODO: urgh this pr is already taking so long I'll do this later
+                    for (var i = 0; i < Math.Ceiling(entities.Count * tax); i++)
+                    {
+                        // QueueDel(entities[i]);
+                    }
+                }
+
+                break;
+        }
+
+        // Handle payout after expedition has finished
+        if (expedition.Completed)
+        {
+            Log.Debug($"Completed mission {expedition.MissionParams.MissionType} with seed {expedition.MissionParams.Seed}");
+            component.NextOffer = _timing.CurTime + TimeSpan.FromSeconds(_cooldown);
+            Announce(uid, Loc.GetString("salvage-expedition-mission-completed"));
+            GiveRewards(expedition);
+        }
+        else
+        {
+            Log.Debug($"Failed mission {expedition.MissionParams.MissionType} with seed {expedition.MissionParams.Seed}");
+            component.NextOffer = _timing.CurTime + TimeSpan.FromSeconds(_failedCooldown);
+            Announce(uid, Loc.GetString("salvage-expedition-mission-failed"));
+        }
+
+
         component.ActiveMission = 0;
         component.Cooldown = true;
-        UpdateConsoles(expedition);
+        UpdateConsoles(component);
+    }
+
+    /// <summary>
+    /// Deducts ore tax for mining.
+    /// </summary>
+    private void MiningTax(List<EntityUid> entities, EntityUid entity, SalvageMiningExpeditionComponent mining, EntityQuery<TransformComponent> xformQuery)
+    {
+        if (!mining.ExemptEntities.Contains(entity))
+        {
+            entities.Add(entity);
+        }
+
+        var xform = xformQuery.GetComponent(entity);
+        var children = xform.ChildEnumerator;
+
+        while (children.MoveNext(out var child))
+        {
+            MiningTax(entities, child.Value, mining, xformQuery);
+        }
     }
 
     private void GenerateMissions(SalvageExpeditionDataComponent component)
     {
         component.Missions.Clear();
+        var configs = Enum.GetValues<SalvageMissionType>().ToList();
+
+        // Temporarily removed coz it SUCKS
+        configs.Remove(SalvageMissionType.Mining);
+
+        // this doesn't support having more missions than types of ratings
+        // but the previous system didn't do that either.
+        var allDifficulties = Enum.GetValues<DifficultyRating>();
+        _random.Shuffle(allDifficulties);
+        var difficulties = allDifficulties.Take(MissionLimit).ToList();
+        difficulties.Sort();
+
+        if (configs.Count == 0)
+            return;
 
         for (var i = 0; i < MissionLimit; i++)
         {
-            var mission = new SalvageMissionParams
-            {
-                Index = component.NextIndex,
-                Seed = _random.Next(),
-                Difficulty = "Moderate",
-            };
+            _random.Shuffle(configs);
+            var rating = difficulties[i];
 
-            component.Missions[component.NextIndex++] = mission;
+            foreach (var config in configs)
+            {
+                var mission = new SalvageMissionParams
+                {
+                    Index = component.NextIndex,
+                    MissionType = config,
+                    Seed = _random.Next(),
+                    Difficulty = rating,
+                };
+
+                component.Missions[component.NextIndex++] = mission;
+                break;
+            }
         }
     }
 
@@ -196,12 +309,14 @@ private void SpawnMission(SalvageMissionParams missionParams, EntityUid station,
             EntityManager,
             _timing,
             _logManager,
+            _mapManager,
             _prototypeManager,
             _anchorable,
             _biome,
             _dungeon,
             _metaData,
             _mapSystem,
+            this,
             station,
             coordinatesDisk,
             missionParams,
@@ -215,4 +330,25 @@ private void OnStructureExamine(EntityUid uid, SalvageStructureComponent compone
     {
         args.PushMarkup(Loc.GetString("salvage-expedition-structure-examine"));
     }
-}
\ No newline at end of file
+
+    private void GiveRewards(SalvageExpeditionComponent comp)
+    {
+        var palletList = new List<EntityUid>();
+        var pallets = EntityQueryEnumerator<CargoPalletComponent>();
+        while (pallets.MoveNext(out var pallet, out var palletComp))
+        {
+            if (_stationSystem.GetOwningStation(pallet) == comp.Station)
+            {
+                palletList.Add(pallet);
+            }
+        }
+
+        if (!(palletList.Count > 0))
+            return;
+
+        foreach (var reward in comp.Rewards)
+        {
+            Spawn(reward, (Transform(_random.Pick(palletList)).MapPosition));
+        }
+    }
+}
diff --git a/Content.Server/Salvage/SalvageSystem.Runner.cs b/Content.Server/Salvage/SalvageSystem.Runner.cs
index 056aef52730..a8cb79db6f8 100644
--- a/Content.Server/Salvage/SalvageSystem.Runner.cs
+++ b/Content.Server/Salvage/SalvageSystem.Runner.cs
@@ -56,7 +56,7 @@ private void OnConsoleFTLAttempt(ref ConsoleFTLAttemptEvent ev)
         // TODO: This is terrible but need bluespace harnesses or something.
         var query = EntityQueryEnumerator<HumanoidAppearanceComponent, MobStateComponent, TransformComponent>();
 
-        while (query.MoveNext(out var uid, out _, out var mobState, out var mobXform))
+        while (query.MoveNext(out var uid, out var _, out var mobState, out var mobXform))
         {
             if (mobXform.MapUid != xform.MapUid)
                 continue;
@@ -124,11 +124,22 @@ private void OnFTLCompleted(ref FTLCompletedEvent args)
             Announce(args.MapUid, Loc.GetString("salvage-expedition-announcement-dungeon", ("direction", directionLocalization)));
 
         component.Stage = ExpeditionStage.Running;
-        Dirty(args.MapUid, component);
+        Dirty(component);
     }
 
     private void OnFTLStarted(ref FTLStartedEvent ev)
     {
+        // Started a mining mission so work out exempt entities
+        if (TryComp<SalvageMiningExpeditionComponent>(
+                _mapManager.GetMapEntityId(ev.TargetCoordinates.ToMap(EntityManager, _transform).MapId),
+                out var mining))
+        {
+            var ents = new List<EntityUid>();
+            var xformQuery = GetEntityQuery<TransformComponent>();
+            MiningTax(ents, ev.Entity, mining, xformQuery);
+            mining.ExemptEntities = ents;
+        }
+
         if (!TryComp<SalvageExpeditionComponent>(ev.FromMapUid, out var expedition) ||
             !TryComp<SalvageExpeditionDataComponent>(expedition.Station, out var station))
         {
@@ -175,7 +186,7 @@ private void UpdateRunner()
                 Dirty(uid, comp);
                 Announce(uid, Loc.GetString("salvage-expedition-announcement-countdown-minutes", ("duration", audioLength.Minutes)));
             }
-            else if (comp.Stage < ExpeditionStage.Countdown && remaining < TimeSpan.FromMinutes(4))
+            else if (comp.Stage < ExpeditionStage.Countdown && remaining < TimeSpan.FromMinutes(5))
             {
                 comp.Stage = ExpeditionStage.Countdown;
                 Dirty(uid, comp);
@@ -216,5 +227,72 @@ private void UpdateRunner()
                 QueueDel(uid);
             }
         }
+
+        // Mining missions: NOOP since it's handled after ftling
+
+        // Structure missions
+        var structureQuery = EntityQueryEnumerator<SalvageStructureExpeditionComponent, SalvageExpeditionComponent>();
+
+        while (structureQuery.MoveNext(out var uid, out var structure, out var comp))
+        {
+            if (comp.Completed)
+                continue;
+
+            var structureAnnounce = false;
+
+            for (var i = 0; i < structure.Structures.Count; i++)
+            {
+                var objective = structure.Structures[i];
+
+                if (Deleted(objective))
+                {
+                    structure.Structures.RemoveSwap(i);
+                    structureAnnounce = true;
+                }
+            }
+
+            if (structureAnnounce)
+            {
+                Announce(uid, Loc.GetString("salvage-expedition-structure-remaining", ("count", structure.Structures.Count)));
+            }
+
+            if (structure.Structures.Count == 0)
+            {
+                comp.Completed = true;
+                Announce(uid, Loc.GetString("salvage-expedition-completed"));
+            }
+        }
+
+        // Elimination missions
+        var eliminationQuery = EntityQueryEnumerator<SalvageEliminationExpeditionComponent, SalvageExpeditionComponent>();
+        while (eliminationQuery.MoveNext(out var uid, out var elimination, out var comp))
+        {
+            if (comp.Completed)
+                continue;
+
+            var announce = false;
+
+            for (var i = 0; i < elimination.Megafauna.Count; i++)
+            {
+                var mob = elimination.Megafauna[i];
+
+                if (Deleted(mob) || _mobState.IsDead(mob))
+                {
+                    elimination.Megafauna.RemoveSwap(i);
+                    announce = true;
+                }
+            }
+
+            if (announce)
+            {
+                Announce(uid, Loc.GetString("salvage-expedition-megafauna-remaining", ("count", elimination.Megafauna.Count)));
+            }
+
+            if (elimination.Megafauna.Count == 0)
+            {
+                comp.Completed = true;
+                Announce(uid, Loc.GetString("salvage-expedition-completed"));
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Content.Server/Salvage/SalvageSystem.cs b/Content.Server/Salvage/SalvageSystem.cs
index 91688b99932..59c561f8636 100644
--- a/Content.Server/Salvage/SalvageSystem.cs
+++ b/Content.Server/Salvage/SalvageSystem.cs
@@ -77,6 +77,7 @@
 using Robust.Shared.Timing;
 using Content.Shared.Labels.EntitySystems;
 using Robust.Shared.EntitySerialization.Systems;
+using Content.Server.Cargo.Systems;
 
 namespace Content.Server.Salvage
 {
@@ -85,12 +86,12 @@ public sealed partial class SalvageSystem : SharedSalvageSystem
         [Dependency] private readonly IChatManager _chat = default!;
         [Dependency] private readonly IConfigurationManager _configurationManager = default!;
         [Dependency] private readonly IGameTiming _timing = default!;
-        [Dependency] private readonly ILogManager _logManager = default!;
         [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
         [Dependency] private readonly IRobustRandom _random = default!;
         [Dependency] private readonly AnchorableSystem _anchorable = default!;
         [Dependency] private readonly BiomeSystem _biome = default!;
+        [Dependency] private readonly CargoSystem _cargo = default!;
         [Dependency] private readonly DungeonSystem _dungeon = default!;
         [Dependency] private readonly GravitySystem _gravity = default!;
         [Dependency] private readonly LabelSystem _labelSystem = default!;
diff --git a/Content.Server/Salvage/SpawnSalvageMissionJob.cs b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
index 3673aa1b561..1c64db4cbc6 100644
--- a/Content.Server/Salvage/SpawnSalvageMissionJob.cs
+++ b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
@@ -1,25 +1,9 @@
-// SPDX-FileCopyrightText: 2023 Visne <39844191+Visne@users.noreply.github.com>
-// SPDX-FileCopyrightText: 2023 deltanedas <39013340+deltanedas@users.noreply.github.com>
-// SPDX-FileCopyrightText: 2023 deltanedas <@deltanedas:kde.org>
-// SPDX-FileCopyrightText: 2024 0x6273 <0x40@keemail.me>
-// SPDX-FileCopyrightText: 2024 ElectroJr <leonsfriedrich@gmail.com>
-// SPDX-FileCopyrightText: 2024 Kara <lunarautomaton6@gmail.com>
-// SPDX-FileCopyrightText: 2024 Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
-// SPDX-FileCopyrightText: 2024 MilenVolf <63782763+MilenVolf@users.noreply.github.com>
-// SPDX-FileCopyrightText: 2024 Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
-// SPDX-FileCopyrightText: 2024 Piras314 <p1r4s@proton.me>
-// SPDX-FileCopyrightText: 2024 SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
-// SPDX-FileCopyrightText: 2024 Vasilis <vasilis@pikachu.systems>
-// SPDX-FileCopyrightText: 2024 metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
-// SPDX-FileCopyrightText: 2024 metalgearsloth <comedian_vs_clown@hotmail.com>
-// SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com>
-//
-// SPDX-License-Identifier: AGPL-3.0-or-later
-
+using System.Collections;
 using System.Linq;
 using System.Numerics;
 using System.Threading;
 using System.Threading.Tasks;
+using Content.Server.Atmos;
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Robust.Shared.CPUJob.JobQueues;
@@ -27,6 +11,7 @@
 using Content.Server.Parallax;
 using Content.Server.Procedural;
 using Content.Server.Salvage.Expeditions;
+using Content.Server.Salvage.Expeditions.Structure;
 using Content.Shared.Atmos;
 using Content.Shared.Construction.EntitySystems;
 using Content.Shared.Dataset;
@@ -40,6 +25,7 @@
 using Content.Shared.Salvage.Expeditions;
 using Content.Shared.Salvage.Expeditions.Modifiers;
 using Content.Shared.Shuttles.Components;
+using Content.Shared.Storage;
 using Robust.Shared.Collections;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
@@ -48,6 +34,11 @@
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using Content.Server.Shuttles.Components;
+using Content.Server.Salvage.Expeditions.Structure;
+using Content.Server.Station.Components; // Frontier
+using Content.Server.Station.Systems; // Frontier
+using Content.Server.Shuttles.Systems;
+using Content.Server.Salvage.Expeditions.Structure;
 
 namespace Content.Server.Salvage;
 
@@ -61,6 +52,9 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
     private readonly DungeonSystem _dungeon;
     private readonly MetaDataSystem _metaData;
     private readonly SharedMapSystem _map;
+    private readonly StationSystem _station; // Frontier
+    private readonly ShuttleSystem _shuttle; // Frontier
+    private readonly SalvageSystem _salvage; // Frontier
 
     public readonly EntityUid Station;
     public readonly EntityUid? CoordinatesDisk;
@@ -68,6 +62,13 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
 
     private readonly ISawmill _sawmill;
 
+    // Frontier: Used for saving state between async job
+#pragma warning disable IDE1006 // suppressing prefix warnings to reduce merge conflict area
+    private EntityUid mapUid = EntityUid.Invalid;
+#pragma warning restore IDE1006
+    private static readonly ProtoId<SalvageDifficultyPrototype> FallbackDifficulty = "NFModerate";
+    // End Frontier
+
     public SpawnSalvageMissionJob(
         double maxTime,
         IEntityManager entManager,
@@ -79,6 +80,9 @@ public SpawnSalvageMissionJob(
         DungeonSystem dungeon,
         MetaDataSystem metaData,
         SharedMapSystem map,
+        StationSystem stationSystem, // Frontier
+        ShuttleSystem shuttleSystem, // Frontier
+        SalvageSystem salvageSystem, // Frontier
         EntityUid station,
         EntityUid? coordinatesDisk,
         SalvageMissionParams missionParams,
@@ -92,6 +96,9 @@ public SpawnSalvageMissionJob(
         _dungeon = dungeon;
         _metaData = metaData;
         _map = map;
+        _station = stationSystem; // Frontier
+        _shuttle = shuttleSystem; // Frontier
+        _salvage = salvageSystem; // Frontier
         Station = station;
         CoordinatesDisk = coordinatesDisk;
         _missionParams = missionParams;
@@ -102,9 +109,37 @@ public SpawnSalvageMissionJob(
     }
 
     protected override async Task<bool> Process()
+    {
+        // Frontier: gracefully handle expedition failures
+        bool success = true;
+        string? errorStackTrace = null;
+        try
+        {
+            await InternalProcess().ContinueWith((t) => { success = false; errorStackTrace = t.Exception?.InnerException?.StackTrace; }, TaskContinuationOptions.OnlyOnFaulted);
+        }
+        finally
+        {
+            ExpeditionSpawnCompleteEvent ev = new(Station, success, _missionParams.Index);
+            _entManager.EventBus.RaiseLocalEvent(Station, ev);
+            if (errorStackTrace != null)
+                _sawmill.Error("salvage", $"Expedition generation failed with exception: {errorStackTrace}!");
+            if (!success)
+            {
+                // Invalidate station, expedition cancellation will be handled by task handler
+                if (_entManager.TryGetComponent<SalvageExpeditionComponent>(mapUid, out var salvage))
+                    salvage.Station = EntityUid.Invalid;
+
+                _entManager.QueueDeleteEntity(mapUid);
+            }
+        }
+        return success;
+        // End Frontier: gracefully handle expedition failures
+    }
+
+    private async Task<bool> InternalProcess() // Frontier: make process an internal function (for a try block indenting an entire), add "out EntityUid mapUid" param
     {
         _sawmill.Debug("salvage", $"Spawning salvage mission with seed {_missionParams.Seed}");
-        var mapUid = _map.CreateMap(out var mapId, runMapInit: false);
+        mapUid = _map.CreateMap(out var mapId, runMapInit: false); // Frontier: remove var
         MetaDataComponent? metadata = null;
         var grid = _entManager.EnsureComponent<MapGridComponent>(mapUid);
         var random = new Random(_missionParams.Seed);
@@ -127,11 +162,13 @@ protected override async Task<bool> Process()
 
         // Setup mission configs
         // As we go through the config the rating will deplete so we'll go for most important to least important.
-        var difficultyId = "Moderate";
-        var difficultyProto = _prototypeManager.Index<SalvageDifficultyPrototype>(difficultyId);
+        // Frontier: custom difficulty
+        if (!_prototypeManager.TryIndex<SalvageDifficultyPrototype>(_missionParams.Difficulty, out var difficultyProto))
+            difficultyProto = _prototypeManager.Index<SalvageDifficultyPrototype>(FallbackDifficulty);
+        // End Frontier
 
         var mission = _entManager.System<SharedSalvageSystem>()
-            .GetMission(difficultyProto, _missionParams.Seed);
+            .GetMission(_missionParams.MissionType, difficultyProto, _missionParams.Seed); // Frontier: add MissionType
 
         var missionBiome = _prototypeManager.Index<SalvageBiomeModPrototype>(mission.Biome);
 
@@ -174,7 +211,7 @@ protected override async Task<bool> Process()
         expedition.EndTime = _timing.CurTime + mission.Duration;
         expedition.MissionParams = _missionParams;
 
-        var landingPadRadius = 24;
+        var landingPadRadius = 4; // Frontier: 24<4 - using this as a margin (4-16), not a radius
         var minDungeonOffset = landingPadRadius + 4;
 
         // We'll use the dungeon rotation as the spawn angle
@@ -186,7 +223,7 @@ protected override async Task<bool> Process()
         dungeonOffset = dungeonRotation.RotateVec(dungeonOffset);
         var dungeonMod = _prototypeManager.Index<SalvageDungeonModPrototype>(mission.Dungeon);
         var dungeonConfig = _prototypeManager.Index(dungeonMod.Proto);
-        var dungeons = await WaitAsyncTask(_dungeon.GenerateDungeonAsync(dungeonConfig, mapUid, grid, (Vector2i)dungeonOffset,
+        var dungeons = await WaitAsyncTask(_dungeon.GenerateDungeonAsync(dungeonConfig, dungeonMod.Proto, mapUid, grid, (Vector2i)dungeonOffset, // Frontier: add dungeonMod.Proto
             _missionParams.Seed));
 
         var dungeon = dungeons.First();
@@ -199,16 +236,63 @@ protected override async Task<bool> Process()
 
         expedition.DungeonLocation = dungeonOffset;
 
-        List<Vector2i> reservedTiles = new();
+        // Frontier: map generation and offset
+        #region Frontier map generation
 
-        foreach (var tile in _map.GetTilesIntersecting(mapUid, grid, new Circle(Vector2.Zero, landingPadRadius), false))
+        // Get map bounding box
+        Box2 dungeonBox = new Box2(dungeonOffset, dungeonOffset);
+        foreach (var tile in dungeon.AllTiles)
         {
-            if (!_biome.TryGetBiomeTile(mapUid, grid, tile.GridIndices, out _))
-                continue;
+            dungeonBox = dungeonBox.ExtendToContain(tile);
+        }
+
+        var stationData = _entManager.GetComponent<StationDataComponent>(Station);
 
-            reservedTiles.Add(tile.GridIndices);
+        // Get ship bounding box relative to largest grid coords
+        var shuttleUid = _station.GetLargestGrid(stationData);
+        Box2 shuttleBox = new Box2();
+
+        if (shuttleUid is { Valid: true } vesselUid &&
+            _entManager.TryGetComponent<MapGridComponent>(vesselUid, out var gridComp))
+        {
+            shuttleBox = gridComp.LocalAABB;
         }
 
+        // Offset ship spawn point from bounding boxes
+        float sin = (float)Math.Sin(dungeonRotation);
+        float cos = (float)Math.Cos(dungeonRotation);
+        Vector2 dungeonProjection = new Vector2(dungeonBox.Width * -sin / 2, dungeonBox.Height * cos / 2); // Project boxes to get relevant offset for dungeon rotation.
+        Vector2 shuttleProjection = new Vector2(shuttleBox.Width * -sin / 2, shuttleBox.Height * cos / 2); // Note: sine is negative because of CCW rotation (starting north, then west)
+        Vector2 coords = dungeonBox.Center - dungeonProjection - dungeonOffset - shuttleProjection - shuttleBox.Center; // Coordinates to spawn the ship at to center it with the dungeon's bounding boxes
+        coords = coords.Rounded(); // Ensure grid is aligned to map coords
+
+        // List<Vector2i> reservedTiles = new();
+
+        // foreach (var tile in _map.GetTilesIntersecting(mapUid, grid, new Circle(Vector2.Zero, landingPadRadius), false))
+        // {
+        //     if (!_biome.TryGetBiomeTile(mapUid, grid, tile.GridIndices, out _))
+        //         continue;
+
+        //     reservedTiles.Add(tile.GridIndices);
+        // }
+        #endregion Frontier map generation
+        // End Frontier: map generation and offset
+
+        // Frontier: mission setup
+        switch (_missionParams.MissionType)
+        {
+            case SalvageMissionType.Destruction:
+                await SetupStructure(mission, dungeon, grid, random);
+                break;
+            case SalvageMissionType.Elimination:
+                await SetupElimination(mission, dungeon, grid, random);
+                break;
+            default:
+                _sawmill.Warning($"No setup function for salvage mission type {_missionParams.MissionType}!");
+                break;
+        }
+        // End Frontier: mission setup
+
         var budgetEntries = new List<IBudgetEntry>();
 
         /*
@@ -269,7 +353,10 @@ protected override async Task<bool> Process()
             }
         }
 
-        var allLoot = _prototypeManager.Index(SharedSalvageSystem.ExpeditionsLootProto);
+        // Frontier: difficulty-based loot tables
+        var lootTable = difficultyProto.LootTable ?? SharedSalvageSystem.ExpeditionsLootProto;
+        var allLoot = _prototypeManager.Index<SalvageLootPrototype>(lootTable);
+        // End Frontier
         var lootBudget = difficultyProto.LootBudget;
 
         foreach (var rule in allLoot.LootRules)
@@ -301,6 +388,14 @@ protected override async Task<bool> Process()
             }
         }
 
+        // Frontier: delay ship FTL
+        if (shuttleUid is { Valid: true })
+        {
+            var shuttle = _entManager.GetComponent<ShuttleComponent>(shuttleUid.Value);
+            _shuttle.FTLToCoordinates(shuttleUid.Value, shuttle, new EntityCoordinates(mapUid, coords), 0f, 5.5f, _salvage.TravelTime);
+        }
+        // End Frontier
+
         return true;
     }
 
@@ -365,4 +460,91 @@ private async Task SpawnDungeonLoot(SalvageLootPrototype loot, EntityUid gridUid
             }
         }
     }
-}
\ No newline at end of file
+
+    // Frontier: mission-specific setup functions
+    private async Task SetupStructure(
+        SalvageMission mission,
+        Dungeon dungeon,
+        MapGridComponent grid,
+        Random random)
+    {
+        await SuspendIfOutOfTime();
+
+        var structureComp = _entManager.EnsureComponent<SalvageDestructionExpeditionComponent>(mapUid);
+        var faction = _prototypeManager.Index<SalvageFactionPrototype>(mission.Faction);
+        var difficulty = _prototypeManager.Index(mission.Difficulty);
+
+        var shaggy = faction.Configs["DefenseStructure"];
+
+        var availableRooms = new ValueList<DungeonRoom>(dungeon.Rooms);
+        var availableTiles = new List<Vector2i>();
+
+        while (availableRooms.Count > 0 && structureComp.Structures.Count < difficulty.DestructionStructures)
+        {
+            availableTiles.Clear();
+            var roomIndex = random.Next(availableRooms.Count);
+            var room = availableRooms.RemoveSwap(roomIndex);
+            availableTiles.AddRange(room.Tiles);
+
+            while (availableTiles.Count > 0)
+            {
+                var tile = availableTiles.RemoveSwap(random.Next(availableTiles.Count));
+
+                if (!_anchorable.TileFree(grid, tile, (int)CollisionGroup.MachineLayer,
+                        (int)CollisionGroup.MachineLayer))
+                {
+                    continue;
+                }
+
+                var uid = _entManager.SpawnEntity(shaggy, _map.GridTileToLocal(mapUid, grid, tile));
+                _entManager.AddComponent<SalvageStructureComponent>(uid);
+                structureComp.Structures.Add(uid);
+                break;
+            }
+        }
+    }
+
+    private async Task SetupElimination(
+        SalvageMission mission,
+        Dungeon dungeon,
+        MapGridComponent grid,
+        Random random)
+    {
+        await SuspendIfOutOfTime();
+
+        // spawn megafauna in a random place
+        var faction = _prototypeManager.Index<SalvageFactionPrototype>(mission.Faction);
+        var prototype = faction.Configs["Megafauna"];
+
+        var availableRooms = new ValueList<DungeonRoom>(dungeon.Rooms);
+        var availableTiles = new List<Vector2i>();
+
+        var uid = EntityUid.Invalid;
+        while (availableRooms.Count > 0 && uid == EntityUid.Invalid)
+        {
+            availableTiles.Clear();
+            var roomIndex = random.Next(availableRooms.Count);
+            var room = availableRooms.RemoveSwap(roomIndex);
+            availableTiles.AddRange(room.Tiles);
+
+            while (availableTiles.Count > 0)
+            {
+                var tile = availableTiles.RemoveSwap(random.Next(availableTiles.Count));
+
+                if (!_anchorable.TileFree(grid, tile, (int)CollisionGroup.MachineLayer,
+                        (int)CollisionGroup.MachineLayer))
+                {
+                    continue;
+                }
+
+                uid = _entManager.SpawnAtPosition(prototype, _map.GridTileToLocal(mapUid, grid, tile));
+                break;
+            }
+        }
+
+        var eliminationComp = _entManager.EnsureComponent<SalvageEliminationExpeditionComponent>(mapUid);
+        if (uid != EntityUid.Invalid)
+            eliminationComp.Megafauna.Add(uid);
+    }
+    // End Frontier: mission-specific setup functions
+}
diff --git a/Content.Shared/CCVar/CCVars.Hud.cs b/Content.Shared/CCVar/CCVars.Hud.cs
index 7faee283f15..33eddbb3bd2 100644
--- a/Content.Shared/CCVar/CCVars.Hud.cs
+++ b/Content.Shared/CCVar/CCVars.Hud.cs
@@ -16,24 +16,12 @@ public sealed partial class CCVars
     public static readonly CVarDef<bool> HudHeldItemShow =
         CVarDef.Create("hud.held_item_show", true, CVar.ARCHIVE | CVar.CLIENTONLY);
 
-    public static readonly CVarDef<bool> CombatModeIndicatorsPointShow =
-        CVarDef.Create("hud.combat_mode_indicators_point_show", true, CVar.ARCHIVE | CVar.CLIENTONLY);
-
     public static readonly CVarDef<bool> LoocAboveHeadShow =
         CVarDef.Create("hud.show_looc_above_head", true, CVar.ARCHIVE | CVar.CLIENTONLY);
 
-    public static readonly CVarDef<float> HudHeldItemOffset =
-        CVarDef.Create("hud.held_item_offset", 28f, CVar.ARCHIVE | CVar.CLIENTONLY);
-
-    /// <summary>
-    ///     Displays framerate counter
-    /// </summary>
-    public static readonly CVarDef<bool> HudFpsCounterVisible =
-        CVarDef.Create("hud.fps_counter_visible", false, CVar.CLIENTONLY | CVar.ARCHIVE);
-
     /// <summary>
     ///     Displays the fork ID and version number
     /// </summary>
     public static readonly CVarDef<bool> HudVersionWatermark =
         CVarDef.Create("hud.version_watermark", false, CVar.CLIENTONLY | CVar.ARCHIVE);
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/CCVar/CCVars.Misc.cs b/Content.Shared/CCVar/CCVars.Misc.cs
index 25d91678d8d..ee1a4d97809 100644
--- a/Content.Shared/CCVar/CCVars.Misc.cs
+++ b/Content.Shared/CCVar/CCVars.Misc.cs
@@ -9,10 +9,6 @@ namespace Content.Shared.CCVar;
 
 public sealed partial class CCVars
 {
-    public static readonly CVarDef<bool> HolidaysEnabled = CVarDef.Create("holidays.enabled", true, CVar.SERVERONLY);
-    public static readonly CVarDef<bool> BrandingSteam = CVarDef.Create("branding.steam", false, CVar.CLIENTONLY);
-    public static readonly CVarDef<int> EntityMenuGroupingType = CVarDef.Create("entity_menu", 0, CVar.CLIENTONLY);
-
     /// <summary>
     ///     Should we pre-load all of the procgen atlasses.
     /// </summary>
@@ -26,12 +22,6 @@ public sealed partial class CCVars
     public static readonly CVarDef<bool> BiomassEasyMode =
         CVarDef.Create("biomass.easy_mode", true, CVar.SERVERONLY);
 
-    /// <summary>
-    ///     A scale factor applied to a grid's bounds when trying to find a spot to randomly generate an anomaly.
-    /// </summary>
-    public static readonly CVarDef<float> AnomalyGenerationGridBoundsScale =
-        CVarDef.Create("anomaly.generation_grid_bounds_scale", 0.6f, CVar.SERVERONLY);
-
     /// <summary>
     ///     How long a client can go without any input before being considered AFK.
     /// </summary>
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 7670797fa27..d5a1f4b8b34 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -237,9 +237,92 @@ public sealed partial class CCVars : CVars
     public static readonly CVarDef<bool> DebugOptionVisualizerTest =
         CVarDef.Create("debug.option_visualizer_test", false, CVar.CLIENTONLY);
 
-    /// <summary>
-    /// Set to true to disable parallel processing in the pow3r solver.
-    /// </summary>
-    public static readonly CVarDef<bool> DebugPow3rDisableParallel =
-        CVarDef.Create("debug.pow3r_disable_parallel", true, CVar.SERVERONLY);
-}
\ No newline at end of file
+        /// <summary>
+        /// Whether mobs can push objects like lockers.
+        /// </summary>
+        /// <remarks>
+        /// Technically client doesn't need to know about it but this may prevent a bug in the distant future so it stays.
+        /// </remarks>
+        public static readonly CVarDef<bool> MobPushing =
+            CVarDef.Create("physics.mob_pushing", false, CVar.REPLICATED);
+
+        public static readonly CVarDef<bool> CombatModeIndicatorsPointShow =
+            CVarDef.Create("hud.combat_mode_indicators_point_show", true, CVar.ARCHIVE | CVar.CLIENTONLY);
+
+        public static readonly CVarDef<float> HudHeldItemOffset =
+            CVarDef.Create("hud.held_item_offset", 28f, CVar.ARCHIVE | CVar.CLIENTONLY);
+
+        public static readonly CVarDef<bool> HudFpsCounterVisible =
+            CVarDef.Create("hud.fps_counter_visible", false, CVar.CLIENTONLY | CVar.ARCHIVE);
+
+        /*
+         * Holidays
+         */
+
+        public static readonly CVarDef<bool> HolidaysEnabled = CVarDef.Create("holidays.enabled", true, CVar.SERVERONLY);
+
+        /*
+         * Branding stuff
+         */
+
+        public static readonly CVarDef<bool> BrandingSteam = CVarDef.Create("branding.steam", false, CVar.CLIENTONLY);
+
+        public static readonly CVarDef<int> EntityMenuGroupingType = CVarDef.Create("entity_menu", 0, CVar.CLIENTONLY);
+
+        /// <summary>
+        /// Whether the Shipyard is enabled.
+        /// </summary>
+        public static readonly CVarDef<bool> Shipyard =
+            CVarDef.Create("shuttle.shipyard", true, CVar.SERVERONLY);
+
+        /*
+         * Crew Manifests
+         */
+
+        /// <summary>
+        ///     Dictates the order the crew manifest will appear in, in terms of its sections.
+        ///     Sections not in this list will appear at the end of the list, in no
+        ///     specific order.
+        /// </summary>
+        public static readonly CVarDef<string> CrewManifestOrdering =
+            CVarDef.Create("crewmanifest.ordering", "Command,Security,Science,Medical,Engineering,Cargo,Civilian,Unknown",
+                CVar.REPLICATED);
+
+        /*
+         * Anomaly
+         */
+
+        /// <summary>
+        ///     A scale factor applied to a grid's bounds when trying to find a spot to randomly generate an anomaly.
+        /// </summary>
+        public static readonly CVarDef<float> AnomalyGenerationGridBoundsScale =
+            CVarDef.Create("anomaly.generation_grid_bounds_scale", 0.6f, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     A scale factor applied to a grid's bounds when trying to find a spot to randomly generate cargo crate.
+        /// </summary>
+        public static readonly CVarDef<float> CargoGenerationGridBoundsScale =
+            CVarDef.Create("cargo.generation_grid_bounds_scale", 0.6f, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     A scale factor applied to a grid's bounds when trying to find a spot to randomly generate syndicate crate.
+        /// </summary>
+        public static readonly CVarDef<float> SyndicateCrateGenerationGridBoundsScale =
+            CVarDef.Create("syndicatecrate.generation_grid_bounds_scale", 0.6f, CVar.SERVERONLY);
+
+        /*
+         * Salvage
+         */
+
+        /// <summary>
+        ///     Forced salvage map prototype name (if empty, randomly selected)
+        /// </summary>
+        public static readonly CVarDef<string>
+            SalvageForced = CVarDef.Create("salvage.forced", "", CVar.SERVERONLY);
+
+        /// <summary>
+        /// Cooldown for failed missions.
+        /// </summary>
+        public static readonly CVarDef<float>
+            SalvageExpeditionFailedCooldown = CVarDef.Create("salvage.expedition_failed_cooldown", 600f, CVar.REPLICATED);
+}
diff --git a/Content.Shared/Procedural/Loot/SalvageLootPrototype.cs b/Content.Shared/Procedural/Loot/SalvageLootPrototype.cs
index dc35989651a..8c1f86d5dc1 100644
--- a/Content.Shared/Procedural/Loot/SalvageLootPrototype.cs
+++ b/Content.Shared/Procedural/Loot/SalvageLootPrototype.cs
@@ -5,7 +5,9 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
+using Content.Shared.Salvage;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Procedural.Loot;
 
@@ -22,9 +24,17 @@ public sealed partial class SalvageLootPrototype : IPrototype
     /// </summary>
     [DataField("guaranteed")] public bool Guaranteed;
 
+    [DataField("desc")] public string Description = string.Empty;
+
+    /// <summary>
+    /// Mission types this loot is not allowed to spawn for
+    /// </summary>
+    [DataField("blacklist")]
+    public List<SalvageMissionType> Blacklist = new();
+
     /// <summary>
     /// All of the loot rules
     /// </summary>
     [DataField("loots")]
     public List<IDungeonLoot> LootRules = new();
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/IBiomeSpecificMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/IBiomeSpecificMod.cs
index 7fefd1e1869..7755a12b633 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/IBiomeSpecificMod.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/IBiomeSpecificMod.cs
@@ -13,5 +13,5 @@ public interface IBiomeSpecificMod : ISalvageMod
     /// <summary>
     /// Whitelist for biomes. If null then any biome is allowed.
     /// </summary>
-    List<ProtoId<SalvageBiomeModPrototype>>? Biomes { get; }
+    List<ProtoId<SalvageBiomeMod>>? Biomes { get; }
 }
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageAirMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageAirMod.cs
index cc7ef8fc608..0275a829178 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageAirMod.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageAirMod.cs
@@ -10,6 +10,7 @@
 
 using Content.Shared.Atmos;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Salvage.Expeditions.Modifiers;
 
@@ -33,8 +34,8 @@ public sealed partial class SalvageAirMod : IPrototype, IBiomeSpecificMod
     public float Cost { get; private set; } = 0f;
 
     /// <inheritdoc/>
-    [DataField]
-    public List<ProtoId<SalvageBiomeModPrototype>>? Biomes { get; private set; } = null;
+    [DataField("biomes", customTypeSerializer: typeof(PrototypeIdListSerializer<SalvageBiomeMod>))]
+    public List<ProtoId<SalvageBiomeMod>>? Biomes { get; private set; } = null;
 
     /// <summary>
     /// Set to true if this planet will have no atmosphere.
@@ -47,4 +48,4 @@ public sealed partial class SalvageAirMod : IPrototype, IBiomeSpecificMod
     /// </summary>
     [DataField("gases")]
     public float[] Gases = new float[Atmospherics.AdjustedNumberOfGases];
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageBiomeModPrototype.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageBiomeMod.cs
similarity index 93%
rename from Content.Shared/Salvage/Expeditions/Modifiers/SalvageBiomeModPrototype.cs
rename to Content.Shared/Salvage/Expeditions/Modifiers/SalvageBiomeMod.cs
index 8b5d0b14c0f..0c6eabd6ad3 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageBiomeModPrototype.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageBiomeMod.cs
@@ -15,8 +15,8 @@ namespace Content.Shared.Salvage.Expeditions.Modifiers;
 /// <summary>
 /// Affects the biome to be used for salvage.
 /// </summary>
-[Prototype]
-public sealed partial class SalvageBiomeModPrototype : IPrototype, ISalvageMod
+[Prototype("SalvageBiomeMod")]
+public sealed class SalvageBiomeMod : IPrototype, ISalvageMod
 {
     [IdDataField] public string ID { get; private set; } = default!;
 
@@ -36,4 +36,4 @@ public sealed partial class SalvageBiomeModPrototype : IPrototype, ISalvageMod
 
     [DataField("biome", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<BiomeTemplatePrototype>))]
     public string? BiomePrototype;
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageDungeonModPrototype.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageDungeonMod.cs
similarity index 80%
rename from Content.Shared/Salvage/Expeditions/Modifiers/SalvageDungeonModPrototype.cs
rename to Content.Shared/Salvage/Expeditions/Modifiers/SalvageDungeonMod.cs
index bcc0decf439..9e9d696ac3f 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageDungeonModPrototype.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageDungeonMod.cs
@@ -14,11 +14,12 @@
 
 using Content.Shared.Procedural;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Salvage.Expeditions.Modifiers;
 
-[Prototype]
-public sealed partial class SalvageDungeonModPrototype : IPrototype, IBiomeSpecificMod
+[Prototype("salvageDungeonMod")]
+public sealed class SalvageDungeonMod : IPrototype, IBiomeSpecificMod
 {
     [IdDataField] public string ID { get; private set; } = default!;
 
@@ -29,12 +30,12 @@ public sealed partial class SalvageDungeonModPrototype : IPrototype, IBiomeSpeci
     public float Cost { get; private set; } = 0f;
 
     /// <inheridoc/>
-    [DataField]
-    public List<ProtoId<SalvageBiomeModPrototype>>? Biomes { get; private set; } = null;
+    [DataField("biomes", customTypeSerializer: typeof(PrototypeIdListSerializer<SalvageBiomeMod>))]
+    public List<ProtoId<SalvageBiomeMod>>? Biomes { get; private set; } = null;
 
     /// <summary>
     /// The config to use for spawning the dungeon.
     /// </summary>
     [DataField(required: true)]
     public ProtoId<DungeonConfigPrototype> Proto = string.Empty;
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageLightMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageLightMod.cs
index 5a4a593fe22..7e6405e6cbf 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageLightMod.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageLightMod.cs
@@ -10,6 +10,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Salvage.Expeditions.Modifiers;
 
@@ -25,8 +26,8 @@ public sealed partial class SalvageLightMod : IPrototype, IBiomeSpecificMod
     public float Cost { get; private set; } = 0f;
 
     /// <inheritdoc/>
-    [DataField]
-    public List<ProtoId<SalvageBiomeModPrototype>>? Biomes { get; private set; } = null;
+    [DataField("biomes", customTypeSerializer: typeof(PrototypeIdListSerializer<SalvageBiomeMod>))]
+    public List<ProtoId<SalvageBiomeMod>>? Biomes { get; private set; } = null;
 
     [DataField("color", required: true)] public Color? Color;
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTemperatureMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTemperatureMod.cs
index 81e34470962..9f8ec7932c3 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTemperatureMod.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTemperatureMod.cs
@@ -10,6 +10,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
 using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Salvage.Expeditions.Modifiers;
 
@@ -25,12 +26,12 @@ public sealed partial class SalvageTemperatureMod : IPrototype, IBiomeSpecificMo
     public float Cost { get; private set; } = 0f;
 
     /// <inheritdoc/>
-    [DataField]
-    public List<ProtoId<SalvageBiomeModPrototype>>? Biomes { get; private set; } = null;
+    [DataField("biomes", customTypeSerializer: typeof(PrototypeIdListSerializer<SalvageBiomeMod>))]
+    public List<ProtoId<SalvageBiomeMod>>? Biomes { get; private set; } = null;
 
     /// <summary>
     /// Temperature in the planets air mix.
     /// </summary>
     [DataField("temperature")]
     public float Temperature = 293.15f;
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTimeMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTimeMod.cs
new file mode 100644
index 00000000000..fe1d65e3af7
--- /dev/null
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTimeMod.cs
@@ -0,0 +1,23 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Salvage.Expeditions.Modifiers;
+
+[Prototype("salvageTimeMod")]
+public sealed class SalvageTimeMod : IPrototype, ISalvageMod
+{
+    [IdDataField] public string ID { get; } = default!;
+
+    [DataField("desc")] public LocId Description { get; private set; } = default;
+
+    /// <summary>
+    /// Cost for difficulty modifiers.
+    /// </summary>
+    [DataField("cost")]
+    public float Cost { get; private set; }
+
+    [DataField("minDuration")]
+    public int MinDuration = 630;
+
+    [DataField("maxDuration")]
+    public int MaxDuration = 570;
+}
diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageWeatherMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageWeatherMod.cs
index 5b2cb950782..611af13dd99 100644
--- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageWeatherMod.cs
+++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageWeatherMod.cs
@@ -12,6 +12,7 @@
 using Content.Shared.Weather;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
 namespace Content.Shared.Salvage.Expeditions.Modifiers;
 
@@ -27,12 +28,12 @@ public sealed partial class SalvageWeatherMod : IPrototype, IBiomeSpecificMod
     public float Cost { get; private set; } = 0f;
 
     /// <inheritdoc/>
-    [DataField]
-    public List<ProtoId<SalvageBiomeModPrototype>>? Biomes { get; private set; } = null;
+    [DataField("biomes", customTypeSerializer: typeof(PrototypeIdListSerializer<SalvageBiomeMod>))]
+    public List<ProtoId<SalvageBiomeMod>>? Biomes { get; private set; } = null;
 
     /// <summary>
     /// Weather prototype to use on the planet.
     /// </summary>
     [DataField("weather", required: true, customTypeSerializer:typeof(PrototypeIdSerializer<WeatherPrototype>))]
     public string WeatherPrototype = string.Empty;
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Salvage/Expeditions/SalvageExpeditions.cs b/Content.Shared/Salvage/Expeditions/SalvageExpeditions.cs
index 1218358082d..95032ed5f00 100644
--- a/Content.Shared/Salvage/Expeditions/SalvageExpeditions.cs
+++ b/Content.Shared/Salvage/Expeditions/SalvageExpeditions.cs
@@ -91,14 +91,28 @@ public sealed partial class SalvageExpeditionDataComponent : Component
 }
 
 [Serializable, NetSerializable]
-public sealed record SalvageMissionParams
+public sealed record SalvageMissionParams : IComparable<SalvageMissionParams>
 {
     [ViewVariables]
     public ushort Index;
 
+    [ViewVariables(VVAccess.ReadWrite)]
+    public SalvageMissionType MissionType;
+
     [ViewVariables(VVAccess.ReadWrite)] public int Seed;
 
-    public string Difficulty = string.Empty;
+    /// <summary>
+    /// Base difficulty for this mission.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite)] public DifficultyRating Difficulty;
+
+    public int CompareTo(SalvageMissionParams? other)
+    {
+        if (other == null)
+            return -1;
+
+        return Difficulty.CompareTo(other.Difficulty);
+    }
 }
 
 /// <summary>
@@ -107,13 +121,16 @@ public sealed record SalvageMissionParams
 /// </summary>
 public sealed record SalvageMission(
     int Seed,
+    DifficultyRating Difficulty,
     string Dungeon,
     string Faction,
+    SalvageMissionType Mission,
     string Biome,
     string Air,
     float Temperature,
     Color? Color,
     TimeSpan Duration,
+    List<string> Rewards,
     List<string> Modifiers)
 {
     /// <summary>
@@ -122,7 +139,12 @@ public sealed record SalvageMission(
     public readonly int Seed = Seed;
 
     /// <summary>
-    /// <see cref="SalvageDungeonModPrototype"/> to be used.
+    /// Difficulty rating.
+    /// </summary>
+    public DifficultyRating Difficulty = Difficulty;
+
+    /// <summary>
+    /// <see cref="SalvageDungeonMod"/> to be used.
     /// </summary>
     public readonly string Dungeon = Dungeon;
 
@@ -131,6 +153,11 @@ public sealed record SalvageMission(
     /// </summary>
     public readonly string Faction = Faction;
 
+    /// <summary>
+    /// Underlying mission params that generated this.
+    /// </summary>
+    public readonly SalvageMissionType Mission = Mission;
+
     /// <summary>
     /// Biome to be used for the mission.
     /// </summary>
@@ -156,6 +183,11 @@ public sealed record SalvageMission(
     /// </summary>
     public TimeSpan Duration = Duration;
 
+    /// <summary>
+    /// The list of items to order on mission completion.
+    /// </summary>
+    public List<string> Rewards = Rewards;
+
     /// <summary>
     /// Modifiers (outside of the above) applied to the mission.
     /// </summary>
diff --git a/Content.Shared/Salvage/Expeditions/SalvageFactionPrototype.cs b/Content.Shared/Salvage/Expeditions/SalvageFactionPrototype.cs
index edcd46cd1a0..d11c9dd6cdc 100644
--- a/Content.Shared/Salvage/Expeditions/SalvageFactionPrototype.cs
+++ b/Content.Shared/Salvage/Expeditions/SalvageFactionPrototype.cs
@@ -7,22 +7,29 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
 using Robust.Shared.Prototypes;
+using Content.Shared.Salvage.Expeditions.Modifiers;
 
 namespace Content.Shared.Salvage.Expeditions;
 
-[Prototype]
-public sealed partial class SalvageFactionPrototype : IPrototype
+[Prototype("salvageFaction")]
+public sealed class SalvageFactionPrototype : IPrototype, ISalvageMod
 {
     [IdDataField] public string ID { get; private set; } = default!;
 
     [DataField("desc")] public LocId Description { get; private set; } = string.Empty;
 
-    [ViewVariables(VVAccess.ReadWrite), DataField("entries", required: true)]
-    public List<SalvageMobEntry> MobGroups = new();
+    /// <summary>
+    /// Cost for difficulty modifiers.
+    /// </summary>
+    [DataField("cost")]
+    public float Cost { get; private set; } = 0f;
+
+    [ViewVariables(VVAccess.ReadWrite), DataField("groups", required: true)]
+    public List<SalvageMobGroup> MobGroups = default!;
 
     /// <summary>
     /// Miscellaneous data for factions.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField("configs")]
     public Dictionary<string, string> Configs = new();
-}
\ No newline at end of file
+}
diff --git a/Content.Shared/Salvage/Expeditions/SalvageMobGroup.cs b/Content.Shared/Salvage/Expeditions/SalvageMobGroup.cs
new file mode 100644
index 00000000000..df1917acdcb
--- /dev/null
+++ b/Content.Shared/Salvage/Expeditions/SalvageMobGroup.cs
@@ -0,0 +1,18 @@
+using Content.Shared.Storage;
+
+namespace Content.Shared.Salvage.Expeditions;
+
+[DataDefinition]
+public partial record struct SalvageMobGroup()
+{
+    // A mob may be cheap but rare or expensive but frequent.
+
+    /// <summary>
+    /// Probability to spawn this group. Summed with everything else for the faction.
+    /// </summary>
+    [ViewVariables(VVAccess.ReadWrite), DataField("prob")]
+    public float Prob = 1f;
+
+    [ViewVariables(VVAccess.ReadWrite), DataField("entries", required: true)]
+    public List<EntitySpawnEntry> Entries = new();
+}
diff --git a/Content.Shared/Salvage/SharedSalvageSystem.cs b/Content.Shared/Salvage/SharedSalvageSystem.cs
index c8225d775dd..51b0ff17641 100644
--- a/Content.Shared/Salvage/SharedSalvageSystem.cs
+++ b/Content.Shared/Salvage/SharedSalvageSystem.cs
@@ -12,27 +12,89 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
 using System.Linq;
-using Content.Shared.CCVar;
 using Content.Shared.Dataset;
 using Content.Shared.Procedural;
 using Content.Shared.Procedural.Loot;
+using Content.Shared.Random;
+using Content.Shared.Random.Helpers;
 using Content.Shared.Salvage.Expeditions;
 using Content.Shared.Salvage.Expeditions.Modifiers;
-using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
+using Robust.Shared.Serialization;
 
 namespace Content.Shared.Salvage;
 
 public abstract partial class SharedSalvageSystem : EntitySystem
 {
-    [Dependency] protected readonly IConfigurationManager CfgManager = default!;
+    [Dependency] private readonly ILocalizationManager _loc = default!;
     [Dependency] private readonly IPrototypeManager _proto = default!;
 
+    #region Descriptions
+
+    public string GetMissionDescription(SalvageMission mission)
+    {
+        // Hardcoded in coooooz it's dynamic based on difficulty and I'm lazy.
+        switch (mission.Mission)
+        {
+            case SalvageMissionType.Mining:
+                // Taxation: , ("tax", $"{GetMiningTax(mission.Difficulty) * 100f:0}")
+                return Loc.GetString("salvage-expedition-desc-mining");
+            case SalvageMissionType.Destruction:
+                var proto = _proto.Index<SalvageFactionPrototype>(mission.Faction).Configs["DefenseStructure"];
+
+                return Loc.GetString("salvage-expedition-desc-structure",
+                    ("count", GetStructureCount(mission.Difficulty)),
+                    ("structure", _loc.GetEntityData(proto).Name));
+            case SalvageMissionType.Elimination:
+                return Loc.GetString("salvage-expedition-desc-elimination");
+            default:
+                throw new NotImplementedException();
+        }
+    }
+
+    public float GetMiningTax(DifficultyRating baseRating)
+    {
+        return 0.6f + (int) baseRating * 0.05f;
+    }
+
     /// <summary>
-    /// Main loot table for salvage expeditions.
+    /// Gets the amount of structures to destroy.
     /// </summary>
     public static readonly ProtoId<SalvageLootPrototype> ExpeditionsLootProto = "SalvageLoot";
+    public int GetStructureCount(DifficultyRating baseRating)
+    {
+        return 1 + (int) baseRating * 2;
+    }
+
+    #endregion
+
+    public int GetDifficulty(DifficultyRating rating)
+    {
+        switch (rating)
+        {
+            case DifficultyRating.Minimal:
+                return 1;
+            case DifficultyRating.Minor:
+                return 2;
+            case DifficultyRating.Moderate:
+                return 4;
+            case DifficultyRating.Hazardous:
+                return 8;
+            case DifficultyRating.Extreme:
+                return 16;
+            default:
+                throw new ArgumentOutOfRangeException(nameof(rating), rating, null);
+        }
+    }
+
+    /// <summary>
+    /// How many groups of mobs to spawn for a mission.
+    /// </summary>
+    public float GetSpawnCount(DifficultyRating difficulty)
+    {
+        return (int) difficulty * 2;
+    }
 
     public string GetFTLName(LocalizedDatasetPrototype dataset, int seed)
     {
@@ -40,21 +102,22 @@ public string GetFTLName(LocalizedDatasetPrototype dataset, int seed)
         return $"{Loc.GetString(dataset.Values[random.Next(dataset.Values.Count)])}-{random.Next(10, 100)}-{(char) (65 + random.Next(26))}";
     }
 
-    public SalvageMission GetMission(SalvageDifficultyPrototype difficulty, int seed)
+    public SalvageMission GetMission(SalvageMissionType config, DifficultyRating difficulty, int seed)
     {
         // This is on shared to ensure the client display for missions and what the server generates are consistent
-        var modifierBudget = difficulty.ModifierBudget;
+        var rating = (float) GetDifficulty(difficulty);
+        // Don't want easy missions to have any negative modifiers but also want
+        // easy to be a 1 for difficulty.
+        rating -= 1f;
         var rand = new System.Random(seed);
 
         // Run budget in order of priority
         // - Biome
         // - Lighting
         // - Atmos
-        var biome = GetMod<SalvageBiomeModPrototype>(rand, ref modifierBudget);
-        var light = GetBiomeMod<SalvageLightMod>(biome.ID, rand, ref modifierBudget);
-        var temp = GetBiomeMod<SalvageTemperatureMod>(biome.ID, rand, ref modifierBudget);
-        var air = GetBiomeMod<SalvageAirMod>(biome.ID, rand, ref modifierBudget);
-        var dungeon = GetBiomeMod<SalvageDungeonModPrototype>(biome.ID, rand, ref modifierBudget);
+        var biome = GetMod<SalvageBiomeMod>(rand, ref rating);
+        var air = GetBiomeMod<SalvageAirMod>(biome.ID, rand, ref rating);
+        var dungeon = GetBiomeMod<SalvageDungeonMod>(biome.ID, rand, ref rating);
         var factionProtos = _proto.EnumeratePrototypes<SalvageFactionPrototype>().ToList();
         factionProtos.Sort((x, y) => string.Compare(x.ID, y.ID, StringComparison.Ordinal));
         var faction = factionProtos[rand.Next(factionProtos.Count)];
@@ -67,19 +130,31 @@ public SalvageMission GetMission(SalvageDifficultyPrototype difficulty, int seed
         }
 
         // only show the description if there is an atmosphere since wont matter otherwise
+        var temp = GetBiomeMod<SalvageTemperatureMod>(biome.ID, rand, ref rating);
         if (temp.Description != string.Empty && !air.Space)
         {
             mods.Add(Loc.GetString(temp.Description));
         }
 
+        var light = GetBiomeMod<SalvageLightMod>(biome.ID, rand, ref rating);
         if (light.Description != string.Empty)
         {
             mods.Add(Loc.GetString(light.Description));
         }
 
-        var duration = TimeSpan.FromSeconds(CfgManager.GetCVar(CCVars.SalvageExpeditionDuration));
+        var time = GetMod<SalvageTimeMod>(rand, ref rating);
+        // Round the duration to nearest 15 seconds.
+        var exactDuration = MathHelper.Lerp(time.MinDuration, time.MaxDuration, rand.NextFloat());
+        exactDuration = MathF.Round(exactDuration / 15f) * 15f;
+        var duration = TimeSpan.FromSeconds(exactDuration);
+
+        if (time.Description != string.Empty)
+        {
+            mods.Add(time.Description);
+        }
 
-        return new SalvageMission(seed, dungeon.ID, faction.ID, biome.ID, air.ID, temp.Temperature, light.Color, duration, mods);
+        var rewards = GetRewards(difficulty, rand);
+        return new SalvageMission(seed, difficulty, dungeon.ID, faction.ID, config, biome.ID, air.ID, temp.Temperature, light.Color, duration, rewards, mods);
     }
 
     public T GetBiomeMod<T>(string biome, System.Random rand, ref float rating) where T : class, IPrototype, IBiomeSpecificMod
@@ -119,4 +194,72 @@ public T GetMod<T>(System.Random rand, ref float rating) where T : class, IProto
 
         throw new InvalidOperationException();
     }
+
+    private List<string> GetRewards(DifficultyRating difficulty, System.Random rand)
+    {
+        var rewards = new List<string>(3);
+        var ids = RewardsForDifficulty(difficulty);
+        foreach (var id in ids)
+        {
+            // pick a random reward to give
+            var weights = _proto.Index<WeightedRandomEntityPrototype>(id);
+            rewards.Add(weights.Pick(rand));
+        }
+
+        return rewards;
+    }
+
+    /// <summary>
+    /// Get a list of WeightedRandomEntityPrototype IDs with the rewards for a certain difficulty.
+    /// </summary>
+    private string[] RewardsForDifficulty(DifficultyRating rating)
+    {
+        var common = "SalvageRewardCommon";
+        var rare = "SalvageRewardRare";
+        var epic = "SalvageRewardEpic";
+        switch (rating)
+        {
+            case DifficultyRating.Minimal:
+                return new string[] { common, common, common };
+            case DifficultyRating.Minor:
+                return new string[] { common, common, rare };
+            case DifficultyRating.Moderate:
+                return new string[] { common, rare, rare };
+            case DifficultyRating.Hazardous:
+                return new string[] { rare, rare, rare, epic };
+            case DifficultyRating.Extreme:
+                return new string[] { rare, rare, epic, epic, epic };
+            default:
+                throw new NotImplementedException();
+        }
+    }
+}
+
+[Serializable, NetSerializable]
+public enum SalvageMissionType : byte
+{
+    /// <summary>
+    /// No dungeon, just ore loot and random mob spawns.
+    /// </summary>
+    Mining,
+
+    /// <summary>
+    /// Destroy the specified structures in a dungeon.
+    /// </summary>
+    Destruction,
+
+    /// <summary>
+    /// Kill a large creature in a dungeon.
+    /// </summary>
+    Elimination,
+}
+
+[Serializable, NetSerializable]
+public enum DifficultyRating : byte
+{
+    Minimal,
+    Minor,
+    Moderate,
+    Hazardous,
+    Extreme,
 }
diff --git a/Resources/ConfigPresets/Build/development.toml b/Resources/ConfigPresets/Build/development.toml
index 165512634fa..ec6b640e52a 100644
--- a/Resources/ConfigPresets/Build/development.toml
+++ b/Resources/ConfigPresets/Build/development.toml
@@ -42,6 +42,7 @@ preload = false
 
 [salvage]
 expedition_cooldown = 30.0
+expedition_failed_cooldown = 30.0
 
 [shuttle]
 grid_fill = false
diff --git a/Resources/Locale/en-US/procedural/expeditions.ftl b/Resources/Locale/en-US/procedural/expeditions.ftl
index 6a92aefb7d3..f2d80c13acf 100644
--- a/Resources/Locale/en-US/procedural/expeditions.ftl
+++ b/Resources/Locale/en-US/procedural/expeditions.ftl
@@ -13,7 +13,8 @@ salvage-expedition-structure-remaining = {$count ->
     *[other] {$count} structures remaining.
 }
 
-salvage-expedition-type = Mission
+salvage-expedition-megafauna-remaining = {$count} megafauna remaining.
+
 salvage-expedition-window-title = Salvage expeditions
 salvage-expedition-window-difficulty = Difficulty:
 salvage-expedition-window-details = Details:
@@ -21,18 +22,31 @@ salvage-expedition-window-hostiles = Hostiles:
 salvage-expedition-window-duration = Duration:
 salvage-expedition-window-biome = Biome:
 salvage-expedition-window-modifiers = Modifiers:
-
-offering-window-claimed = Claimed
-offering-window-claim = Claim
+salvage-expedition-window-rewards = Rewards:
+salvage-expedition-window-claimed = Claimed
+salvage-expedition-window-claim = Claim
 
 salvage-expedition-window-next = Next offer
 
+# Expedition descriptions
+salvage-expedition-desc-mining = Collect resources inside the area.
+#  You will be taxed {$tax}% of the resources collected.
+salvage-expedition-desc-structure = {$count ->
+    [one] Destroy {$count} {$structure} inside the area.
+    *[other] Destroy {$count} {$structure}s inside the area.
+}
+salvage-expedition-desc-elimination = Kill a large and dangerous creature inside the area.
+
+salvage-expedition-type-Mining = Mining
+salvage-expedition-type-Destruction = Destruction
+salvage-expedition-type-Elimination = Elimination
+
+salvage-expedition-difficulty-Minimal = Minimal
+salvage-expedition-difficulty-Minor = Minor
 salvage-expedition-difficulty-Moderate = Moderate
 salvage-expedition-difficulty-Hazardous = Hazardous
 salvage-expedition-difficulty-Extreme = Extreme
 
-salvage-expedition-difficulty-players = Recommended salvagers:
-
 # Runner
 salvage-expedition-not-all-present = Not all salvagers are aboard the shuttle!
 
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
index fc5fdc8461d..f81c8645cb0 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
@@ -327,13 +327,6 @@
   parent: MobCarp
   suffix: Dungeon
   components:
-  - type: MobThresholds
-    thresholds:
-      0: Alive
-      50: Dead
-  - type: SlowOnDamage
-    speedModifierThresholds:
-      25: 0.7
   - type: MeleeWeapon
     damage:
       types:
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index fa5f97fc53a..c16b2524bd4 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -397,7 +397,9 @@
   - type: Butcherable
     spawned:
     - id: FoodMeatDragon
-      amount: 1
+      amount: 3
+  - type: SalvageMobRestrictions
+  # half damage, spread evenly
   - type: MeleeWeapon
     damage:
       groups:
diff --git a/Resources/Prototypes/Procedural/salvage_difficulties.yml b/Resources/Prototypes/Procedural/salvage_difficulties.yml
deleted file mode 100644
index 1cecda87a0d..00000000000
--- a/Resources/Prototypes/Procedural/salvage_difficulties.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-# SPDX-FileCopyrightText: 2023 metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
-# SPDX-FileCopyrightText: 2025 Aiden <28298836+Aidenkrz@users.noreply.github.com>
-#
-# SPDX-License-Identifier: MIT
-
-- type: salvageDifficulty
-  id: Moderate
-  lootBudget: 30
-  mobBudget: 25
-  modifierBudget: 2
-  color: "#52B4E996"
-  recommendedPlayers: 2
-
-    #9FED5896
-    #EFB34196
-    #DE3A3A96
-    #D381C996
\ No newline at end of file
diff --git a/Resources/Prototypes/Procedural/salvage_factions.yml b/Resources/Prototypes/Procedural/salvage_factions.yml
index d19ffcc5042..8c976d182ee 100644
--- a/Resources/Prototypes/Procedural/salvage_factions.yml
+++ b/Resources/Prototypes/Procedural/salvage_factions.yml
@@ -34,22 +34,27 @@
 
 - type: salvageFaction
   id: Carps
-  desc: salvage-faction-carps
-  entries:
-    - proto: MobCarpDungeon
-    # These do too much damage for salvage, need nerfs
-    #- proto: MobCarpHolo
-    #  cost: 5
-    #  prob: 0.1
-    #- proto: MobCarpMagic
-    #  cost: 5
-    #  prob: 0.1
-    - proto: MobCarpRainbow # carp version of rouny...
-      cost: 3
-      prob: 0.05
-    - proto: MobDragonDungeon
-      cost: 10
-      prob: 0.02
+  groups:
+  - entries:
+    - id: MobCarpDungeon
+      amount: 1
+      maxAmount: 4
+  - entries:
+    - id: MobCarpMagic
+      amount: 1
+      maxAmount: 3
+    prob: 0.1
+#  - entries:
+#    - id: MobCarpHolo
+#      amount: 1
+#      maxAmount: 2
+#    prob: 0.25'
+  - entries:
+    - id: MobCarpRainbow # carp version of rouny...
+      amount: 1
+      maxAmount: 1
+    prob: 0.05
   configs:
     DefenseStructure: CarpStatue
+    Mining: Carps
     Megafauna: MobDragonDungeon
diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml
index 221c19053e1..451758cc96b 100644
--- a/Resources/Prototypes/Procedural/salvage_loot.yml
+++ b/Resources/Prototypes/Procedural/salvage_loot.yml
@@ -198,4 +198,4 @@
   guaranteed: true
   loots:
     - !type:BiomeMarkerLoot
-      proto: OreArtifactFragment
\ No newline at end of file
+      proto: OreArtifactFragment
diff --git a/Resources/Prototypes/Procedural/salvage_mods.yml b/Resources/Prototypes/Procedural/salvage_mods.yml
index e69258ae9f4..ac98c6c8473 100644
--- a/Resources/Prototypes/Procedural/salvage_mods.yml
+++ b/Resources/Prototypes/Procedural/salvage_mods.yml
@@ -39,26 +39,49 @@
   cost: 2
   biome: Lava
 
+- type: salvageBiomeMod
+  id: Snow
+  biome: Snow
+
+- type: salvageBiomeMod
+  id: Caves
+  cost: 1
+  biome: Caves
+
 #- type: salvageBiomeMod
 #  id: Space
 #  cost: 1
 #  weather: false
 #  biome: null
 
+# Temperature mods -> not required
+# Also whitelist it
+
+# Weather mods -> not required
+- type: salvageWeatherMod
+  id: SnowfallHeavy
+  weather: SnowfallHeavy
+  cost: 1
+
+- type: salvageWeatherMod
+  id: Rain
+  weather: Rain
+
 # Light mods -> required
+# At some stage with sub-biomes this will probably be moved onto the biome itself
 - type: salvageLightMod
   id: Daylight
   desc: salvage-light-mod-daylight
   color: "#D8B059"
   biomes:
-    - Grasslands
+  - Grasslands
 
 - type: salvageLightMod
   id: Lavalight
   desc: salvage-light-mod-daylight
   color: "#A34931"
   biomes:
-    - Lava
+  - Lava
 
 - type: salvageLightMod
   id: Evening
@@ -80,13 +103,20 @@
 - type: salvageTemperatureMod
   id: Hot
   desc: salvage-temperature-mod-hot
+  desc: Night time
+  cost: 2
+  color: null
+
+# Time mods -> at least 1 required
+- type: salvageTimeMod
+  id: StandardTime
+
+- type: salvageTimeMod
+  id: RushTime
+  desc: Rush
+  minDuration: 420
+  maxDuration: 465
   cost: 1
-  temperature: 323.15 # 50C
-  biomes:
-    - Caves
-    #- LowDesert
-    - Grasslands
-    - Lava
 
 - type: salvageTemperatureMod
   id: Burning
@@ -235,6 +265,10 @@
 #- type: salvageWeatherMod
 #  id: Rain
 #  weather: Rain
+# Misc mods
+- type: salvageMod
+  id: LongDistance
+  desc: Long distance
 
 # Dungeons
 #  For now just simple 1-dungeon setups
@@ -272,4 +306,176 @@
   desc: salvage-dungeon-mod-haunted
   proto: Haunted
   biomes:
-    - Caves
\ No newline at end of file
+    - Caves
+# Air mixtures
+- type: salvageAirMod
+  id: Space
+  desc: No atmosphere
+  space: true
+  cost: 1
+  biomes:
+  - Caves
+  - Lava
+
+- type: salvageAirMod
+  id: Breathable
+  gases:
+  - 21.824779 # oxygen
+  - 82.10312 # nitrogen
+  biomes:
+  - Caves
+  #- LowDesert
+  - Snow
+  - Grasslands
+
+- type: salvageAirMod
+  id: Sleepy
+  cost: 1
+  desc: Dangerous atmosphere
+  gases:
+  - 21.824779 # oxygen
+  - 72.10312 # nitrogen
+  - 0
+  - 0
+  - 0
+  - 0
+  - 0
+  - 8 # nitrous oxide
+  biomes:
+  - Caves
+  #- LowDesert
+  - Snow
+  - Grasslands
+  - Lava
+
+- type: salvageAirMod
+  id: Poisoned
+  cost: 2
+  desc: Dangerous atmosphere
+  gases:
+  - 21.824779 # oxygen
+  - 77.10312 # nitrogen
+  - 8 # carbon dioxide
+  biomes:
+  - Caves
+  #- LowDesert
+  - Snow
+  - Grasslands
+  - Lava
+
+- type: salvageAirMod
+  id: Poison
+  cost: 3
+  desc: Toxic atmosphere
+  gases:
+  - 21.824779 # oxygen
+  - 43.649558 # nitrogen
+  - 20.453562 # carbon dioxide
+  - 0 # plasma
+  - 0 # tritium
+  - 0 # water vapor
+  - 12 # miasma
+  - 0 # nitrous oxide
+  - 0 # frezon
+  biomes:
+  - Caves
+  - Snow
+  - Lava
+
+- type: salvageAirMod
+  id: Plasma
+  cost: 4
+  desc: Toxic atmosphere
+  gases:
+  - 0 # oxygen
+  - 21.824779 # nitrogen
+  - 21.824779 # carbon dioxide
+  - 38.453562 # plasma
+  - 0 # tritium
+  - 0 # water vapor
+  - 0 # miasma
+  - 0 # nitrous oxide
+  - 0 # frezon
+  biomes:
+  - Caves
+  - Lava
+
+- type: salvageAirMod
+  id: Burnable
+  cost: 5
+  desc: Volatile atmosphere
+  gases:
+  - 21.824779 # oxygen
+  - 21.824779 # nitrogen
+  - 21.824779 # carbon dioxide
+  - 36.453562 # plasma
+  - 0.1 # tritium
+  - 1.9 # water vapor
+  - 0 # miasma
+  - 0 # nitrous oxide
+  - 0 # frezon
+  biomes:
+  - Caves
+  - Lava
+
+# Temperatures
+
+- type: salvageTemperatureMod
+  id: RoomTemp
+  biomes:
+  - Caves
+  #- LowDesert
+  - Grasslands
+
+- type: salvageTemperatureMod
+  id: Hot
+  temperature: 323.15 # 50C
+  biomes:
+  - Caves
+  #- LowDesert
+  - Grasslands
+  - Lava
+
+- type: salvageTemperatureMod
+  id: Burning
+  desc: High temperature
+  cost: 1
+  temperature: 423.15 # 200C
+  biomes:
+  - Caves
+  #- LowDesert
+  - Lava
+
+- type: salvageTemperatureMod
+  id: Melting
+  desc: Extreme heat
+  cost: 4
+  temperature: 1273.15 # 1000C hot hot hot
+  biomes:
+  - Lava
+
+- type: salvageTemperatureMod
+  id: Cold
+  temperature: 275.15 # 2C
+  biomes:
+  - Caves
+  #- LowDesert
+  - Grasslands
+  - Snow
+
+- type: salvageTemperatureMod
+  id: Tundra
+  desc: Low temperature
+  cost: 2
+  temperature: 263.15 # -40C
+  biomes:
+  - Caves
+  - Snow
+
+- type: salvageTemperatureMod
+  id: Frozen
+  desc: Extreme cold
+  cost: 3
+  temperature: 123.15 # -150C
+  biomes:
+  - Snow