diff --git a/Content.Client/Stack/StackCustomSplitBoundUserInterface.cs b/Content.Client/Stack/StackCustomSplitBoundUserInterface.cs
new file mode 100644
index 00000000000..ff9a03580a9
--- /dev/null
+++ b/Content.Client/Stack/StackCustomSplitBoundUserInterface.cs
@@ -0,0 +1,41 @@
+// Cherry-picked from space-station-14#32938 courtesy of Ilya246
+using JetBrains.Annotations;
+using Content.Shared.Stacks;
+using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
+
+namespace Content.Client.Stack
+{
+    [UsedImplicitly]
+    public sealed class StackCustomSplitBoundUserInterface : BoundUserInterface
+    {
+        private IEntityManager _entManager;
+        private EntityUid _owner;
+        [ViewVariables]
+        private StackCustomSplitWindow? _window;
+
+        public StackCustomSplitBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+        {
+            _owner = owner;
+            _entManager = IoCManager.Resolve<IEntityManager>();
+        }
+
+        protected override void Open()
+        {
+            base.Open();
+            _window = this.CreateWindow<StackCustomSplitWindow>();
+
+            if (_entManager.TryGetComponent<StackComponent>(_owner, out var comp))
+                _window.SetMax(comp.Count);
+
+            _window.ApplyButton.OnPressed += _ =>
+            {
+                if (int.TryParse(_window.AmountLineEdit.Text, out var i))
+                {
+                    SendMessage(new StackCustomSplitAmountMessage(i));
+                    _window.Close();
+                }
+            };
+        }
+    }
+}
diff --git a/Content.Client/Stack/StackCustomSplitWindow.xaml b/Content.Client/Stack/StackCustomSplitWindow.xaml
new file mode 100644
index 00000000000..2294d459415
--- /dev/null
+++ b/Content.Client/Stack/StackCustomSplitWindow.xaml
@@ -0,0 +1,15 @@
+<DefaultWindow xmlns="https://spacestation14.io"
+            Title="{Loc 'ui-custom-stack-split-title'}"
+            Resizable="False">
+    <!--Cherry-picked from space-station-14#32938 courtesy of Ilya246-->
+
+    <BoxContainer Orientation="Vertical" SeparationOverride="4" MinSize="240 80">
+        <BoxContainer Orientation="Horizontal">
+            <LineEdit Name="AmountLineEdit" Access="Public" HorizontalExpand="True" PlaceHolder="{Loc 'ui-custom-stack-split-line-edit-placeholder'}"/>
+        </BoxContainer>
+        <BoxContainer Orientation="Horizontal">
+          <Label Name="MaximumAmount" Access="Public" />
+        </BoxContainer>
+        <Button Name="ApplyButton" Access="Public" Text="{Loc 'ui-custom-stack-split-apply'}"/>
+    </BoxContainer>
+</DefaultWindow>
\ No newline at end of file
diff --git a/Content.Client/Stack/StackCustomSplitWindow.xaml.cs b/Content.Client/Stack/StackCustomSplitWindow.xaml.cs
new file mode 100644
index 00000000000..e07d8474a36
--- /dev/null
+++ b/Content.Client/Stack/StackCustomSplitWindow.xaml.cs
@@ -0,0 +1,35 @@
+// Cherry-picked from space-station-14#32938 courtesy of Ilya246
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.Stack
+{
+    [GenerateTypedNameReferences]
+    public sealed partial class StackCustomSplitWindow : DefaultWindow
+    {
+        private int _max = Int32.MaxValue;
+        private int _min = 1;
+
+        public StackCustomSplitWindow()
+        {
+            RobustXamlLoader.Load(this);
+            AmountLineEdit.OnTextChanged += OnValueChanged;
+        }
+
+        public void SetMax(int max)
+        {
+          _max = max;
+          MaximumAmount.Text = Loc.GetString("comp-stack-split-size", ("size", _max));
+        }
+
+        private void OnValueChanged(LineEdit.LineEditEventArgs args)
+        {
+            if (!int.TryParse(AmountLineEdit.Text, out var amount)  || amount > _max || amount < _min)
+                ApplyButton.Disabled = true;
+            else
+                ApplyButton.Disabled = false;
+        }
+    }
+}
diff --git a/Content.Server/Stack/StackSystem.cs b/Content.Server/Stack/StackSystem.cs
index 7806ffeb097..69633d03517 100644
--- a/Content.Server/Stack/StackSystem.cs
+++ b/Content.Server/Stack/StackSystem.cs
@@ -15,6 +15,7 @@ namespace Content.Server.Stack
     public sealed class StackSystem : SharedStackSystem
     {
         [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; // Cherry-picked from space-station-14#32938 courtesy of Ilya246
 
         public static readonly int[] DefaultSplitAmounts = { 1, 5, 10, 20, 50, 100, 500, 1000, 5000, 10000 };
 
@@ -170,16 +171,33 @@ private void OnStackAlternativeInteract(EntityUid uid, StackComponent stack, Get
             if (!args.CanAccess || !args.CanInteract || args.Hands == null || stack.Count == 1)
                 return;
 
+            // Frontier: cherry-picked from ss14#32938, moved up top
+            var priority = 1;
+            if (_ui.HasUi(uid, StackCustomSplitUiKey.Key)) // Frontier: check for interface
+            {
+                AlternativeVerb custom = new()
+                {
+                    Text = Loc.GetString("comp-stack-split-custom"),
+                    Category = VerbCategory.Split,
+                    Act = () =>
+                    {
+                        _ui.OpenUi(uid, StackCustomSplitUiKey.Key, args.User);
+                    },
+                    Priority = priority--
+                };
+                args.Verbs.Add(custom);
+            }
+            // End Frontier: cherry-picked from ss14#32938, moved up top
+
             AlternativeVerb halve = new()
             {
                 Text = Loc.GetString("comp-stack-split-halve"),
                 Category = VerbCategory.Split,
                 Act = () => UserSplit(uid, args.User, stack.Count / 2, stack),
-                Priority = 1
+                Priority = priority-- // Frontier: 1<priority--
             };
             args.Verbs.Add(halve);
 
-            var priority = 0;
             foreach (var amount in DefaultSplitAmounts)
             {
                 if (amount >= stack.Count)
@@ -200,6 +218,20 @@ private void OnStackAlternativeInteract(EntityUid uid, StackComponent stack, Get
             }
         }
 
+        // Cherry-picked from ss14#32938 courtesy of Ilya246
+        protected override void OnCustomSplitMessage(Entity<StackComponent> ent, ref StackCustomSplitAmountMessage message)
+        {
+            var (uid, comp) = ent;
+
+            // digital ghosts shouldn't be allowed to split stacks
+            if (!(message.Actor is { Valid: true } user))
+                return;
+
+            var amount = message.Amount;
+            UserSplit(uid, user, amount, comp);
+        }
+        // End cherry-pick from ss14#32938 courtesy of Ilya246
+
         private void UserSplit(EntityUid uid, EntityUid userUid, int amount,
             StackComponent? stack = null,
             TransformComponent? userTransform = null)
diff --git a/Content.Server/_NF/Chemistry/RandomPillSystem.cs b/Content.Server/_NF/Chemistry/RandomPillSystem.cs
new file mode 100644
index 00000000000..9326703f323
--- /dev/null
+++ b/Content.Server/_NF/Chemistry/RandomPillSystem.cs
@@ -0,0 +1,26 @@
+using Content.Shared.Chemistry.Components;
+using Robust.Shared.Random;
+
+namespace Content.Server._NF.Chemistry;
+
+public sealed class RandomPillSystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    public const int MaxPillType = 21;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<PillComponent, MapInitEvent>(OnMapInit);
+    }
+
+    private void OnMapInit(Entity<PillComponent> ent, ref MapInitEvent componentInit)
+    {
+        if (ent.Comp.Random)
+        {
+            ent.Comp.PillType = (uint)_random.Next(MaxPillType);
+            Dirty(ent);
+        }
+    }
+}
diff --git a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs
index 68062cdb598..176eb06ba81 100644
--- a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs
+++ b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs
@@ -4,22 +4,23 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
+using Content.Server._NF.Bank;
+using Content.Server._NF.GameRule.Components;
 using Content.Server._NF.GameTicking.Events;
-using Content.Shared.GameTicking.Components;
-using Robust.Shared.Prototypes;
 using Content.Server.Cargo.Components;
 using Content.Server.GameTicking;
+using Content.Server.GameTicking.Presets;
 using Content.Server.GameTicking.Rules;
-using Content.Shared._NF.CCVar; // Frontier
-using Robust.Shared.Configuration;
 using Content.Shared._NF.Bank;
-using Content.Server._NF.GameRule.Components;
-using Content.Server._NF.Bank;
-using Robust.Shared.Player;
-using Robust.Shared.Network;
+using Content.Shared._NF.CCVar;
 using Content.Shared.GameTicking;
-using Robust.Shared.Enums;
+using Content.Shared.GameTicking.Components;
 using Robust.Server.Player;
+using Robust.Shared.Configuration;
+using Robust.Shared.Enums;
+using Robust.Shared.Network;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server._NF.GameRule;
 
@@ -28,14 +29,17 @@ namespace Content.Server._NF.GameRule;
 /// </summary>
 public sealed class NFAdventureRuleSystem : GameRuleSystem<NFAdventureRuleComponent>
 {
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IConfigurationManager _configurationManager = default!;
-    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly BankSystem _bank = default!;
+    [Dependency] private readonly GameTicker _ticker = default!;
     [Dependency] private readonly PointOfInterestSystem _poi = default!;
 
     private readonly HttpClient _httpClient = new();
 
+    private readonly ProtoId<GamePresetPrototype> _fallbackPresetID = "NFPirates";
+
     public sealed class PlayerRoundBankInformation
     {
         // Initial balance, obtained on spawn
@@ -68,7 +72,7 @@ public override void Initialize()
         SubscribeLocalEvent<PlayerSpawnCompleteEvent>(OnPlayerSpawningEvent);
         SubscribeLocalEvent<PlayerDetachedEvent>(OnPlayerDetachedEvent);
         SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart);
-        _playerManager.PlayerStatusChanged += PlayerManagerOnPlayerStatusChanged;
+        _player.PlayerStatusChanged += PlayerManagerOnPlayerStatusChanged;
     }
 
     protected override void AppendRoundEndText(EntityUid uid, NFAdventureRuleComponent component, GameRuleComponent gameRule, ref RoundEndTextAppendEvent ev)
@@ -196,8 +200,14 @@ protected override void Started(EntityUid uid, NFAdventureRuleComponent componen
         List<PointOfInterestPrototype> optionalProtos = new();
         Dictionary<string, List<PointOfInterestPrototype>> remainingUniqueProtosBySpawnGroup = new();
 
-        foreach (var location in _prototypeManager.EnumeratePrototypes<PointOfInterestPrototype>())
+        var currentPreset = _ticker.CurrentPreset?.ID ?? _fallbackPresetID;
+
+        foreach (var location in _proto.EnumeratePrototypes<PointOfInterestPrototype>())
         {
+            // Check if any preset is accepted (empty) or if current preset is supported.
+            if (location.SpawnGamePreset.Length > 0 && !location.SpawnGamePreset.Contains(currentPreset))
+                continue;
+
             if (location.SpawnGroup == "CargoDepot")
                 depotProtos.Add(location);
             else if (location.SpawnGroup == "MarketStation")
@@ -228,7 +238,7 @@ protected override void Started(EntityUid uid, NFAdventureRuleComponent componen
     private async Task ReportRound(string message, int color = 0x77DDE7)
     {
         Logger.InfoS("discord", message);
-        string webhookUrl = _configurationManager.GetCVar(NFCCVars.DiscordLeaderboardWebhook);
+        string webhookUrl = _cfg.GetCVar(NFCCVars.DiscordLeaderboardWebhook);
         if (webhookUrl == string.Empty)
             return;
 
@@ -249,7 +259,7 @@ private async Task ReportRound(string message, int color = 0x77DDE7)
 
     private async Task ReportLedger(int color = 0xBF863F)
     {
-        string webhookUrl = _configurationManager.GetCVar(NFCCVars.DiscordLeaderboardWebhook);
+        string webhookUrl = _cfg.GetCVar(NFCCVars.DiscordLeaderboardWebhook);
         if (webhookUrl == string.Empty)
             return;
 
diff --git a/Content.Server/_NF/GameRule/PointOfInterestPrototype.cs b/Content.Server/_NF/GameRule/PointOfInterestPrototype.cs
index f29cf76474e..84baf23c519 100644
--- a/Content.Server/_NF/GameRule/PointOfInterestPrototype.cs
+++ b/Content.Server/_NF/GameRule/PointOfInterestPrototype.cs
@@ -52,6 +52,7 @@ public sealed partial class PointOfInterestPrototype : IPrototype
 
     /// <summary>
     ///     What gamepresets ID this POI is allowed to spawn on.
+    ///     If left empty, all presets are allowed.
     /// </summary>
     [DataField]
     public ProtoId<GamePresetPrototype>[] SpawnGamePreset { get; private set; } = [];
diff --git a/Content.Server/_NF/GameRule/PointOfInterestSystem.cs b/Content.Server/_NF/GameRule/PointOfInterestSystem.cs
index d58a70b924a..f9a910027f9 100644
--- a/Content.Server/_NF/GameRule/PointOfInterestSystem.cs
+++ b/Content.Server/_NF/GameRule/PointOfInterestSystem.cs
@@ -1,16 +1,16 @@
 using System.Linq;
 using System.Numerics;
+using Content.Server.Maps;
+using Content.Server.Station.Systems;
+using Content.Server.GameTicking;
+using Content.Shared._NF.CCVar;
+using Content.Shared.GameTicking;
 using Robust.Server.GameObjects;
 using Robust.Server.Maps;
 using Robust.Shared.Configuration;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Content.Server.Maps;
-using Content.Server.Station.Systems;
-using Content.Server.GameTicking;
-using Content.Shared._NF.CCVar;
-using Content.Shared.GameTicking;
 
 namespace Content.Server._NF.GameRule;
 
@@ -20,14 +20,14 @@ namespace Content.Server._NF.GameRule;
 //[Access(typeof(NfAdventureRuleSystem))]
 public sealed class PointOfInterestSystem : EntitySystem
 {
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+    [Dependency] private readonly GameTicker _ticker = default!;
     [Dependency] private readonly MapLoaderSystem _map = default!;
     [Dependency] private readonly MetaDataSystem _meta = default!;
-    [Dependency] private readonly StationSystem _station = default!;
     [Dependency] private readonly StationRenameWarpsSystems _renameWarps = default!;
-    [Dependency] private readonly GameTicker _ticker = default!;
+    [Dependency] private readonly StationSystem _station = default!;
 
     private List<Vector2> _stationCoords = new();
 
@@ -55,7 +55,7 @@ public void GenerateDepots(MapId mapUid, List<PointOfInterestPrototype> depotPro
         //by the number of depots set in our corresponding cvar
 
         depotStations = new List<EntityUid>();
-        var depotCount = _configurationManager.GetCVar(NFCCVars.CargoDepots);
+        var depotCount = _cfg.GetCVar(NFCCVars.CargoDepots);
         var rotation = 2 * Math.PI / depotCount;
         var rotationOffset = _random.NextAngle() / depotCount;
 
@@ -68,7 +68,8 @@ public void GenerateDepots(MapId mapUid, List<PointOfInterestPrototype> depotPro
         {
             var proto = _random.Pick(depotPrototypes);
 
-            if (!proto.SpawnGamePreset.Contains(currentPreset))
+            // Safety check: ensure selected POIs are either fine in any preset or accepts this current one.
+            if (proto.SpawnGamePreset.Length > 0 && !proto.SpawnGamePreset.Contains(currentPreset))
                 continue;
 
             Vector2i offset = new Vector2i((int) _random.Next(proto.MinimumDistance, proto.MaximumDistance), 0);
@@ -96,7 +97,7 @@ public void GenerateMarkets(MapId mapUid, List<PointOfInterestPrototype> marketP
         //ideal world
 
         marketStations = new List<EntityUid>();
-        var marketCount = _configurationManager.GetCVar(NFCCVars.MarketStations);
+        var marketCount = _cfg.GetCVar(NFCCVars.MarketStations);
         _random.Shuffle(marketPrototypes);
         int marketsAdded = 0;
 
@@ -106,7 +107,8 @@ public void GenerateMarkets(MapId mapUid, List<PointOfInterestPrototype> marketP
 
         foreach (var proto in marketPrototypes)
         {
-            if (!proto.SpawnGamePreset.Contains(currentPreset))
+            // Safety check: ensure selected POIs are either fine in any preset or accepts this current one.
+            if (proto.SpawnGamePreset.Length > 0 && !proto.SpawnGamePreset.Contains(currentPreset))
                 continue;
 
             if (marketsAdded >= marketCount)
@@ -130,7 +132,7 @@ public void GenerateOptionals(MapId mapUid, List<PointOfInterestPrototype> optio
         //and most RP places. This will essentially put them all into a pool to pull from, and still does not use the RNG function.
 
         optionalStations = new List<EntityUid>();
-        var optionalCount = _configurationManager.GetCVar(NFCCVars.OptionalStations);
+        var optionalCount = _cfg.GetCVar(NFCCVars.OptionalStations);
         _random.Shuffle(optionalPrototypes);
         int optionalsAdded = 0;
 
@@ -140,7 +142,8 @@ public void GenerateOptionals(MapId mapUid, List<PointOfInterestPrototype> optio
 
         foreach (var proto in optionalPrototypes)
         {
-            if (!proto.SpawnGamePreset.Contains(currentPreset))
+            // Safety check: ensure selected POIs are either fine in any preset or accepts this current one.
+            if (proto.SpawnGamePreset.Length > 0 && !proto.SpawnGamePreset.Contains(currentPreset))
                 continue;
 
             if (optionalsAdded >= optionalCount)
@@ -171,7 +174,8 @@ public void GenerateRequireds(MapId mapUid, List<PointOfInterestPrototype> requi
 
         foreach (var proto in requiredPrototypes)
         {
-            if (!proto.SpawnGamePreset.Contains(currentPreset))
+            // Safety check: ensure selected POIs are either fine in any preset or accepts this current one.
+            if (proto.SpawnGamePreset.Length > 0 && !proto.SpawnGamePreset.Contains(currentPreset))
                 continue;
 
             var offset = GetRandomPOICoord(proto.MinimumDistance, proto.MaximumDistance);
@@ -205,7 +209,8 @@ public void GenerateUniques(MapId mapUid, Dictionary<string, List<PointOfInteres
             _random.Shuffle(prototypeList);
             foreach (var proto in prototypeList)
             {
-                if (!proto.SpawnGamePreset.Contains(currentPreset))
+                // Safety check: ensure selected POIs are either fine in any preset or accepts this current one.
+                if (proto.SpawnGamePreset.Length > 0 && !proto.SpawnGamePreset.Contains(currentPreset))
                     continue;
 
                 var chance = _random.NextFloat(0, 1);
@@ -238,7 +243,7 @@ private bool TrySpawnPoiGrid(MapId mapUid, PointOfInterestPrototype proto, Vecto
             string stationName = string.IsNullOrEmpty(overrideName) ? proto.Name : overrideName;
 
             EntityUid? stationUid = null;
-            if (_prototypeManager.TryIndex<GameMapPrototype>(proto.ID, out var stationProto))
+            if (_proto.TryIndex<GameMapPrototype>(proto.ID, out var stationProto))
             {
                 stationUid = _station.InitializeNewStation(stationProto.Stations[proto.ID], mapUids, stationName);
             }
@@ -270,8 +275,8 @@ private bool TrySpawnPoiGrid(MapId mapUid, PointOfInterestPrototype proto, Vecto
 
     private Vector2 GetRandomPOICoord(float unscaledMinRange, float unscaledMaxRange)
     {
-        int numRetries = int.Max(_configurationManager.GetCVar(NFCCVars.POIPlacementRetries), 0);
-        float minDistance = float.Max(_configurationManager.GetCVar(NFCCVars.MinPOIDistance), 0); // Constant at the end to avoid NaN weirdness
+        int numRetries = int.Max(_cfg.GetCVar(NFCCVars.POIPlacementRetries), 0);
+        float minDistance = float.Max(_cfg.GetCVar(NFCCVars.MinPOIDistance), 0); // Constant at the end to avoid NaN weirdness
 
         Vector2 coords = _random.NextVector2(unscaledMinRange, unscaledMaxRange);
         for (int i = 0; i < numRetries; i++)
diff --git a/Content.Shared/Chemistry/Components/PillComponent.cs b/Content.Shared/Chemistry/Components/PillComponent.cs
index ad32aa750a4..0cb356454d6 100644
--- a/Content.Shared/Chemistry/Components/PillComponent.cs
+++ b/Content.Shared/Chemistry/Components/PillComponent.cs
@@ -12,4 +12,10 @@ public sealed partial class PillComponent : Component
     [DataField("pillType")]
     [ViewVariables(VVAccess.ReadWrite)]
     public uint PillType;
+
+    /// <summary>
+    /// Frontier: if true, pill appearance will be randomly generated on init.
+    /// </summary>
+    [DataField(serverOnly: true)]
+    public bool Random;
 }
diff --git a/Content.Shared/Construction/SharedFlatpackSystem.cs b/Content.Shared/Construction/SharedFlatpackSystem.cs
index a83948b1674..9644800d773 100644
--- a/Content.Shared/Construction/SharedFlatpackSystem.cs
+++ b/Content.Shared/Construction/SharedFlatpackSystem.cs
@@ -93,6 +93,8 @@ private void OnFlatpackInteractUsing(Entity<FlatpackComponent> ent, ref Interact
         if (_net.IsServer)
         {
             var spawn = Spawn(comp.Entity, _map.GridTileToLocal(grid, gridComp, buildPos));
+            if (TryComp(spawn, out TransformComponent? spawnXform)) // Frontier: rotatable flatpacks
+                spawnXform.LocalRotation = xform.LocalRotation.GetCardinalDir().ToAngle(); // Frontier: rotatable flatpacks
             _adminLogger.Add(LogType.Construction,
                 LogImpact.Low,
                 $"{ToPrettyString(args.User):player} unpacked {ToPrettyString(spawn):entity} at {xform.Coordinates} from {ToPrettyString(uid):entity}");
diff --git a/Content.Shared/Stacks/SharedStackSystem.cs b/Content.Shared/Stacks/SharedStackSystem.cs
index 7fe058afbaa..922e57a4161 100644
--- a/Content.Shared/Stacks/SharedStackSystem.cs
+++ b/Content.Shared/Stacks/SharedStackSystem.cs
@@ -37,11 +37,17 @@ public override void Initialize()
             SubscribeLocalEvent<StackComponent, ComponentStartup>(OnStackStarted);
             SubscribeLocalEvent<StackComponent, ExaminedEvent>(OnStackExamined);
             SubscribeLocalEvent<StackComponent, InteractUsingEvent>(OnStackInteractUsing);
+            SubscribeLocalEvent<StackComponent, StackCustomSplitAmountMessage>(OnCustomSplitMessage); // cherry-pick #32938
 
             _vvm.GetTypeHandler<StackComponent>()
                 .AddPath(nameof(StackComponent.Count), (_, comp) => comp.Count, SetCount);
         }
 
+        // Cherry-pick #32938 courtesy of Ilya246
+        // client shouldn't try to split stacks so do nothing on client
+        protected virtual void OnCustomSplitMessage(Entity<StackComponent> ent, ref StackCustomSplitAmountMessage message) {}
+        // End cherry-pick #32938 courtesy of Ilya246
+
         public override void Shutdown()
         {
             base.Shutdown();
diff --git a/Content.Shared/Stacks/StackCustomSplit.cs b/Content.Shared/Stacks/StackCustomSplit.cs
new file mode 100644
index 00000000000..ddfd7cd02d7
--- /dev/null
+++ b/Content.Shared/Stacks/StackCustomSplit.cs
@@ -0,0 +1,22 @@
+// Cherry-pick space-station-14#32938 courtesy of Ilya246
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Stacks
+{
+    [Serializable, NetSerializable]
+    public sealed class StackCustomSplitAmountMessage : BoundUserInterfaceMessage
+    {
+        public int Amount;
+
+        public StackCustomSplitAmountMessage(int amount)
+        {
+            Amount = amount;
+        }
+    }
+
+    [Serializable, NetSerializable]
+    public enum StackCustomSplitUiKey
+    {
+        Key,
+    }
+}
\ No newline at end of file
diff --git a/Content.Shared/_EE/CCVar/EECCVars.cs b/Content.Shared/_EE/CCVar/EECCVars.cs
index b16d1fa01f0..378559a5037 100644
--- a/Content.Shared/_EE/CCVar/EECCVars.cs
+++ b/Content.Shared/_EE/CCVar/EECCVars.cs
@@ -1,81 +1,78 @@
-using Robust.Shared;
 using Robust.Shared.Configuration;
 
-namespace Content.Shared._EE.CCVar
+namespace Content.Shared._EE.CCVar;
+
+[CVarDefs] // ReSharper disable once InconsistentNaming
+public sealed class EECCVars
 {
-    // ReSharper disable once InconsistentNaming
-    [CVarDefs]
-    public sealed class EECCVars : CVars
-    {
-        #region Jetpack System
+    #region Jetpack System
 
-        /// <summary>
-        ///     When true, Jetpacks can be enabled anywhere, even in gravity.
-        /// </summary>
-        public static readonly CVarDef<bool> JetpackEnableAnywhere =
-            CVarDef.Create("ee.jetpack.enable_anywhere", false, CVar.REPLICATED);
+    /// <summary>
+    ///     When true, Jetpacks can be enabled anywhere, even in gravity.
+    /// </summary>
+    public static readonly CVarDef<bool> JetpackEnableAnywhere =
+        CVarDef.Create("ee.jetpack.enable_anywhere", false, CVar.REPLICATED);
 
-        /// <summary>
-        ///     When true, jetpacks can be enabled on grids that have zero gravity.
-        /// </summary>
-        public static readonly CVarDef<bool> JetpackEnableInNoGravity =
-            CVarDef.Create("ee.jetpack.enable_in_no_gravity", true, CVar.REPLICATED);
+    /// <summary>
+    ///     When true, jetpacks can be enabled on grids that have zero gravity.
+    /// </summary>
+    public static readonly CVarDef<bool> JetpackEnableInNoGravity =
+        CVarDef.Create("ee.jetpack.enable_in_no_gravity", true, CVar.REPLICATED);
 
-        #endregion
+    #endregion
 
-        #region Contests System
+    #region Contests System
 
-        /// <summary>
-        ///     The MASTER TOGGLE for the entire Contests System.
-        ///     ALL CONTESTS BELOW, regardless of type or setting will output 1f when false.
-        /// </summary>
-        public static readonly CVarDef<bool> DoContestsSystem =
-            CVarDef.Create("contests.do_contests_system", true, CVar.REPLICATED | CVar.SERVER);
+    /// <summary>
+    ///     The MASTER TOGGLE for the entire Contests System.
+    ///     ALL CONTESTS BELOW, regardless of type or setting will output 1f when false.
+    /// </summary>
+    public static readonly CVarDef<bool> DoContestsSystem =
+        CVarDef.Create("ee.contests.do_contests_system", true, CVar.REPLICATED | CVar.SERVER);
 
-        /// <summary>
-        ///     Contest functions normally include an optional override to bypass the clamp set by max_percentage.
-        ///     This CVar disables the bypass when false, forcing all implementations to comply with max_percentage.
-        /// </summary>
-        public static readonly CVarDef<bool> AllowClampOverride =
-            CVarDef.Create("contests.allow_clamp_override", true, CVar.REPLICATED | CVar.SERVER);
-        /// <summary>
-        ///     Toggles all MassContest functions. All mass contests output 1f when false
-        /// </summary>
-        public static readonly CVarDef<bool> DoMassContests =
-            CVarDef.Create("contests.do_mass_contests", true, CVar.REPLICATED | CVar.SERVER);
+    /// <summary>
+    ///     Contest functions normally include an optional override to bypass the clamp set by max_percentage.
+    ///     This CVar disables the bypass when false, forcing all implementations to comply with max_percentage.
+    /// </summary>
+    public static readonly CVarDef<bool> AllowClampOverride =
+        CVarDef.Create("ee.contests.allow_clamp_override", true, CVar.REPLICATED | CVar.SERVER);
+    /// <summary>
+    ///     Toggles all MassContest functions. All mass contests output 1f when false
+    /// </summary>
+    public static readonly CVarDef<bool> DoMassContests =
+        CVarDef.Create("ee.contests.do_mass_contests", true, CVar.REPLICATED | CVar.SERVER);
 
-        /// <summary>
-        ///     Toggles all StaminaContest functions. All stamina contests output 1f when false
-        /// </summary>
-        public static readonly CVarDef<bool> DoStaminaContests =
-            CVarDef.Create("contests.do_stamina_contests", true, CVar.REPLICATED | CVar.SERVER);
+    /// <summary>
+    ///     Toggles all StaminaContest functions. All stamina contests output 1f when false
+    /// </summary>
+    public static readonly CVarDef<bool> DoStaminaContests =
+        CVarDef.Create("ee.contests.do_stamina_contests", true, CVar.REPLICATED | CVar.SERVER);
 
-        /// <summary>
-        ///     Toggles all HealthContest functions. All health contests output 1f when false
-        /// </summary>
-        public static readonly CVarDef<bool> DoHealthContests =
-            CVarDef.Create("contests.do_health_contests", true, CVar.REPLICATED | CVar.SERVER);
+    /// <summary>
+    ///     Toggles all HealthContest functions. All health contests output 1f when false
+    /// </summary>
+    public static readonly CVarDef<bool> DoHealthContests =
+        CVarDef.Create("ee.contests.do_health_contests", true, CVar.REPLICATED | CVar.SERVER);
 
-        /// <summary>
-        ///     Toggles all MindContest functions. All mind contests output 1f when false.
-        ///     MindContests are not currently implemented, and are awaiting completion of the Psionic Refactor
-        /// </summary>
-        public static readonly CVarDef<bool> DoMindContests =
-            CVarDef.Create("contests.do_mind_contests", true, CVar.REPLICATED | CVar.SERVER);
+    /// <summary>
+    ///     Toggles all MindContest functions. All mind contests output 1f when false.
+    ///     MindContests are not currently implemented, and are awaiting completion of the Psionic Refactor
+    /// </summary>
+    public static readonly CVarDef<bool> DoMindContests =
+        CVarDef.Create("ee.contests.do_mind_contests", true, CVar.REPLICATED | CVar.SERVER);
 
-        /// <summary>
-        ///     Toggles all MoodContest functions. All mood contests output 1f when false.
-        /// </summary>
-        public static readonly CVarDef<bool> DoMoodContests =
-            CVarDef.Create("contests.do_mood_contests", true, CVar.REPLICATED | CVar.SERVER);
+    /// <summary>
+    ///     Toggles all MoodContest functions. All mood contests output 1f when false.
+    /// </summary>
+    public static readonly CVarDef<bool> DoMoodContests =
+        CVarDef.Create("ee.contests.do_mood_contests", true, CVar.REPLICATED | CVar.SERVER);
 
-        /// <summary>
-        ///     The maximum amount that Mass Contests can modify a physics multiplier, given as a +/- percentage
-        ///     Default of 0.25f outputs between * 0.75f and 1.25f
-        /// </summary>
-        public static readonly CVarDef<float> MassContestsMaxPercentage =
-            CVarDef.Create("contests.max_percentage", 0.25f, CVar.REPLICATED | CVar.SERVER);
+    /// <summary>
+    ///     The maximum amount that Mass Contests can modify a physics multiplier, given as a +/- percentage
+    ///     Default of 0.25f outputs between * 0.75f and 1.25f
+    /// </summary>
+    public static readonly CVarDef<float> MassContestsMaxPercentage =
+        CVarDef.Create("ee.contests.max_percentage", 0.25f, CVar.REPLICATED | CVar.SERVER);
 
-        #endregion
-    }
+    #endregion
 }
diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index 62a7ab1e93d..7b8d21ceb44 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -6096,3 +6096,29 @@ Entries:
         shots.
   id: 5610
   time: '2024-12-24T23:05:02.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Add
+      message: Flatpacks can be rotated, and respect their rotation when unpacked.
+    - type: Tweak
+      message: Soil crates now must be "assembled" with a shovel.
+  id: 5611
+  time: '2024-12-26T00:49:53.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Fix
+      message: Cargo Depots should be spawning normally now.
+  id: 5612
+  time: '2024-12-26T15:21:56.0000000+00:00'
+- author: Ilya246 and whatston3
+  changes:
+    - type: Add
+      message: Spesos and spessos now support custom split amounts.
+  id: 5613
+  time: '2024-12-26T20:21:42.0000000+00:00'
+- author: Bonaout
+  changes:
+    - type: Tweak
+      message: Pirate PDAs now have the AstroNav program
+  id: 5614
+  time: '2024-12-26T21:07:18.0000000+00:00'
diff --git a/Resources/Locale/en-US/stack/stack-component.ftl b/Resources/Locale/en-US/stack/stack-component.ftl
index e8cbaa69df1..93ceea15107 100644
--- a/Resources/Locale/en-US/stack/stack-component.ftl
+++ b/Resources/Locale/en-US/stack/stack-component.ftl
@@ -20,4 +20,13 @@ comp-stack-becomes-full = Stack is now full.
 # Text related to splitting a stack
 comp-stack-split = You split the stack.
 comp-stack-split-halve = Halve
+comp-stack-split-custom = Split amount...
 comp-stack-split-too-small = Stack is too small to split.
+
+# Cherry-picked from space-station-14#32938 courtesy of Ilya246
+comp-stack-split-size = Max: {$size}
+
+ui-custom-stack-split-title = Split Amount
+ui-custom-stack-split-line-edit-placeholder = Amount
+ui-custom-stack-split-apply = Split
+# End cherry-pick from ss14#32938
\ No newline at end of file
diff --git a/Resources/Maps/_NF/POI/trade.yml b/Resources/Maps/_NF/POI/trade.yml
index 1fab43e1778..27b2a1d9789 100644
--- a/Resources/Maps/_NF/POI/trade.yml
+++ b/Resources/Maps/_NF/POI/trade.yml
@@ -9219,18 +9219,6 @@ entities:
       parent: 1
 - proto: CargoPalletSell
   entities:
-  - uid: 225
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 61.5,22.5
-      parent: 1
-  - uid: 226
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,22.5
-      parent: 1
   - uid: 228
     components:
     - type: Transform
@@ -9461,6 +9449,16 @@ entities:
     - type: Transform
       pos: 81.5,-7.5
       parent: 1
+  - uid: 225
+    components:
+    - type: Transform
+      pos: 61.5,22.5
+      parent: 1
+  - uid: 226
+    components:
+    - type: Transform
+      pos: 63.5,22.5
+      parent: 1
   - uid: 341
     components:
     - type: Transform
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index 27b585fe675..4a3614dcd0c 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -379,8 +379,8 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.90
-        Slash: 0.90
+        Blunt: 0.95 # Frontier 0.90<0.95
+        Slash: 0.95 # Frontier 0.90<0.95
         Piercing: 0.95
         Heat: 0.95
 
@@ -397,8 +397,8 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.90
-        Slash: 0.90
+        Blunt: 0.95 # Frontier 0.90<0.95
+        Slash: 0.95 # Frontier 0.90<0.95
         Piercing: 0.95
         Heat: 0.95
   - type: PirateBountyItem # Frontier
diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
index 8a6424ffcc7..c6f9c7449f9 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
@@ -35,6 +35,7 @@
       cpu_supply: "#A46106"
   - type: StaticPrice
     price: 250
+  - type: Rotatable # Frontier
 
 - type: entity
   parent: BaseFlatpack
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 28bea188438..6247747e6bd 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -889,6 +889,7 @@
     uiKey: enum.PdaUiKey.Key
     preinstalled:
       - NotekeeperCartridge
+      - AstroNavCartridge # Frontier
 
 - type: entity
   parent: BaseSecurityPDA
diff --git a/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml
index 12dd680d9f6..c26ca15099f 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/space_cash.yml
@@ -35,6 +35,12 @@
     - cash_100000 # Frontier: larger denominations
     - cash_250000 # Frontier: larger denominations (cash_1000000<cash_250000)
     layerFunction: Threshold # Frontier: multicolour cash
+  # cherry-pick from space-station#32938 courtesy of Ilya246
+  - type: UserInterface
+    interfaces:
+      enum.StackCustomSplitUiKey.Key:
+        type: StackCustomSplitBoundUserInterface
+  # end cherry-pick from ss#32938
   - type: StackLayerThreshold # Frontier
     thresholds: [10, 100, 500, 1000, 5000, 10000, 25000, 50000, 100000, 250000] # Frontier
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml
index cdff0cdbe4a..26714e22ada 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/randompill.yml
@@ -86,6 +86,8 @@
   - type: RandomFillSolution
     solution: food
     weightedRandomId: RandomFillStrangePill
+  - type: Pill # Frontier
+    random: true # Frontier
 # RandomSprite does not work with pill component
   # - type: Sprite
   #   sprite: Objects/Specific/Chemistry/pills.rsi
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml
index bda5921d675..f8be28c87b0 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml
@@ -34,24 +34,6 @@
           amount: 2
           defaultPrototype: Beaker
 
-- type: entity
-  id: ScienceTechFabCircuitboard
-  parent: BaseMachineCircuitboard
-  name: science techfab machine board
-  description: A machine printed circuit board for a science techfab
-  components:
-    - type: Sprite
-      state: science
-    - type: MachineBoard
-      prototype: ScienceTechFab
-      requirements: # Frontier
-        MatterBin: 2 # Frontier stackRequirements<requirements
-        Manipulator: 2 # Frontier stackRequirements<requirements
-      tagRequirements:
-        GlassBeaker:
-          amount: 2
-          defaultPrototype: Beaker
-
 - type: entity
   id: DeepFryerMachineCircuitboard
   parent: BaseMachineCircuitboard
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml
index bb610cba413..b0732457042 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml
@@ -11,7 +11,6 @@
     ResearchAndDevelopmentServerFlatpack: 4294967295 # Infinite
     ComputerResearchAndDevelopmentFlatpack: 4294967295 # Infinite
     BlueprintLithographFlatpack: 4294967295 # Infinite
-    ScienceTechFabFlatpack: 4294967295 # Infinite
     EngineeringTechFabFlatpack: 4294967295 # Infinite
     SalvageTechfabNFFlatpack: 4294967295 # Infinite
     ScrapProcessorFlatpack: 4294967295 # Infinite
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml
index 0a63a8e32ee..4e2e68ff8e3 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_general.yml
@@ -415,7 +415,6 @@
     prototypes:
     - CutterMachine
     - SalvageTechfabNF
-    - ScienceTechFab
     - ServiceTechFab
     - EngineeringTechFab
     - Autolathe
@@ -722,7 +721,6 @@
     - SurveillanceWirelessCameraMonitorCircuitboard
     # Boards
     - SalvageTechFabCircuitboardNF
-    - ScienceTechFabCircuitboard
     - ServiceTechFabCircuitboard
     - EngineeringTechFabCircuitboard
     - AmmoTechFabCircuitboard
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml
index fd7e2290907..cf4e39b2190 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_research.yml
@@ -247,7 +247,6 @@
     # Lathes
     - CircuitImprinterMachineCircuitboard
     - ExosuitFabricatorMachineCircuitboard
-    - ScienceTechFabCircuitboard
     - ProtolatheMachineCircuitboard
     - AutolatheMachineCircuitboard
     - FlatpackerMachineCircuitboard
@@ -288,7 +287,6 @@
     - MachineArtifactAnalyzerFlatpack
     - MachineAnomalyVesselFlatpack
     - MachineAPEFlatpack
-    - ScienceTechFabFlatpack
     - MachineArtifactCrusherFlatpack
     - ComputerResearchAndDevelopmentFlatpack
     - ResearchAndDevelopmentServerFlatpack
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml
index 12971234f6b..be4b998bb04 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml
@@ -250,15 +250,6 @@
     layers:
     - state: science_ape
 
-- type: entity
-  parent: ExosuitFabricatorFlatpack
-  id: ScienceTechFabFlatpack
-  name: science techfab flatpack
-  description: A flatpack used for constructing a science techfab.
-  components:
-  - type: Flatpack
-    entity: ScienceTechFab
-
 - type: entity
   parent: ExosuitFabricatorFlatpack
   id: MachineArtifactCrusherFlatpack
@@ -370,11 +361,13 @@
 - type: entity
   parent: UniformPrinterFlatpack
   id: HydroponicsSoilNutritionFlatpack
-  name: crate with fertile soil
-  description: A crate with fertile soil used for constructing a soil bed for growing.
+  name: crate of fertile soil
+  description: A crate of fertile soil used for constructing a soil bed for growing. Spread it around with a shovel.
   components:
   - type: Flatpack
     entity: HydroponicsSoilNutrition
+    qualityNeeded: Digging
+    unpackSound: /Audio/Items/shovel_dig.ogg
   - type: Sprite
     layers:
     - state: soil
@@ -382,11 +375,13 @@
 - type: entity
   parent: UniformPrinterFlatpack
   id: HydroponicsSoilEmptyFlatpack
-  name: crate with soil
-  description: A crate with soil used for constructing a soil bed for growing.
+  name: crate of soil
+  description: A crate of soil used for constructing a soil bed for growing. Spread it around with a shovel.
   components:
   - type: Flatpack
     entity: HydroponicsSoilEmpty
+    qualityNeeded: Digging
+    unpackSound: /Audio/Items/shovel_dig.ogg
   - type: Sprite
     layers:
     - state: soil
@@ -669,9 +664,12 @@
   components:
   - type: Flatpack
     entity: AirlockShuttle
+  - type: Sprite
+    layers:
+    - state: command_airlock_directional
 
 - type: entity
-  parent: AirlockFlatpack
+  parent: AirlockShuttleFlatpack
   id: AirlockGlassShuttleFlatpack
   name: docking glass airlock flatpack
   description: A flatpack used for constructing a glass docking airlock.
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/space_cash.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/space_cash.yml
index 64f182fc84e..d781c457008 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Misc/space_cash.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/space_cash.yml
@@ -61,17 +61,21 @@
     - cash_100
     - cash_500
     - cash_1000
-    - cash_5000 # Frontier: larger denominations
-    - cash_10000 # Frontier: larger denominations
-    - cash_25000 # Frontier: larger denominations
-    - cash_50000 # Frontier: larger denominations
-    - cash_100000 # Frontier: larger denominations
-    - cash_250000 # Frontier: larger denominations (cash_1000000<cash_250000)
-    layerFunction: Threshold # Frontier: multicolour cash
-  - type: StackLayerThreshold # Frontier
-    thresholds: [10, 100, 500, 1000, 5000, 10000, 25000, 50000, 100000, 250000] # Frontier
+    - cash_5000
+    - cash_10000
+    - cash_25000
+    - cash_50000
+    - cash_100000
+    - cash_250000
+    layerFunction: Threshold
+  - type: UserInterface
+    interfaces:
+      enum.StackCustomSplitUiKey.Key:
+        type: StackCustomSplitBoundUserInterface
+  - type: StackLayerThreshold
+    thresholds: [10, 100, 500, 1000, 5000, 10000, 25000, 50000, 100000, 250000]
   - type: Sprite
-    sprite: _NF/Objects/Economy/counterfeit_cash.rsi # Frontier: larger denominations
+    sprite: _NF/Objects/Economy/counterfeit_cash.rsi
     state: cash
     layers:
     - state: cash
@@ -95,13 +99,13 @@
   name: spesso
   unit: materials-unit-bill
   stackEntity: SpaceCashCounterfeit
-  icon: { sprite: _NF/Objects/Economy/counterfeit_cash.rsi, state: cash } # Frontier: use Frontier sprite set
+  icon: { sprite: _NF/Objects/Economy/counterfeit_cash.rsi, state: cash }
   price: 0
 
 - type: stack
   id: CreditCounterfeit
   name: spesso
-  icon: { sprite: _NF/Objects/Economy/counterfeit_cash.rsi, state: cash } # Frontier: use Frontier sprite set
+  icon: { sprite: _NF/Objects/Economy/counterfeit_cash.rsi, state: cash }
   spawn: SpaceCashCounterfeit
 
 - type: currency
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
index d6a9f857edb..b3f1f62616b 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -15,98 +15,6 @@
     containers:
     - blueprint
 
-- type: entity
-  parent: [ BlueprintReceiverBase, BaseLatheLube ]
-  id: ScienceTechFab
-  name: science techfab
-  description: Prints equipment for use by the epistemics department.
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Structures/Machines/techfab.rsi
-    layers:
-    - state: icon
-      map: ["enum.LatheVisualLayers.IsRunning"]
-    - state: sci
-    - state: unlit
-      shader: unshaded
-      map: ["enum.PowerDeviceVisualLayers.Powered"]
-    - state: inserting
-      map: ["enum.MaterialStorageVisualLayers.Inserting"]
-    - state: panel
-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: Machine
-    board: ScienceTechFabCircuitboard
-  - type: Lathe
-    idleState: icon
-    runningState: icon
-    staticRecipes:
-    # Shared lathe recipes
-    ## Basic tools
-      - Wirecutter
-      - Screwdriver
-      - Welder
-      - Wrench
-      - CrowbarGreen
-      - Multitool
-      - FlashlightLantern
-      - AppraisalTool
-      - HandLabeler
-      - Signaller
-      - ClothingMaskWeldingGas
-    ## Basic storage
-      - ToolboxArtisticNF
-      - ToolboxElectricalNF
-      - ToolboxMechanicalNF
-      - ToolboxEmergencyNF
-    ## Basic parts
-      - CableStack
-      - LightTube
-      - LedLightTube
-      - SodiumLightTube
-      - ExteriorLightTube
-      - LightBulb
-      - LedLightBulb
-      - ConveyorBeltAssembly
-      - PowerCellSmall
-      - PowerCellMedium
-    ## Basic electronics
-      - SignalTimerElectronics
-      - CellRechargerCircuitboard
-      - BorgChargerCircuitboard
-      - WeaponCapacitorRechargerCircuitboard
-      - AirTank
-    # Science techfab
-    ## Tools
-      - NodeScanner
-    dynamicRecipes:
-    # Shared lathe recipes
-    ## Advanced tools
-      - WelderExperimental
-      - JawsOfLife
-      - PowerDrill
-      - JetpackVoid
-      - PowerCellHigh
-      #- PowerCellHyperNF
-      - PowerCellMicroreactor
-      - BluespaceBeaker
-      - VialBluespace
-      - CryostasisBeaker
-      - ClothingBackpackHolding
-      - ClothingBackpackSatchelHolding
-      - ClothingBackpackDuffelHolding
-      - ClothingBackpackMessengerHolding
-      - ChemicalPayload
-      - Bucket
-      - MopItem
-      - SprayBottle
-      - FireExtinguisher
-      - CableStack
-      - CableMVStack
-      - CableHVStack
-      - ClothingOuterHardsuitBasic
-      - ClothingOuterHardsuitRd
-
 - type: entity
   parent: [ BlueprintReceiverBase, BaseLatheLube ]
   id: ServiceTechFab
diff --git a/Resources/Prototypes/_NF/PointsOfInterest/depots.yml b/Resources/Prototypes/_NF/PointsOfInterest/depots.yml
index 0b8eae5b82c..d6c3105327d 100644
--- a/Resources/Prototypes/_NF/PointsOfInterest/depots.yml
+++ b/Resources/Prototypes/_NF/PointsOfInterest/depots.yml
@@ -31,6 +31,7 @@
   name: Cargo Depot
   minimumDistance: 4500
   maximumDistance: 6000
+  spawnGamePreset: [ NFAdventure, NFPirate ]
   spawnGroup: CargoDepot
   gridPath: /Maps/_NF/POI/cargodepotalt.yml
   addComponents:
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/command_airlock_directional.png b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/command_airlock_directional.png
new file mode 100644
index 00000000000..49f01a01d36
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/command_airlock_directional.png differ
diff --git a/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/meta.json b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/meta.json
index f19ad0797f0..435f2645b5b 100644
--- a/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Devices/flatpack.rsi/meta.json
@@ -19,6 +19,9 @@
         {
             "name": "command_airlock"
         },
+        {
+            "name": "command_airlock_directional"
+        },
         {
             "name": "command_server"
         },
diff --git a/Resources/_NF/migration.yml b/Resources/_NF/migration.yml
index 08df7cb5dee..b64ad3579c4 100644
--- a/Resources/_NF/migration.yml
+++ b/Resources/_NF/migration.yml
@@ -176,3 +176,8 @@ VehicleJanicart: NFVehicleJanicart
 
 # 2024-12-22 Barrels 
 CrateSpaceCleaner: ChemicalBarrelSpaceCleaner
+
+# 2024-12-27 Useless
+ScienceTechFab: UnfinishedMachineFrame
+ScienceTechFabCircuitboard: ProtolatheMachineCircuitboard
+ScienceTechFabFlatpack: ProtolatheFlatpack