diff --git a/Content.Client/IconSmoothing/IconSmoothSystem.cs b/Content.Client/IconSmoothing/IconSmoothSystem.cs
index 2715805e758..d6afbc42cb4 100644
--- a/Content.Client/IconSmoothing/IconSmoothSystem.cs
+++ b/Content.Client/IconSmoothing/IconSmoothSystem.cs
@@ -81,21 +81,25 @@ public void SetStateBase(EntityUid uid, IconSmoothComponent component, string ne
 
         private void SetCornerLayers(SpriteComponent sprite, IconSmoothComponent component)
         {
-            sprite.LayerMapRemove(CornerLayers.SE);
-            sprite.LayerMapRemove(CornerLayers.NE);
-            sprite.LayerMapRemove(CornerLayers.NW);
-            sprite.LayerMapRemove(CornerLayers.SW);
-
+            // Frontier: Allow overlays on entities using CornerLayers smoothing - don't remove layers, adjust existing ones or create new ones.
             var state0 = $"{component.StateBase}0";
-            sprite.LayerMapSet(CornerLayers.SE, sprite.AddLayerState(state0));
-            sprite.LayerSetDirOffset(CornerLayers.SE, DirectionOffset.None);
-            sprite.LayerMapSet(CornerLayers.NE, sprite.AddLayerState(state0));
-            sprite.LayerSetDirOffset(CornerLayers.NE, DirectionOffset.CounterClockwise);
-            sprite.LayerMapSet(CornerLayers.NW, sprite.AddLayerState(state0));
-            sprite.LayerSetDirOffset(CornerLayers.NW, DirectionOffset.Flip);
-            sprite.LayerMapSet(CornerLayers.SW, sprite.AddLayerState(state0));
-            sprite.LayerSetDirOffset(CornerLayers.SW, DirectionOffset.Clockwise);
+            SetCornerLayerState(sprite, CornerLayers.SE, DirectionOffset.None, state0);
+            SetCornerLayerState(sprite, CornerLayers.NE, DirectionOffset.CounterClockwise, state0);
+            SetCornerLayerState(sprite, CornerLayers.NW, DirectionOffset.Flip, state0);
+            SetCornerLayerState(sprite, CornerLayers.SW, DirectionOffset.Clockwise, state0);
+            // End Frontier: Allow overlays on entities using CornerLayers smoothing - don't remove layers, adjust existing ones or create new ones.
+        }
+
+        // Frontier: set layer function to remove redundancy
+        private void SetCornerLayerState(SpriteComponent sprite, CornerLayers corner, DirectionOffset offset, string state)
+        {
+            if (sprite.LayerMapTryGet(corner, out var layer))
+                sprite.LayerSetState(layer, state);
+            else
+                sprite.LayerMapSet(corner, sprite.AddLayerState(state));
+            sprite.LayerSetDirOffset(corner, offset);
         }
+        // End Frontier: set layer function to remove redundancy
 
         private void OnShutdown(EntityUid uid, IconSmoothComponent component, ComponentShutdown args)
         {
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.IntegrationTests/PoolSettings.cs b/Content.IntegrationTests/PoolSettings.cs
index 187af4569f9..5cebda0bfa1 100644
--- a/Content.IntegrationTests/PoolSettings.cs
+++ b/Content.IntegrationTests/PoolSettings.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 
 using Robust.Shared.Random;
 
@@ -93,7 +93,7 @@ public sealed class PoolSettings
     /// <summary>
     /// Frontier: the preset to run the game in.
     /// Set to secret for upstream tests to mimic upstream behaviour.
-    /// If you need to check adventure game rule things, set this to Adventure.
+    /// If you need to check adventure game rule things, set this to nfadventure or nfpirate.
     /// </summary>
     public string GameLobbyDefaultPreset { get; set; } = "secret";
 
diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
index 0a69fdc71c7..4eda3dd8501 100644
--- a/Content.IntegrationTests/Tests/EntityTest.cs
+++ b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -351,7 +351,8 @@ public async Task AllComponentsOneToOneDeleteTest()
                 "DebrisFeaturePlacerController", // Above.
                 "LoadedChunk", // Worldgen chunk loading malding.
                 "BiomeSelection", // Whaddya know, requires config.
-                "ActivatableUI", // Requires enum key
+                "ActivatableUI", // Frontier: Requires enum key
+                "AlertLevel", // Frontier: requires alert set
             };
 
             // TODO TESTS
diff --git a/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs b/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs
index 3dd216c5dce..f604d810ffa 100644
--- a/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs
+++ b/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs
@@ -2,6 +2,7 @@
 using Content.Server.Station.Systems;
 using Content.Shared.AlertLevel;
 using Content.Shared.Power;
+using Content.Server._NF.SectorServices; // Frontier
 
 namespace Content.Server.AlertLevel;
 
@@ -9,6 +10,7 @@ public sealed class AlertLevelDisplaySystem : EntitySystem
 {
     [Dependency] private readonly StationSystem _stationSystem = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SectorServiceSystem _sectorService = default!; // Frontier
 
     public override void Initialize()
     {
@@ -30,8 +32,9 @@ private void OnDisplayInit(EntityUid uid, AlertLevelDisplayComponent alertLevelD
     {
         if (TryComp(uid, out AppearanceComponent? appearance))
         {
-            var stationUid = _stationSystem.GetOwningStation(uid);
-            if (stationUid != null && TryComp(stationUid, out AlertLevelComponent? alert))
+            //var stationUid = _stationSystem.GetOwningStation(uid); // Frontier: sector-wide alerts
+            var stationUid = _sectorService.GetServiceEntity(); // Frontier: sector-wide alerts
+            if (stationUid.Valid && TryComp(stationUid, out AlertLevelComponent? alert)) // Frontier: uid != null < uid.Valid
             {
                 _appearance.SetData(uid, AlertLevelDisplay.CurrentLevel, alert.CurrentLevel, appearance);
             }
diff --git a/Content.Server/AlertLevel/AlertLevelSystem.cs b/Content.Server/AlertLevel/AlertLevelSystem.cs
index 0b49d7e4bfa..71ad018603a 100644
--- a/Content.Server/AlertLevel/AlertLevelSystem.cs
+++ b/Content.Server/AlertLevel/AlertLevelSystem.cs
@@ -6,6 +6,9 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Configuration;
 using Robust.Shared.Prototypes;
+using Content.Server.GameTicking; // Frontier
+using Robust.Shared.Player; // Frontier
+using Content.Server._NF.SectorServices; // Frontier
 
 namespace Content.Server.AlertLevel;
 
@@ -16,13 +19,16 @@ public sealed class AlertLevelSystem : EntitySystem
     [Dependency] private readonly ChatSystem _chatSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly StationSystem _stationSystem = default!;
+    [Dependency] private readonly GameTicker _ticker = default!; // Frontier
+    [Dependency] private readonly SectorServiceSystem _sectorService = default!;
 
     // Until stations are a prototype, this is how it's going to have to be.
     public const string DefaultAlertLevelSet = "stationAlerts";
 
     public override void Initialize()
     {
-        SubscribeLocalEvent<StationInitializedEvent>(OnStationInitialize);
+        //SubscribeLocalEvent<StationInitializedEvent>(OnStationInitialize); // Frontier: sector-wide services
+        SubscribeLocalEvent<AlertLevelComponent, ComponentInit>(OnInit); // Frontier: sector-wide services
         SubscribeLocalEvent<PrototypesReloadedEventArgs>(OnPrototypeReload);
     }
 
@@ -46,6 +52,8 @@ public override void Update(float time)
         }
     }
 
+    // Frontier: sector-wide services
+    /*
     private void OnStationInitialize(StationInitializedEvent args)
     {
         if (!TryComp<AlertLevelComponent>(args.Station, out var alertLevelComponent))
@@ -66,6 +74,26 @@ private void OnStationInitialize(StationInitializedEvent args)
 
         SetLevel(args.Station, defaultLevel, false, false, true);
     }
+    */
+
+    private void OnInit(EntityUid uid, AlertLevelComponent comp, ComponentInit args)
+    {
+        if (!_prototypeManager.TryIndex(comp.AlertLevelPrototype, out AlertLevelPrototype? alerts))
+        {
+            return;
+        }
+
+        comp.AlertLevels = alerts;
+
+        var defaultLevel = comp.AlertLevels.DefaultLevel;
+        if (string.IsNullOrEmpty(defaultLevel))
+        {
+            defaultLevel = comp.AlertLevels.Levels.Keys.First();
+        }
+
+        SetLevel(uid, defaultLevel, false, false, true);
+    }
+    // End Frontier
 
     private void OnPrototypeReload(PrototypesReloadedEventArgs args)
     {
@@ -98,20 +126,30 @@ private void OnPrototypeReload(PrototypesReloadedEventArgs args)
 
     public string GetLevel(EntityUid station, AlertLevelComponent? alert = null)
     {
-        if (!Resolve(station, ref alert))
-        {
+        // Frontier: sector-wide alarms
+        if (!TryComp(_sectorService.GetServiceEntity(), out alert))
             return string.Empty;
-        }
+
+        // if (!Resolve(station, ref alert))
+        // {
+        //     return string.Empty;
+        // }
+        // End Frontier
 
         return alert.CurrentLevel;
     }
 
     public float GetAlertLevelDelay(EntityUid station, AlertLevelComponent? alert = null)
     {
-        if (!Resolve(station, ref alert))
-        {
+        // Frontier: sector-wide alarms
+        if (!TryComp(_sectorService.GetServiceEntity(), out alert))
             return float.NaN;
-        }
+
+        // if (!Resolve(station, ref alert))
+        // {
+        //     return float.NaN;
+        // }
+        // End Frontier
 
         return alert.CurrentDelay;
     }
@@ -128,8 +166,13 @@ public float GetAlertLevelDelay(EntityUid station, AlertLevelComponent? alert =
     public void SetLevel(EntityUid station, string level, bool playSound, bool announce, bool force = false,
         bool locked = false, MetaDataComponent? dataComponent = null, AlertLevelComponent? component = null)
     {
-        if (!Resolve(station, ref component, ref dataComponent)
-            || component.AlertLevels == null
+        // Frontier: sector-wide alerts
+        EntityUid sectorEnt = _sectorService.GetServiceEntity();
+        if (!TryComp<AlertLevelComponent>(sectorEnt, out component))
+            return;
+        // End Frontier
+
+        if (component.AlertLevels == null // Frontier: remove component, resolve station to data component later
             || !component.AlertLevels.Levels.TryGetValue(level, out var detail)
             || component.CurrentLevel == level)
         {
@@ -152,7 +195,7 @@ public void SetLevel(EntityUid station, string level, bool playSound, bool annou
         component.CurrentLevel = level;
         component.IsLevelLocked = locked;
 
-        var stationName = dataComponent.EntityName;
+        //var stationName = dataComponent.EntityName; // Frontier: remove station name
 
         var name = level.ToLower();
 
@@ -177,7 +220,9 @@ public void SetLevel(EntityUid station, string level, bool playSound, bool annou
         {
             if (detail.Sound != null)
             {
-                var filter = _stationSystem.GetInOwningStation(station);
+                //var filter = _stationSystem.GetInOwningStation(station); // Frontier: global alerts
+                var filter = Filter.Empty(); // Frontier
+                filter.AddInMap(_ticker.DefaultMap, EntityManager); // Frontier
                 _audio.PlayGlobal(detail.Sound, filter, true, detail.Sound.Params);
             }
             else
@@ -186,13 +231,14 @@ public void SetLevel(EntityUid station, string level, bool playSound, bool annou
             }
         }
 
-        if (announce)
+        if (announce && Resolve(station, ref dataComponent)) // Frontier: add Resolve for dataComponent
         {
+            var stationName = dataComponent.EntityName; // Frontier: moved down
             _chatSystem.DispatchStationAnnouncement(station, announcementFull, playDefaultSound: playDefault,
                 colorOverride: detail.Color, sender: stationName);
         }
 
-        RaiseLocalEvent(new AlertLevelChangedEvent(station, level));
+        RaiseLocalEvent(new AlertLevelChangedEvent(EntityUid.Invalid, level)); // Frontier: pass invalid, we have no station
     }
 }
 
diff --git a/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs b/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
index 405500442f7..e8648b12152 100644
--- a/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
+++ b/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Server._NF.SectorServices;
 using Content.Server.Administration;
 using Content.Server.Station.Systems;
 using Content.Shared.Administration;
@@ -21,11 +22,14 @@ public override CompletionResult GetCompletion(IConsoleShell shell, string[] arg
             var player = shell.Player;
             if (player?.AttachedEntity != null)
             {
-                var stationUid = _entitySystems.GetEntitySystem<StationSystem>().GetOwningStation(player.AttachedEntity.Value);
-                if (stationUid != null)
-                {
-                    levelNames = GetStationLevelNames(stationUid.Value);
-                }
+                // Frontier: sector-wide alerts
+                levelNames = GetSectorLevelNames();
+                // var stationUid = _entitySystems.GetEntitySystem<StationSystem>().GetOwningStation(player.AttachedEntity.Value);
+                // if (stationUid != null)
+                // {
+                //     levelNames = GetStationLevelNames(stationUid.Value);
+                // }
+                // End Frontier
             }
 
             return args.Length switch
@@ -68,7 +72,7 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
             }
 
             var level = args[0];
-            var levelNames = GetStationLevelNames(stationUid.Value);
+            var levelNames = GetSectorLevelNames();
             if (!levelNames.Contains(level))
             {
                 shell.WriteLine(LocalizationManager.GetString("cmd-setalertlevel-invalid-level"));
@@ -78,10 +82,12 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args)
             _entitySystems.GetEntitySystem<AlertLevelSystem>().SetLevel(stationUid.Value, level, true, true, true, locked);
         }
 
-        private string[] GetStationLevelNames(EntityUid station)
+        // Frontier: sector-wide alert level names
+        private string[] GetSectorLevelNames()
         {
+            var sectorServiceUid = _entitySystems.GetEntitySystem<SectorServiceSystem>().GetServiceEntity();
             var entityManager = IoCManager.Resolve<IEntityManager>();
-            if (!entityManager.TryGetComponent<AlertLevelComponent>(station, out var alertLevelComp))
+            if (!entityManager.TryGetComponent<AlertLevelComponent>(sectorServiceUid, out var alertLevelComp))
                 return new string[]{};
 
             if (alertLevelComp.AlertLevels == null)
@@ -89,5 +95,6 @@ private string[] GetStationLevelNames(EntityUid station)
 
             return alertLevelComp.AlertLevels.Levels.Keys.ToArray();
         }
+        // End Frontier
     }
 }
diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs
index 6c320edb23c..09c12e58703 100644
--- a/Content.Server/Communications/CommunicationsConsoleSystem.cs
+++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs
@@ -21,6 +21,7 @@
 using Content.Shared.Popups;
 using Robust.Server.GameObjects;
 using Robust.Shared.Configuration;
+using Content.Server._NF.SectorServices; // Frontier
 
 namespace Content.Server.Communications
 {
@@ -37,6 +38,7 @@ public sealed class CommunicationsConsoleSystem : EntitySystem
         [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
         [Dependency] private readonly IConfigurationManager _cfg = default!;
         [Dependency] private readonly IAdminLogManager _adminLogger = default!;
+        [Dependency] private readonly SectorServiceSystem _sectorService = default!; // Frontier: sector-wide alerts
 
         private const float UIUpdateInterval = 5.0f;
 
@@ -110,9 +112,9 @@ private void OnAlertLevelChanged(AlertLevelChangedEvent args)
             var query = EntityQueryEnumerator<CommunicationsConsoleComponent>();
             while (query.MoveNext(out var uid, out var comp))
             {
-                var entStation = _stationSystem.GetOwningStation(uid);
-                if (args.Station == entStation)
-                    UpdateCommsConsoleInterface(uid, comp);
+                // var entStation = _stationSystem.GetOwningStation(uid); // Frontier: sector-wide alerts
+                // if (args.Station == entStation) // Frontier: sector-wide alerts
+                UpdateCommsConsoleInterface(uid, comp);
             }
         }
 
@@ -133,14 +135,15 @@ public void UpdateCommsConsoleInterface()
         /// </summary>
         public void UpdateCommsConsoleInterface(EntityUid uid, CommunicationsConsoleComponent comp)
         {
-            var stationUid = _stationSystem.GetOwningStation(uid);
+            //var stationUid = _stationSystem.GetOwningStation(uid); // Frontier: sector-wide alerts
+            var stationUid = _sectorService.GetServiceEntity(); // Frontier: sector-wide alerts
             List<string>? levels = null;
             string currentLevel = default!;
             float currentDelay = 0;
 
-            if (stationUid != null)
+            if (stationUid.Valid) // Frontier: != null < .Valid
             {
-                if (TryComp(stationUid.Value, out AlertLevelComponent? alertComp) &&
+                if (TryComp(stationUid, out AlertLevelComponent? alertComp) && // Frontier: stationUid.Value<stationUid
                     alertComp.AlertLevels != null)
                 {
                     if (alertComp.IsSelectable)
@@ -156,7 +159,7 @@ public void UpdateCommsConsoleInterface(EntityUid uid, CommunicationsConsoleComp
                     }
 
                     currentLevel = alertComp.CurrentLevel;
-                    currentDelay = _alertLevelSystem.GetAlertLevelDelay(stationUid.Value, alertComp);
+                    currentDelay = _alertLevelSystem.GetAlertLevelDelay(stationUid, alertComp); // Frontier: stationUid.Value<stationUid
                 }
             }
 
diff --git a/Content.Server/Corvax/Respawn/RespawnSystem.cs b/Content.Server/Corvax/Respawn/RespawnSystem.cs
index 29563a3c6e9..6bd0d975c2e 100644
--- a/Content.Server/Corvax/Respawn/RespawnSystem.cs
+++ b/Content.Server/Corvax/Respawn/RespawnSystem.cs
@@ -12,8 +12,9 @@
 using Content.Server.CryoSleep; // Frontier
 using Robust.Shared.Player; // Frontier
 using Content.Shared.Ghost; // Frontier
-using Content.Server.Administration.Managers;
+using Content.Server.Administration.Managers; // Frontier
 using Content.Server.Administration; // Frontier
+using Content.Shared.GameTicking; // Frontier
 
 namespace Content.Server.Corvax.Respawn;
 
@@ -44,6 +45,7 @@ public override void Initialize()
         SubscribeLocalEvent<MindContainerComponent, MindRemovedMessage>(OnMindRemoved);
         SubscribeLocalEvent<MindContainerComponent, CryosleepBeforeMindRemovedEvent>(OnCryoBeforeMindRemoved);
         SubscribeLocalEvent<MindContainerComponent, CryosleepWakeUpEvent>(OnCryoWakeUp);
+        SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart); // Frontier
 
         _admin.OnPermsChanged += OnAdminPermsChanged; // Frontier
         _player.PlayerStatusChanged += PlayerStatusChanged; // Frontier
@@ -115,7 +117,7 @@ private void OnAdminPermsChanged(AdminPermsChangedEventArgs args)
         }
     }
 
-    // Frontier: respawn handler: adjusts 
+    // Frontier: respawn handler: adjusts respawn and cryo timers.
     public void Respawn(ICommonSession session)
     {
         var respawnData = GetRespawnData(session.UserId);
@@ -187,5 +189,11 @@ private void PlayerStatusChanged(object? _, SessionStatusEventArgs args)
             RaiseNetworkEvent(new RespawnResetEvent(_respawnInfo[session.UserId].RespawnTime), session);
         }
     }
+
+    // Frontier: reset game state, we have a new round.
+    private void OnRoundRestart(RoundRestartCleanupEvent ev)
+    {
+        _respawnInfo.Clear();
+    }
     // End Frontier
 }
diff --git a/Content.Server/EntityEffects/Effects/MakeSentient.cs b/Content.Server/EntityEffects/Effects/MakeSentient.cs
index a037ca4f225..cbca3e546f3 100644
--- a/Content.Server/EntityEffects/Effects/MakeSentient.cs
+++ b/Content.Server/EntityEffects/Effects/MakeSentient.cs
@@ -50,5 +50,6 @@ public override void Effect(EntityEffectBaseArgs args)
         var entityData = entityManager.GetComponent<MetaDataComponent>(uid);
         ghostRole.RoleName = entityData.EntityName;
         ghostRole.RoleDescription = Loc.GetString("ghost-role-information-cognizine-description");
+        ghostRole.RoleRules = Loc.GetString("ghost-role-information-freeagent-rules"); // Frontier
     }
 }
diff --git a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
index d41c72f3057..3222beecabb 100644
--- a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
+++ b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
@@ -255,6 +255,11 @@ private bool TryTwoWayAbsorbentRefillableTransfer(
             {
                 _popups.PopupEntity(Loc.GetString("mopping-system-full", ("used", target)), user, user);
             }
+            // Frontier: out-only refillable solutions
+            else if (TryComp<RefillableSolutionComponent>(refillableSoln.Owner, out var refillableSolnComp) && refillableSolnComp.PreventTransferOut)
+            {
+            }
+            // End Frontier
             else
             {
                 // transfer as much contaminants to refillable as will fit
diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.Transfers.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.Transfers.cs
index 04bbf55c581..aeffb41dbf5 100644
--- a/Content.Server/Fluids/EntitySystems/PuddleSystem.Transfers.cs
+++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.Transfers.cs
@@ -14,6 +14,11 @@ private void InitializeTransfers()
 
     private void OnRefillableDragged(Entity<RefillableSolutionComponent> entity, ref DragDropDraggedEvent args)
     {
+        // Frontier: silently prevent non-transferrable solution
+        if (entity.Comp.PreventTransferOut)
+            return;
+        // End Frontier
+
         if (!_solutionContainerSystem.TryGetSolution(entity.Owner, entity.Comp.Solution, out var soln, out var solution) || solution.Volume == FixedPoint2.Zero)
         {
             _popups.PopupEntity(Loc.GetString("mopping-system-empty", ("used", entity.Owner)), entity, args.User);
diff --git a/Content.Server/Gatherable/GatherableSystem.Projectile.cs b/Content.Server/Gatherable/GatherableSystem.Projectile.cs
index 3ab8872fd7d..df4c6122f4d 100644
--- a/Content.Server/Gatherable/GatherableSystem.Projectile.cs
+++ b/Content.Server/Gatherable/GatherableSystem.Projectile.cs
@@ -1,4 +1,5 @@
 using Content.Server.Gatherable.Components;
+using Content.Shared.Mining.Components;
 using Content.Shared.Projectiles;
 using Robust.Shared.Physics.Events;
 
@@ -21,6 +22,21 @@ private void OnProjectileCollide(Entity<GatheringProjectileComponent> gathering,
             return;
         }
 
+        // Frontier: gathering changes
+        // bad gatherer - not strong enough
+        if (_whitelistSystem.IsWhitelistFail(gatherable.ToolWhitelist, gathering.Owner))
+        {
+            QueueDel(gathering);
+            return;
+        }
+        // Too strong (e.g. overpen) - gathers ore but destroys it
+        if (TryComp<OreVeinComponent>(args.OtherEntity, out var oreVein)
+            && _whitelistSystem.IsWhitelistPass(oreVein.GatherDestructionWhitelist, gathering.Owner))
+        {
+            oreVein.PreventSpawning = true;
+        }
+        // End Frontier: gathering changes
+
         Gather(args.OtherEntity, gathering, gatherable);
         gathering.Comp.Amount--;
 
diff --git a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
index 6bd5750460a..633a027ef8f 100644
--- a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
@@ -11,6 +11,7 @@
 using Content.Shared.Station.Components;
 using Robust.Server.GameObjects;
 using Color = Robust.Shared.Maths.Color;
+using Content.Server._NF.SectorServices; // Frontier: sector services
 
 namespace Content.Server.Light.EntitySystems;
 
@@ -21,6 +22,7 @@ public sealed class EmergencyLightSystem : SharedEmergencyLightSystem
     [Dependency] private readonly PointLightSystem _pointLight = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly StationSystem _station = default!;
+    [Dependency] private readonly SectorServiceSystem _sectorService = default!; // Frontier: sector-wide alerts
 
     public override void Initialize()
     {
@@ -30,6 +32,8 @@ public override void Initialize()
         SubscribeLocalEvent<AlertLevelChangedEvent>(OnAlertLevelChanged);
         SubscribeLocalEvent<EmergencyLightComponent, ExaminedEvent>(OnEmergencyExamine);
         SubscribeLocalEvent<EmergencyLightComponent, PowerChangedEvent>(OnEmergencyPower);
+
+        SubscribeLocalEvent<EmergencyLightComponent, MapInitEvent>(OnMapInit); // Frontier
     }
 
     private void OnEmergencyPower(Entity<EmergencyLightComponent> entity, ref PowerChangedEvent args)
@@ -56,8 +60,10 @@ private void OnEmergencyExamine(EntityUid uid, EmergencyLightComponent component
                         Loc.GetString(component.BatteryStateText[component.State]))));
 
             // Show alert level on the light itself.
-            if (!TryComp<AlertLevelComponent>(_station.GetOwningStation(uid), out var alerts))
+            // Frontier: sector-wide alerts
+            if (!TryComp<AlertLevelComponent>(_sectorService.GetServiceEntity(), out var alerts))
                 return;
+            // End Frontier: sector-wide alerts
 
             if (alerts.AlertLevels == null)
                 return;
@@ -94,8 +100,12 @@ private void OnEmergencyLightEvent(EntityUid uid, EmergencyLightComponent compon
 
     private void OnAlertLevelChanged(AlertLevelChangedEvent ev)
     {
-        if (!TryComp<AlertLevelComponent>(ev.Station, out var alert))
+        // Frontier: sector-wide alerts
+        // if (!TryComp<AlertLevelComponent>(ev.Station, out var alert))
+        //     return;
+        if (!TryComp<AlertLevelComponent>(_sectorService.GetServiceEntity(), out var alert))
             return;
+        // End Frontier
 
         if (alert.AlertLevels == null || !alert.AlertLevels.Levels.TryGetValue(ev.AlertLevel, out var details))
             return;
@@ -103,8 +113,8 @@ private void OnAlertLevelChanged(AlertLevelChangedEvent ev)
         var query = EntityQueryEnumerator<EmergencyLightComponent, PointLightComponent, AppearanceComponent, TransformComponent>();
         while (query.MoveNext(out var uid, out var light, out var pointLight, out var appearance, out var xform))
         {
-            if (CompOrNull<StationMemberComponent>(xform.GridUid)?.Station != ev.Station)
-                continue;
+            // if (CompOrNull<StationMemberComponent>(xform.GridUid)?.Station != ev.Station) // Frontier: sector-wide alerts
+            //     continue; // Frontier: sector-wide alerts
 
             _pointLight.SetColor(uid, details.EmergencyLightColor, pointLight);
             _appearance.SetData(uid, EmergencyLightVisuals.Color, details.EmergencyLightColor, appearance);
@@ -237,4 +247,21 @@ private void TurnOn(Entity<EmergencyLightComponent> entity, Color color)
         _appearance.SetData(entity.Owner, EmergencyLightVisuals.On, true);
         _ambient.SetAmbience(entity.Owner, true);
     }
+
+    // Frontier: ensure the lights are accurate to the station
+    private void OnMapInit(Entity<EmergencyLightComponent> entity, ref MapInitEvent ev)
+    {
+        if (!TryComp<AlertLevelComponent>(_sectorService.GetServiceEntity(), out var alert))
+            return;
+
+        if (alert.AlertLevels == null || !alert.AlertLevels.Levels.TryGetValue(alert.CurrentLevel, out var details))
+            return;
+
+        entity.Comp.ForciblyEnabled = details.ForceEnableEmergencyLights;
+        if (details.ForceEnableEmergencyLights)
+            TurnOn(entity, details.EmergencyLightColor);
+        else
+            TurnOff(entity, details.EmergencyLightColor);
+    }
+    // End Frontier
 }
diff --git a/Content.Server/Mining/MiningSystem.cs b/Content.Server/Mining/MiningSystem.cs
index 18e96e57696..8f6bb6ca191 100644
--- a/Content.Server/Mining/MiningSystem.cs
+++ b/Content.Server/Mining/MiningSystem.cs
@@ -29,6 +29,11 @@ private void OnDestruction(EntityUid uid, OreVeinComponent component, Destructio
         if (component.CurrentOre == null)
             return;
 
+        // Frontier
+        if (component.PreventSpawning)
+            return;
+        // End Frontier
+
         var proto = _proto.Index<OrePrototype>(component.CurrentOre);
 
         if (proto.OreEntity == null)
diff --git a/Content.Server/PDA/PdaSystem.cs b/Content.Server/PDA/PdaSystem.cs
index 09e0fb0c073..4e77fccef94 100644
--- a/Content.Server/PDA/PdaSystem.cs
+++ b/Content.Server/PDA/PdaSystem.cs
@@ -25,6 +25,7 @@
 using Content.Shared.Bank.Components; // Frontier
 using Content.Shared.Shipyard.Components; // Frontier
 using Content.Server.Shipyard.Systems; // Frontier
+using Content.Server._NF.SectorServices; // Frontier
 
 namespace Content.Server.PDA
 {
@@ -39,6 +40,7 @@ public sealed class PdaSystem : SharedPdaSystem
         [Dependency] private readonly UserInterfaceSystem _ui = default!;
         [Dependency] private readonly UnpoweredFlashlightSystem _unpoweredFlashlight = default!;
         [Dependency] private readonly ContainerSystem _containerSystem = default!;
+        [Dependency] private readonly SectorServiceSystem _sectorService = default!;
 
         public override void Initialize()
         {
@@ -295,7 +297,8 @@ private void UpdateStationName(EntityUid uid, PdaComponent pda)
 
         private void UpdateAlertLevel(EntityUid uid, PdaComponent pda)
         {
-            var station = _station.GetOwningStation(uid);
+            //var station = _station.GetOwningStation(uid); // Frontier
+            var station = _sectorService.GetServiceEntity(); // Frontier
             if (!TryComp(station, out AlertLevelComponent? alertComp) ||
                 alertComp.AlertLevels == null)
                 return;
diff --git a/Content.Server/Power/Generator/GeneratorSystem.cs b/Content.Server/Power/Generator/GeneratorSystem.cs
index cbe454f69a9..111cf363636 100644
--- a/Content.Server/Power/Generator/GeneratorSystem.cs
+++ b/Content.Server/Power/Generator/GeneratorSystem.cs
@@ -68,21 +68,7 @@ private void OnEjectFuel(EntityUid uid, FuelGeneratorComponent component, Portab
 
     private void SolidEmpty(EntityUid uid, SolidFuelGeneratorAdapterComponent component, GeneratorEmpty args)
     {
-        // Frontier: eject fuel-grade material
-        if (component.EjectedFuelProtoId == null)
-            _materialStorage.EjectAllMaterial(uid);
-        else
-        {
-            int materialAmount = _materialStorage.GetMaterialAmount(uid, component.FuelMaterial);
-            if (materialAmount <= 0) // No fuel?  Job done.
-                return;
-            _materialStorage.TryChangeMaterialAmount(uid, component.FuelMaterial, -materialAmount);
-
-            var ejectedUid = Spawn(component.EjectedFuelProtoId, Transform(uid).Coordinates);
-            if (TryComp<PhysicalCompositionComponent>(ejectedUid, out var phys))
-                phys.MaterialComposition[component.FuelMaterial] = materialAmount;
-        }
-        // End Frontier
+        _materialStorage.EjectAllMaterial(uid);
     }
 
     private void ChemicalEmpty(Entity<ChemicalFuelGeneratorAdapterComponent> entity, ref GeneratorEmpty args)
diff --git a/Content.Server/Power/Generator/SolidFuelGeneratorAdapterComponent.cs b/Content.Server/Power/Generator/SolidFuelGeneratorAdapterComponent.cs
index 0274f8fe42a..ccb2210fa40 100644
--- a/Content.Server/Power/Generator/SolidFuelGeneratorAdapterComponent.cs
+++ b/Content.Server/Power/Generator/SolidFuelGeneratorAdapterComponent.cs
@@ -38,11 +38,4 @@ public sealed partial class SolidFuelGeneratorAdapterComponent : Component
     /// </summary>
     [DataField("multiplier"), ViewVariables(VVAccess.ReadWrite)]
     public float Multiplier;
-
-    /// <summary>
-    /// Frontier: entity to spawn for ejected fuel.  If null, will spawn material stacks as normal.
-    /// </summary>
-    [DataField(customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    [ViewVariables(VVAccess.ReadWrite)]
-    public string? EjectedFuelProtoId;
 }
diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
index 77a31074a62..42eec583f81 100644
--- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
@@ -18,6 +18,8 @@
 using Robust.Server.GameObjects; // Nuclear-14
 using Robust.Shared.Prototypes;
 using Content.Shared.Access.Systems; // Frontier
+using Content.Shared.Verbs; //Frontier
+using Robust.Shared.Utility; //Frontier
 
 namespace Content.Server.Radio.EntitySystems;
 
@@ -51,6 +53,7 @@ public override void Initialize()
         SubscribeLocalEvent<RadioMicrophoneComponent, ListenEvent>(OnListen);
         SubscribeLocalEvent<RadioMicrophoneComponent, ListenAttemptEvent>(OnAttemptListen);
         SubscribeLocalEvent<RadioMicrophoneComponent, PowerChangedEvent>(OnPowerChanged);
+        SubscribeLocalEvent<RadioMicrophoneComponent, GetVerbsEvent<AlternativeVerb>>(OnGetAltVerbs); // Frontier
 
         SubscribeLocalEvent<RadioSpeakerComponent, ComponentInit>(OnSpeakerInit);
         SubscribeLocalEvent<RadioSpeakerComponent, ActivateInWorldEvent>(OnActivateSpeaker);
@@ -366,6 +369,44 @@ private void UpdateHandheldRadioUi(Entity<RadioMicrophoneComponent> radio)
     #endregion
     // Nuclear-14-End
 
+    // Frontier Start
+    /// <summary>
+    ///     Adds an alt verb allowing for the mic to be toggled easily.
+    /// </summary>
+    private void OnGetAltVerbs(EntityUid uid, RadioMicrophoneComponent microphone, GetVerbsEvent<AlternativeVerb> args)
+    {
+        if (!args.CanInteract || !args.CanAccess)
+            return;
+
+        AlternativeVerb verb = new()
+        {
+            Text = Loc.GetString("handheld-radio-component-toggle"),
+            Icon = new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/VerbIcons/settings.svg.192dpi.png")),
+            Act = () => ToggleRadioOrIntercomMic(uid, microphone, args.User)
+        };
+        args.Verbs.Add(verb);
+    }
+
+    /// <summary>
+    ///     A mic toggle for both radios and intercoms.
+    /// </summary>
+    private void ToggleRadioOrIntercomMic(EntityUid uid, RadioMicrophoneComponent microphone, EntityUid user)
+    {
+        if (!_access.IsAllowed(user, uid))
+            return;
+        if (microphone.PowerRequired && !this.IsPowered(uid, EntityManager))
+            return;
+
+        ToggleRadioMicrophone(uid, user, false, microphone);
+        if (TryComp<IntercomComponent>(uid, out var intercom))
+        {
+            intercom.MicrophoneEnabled = microphone.Enabled;
+            Dirty<IntercomComponent>((uid, intercom));
+        }
+    }
+    // Frontier End
+
+
     // Frontier: init intercom with map
     private void OnMapInit(EntityUid uid, IntercomComponent ent, MapInitEvent args)
     {
diff --git a/Content.Server/RoundEnd/RoundEndSystem.cs b/Content.Server/RoundEnd/RoundEndSystem.cs
index bb5934f3f08..53433f523db 100644
--- a/Content.Server/RoundEnd/RoundEndSystem.cs
+++ b/Content.Server/RoundEnd/RoundEndSystem.cs
@@ -22,6 +22,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Timer = Robust.Shared.Timing.Timer;
+using Content.Server._NF.SectorServices; // Frontier
 
 namespace Content.Server.RoundEnd
 {
@@ -42,6 +43,7 @@ public sealed class RoundEndSystem : EntitySystem
         [Dependency] private readonly EmergencyShuttleSystem _shuttle = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly StationSystem _stationSystem = default!;
+        [Dependency] private readonly SectorServiceSystem _sectorService = default!; // Frontier: sector-wide alerts
 
         public TimeSpan DefaultCooldownDuration { get; set; } = TimeSpan.FromSeconds(30);
 
@@ -131,7 +133,8 @@ public void RequestRoundEnd(EntityUid? requester = null, bool checkCooldown = tr
 
             if (requester != null)
             {
-                var stationUid = _stationSystem.GetOwningStation(requester.Value);
+                var stationUid = _sectorService.GetServiceEntity(); // Frontier: sector-wide alerts
+                // var stationUid = _stationSystem.GetOwningStation(requester.Value); // Frontier: sector-wide alerts
                 if (TryComp<AlertLevelComponent>(stationUid, out var alertLevel))
                 {
                     duration = _protoManager
diff --git a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs
index 62d225badd7..923371f3b1e 100644
--- a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs
+++ b/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs
@@ -3,7 +3,6 @@
 using Content.Server.Radio.EntitySystems;
 using Content.Server._NF.Bank;
 using Content.Server.Shipyard.Components;
-using Content.Shared._NF.GameRule;
 using Content.Shared.Bank.Components;
 using Content.Shared.Shipyard.Events;
 using Content.Shared.Shipyard.BUI;
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/StationEvents/Events/AlertLevelInterceptionRule.cs b/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs
index 916d7d16883..150517374a2 100644
--- a/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs
+++ b/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs
@@ -15,6 +15,7 @@ protected override void Started(EntityUid uid, AlertLevelInterceptionRuleCompone
 
         if (!TryGetRandomStation(out var chosenStation))
             return;
+        // Frontier - note: levels are globally set/gotten, regardless of arg
         if (_alertLevelSystem.GetLevel(chosenStation.Value) != "green")
             return;
 
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/Components/AdventureRuleComponent.cs b/Content.Server/_NF/GameRule/Components/NFAdventureRuleComponent.cs
similarity index 58%
rename from Content.Server/_NF/GameRule/Components/AdventureRuleComponent.cs
rename to Content.Server/_NF/GameRule/Components/NFAdventureRuleComponent.cs
index fc85a5209c6..2ea4339bb70 100644
--- a/Content.Server/_NF/GameRule/Components/AdventureRuleComponent.cs
+++ b/Content.Server/_NF/GameRule/Components/NFAdventureRuleComponent.cs
@@ -1,10 +1,7 @@
-using Content.Shared.Procedural;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
-
 namespace Content.Server._NF.GameRule.Components;
 
-[RegisterComponent, Access(typeof(NfAdventureRuleSystem))]
-public sealed partial class AdventureRuleComponent : Component
+[RegisterComponent, Access(typeof(NFAdventureRuleSystem))]
+public sealed partial class NFAdventureRuleComponent : Component
 {
     public List<EntityUid> NFPlayerMinds = new();
     public List<EntityUid> CargoDepots = new();
diff --git a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs
index 5ee7e6e8b7a..176eb06ba81 100644
--- a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs
+++ b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs
@@ -1,57 +1,45 @@
 using System.Linq;
 using System.Net.Http;
-using System.Numerics;
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
-using Content.Shared._NF.GameRule;
+using Content.Server._NF.Bank;
+using Content.Server._NF.GameRule.Components;
 using Content.Server._NF.GameTicking.Events;
-using Robust.Server.GameObjects;
-using Robust.Server.Maps;
-using Content.Shared.GameTicking.Components;
-using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
-using Content.Server.Shuttles.Systems;
 using Content.Server.Cargo.Components;
 using Content.Server.GameTicking;
+using Content.Server.GameTicking.Presets;
 using Content.Server.GameTicking.Rules;
-using Content.Server.Maps;
-using Content.Server.Station.Systems;
-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 Content.Server.Warps;
+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;
 
 /// <summary>
 /// This handles the dungeon and trading post spawning, as well as round end capitalism summary
 /// </summary>
-public sealed class NfAdventureRuleSystem : GameRuleSystem<AdventureRuleComponent>
+public sealed class NFAdventureRuleSystem : GameRuleSystem<NFAdventureRuleComponent>
 {
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly IConfigurationManager _configurationManager = default!;
-    [Dependency] private readonly IPlayerManager _playerManager = default!;
-    [Dependency] private readonly MapLoaderSystem _map = default!;
-    [Dependency] private readonly MetaDataSystem _meta = default!;
-    [Dependency] private readonly StationSystem _station = default!;
-    [Dependency] private readonly ShuttleSystem _shuttle = default!;
-    [Dependency] private readonly PhysicsSystem _physics = 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 StationRenameWarpsSystems _renameWarps = 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
@@ -77,11 +65,6 @@ public PlayerRoundBankInformation(int startBalance, string name, NetUserId userI
     [ViewVariables]
     private Dictionary<EntityUid, PlayerRoundBankInformation> _players = new();
 
-    private float _distanceOffset = 1f;
-    private List<Vector2> _stationCoords = new();
-
-    private MapId _mapId;
-
     /// <inheritdoc/>
     public override void Initialize()
     {
@@ -89,10 +72,10 @@ 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, AdventureRuleComponent component, GameRuleComponent gameRule, ref RoundEndTextAppendEvent ev)
+    protected override void AppendRoundEndText(EntityUid uid, NFAdventureRuleComponent component, GameRuleComponent gameRule, ref RoundEndTextAppendEvent ev)
     {
         ev.AddLine(Loc.GetString("adventure-list-start"));
         var allScore = new List<Tuple<string, int>>();
@@ -206,12 +189,9 @@ private void OnRoundRestart(RoundRestartCleanupEvent ev)
         _players.Clear();
     }
 
-    protected override void Started(EntityUid uid, AdventureRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
+    protected override void Started(EntityUid uid, NFAdventureRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
     {
-        _mapId = GameTicker.DefaultMap;
-
-        _distanceOffset = _configurationManager.GetCVar(NFCCVars.POIDistanceModifier);
-        _stationCoords = new List<Vector2>();
+        var mapUid = GameTicker.DefaultMap;
 
         //First, we need to grab the list and sort it into its respective spawning logics
         List<PointOfInterestPrototype> depotProtos = new();
@@ -220,8 +200,14 @@ protected override void Started(EntityUid uid, AdventureRuleComponent component,
         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")
@@ -237,11 +223,11 @@ protected override void Started(EntityUid uid, AdventureRuleComponent component,
                 remainingUniqueProtosBySpawnGroup[location.SpawnGroup].Add(location);
             }
         }
-        GenerateDepots(depotProtos, out component.CargoDepots);
-        GenerateMarkets(marketProtos, out component.MarketStations);
-        GenerateRequireds(requiredProtos, out component.RequiredPois);
-        GenerateOptionals(optionalProtos, out component.OptionalPois);
-        GenerateUniques(remainingUniqueProtosBySpawnGroup, out component.UniquePois);
+        _poi.GenerateDepots(mapUid, depotProtos, out component.CargoDepots);
+        _poi.GenerateMarkets(mapUid, marketProtos, out component.MarketStations);
+        _poi.GenerateRequireds(mapUid, requiredProtos, out component.RequiredPois);
+        _poi.GenerateOptionals(mapUid, optionalProtos, out component.OptionalPois);
+        _poi.GenerateUniques(mapUid, remainingUniqueProtosBySpawnGroup, out component.UniquePois);
 
         base.Started(uid, component, gameRule, args);
 
@@ -249,227 +235,10 @@ protected override void Started(EntityUid uid, AdventureRuleComponent component,
         RaiseLocalEvent(EntityUid.Invalid, new StationsGeneratedEvent(), broadcast: true); // TODO: attach this to a meaningful entity.
     }
 
-    private void GenerateDepots(List<PointOfInterestPrototype> depotPrototypes, out List<EntityUid> depotStations)
-    {
-        //For depots, we want them to fill a circular type dystance formula to try to keep them as far apart as possible
-        //Therefore, we will be taking our range properties and treating them as magnitudes of a direction vector divided
-        //by the number of depots set in our corresponding cvar
-
-        depotStations = new List<EntityUid>();
-        var depotCount = _configurationManager.GetCVar(NFCCVars.CargoDepots);
-        var rotation = 2 * Math.PI / depotCount;
-        var rotationOffset = _random.NextAngle() / depotCount;
-
-        for (int i = 0; i < depotCount && depotPrototypes.Count > 0; i++)
-        {
-            var proto = _random.Pick(depotPrototypes);
-            Vector2i offset = new Vector2i((int) (_random.Next(proto.MinimumDistance, proto.MaximumDistance) * _distanceOffset), 0);
-            offset = offset.Rotate(rotationOffset);
-            rotationOffset += rotation;
-            // Append letter to depot name.
-
-            string overrideName = proto.Name;
-            if (i < 26)
-                overrideName += $" {(char) ('A' + i)}"; // " A" ... " Z"
-            else
-                overrideName += $" {i + 1}"; // " 27", " 28"...
-            if (TrySpawnPoiGrid(proto, offset, out var depotUid, overrideName: overrideName) && depotUid is { Valid: true } depot)
-            {
-                depotStations.Add(depot);
-                AddStationCoordsToSet(offset); // adjust list of actual station coords
-            }
-        }
-    }
-
-    private void GenerateMarkets(List<PointOfInterestPrototype> marketPrototypes, out List<EntityUid> marketStations)
-    {
-        //For market stations, we are going to allow for a bit of randomness and a different offset configuration. We dont
-        //want copies of this one, since these can be more themed and duplicate names, for instance, can make for a less
-        //ideal world
-
-        marketStations = new List<EntityUid>();
-        var marketCount = _configurationManager.GetCVar(NFCCVars.MarketStations);
-        _random.Shuffle(marketPrototypes);
-        int marketsAdded = 0;
-        foreach (var proto in marketPrototypes)
-        {
-            if (marketsAdded >= marketCount)
-                break;
-
-            var offset = GetRandomPOICoord(proto.MinimumDistance, proto.MaximumDistance, true);
-
-            if (TrySpawnPoiGrid(proto, offset, out var marketUid) && marketUid is { Valid: true } market)
-            {
-                marketStations.Add(market);
-                marketsAdded++;
-                AddStationCoordsToSet(offset);
-            }
-        }
-    }
-
-    private void GenerateOptionals(List<PointOfInterestPrototype> optionalPrototypes, out List<EntityUid> optionalStations)
-    {
-        //Stations that do not have a defined grouping in their prototype get a default of "Optional" and get put into the
-        //generic random rotation of POIs. This should include traditional places like Tinnia's rest, the Science Lab, The Pit,
-        //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);
-        _random.Shuffle(optionalPrototypes);
-        int optionalsAdded = 0;
-        foreach (var proto in optionalPrototypes)
-        {
-            if (optionalsAdded >= optionalCount)
-                break;
-
-            var offset = GetRandomPOICoord(proto.MinimumDistance, proto.MaximumDistance, true);
-
-            if (TrySpawnPoiGrid(proto, offset, out var optionalUid) && optionalUid is { Valid: true } uid)
-            {
-                optionalStations.Add(uid);
-                AddStationCoordsToSet(offset);
-            }
-        }
-    }
-
-    private void GenerateRequireds(List<PointOfInterestPrototype> requiredPrototypes, out List<EntityUid> requiredStations)
-    {
-        //Stations are required are ones that are vital to function but otherwise still follow a generic random spawn logic
-        //Traditionally these would be stations like Expedition Lodge, NFSD station, Prison/Courthouse POI, etc.
-        //There are no limit to these, and any prototype marked alwaysSpawn = true will get pulled out of any list that isnt Markets/Depots
-        //And will always appear every time, and also will not be included in other optional/dynamic lists
-
-        requiredStations = new List<EntityUid>();
-        foreach (var proto in requiredPrototypes)
-        {
-            var offset = GetRandomPOICoord(proto.MinimumDistance, proto.MaximumDistance, true);
-
-            if (TrySpawnPoiGrid(proto, offset, out var requiredUid) && requiredUid is { Valid: true } uid)
-            {
-                requiredStations.Add(uid);
-                AddStationCoordsToSet(offset);
-            }
-        }
-    }
-
-    private void GenerateUniques(Dictionary<string, List<PointOfInterestPrototype>> uniquePrototypes, out List<EntityUid> uniqueStations)
-    {
-        //Unique locations are semi-dynamic groupings of POIs that rely each independantly on the SpawnChance per POI prototype
-        //Since these are the remainder, and logically must have custom-designated groupings, we can then know to subdivide
-        //our random pool into these found groups.
-        //To do this with an equal distribution on a per-POI, per-round percentage basis, we are going to ensure a random
-        //pick order of which we analyze our weighted chances to spawn, and if successful, remove every entry of that group
-        //entirely.
-
-        uniqueStations = new List<EntityUid>();
-        foreach (var prototypeList in uniquePrototypes.Values)
-        {
-            // Try to spawn
-            _random.Shuffle(prototypeList);
-            foreach (var proto in prototypeList)
-            {
-                var chance = _random.NextFloat(0, 1);
-                if (chance <= proto.SpawnChance)
-                {
-                    var offset = GetRandomPOICoord(proto.MinimumDistance, proto.MaximumDistance, true);
-
-                    if (TrySpawnPoiGrid(proto, offset, out var optionalUid) && optionalUid is { Valid: true } uid)
-                    {
-                        uniqueStations.Add(uid);
-                        AddStationCoordsToSet(offset);
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    private bool TrySpawnPoiGrid(PointOfInterestPrototype proto, Vector2 offset, out EntityUid? gridUid, string? overrideName = null)
-    {
-        gridUid = null;
-        if (_map.TryLoad(_mapId, proto.GridPath.ToString(), out var mapUids,
-                new MapLoadOptions
-                {
-                    Offset = offset,
-                    Rotation = _random.NextAngle()
-                }))
-        {
-
-            string stationName = string.IsNullOrEmpty(overrideName) ? proto.Name : overrideName;
-
-            EntityUid? stationUid = null;
-            if (_prototypeManager.TryIndex<GameMapPrototype>(proto.ID, out var stationProto))
-            {
-                stationUid = _station.InitializeNewStation(stationProto.Stations[proto.ID], mapUids, stationName);
-            }
-
-            foreach (var grid in mapUids)
-            {
-                var meta = EnsureComp<MetaDataComponent>(grid);
-                _meta.SetEntityName(grid, stationName, meta);
-
-                EntityManager.AddComponents(grid, proto.AddComponents);
-            }
-
-            // Rename warp points after set up if needed
-            if (proto.NameWarp)
-            {
-                bool? hideWarp = proto.HideWarp ? true : null;
-                if (stationUid != null)
-                    _renameWarps.SyncWarpPointsToStation(stationUid.Value, forceAdminOnly: hideWarp);
-                else
-                    _renameWarps.SyncWarpPointsToGrids(mapUids, forceAdminOnly: hideWarp);
-            }
-
-            gridUid = mapUids[0];
-            return true;
-        }
-
-        return false;
-    }
-
-    private Vector2 GetRandomPOICoord(float unscaledMinRange, float unscaledMaxRange, bool scaleRange)
-    {
-        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
-
-        Vector2 coords = _random.NextVector2(unscaledMinRange, unscaledMaxRange);
-        if (scaleRange)
-            coords *= _distanceOffset;
-        for (int i = 0; i < numRetries; i++)
-        {
-            bool positionIsValid = true;
-            foreach (var station in _stationCoords)
-            {
-                if (Vector2.Distance(station, coords) < minDistance)
-                {
-                    positionIsValid = false;
-                    break;
-                }
-            }
-
-            // We have a valid position
-            if (positionIsValid)
-                break;
-
-            // No vector yet, get next value.
-            coords = _random.NextVector2(unscaledMinRange, unscaledMaxRange);
-            if (scaleRange)
-                coords *= _distanceOffset;
-        }
-
-        return coords;
-    }
-
-    private void AddStationCoordsToSet(Vector2 coords)
-    {
-        _stationCoords.Add(coords);
-    }
-
     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;
 
@@ -490,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.Shared/_NF/GameRule/PointOfInterestPrototype.cs b/Content.Server/_NF/GameRule/PointOfInterestPrototype.cs
similarity index 81%
rename from Content.Shared/_NF/GameRule/PointOfInterestPrototype.cs
rename to Content.Server/_NF/GameRule/PointOfInterestPrototype.cs
index b1b11cd5963..84baf23c519 100644
--- a/Content.Shared/_NF/GameRule/PointOfInterestPrototype.cs
+++ b/Content.Server/_NF/GameRule/PointOfInterestPrototype.cs
@@ -1,8 +1,8 @@
+using Content.Server.GameTicking.Presets;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 
-namespace Content.Shared._NF.GameRule;
+namespace Content.Server._NF.GameRule;
 
 /// <summary>
 ///     Describes information for a single point of interest to be spawned in the world
@@ -11,7 +11,6 @@ namespace Content.Shared._NF.GameRule;
 [Serializable]
 public sealed partial class PointOfInterestPrototype : IPrototype
 {
-    /// <inheritdoc/>
     [IdDataField]
     public string ID { get; private set; } = default!;
 
@@ -22,13 +21,13 @@ public sealed partial class PointOfInterestPrototype : IPrototype
     public string Name { get; private set; } = "";
 
     /// <summary>
-    /// Should we set the warppoint name based on the grid name.
+    ///     Should we set the warppoint name based on the grid name.
     /// </summary>
     [DataField]
     public bool NameWarp { get; set; } = true;
 
     /// <summary>
-    /// If true, makes the warp point admin-only (hiding it for players).
+    ///     If true, makes the warp point admin-only (hiding it for players).
     /// </summary>
     [DataField]
     public bool HideWarp { get; set; } = false;
@@ -46,11 +45,18 @@ public sealed partial class PointOfInterestPrototype : IPrototype
     public int MaximumDistance { get; private set; } = 10000;
 
     /// <summary>
-    /// Components to be added to any spawned grids.
+    ///     Components to be added to any spawned grids.
     /// </summary>
     [DataField]
     public ComponentRegistry AddComponents { get; set; } = new();
 
+    /// <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; } = [];
+
     /// <summary>
     ///     If the POI does not belong to a pre-defined group, it will default to the "unique" internal category and will
     ///     use this float from 0-1 as a raw chance to spawn each round.
diff --git a/Content.Server/_NF/GameRule/PointOfInterestSystem.cs b/Content.Server/_NF/GameRule/PointOfInterestSystem.cs
new file mode 100644
index 00000000000..f9a910027f9
--- /dev/null
+++ b/Content.Server/_NF/GameRule/PointOfInterestSystem.cs
@@ -0,0 +1,304 @@
+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;
+
+namespace Content.Server._NF.GameRule;
+
+/// <summary>
+/// This handles the dungeon and trading post spawning, as well as round end capitalism summary
+/// </summary>
+//[Access(typeof(NfAdventureRuleSystem))]
+public sealed class PointOfInterestSystem : EntitySystem
+{
+    [Dependency] private readonly IConfigurationManager _cfg = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly GameTicker _ticker = default!;
+    [Dependency] private readonly MapLoaderSystem _map = default!;
+    [Dependency] private readonly MetaDataSystem _meta = default!;
+    [Dependency] private readonly StationRenameWarpsSystems _renameWarps = default!;
+    [Dependency] private readonly StationSystem _station = default!;
+
+    private List<Vector2> _stationCoords = new();
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart);
+    }
+
+    private void OnRoundRestart(RoundRestartCleanupEvent ev)
+    {
+        _stationCoords.Clear();
+    }
+
+    private void AddStationCoordsToSet(Vector2 coords)
+    {
+        _stationCoords.Add(coords);
+    }
+
+    public void GenerateDepots(MapId mapUid, List<PointOfInterestPrototype> depotPrototypes, out List<EntityUid> depotStations)
+    {
+        //For depots, we want them to fill a circular type dystance formula to try to keep them as far apart as possible
+        //Therefore, we will be taking our range properties and treating them as magnitudes of a direction vector divided
+        //by the number of depots set in our corresponding cvar
+
+        depotStations = new List<EntityUid>();
+        var depotCount = _cfg.GetCVar(NFCCVars.CargoDepots);
+        var rotation = 2 * Math.PI / depotCount;
+        var rotationOffset = _random.NextAngle() / depotCount;
+
+        if (_ticker.CurrentPreset is null)
+            return;
+
+        var currentPreset = _ticker.CurrentPreset.ID;
+
+        for (int i = 0; i < depotCount && depotPrototypes.Count > 0; i++)
+        {
+            var proto = _random.Pick(depotPrototypes);
+
+            // 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);
+            offset = offset.Rotate(rotationOffset);
+            rotationOffset += rotation;
+            // Append letter to depot name.
+
+            string overrideName = proto.Name;
+            if (i < 26)
+                overrideName += $" {(char)('A' + i)}"; // " A" ... " Z"
+            else
+                overrideName += $" {i + 1}"; // " 27", " 28"...
+            if (TrySpawnPoiGrid(mapUid, proto, offset, out var depotUid, overrideName: overrideName) && depotUid is { Valid: true } depot)
+            {
+                depotStations.Add(depot);
+                AddStationCoordsToSet(offset); // adjust list of actual station coords
+            }
+        }
+    }
+
+    public void GenerateMarkets(MapId mapUid, List<PointOfInterestPrototype> marketPrototypes, out List<EntityUid> marketStations)
+    {
+        //For market stations, we are going to allow for a bit of randomness and a different offset configuration. We dont
+        //want copies of this one, since these can be more themed and duplicate names, for instance, can make for a less
+        //ideal world
+
+        marketStations = new List<EntityUid>();
+        var marketCount = _cfg.GetCVar(NFCCVars.MarketStations);
+        _random.Shuffle(marketPrototypes);
+        int marketsAdded = 0;
+
+        if (_ticker.CurrentPreset is null)
+            return;
+        var currentPreset = _ticker.CurrentPreset.ID;
+
+        foreach (var proto in marketPrototypes)
+        {
+            // 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)
+                break;
+
+            var offset = GetRandomPOICoord(proto.MinimumDistance, proto.MaximumDistance);
+
+            if (TrySpawnPoiGrid(mapUid, proto, offset, out var marketUid) && marketUid is { Valid: true } market)
+            {
+                marketStations.Add(market);
+                marketsAdded++;
+                AddStationCoordsToSet(offset);
+            }
+        }
+    }
+
+    public void GenerateOptionals(MapId mapUid, List<PointOfInterestPrototype> optionalPrototypes, out List<EntityUid> optionalStations)
+    {
+        //Stations that do not have a defined grouping in their prototype get a default of "Optional" and get put into the
+        //generic random rotation of POIs. This should include traditional places like Tinnia's rest, the Science Lab, The Pit,
+        //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 = _cfg.GetCVar(NFCCVars.OptionalStations);
+        _random.Shuffle(optionalPrototypes);
+        int optionalsAdded = 0;
+
+        if (_ticker.CurrentPreset is null)
+            return;
+        var currentPreset = _ticker.CurrentPreset.ID;
+
+        foreach (var proto in optionalPrototypes)
+        {
+            // 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)
+                break;
+
+            var offset = GetRandomPOICoord(proto.MinimumDistance, proto.MaximumDistance);
+
+            if (TrySpawnPoiGrid(mapUid, proto, offset, out var optionalUid) && optionalUid is { Valid: true } uid)
+            {
+                optionalStations.Add(uid);
+                AddStationCoordsToSet(offset);
+            }
+        }
+    }
+
+    public void GenerateRequireds(MapId mapUid, List<PointOfInterestPrototype> requiredPrototypes, out List<EntityUid> requiredStations)
+    {
+        //Stations are required are ones that are vital to function but otherwise still follow a generic random spawn logic
+        //Traditionally these would be stations like Expedition Lodge, NFSD station, Prison/Courthouse POI, etc.
+        //There are no limit to these, and any prototype marked alwaysSpawn = true will get pulled out of any list that isnt Markets/Depots
+        //And will always appear every time, and also will not be included in other optional/dynamic lists
+
+        requiredStations = new List<EntityUid>();
+
+        if (_ticker.CurrentPreset is null)
+            return;
+        var currentPreset = _ticker.CurrentPreset!.ID;
+
+        foreach (var proto in requiredPrototypes)
+        {
+            // 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);
+
+            if (TrySpawnPoiGrid(mapUid, proto, offset, out var requiredUid) && requiredUid is { Valid: true } uid)
+            {
+                requiredStations.Add(uid);
+                AddStationCoordsToSet(offset);
+            }
+        }
+    }
+
+    public void GenerateUniques(MapId mapUid, Dictionary<string, List<PointOfInterestPrototype>> uniquePrototypes, out List<EntityUid> uniqueStations)
+    {
+        //Unique locations are semi-dynamic groupings of POIs that rely each independantly on the SpawnChance per POI prototype
+        //Since these are the remainder, and logically must have custom-designated groupings, we can then know to subdivide
+        //our random pool into these found groups.
+        //To do this with an equal distribution on a per-POI, per-round percentage basis, we are going to ensure a random
+        //pick order of which we analyze our weighted chances to spawn, and if successful, remove every entry of that group
+        //entirely.
+
+        uniqueStations = new List<EntityUid>();
+
+        if (_ticker.CurrentPreset is null)
+            return;
+        var currentPreset = _ticker.CurrentPreset!.ID;
+
+        foreach (var prototypeList in uniquePrototypes.Values)
+        {
+            // Try to spawn
+            _random.Shuffle(prototypeList);
+            foreach (var proto in prototypeList)
+            {
+                // 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);
+                if (chance <= proto.SpawnChance)
+                {
+                    var offset = GetRandomPOICoord(proto.MinimumDistance, proto.MaximumDistance);
+
+                    if (TrySpawnPoiGrid(mapUid, proto, offset, out var optionalUid) && optionalUid is { Valid: true } uid)
+                    {
+                        uniqueStations.Add(uid);
+                        AddStationCoordsToSet(offset);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    private bool TrySpawnPoiGrid(MapId mapUid, PointOfInterestPrototype proto, Vector2 offset, out EntityUid? gridUid, string? overrideName = null)
+    {
+        gridUid = null;
+        if (_map.TryLoad(mapUid, proto.GridPath.ToString(), out var mapUids,
+                new MapLoadOptions
+                {
+                    Offset = offset,
+                    Rotation = _random.NextAngle()
+                }))
+        {
+
+            string stationName = string.IsNullOrEmpty(overrideName) ? proto.Name : overrideName;
+
+            EntityUid? stationUid = null;
+            if (_proto.TryIndex<GameMapPrototype>(proto.ID, out var stationProto))
+            {
+                stationUid = _station.InitializeNewStation(stationProto.Stations[proto.ID], mapUids, stationName);
+            }
+
+            foreach (var grid in mapUids)
+            {
+                var meta = EnsureComp<MetaDataComponent>(grid);
+                _meta.SetEntityName(grid, stationName, meta);
+
+                EntityManager.AddComponents(grid, proto.AddComponents);
+            }
+
+            // Rename warp points after set up if needed
+            if (proto.NameWarp)
+            {
+                bool? hideWarp = proto.HideWarp ? true : null;
+                if (stationUid != null)
+                    _renameWarps.SyncWarpPointsToStation(stationUid.Value, forceAdminOnly: hideWarp);
+                else
+                    _renameWarps.SyncWarpPointsToGrids(mapUids, forceAdminOnly: hideWarp);
+            }
+
+            gridUid = mapUids[0];
+            return true;
+        }
+
+        return false;
+    }
+
+    private Vector2 GetRandomPOICoord(float unscaledMinRange, float unscaledMaxRange)
+    {
+        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++)
+        {
+            bool positionIsValid = true;
+            foreach (var station in _stationCoords)
+            {
+                if (Vector2.Distance(station, coords) < minDistance)
+                {
+                    positionIsValid = false;
+                    break;
+                }
+            }
+
+            // We have a valid position
+            if (positionIsValid)
+                break;
+
+            // No vector yet, get next value.
+            coords = _random.NextVector2(unscaledMinRange, unscaledMaxRange);
+        }
+
+        return coords;
+    }
+}
diff --git a/Content.Server/_NF/Gatherable/Components/MiningGatheringHardComponent.cs b/Content.Server/_NF/Gatherable/Components/MiningGatheringHardComponent.cs
new file mode 100644
index 00000000000..56dc31e5d87
--- /dev/null
+++ b/Content.Server/_NF/Gatherable/Components/MiningGatheringHardComponent.cs
@@ -0,0 +1,7 @@
+namespace Content.Server._NF.Gatherable.Components;
+
+/// <summary>
+/// Component denotes an item can be used to gather from hard rocks.
+/// </summary>
+[RegisterComponent]
+public sealed partial class MiningGatheringHardComponent : Component;
diff --git a/Content.Server/_NF/Gatherable/Components/MiningGatheringSoftComponent.cs b/Content.Server/_NF/Gatherable/Components/MiningGatheringSoftComponent.cs
new file mode 100644
index 00000000000..ff66dedb73c
--- /dev/null
+++ b/Content.Server/_NF/Gatherable/Components/MiningGatheringSoftComponent.cs
@@ -0,0 +1,7 @@
+namespace Content.Server._NF.Gatherable.Components;
+
+/// <summary>
+/// Component denotes an item can be used to gather from softer rocks.
+/// </summary>
+[RegisterComponent]
+public sealed partial class MiningGatheringSoftComponent : Component;
diff --git a/Content.Server/_NF/Power/Generator/FuelGradeAdapterComponent.cs b/Content.Server/_NF/Power/Generator/FuelGradeAdapterComponent.cs
new file mode 100644
index 00000000000..e508025100b
--- /dev/null
+++ b/Content.Server/_NF/Power/Generator/FuelGradeAdapterComponent.cs
@@ -0,0 +1,14 @@
+using Content.Shared.Materials;
+using Robust.Shared.Prototypes; // Frontier
+
+namespace Content.Server._NF.Power.Generator;
+
+[RegisterComponent]
+public sealed partial class FuelGradeAdapterComponent : Component
+{
+    [DataField]
+    public ProtoId<MaterialPrototype> InputMaterial = "Plasma";
+
+    [DataField]
+    public ProtoId<MaterialPrototype> OutputMaterial = "FuelGradePlasma";
+}
diff --git a/Content.Server/_NF/Power/Generator/FuelGradeAdapterSystem.cs b/Content.Server/_NF/Power/Generator/FuelGradeAdapterSystem.cs
new file mode 100644
index 00000000000..2b8c4d1e8fa
--- /dev/null
+++ b/Content.Server/_NF/Power/Generator/FuelGradeAdapterSystem.cs
@@ -0,0 +1,31 @@
+using Content.Server.Materials;
+using Content.Shared.Materials;
+
+namespace Content.Server._NF.Power.Generator;
+
+public sealed class FuelGradeAdapterSystem : EntitySystem
+{
+    [Dependency] private readonly MaterialStorageSystem _materialStorage = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<FuelGradeAdapterComponent, MaterialEntityInsertedEvent>(OnMaterialEntityInserted);
+    }
+
+    public void OnMaterialEntityInserted(Entity<FuelGradeAdapterComponent> entity, ref MaterialEntityInsertedEvent args)
+    {
+        // Convert all of the input material in the material storage into output material
+        if (!TryComp<MaterialStorageComponent>(entity.Owner, out var materialStorage))
+            return;
+
+        var inputAmount = _materialStorage.GetMaterialAmount(entity.Owner, entity.Comp.InputMaterial, materialStorage);
+        if (inputAmount > 0)
+        {
+            _materialStorage.TryChangeMaterialAmount(entity.Owner, entity.Comp.InputMaterial, -inputAmount, materialStorage, dirty: false);
+            _materialStorage.TryChangeMaterialAmount(entity.Owner, entity.Comp.OutputMaterial, inputAmount, materialStorage, dirty: true);
+        }
+    }
+}
+
diff --git a/Content.Server/_NF/Smuggling/DeadDropSystem.cs b/Content.Server/_NF/Smuggling/DeadDropSystem.cs
index feed41ed4ff..6c658e2a661 100644
--- a/Content.Server/_NF/Smuggling/DeadDropSystem.cs
+++ b/Content.Server/_NF/Smuggling/DeadDropSystem.cs
@@ -590,15 +590,26 @@ private void SendDeadDrop(EntityUid uid, DeadDropComponent component, EntityUid
                         output = Loc.GetString(messageLoc, ("location", MetaData(sender).EntityName));
                         break;
                     case SmugglingReportMessageType.DeadDropStationWithRandomAlt:
+                        var actualStationName = MetaData(sender).EntityName;
                         if (sectorDeadDrop is not null)
                         {
-                            string[] names = [MetaData(sender).EntityName, _random.Pick<string>(sectorDeadDrop.DeadDropStationNames.Values)];
-                            _random.Shuffle(names);
-                            output = Loc.GetString(messageLoc, ("location1", names[0]), ("location2", names[1]));
+                            var otherStationList = sectorDeadDrop.DeadDropStationNames.Values.Where(x => x != actualStationName).ToList();
+                            if (otherStationList.Count > 0)
+                            {
+                                string[] names = [actualStationName, _random.Pick<string>(otherStationList)];
+                                _random.Shuffle(names);
+                                output = Loc.GetString(messageLoc, ("location1", names[0]), ("location2", names[1]));
+                            }
+                            else
+                            {
+                                // No valid alternate, just output where the dead drop is
+                                output = Loc.GetString(messageLoc, ("location1", actualStationName));
+                            }
                         }
                         else
                         {
-                            output = Loc.GetString(messageLoc, ("location1", MetaData(sender).EntityName)); // Looks strange, but still has a proper value.
+                            // No valid alternate, just output where the dead drop is
+                            output = Loc.GetString(messageLoc, ("location1", actualStationName));
                         }
                         break;
                     case SmugglingReportMessageType.PodLocation:
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
index 6427dbbf734..790b77e1d11 100644
--- a/Content.Shared/CCVar/CCVars.cs
+++ b/Content.Shared/CCVar/CCVars.cs
@@ -163,7 +163,7 @@ public static readonly CVarDef<bool>
         ///     Controls the default game preset.
         /// </summary>
         public static readonly CVarDef<string>
-            GameLobbyDefaultPreset = CVarDef.Create("game.defaultpreset", "adventure", CVar.ARCHIVE); // Frontier: secret<adventure
+            GameLobbyDefaultPreset = CVarDef.Create("game.defaultpreset", "nfpirate", CVar.ARCHIVE); // Frontier: secret<nfpirate
 
         /// <summary>
         ///     Controls if the game can force a different preset if the current preset's criteria are not met.
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/Chemistry/Components/RefillableSolutionComponent.cs b/Content.Shared/Chemistry/Components/RefillableSolutionComponent.cs
index 245b7398a7e..47637de05cc 100644
--- a/Content.Shared/Chemistry/Components/RefillableSolutionComponent.cs
+++ b/Content.Shared/Chemistry/Components/RefillableSolutionComponent.cs
@@ -22,4 +22,10 @@ public sealed partial class RefillableSolutionComponent : Component
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public FixedPoint2? MaxRefill = null;
+
+    /// <summary>
+    /// Frontier: prevent transferring solution out into others
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public bool PreventTransferOut = false;
 }
diff --git a/Content.Shared/Clothing/EntitySystems/FactionClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/FactionClothingSystem.cs
index cbc7cf724ca..39b94804028 100644
--- a/Content.Shared/Clothing/EntitySystems/FactionClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/FactionClothingSystem.cs
@@ -3,6 +3,10 @@
 using Content.Shared.NPC.Components;
 using Content.Shared.NPC.Systems;
 using Robust.Shared.Player; // Frontier - Dont edit AI factions
+using Content.Shared.Inventory; // Frontier
+using Content.Shared.NPC.Prototypes; // Frontier
+using Robust.Shared.Prototypes; // Frontier
+using Content.Shared.Mind.Components; // Frontier
 
 namespace Content.Shared.Clothing.EntitySystems;
 
@@ -12,6 +16,7 @@ namespace Content.Shared.Clothing.EntitySystems;
 public sealed class FactionClothingSystem : EntitySystem
 {
     [Dependency] private readonly NpcFactionSystem _faction = default!;
+    [Dependency] private readonly InventorySystem _inventory = default!; // Frontier
 
     public override void Initialize()
     {
@@ -19,31 +24,98 @@ public override void Initialize()
 
         SubscribeLocalEvent<FactionClothingComponent, GotEquippedEvent>(OnEquipped);
         SubscribeLocalEvent<FactionClothingComponent, GotUnequippedEvent>(OnUnequipped);
+        SubscribeLocalEvent<NpcFactionMemberComponent, PlayerAttachedEvent>(OnPlayerAttached); // Frontier
+        SubscribeLocalEvent<NpcFactionMemberComponent, PlayerDetachedEvent>(OnPlayerDetached); // Frontier
     }
 
+    // Frontier: rewritten from scratch
     private void OnEquipped(Entity<FactionClothingComponent> ent, ref GotEquippedEvent args)
     {
-        if (!HasComp<ActorComponent>(args.Equipee)) // Frontier - Dont edit AI factions
-            return; // Frontier - Dont edit AI factions
+        var alreadyMember = CheckEntityEquipmentForFaction(args.Equipee, ent.Comp.Faction, args.Equipment);
+        if (alreadyMember is null)
+        {
+            TryComp<NpcFactionMemberComponent>(args.Equipee, out var factionComp);
+            var faction = (args.Equipee, factionComp);
+            ent.Comp.AlreadyMember = _faction.IsMember(faction, ent.Comp.Faction);
 
-        TryComp<NpcFactionMemberComponent>(args.Equipee, out var factionComp);
-        var faction = (args.Equipee, factionComp);
-        ent.Comp.AlreadyMember = _faction.IsMember(faction, ent.Comp.Faction);
+            // Do not edit factions on AI controlled mobs
+            if (!HasComp<ActorComponent>(args.Equipee))
+                return;
 
-        _faction.AddFaction(faction, ent.Comp.Faction);
+            if (!ent.Comp.AlreadyMember)
+                _faction.AddFaction(faction, ent.Comp.Faction);
+        }
+        else
+        {
+            ent.Comp.AlreadyMember = alreadyMember.Value;
+        }
     }
 
     private void OnUnequipped(Entity<FactionClothingComponent> ent, ref GotUnequippedEvent args)
     {
-        if (!HasComp<ActorComponent>(args.Equipee)) // Frontier - Dont edit AI factions
-            return; // Frontier - Dont edit AI factions
-
+        // Reset the component, should be false when unworn.
         if (ent.Comp.AlreadyMember)
         {
             ent.Comp.AlreadyMember = false;
             return;
         }
 
-        _faction.RemoveFaction(args.Equipee, ent.Comp.Faction);
+        // Do not edit factions on AI controlled mobs
+        if (!HasComp<ActorComponent>(args.Equipee))
+            return;
+
+        var alreadyMember = CheckEntityEquipmentForFaction(args.Equipee, ent.Comp.Faction, args.Equipment);
+        if (alreadyMember is null)
+        {
+            _faction.RemoveFaction(args.Equipee, ent.Comp.Faction);
+        }
+    }
+
+    public bool? CheckEntityEquipmentForFaction(EntityUid ent, ProtoId<NpcFactionPrototype> prototype, EntityUid? skipEnt = null)
+    {
+        var enumerator = _inventory.GetSlotEnumerator(ent);
+        while (enumerator.NextItem(out var item))
+        {
+            if (!TryComp<FactionClothingComponent>(item, out var faction))
+                continue;
+            if (faction.Faction == prototype && item != skipEnt)
+                return faction.AlreadyMember;
+        }
+        return null;
+    }
+
+    private void OnPlayerAttached(Entity<NpcFactionMemberComponent> ent, ref PlayerAttachedEvent args)
+    {
+        // Iterate through all items, add factions for any items found where AlreadyMember is false
+        List<ProtoId<NpcFactionPrototype>> factions = new();
+        var enumerator = _inventory.GetSlotEnumerator(ent.Owner);
+        while (enumerator.NextItem(out var item))
+        {
+            if (!TryComp<FactionClothingComponent>(item, out var faction))
+                continue;
+            if (!faction.AlreadyMember && !factions.Contains(faction.Faction))
+            {
+                _faction.AddFaction((ent.Owner, ent.Comp), faction.Faction);
+                factions.Add(faction.Faction);
+            }
+        }
+    }
+
+    private void OnPlayerDetached(Entity<NpcFactionMemberComponent> ent, ref PlayerDetachedEvent args)
+    {
+        // Iterate through all items, remove factions for any items found where AlreadyMember is true
+        List<ProtoId<NpcFactionPrototype>> factions = new();
+        var enumerator = _inventory.GetSlotEnumerator(ent.Owner);
+        while (enumerator.NextItem(out var item))
+        {
+            if (!TryComp<FactionClothingComponent>(item, out var faction))
+                continue;
+            if (!faction.AlreadyMember && !factions.Contains(faction.Faction))
+            {
+                _faction.RemoveFaction((ent.Owner, ent.Comp), faction.Faction);
+                factions.Add(faction.Faction);
+            }
+        }
     }
+    // End Frontier
 }
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/Fluids/SharedPuddleSystem.cs b/Content.Shared/Fluids/SharedPuddleSystem.cs
index f573c042c55..edd18c5ddb4 100644
--- a/Content.Shared/Fluids/SharedPuddleSystem.cs
+++ b/Content.Shared/Fluids/SharedPuddleSystem.cs
@@ -55,7 +55,7 @@ private void OnDumpCanDropTarget(Entity<DumpableSolutionComponent> entity, ref C
 
     private void OnDrainCanDropTarget(Entity<DrainableSolutionComponent> entity, ref CanDropTargetEvent args)
     {
-        if (HasComp<RefillableSolutionComponent>(args.Dragged))
+        if (TryComp<RefillableSolutionComponent>(args.Dragged, out var refillable) && !refillable.PreventTransferOut) // Frontier: HasComp<TryComp, add PreventTransferOut check
         {
             args.CanDrop = true;
             args.Handled = true;
@@ -66,6 +66,8 @@ private void OnRefillableCanDropDragged(Entity<RefillableSolutionComponent> enti
     {
         if (!HasComp<DrainableSolutionComponent>(args.Target) && !HasComp<DumpableSolutionComponent>(args.Target))
             return;
+        if (entity.Comp.PreventTransferOut) // Frontier
+            return; // Frontier
 
         args.CanDrop = true;
         args.Handled = true;
diff --git a/Content.Shared/Mining/Components/OreVeinComponent.cs b/Content.Shared/Mining/Components/OreVeinComponent.cs
index 6ee40a624ec..a26ceaf8915 100644
--- a/Content.Shared/Mining/Components/OreVeinComponent.cs
+++ b/Content.Shared/Mining/Components/OreVeinComponent.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Random;
 using Robust.Shared.Prototypes;
+using Content.Shared.Whitelist; // Frontier
 
 namespace Content.Shared.Mining.Components;
 
@@ -28,4 +29,16 @@ public sealed partial class OreVeinComponent : Component
     /// </summary>
     [DataField]
     public ProtoId<OrePrototype>? CurrentOre;
+
+    /// <summary>
+    /// Frontier: if this ore is somehow "ruined", set this to true before destroying the entity.
+    /// </summary>
+    [DataField]
+    public bool PreventSpawning;
+
+    /// <summary>
+    /// Frontier: whitelist to check when gathering materials - these entities are too strong and ruin the ore.
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? GatherDestructionWhitelist;
 }
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/Weapons/Reflect/ReflectComponent.cs b/Content.Shared/Weapons/Reflect/ReflectComponent.cs
index ee35f4dbb1f..8418c1f3efb 100644
--- a/Content.Shared/Weapons/Reflect/ReflectComponent.cs
+++ b/Content.Shared/Weapons/Reflect/ReflectComponent.cs
@@ -14,7 +14,7 @@ public sealed partial class ReflectComponent : Component
     /// What we reflect.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField("reflects")]
-    public ReflectType Reflects = ReflectType.Energy | ReflectType.NonEnergy | ReflectType.ShuttleKinetic; // Frontier: added ShuttleKinetic
+    public ReflectType Reflects = ReflectType.Energy | ReflectType.NonEnergy;
 
     /// <summary>
     /// Probability for a projectile to be reflected.
@@ -35,5 +35,4 @@ public enum ReflectType : byte
     None = 0,
     NonEnergy = 1 << 0,
     Energy = 1 << 1,
-    ShuttleKinetic = 1 << 7, //Frontier: PTK-800
 }
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/Audio/_NF/Items/Gavel/attributions.yml b/Resources/Audio/_NF/Items/Gavel/attributions.yml
new file mode 100644
index 00000000000..40567c28c71
--- /dev/null
+++ b/Resources/Audio/_NF/Items/Gavel/attributions.yml
@@ -0,0 +1,4 @@
+- files: ["gavel1.ogg", "gavel2.ogg", "gavel3.ogg", "gavel4.ogg"]
+  license: "CC-BY-3.0"
+  copyright: "craigsmith (FreeSound), released under CC-0"
+  source: "https://freesound.org/people/craigsmith/sounds/675979/"
diff --git a/Resources/Audio/_NF/Items/Gavel/gavel1.ogg b/Resources/Audio/_NF/Items/Gavel/gavel1.ogg
new file mode 100644
index 00000000000..f1f9d5e2867
Binary files /dev/null and b/Resources/Audio/_NF/Items/Gavel/gavel1.ogg differ
diff --git a/Resources/Audio/_NF/Items/Gavel/gavel2.ogg b/Resources/Audio/_NF/Items/Gavel/gavel2.ogg
new file mode 100644
index 00000000000..80e9793baba
Binary files /dev/null and b/Resources/Audio/_NF/Items/Gavel/gavel2.ogg differ
diff --git a/Resources/Audio/_NF/Items/Gavel/gavel3.ogg b/Resources/Audio/_NF/Items/Gavel/gavel3.ogg
new file mode 100644
index 00000000000..ce6621ad43f
Binary files /dev/null and b/Resources/Audio/_NF/Items/Gavel/gavel3.ogg differ
diff --git a/Resources/Audio/_NF/Items/Gavel/gavel4.ogg b/Resources/Audio/_NF/Items/Gavel/gavel4.ogg
new file mode 100644
index 00000000000..8dfdd145dbb
Binary files /dev/null and b/Resources/Audio/_NF/Items/Gavel/gavel4.ogg differ
diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index 00d8693cc57..7b8d21ceb44 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -5915,3 +5915,210 @@ Entries:
       message: Blue wrecks should now have more interesting loot.
   id: 5586
   time: '2024-12-14T22:31:21.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Fix
+      message: >-
+        Deconstructing a portable generator with fuel now returns fuel-grade
+        material.
+    - type: Add
+      message: Fuel-grade materials now have sprites from GhostPrince.
+  id: 5587
+  time: '2024-12-15T09:42:28.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: >-
+        Wassail is now craftable by bartenders. Check your guidebook for a
+        recipe.
+  id: 5588
+  time: '2024-12-15T13:11:51.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Tweak
+      message: >-
+        Slight adjustments to Salicylic Acid recipe, additional recipe for
+        Aloxadone and 2 point buff to Aloxadone caustic damage heal.
+  id: 5589
+  time: '2024-12-15T13:12:59.0000000+00:00'
+- author: Leander
+  changes:
+    - type: Tweak
+      message: Cognizined creatures will show more unpredictable behavior.
+  id: 5590
+  time: '2024-12-15T13:13:11.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Tweak
+      message: >-
+        Adjust base plastic cost for jugs in the medical techfab from 4 to 2
+        sheets.
+  id: 5591
+  time: '2024-12-15T14:42:26.0000000+00:00'
+- author: Tych0theSynth
+  changes:
+    - type: Fix
+      message: Fixed a disabled thruster on the Spectre.
+  id: 5592
+  time: '2024-12-15T14:48:51.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Fix
+      message: Respawn timers are reset on a new round.
+  id: 5593
+  time: '2024-12-17T13:47:19.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Fix
+      message: Fixed issues with missing department localization strings.
+  id: 5594
+  time: '2024-12-17T19:51:37.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Added a shuttle map to the Charon guidebook page.
+  id: 5595
+  time: '2024-12-17T21:36:54.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Add
+      message: Eggnog is now craftable by chefs and bartenders.
+  id: 5596
+  time: '2024-12-18T16:50:26.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: Hostile faction bosses can now be encountered on VGroids.
+  id: 5597
+  time: '2024-12-18T19:00:32.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Fix
+      message: >-
+        Faction-associated items of clothing should be properly tracked, the
+        CDET should only attack players wearing contraband.
+  id: 5598
+  time: '2024-12-20T17:28:19.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: >-
+        Added the blood cult cat ghost role (for players to pledge their
+        allegiance to).
+  id: 5599
+  time: '2024-12-20T18:08:59.0000000+00:00'
+- author: whatston3 and leonardo-dabepis
+  changes:
+    - type: Add
+      message: Added a gavel, gavel block, powdered wig to the courthouse.
+    - type: Tweak
+      message: Remodeled the Courthouse slightly.
+  id: 5600
+  time: '2024-12-20T18:11:32.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Fix
+      message: Removed duplicate location hints from NFSD radio callouts.
+  id: 5601
+  time: '2024-12-20T18:16:13.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Fix
+      message: >-
+        Reagents in food solutions cannot be transferred out, e.g. into a
+        ChemMaster.
+  id: 5602
+  time: '2024-12-20T22:55:17.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Adds a pair of plushies from Lvl 1 Eevee
+  id: 5603
+  time: '2024-12-21T00:50:56.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Tweak
+      message: Alert levels are now sector-wide, with appropriate announcements.
+  id: 5604
+  time: '2024-12-21T01:12:26.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Fix
+      message: Emergency lights start in their appropriate state when built.
+  id: 5605
+  time: '2024-12-21T20:28:31.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Remove
+      message: >-
+        majority of chemistry jugs removed from sale, to be replaced with new
+        barrels.
+  id: 5606
+  time: '2024-12-21T23:05:32.0000000+00:00'
+- author: dvir001
+  changes:
+    - type: Add
+      message: >-
+        Added barrels of chems, oil, water, fuel, booze, etc. to wrecks, rare
+        chems to cargo.
+    - type: Tweak
+      message: The ChefVend now contains one jar of each oil.
+  id: 5607
+  time: '2024-12-21T23:06:11.0000000+00:00'
+- author: chrome-cirrus
+  changes:
+    - type: Tweak
+      message: >-
+        Add slots to the Janicart vehicle to give it feature parity with the
+        janitor trolley and make things more convenient for practicioners of the
+        janitorial arts
+    - type: Add
+      message: Research target that unlocks crafting of Janicart flatpacks
+    - type: Remove
+      message: Janicart crates no longer purchaseable at cargo
+  id: 5608
+  time: '2024-12-24T22:38:28.0000000+00:00'
+- author: Alkheemist
+  changes:
+    - type: Tweak
+      message: Handicomm mics can now be toggled with an alt-click
+  id: 5609
+  time: '2024-12-24T22:48:18.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Tweak
+      message: >-
+        Walls on asteroids can now contain ore denser than regular rocks and
+        require diamond drills, a holopickaxe, or a PTK to mine.
+    - type: Tweak
+      message: >-
+        PTK bolts destroy ore in softer rock, but "walls" no longer reflect
+        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/_NF/adventure/adventure.ftl b/Resources/Locale/en-US/_NF/adventure/adventure.ftl
index 3e1a1268163..9ee3991db5d 100644
--- a/Resources/Locale/en-US/_NF/adventure/adventure.ftl
+++ b/Resources/Locale/en-US/_NF/adventure/adventure.ftl
@@ -11,8 +11,12 @@ adventure-webhook-top-loss = lost a total of {$amount}.
 
 adventure-webhook-ledger-start = Ledger Summary
 
-adventure-title = New Frontier Adventure Mode
-adventure-description = Join a ship crew or buy your own and explore, research, salvage, or haul your way to riches!
+nf-adventure-title = Adventure
+nf-adventure-description = Join a ship crew or buy your own and explore, research, salvage, or haul your way to riches!
+
+nf-pirate-title = Pirates
+nf-pirate-description = A gang of pirates is on the loose! Take care out in space and try not to get plundered!
+
 currency = Spesos
 
 shipyard-rules-default1 =
diff --git a/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl
index 0c07a8261c8..bd350a7b5bb 100644
--- a/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl
@@ -9,3 +9,4 @@ flavor-complex-greed = like greed
 flavor-complex-blast = like jungle warfare
 flavor-complex-torpedo = like convoy raiding
 flavor-complex-bees = like buzzing and honey
+flavor-complex-wassail = warm and comforting
diff --git a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl
index a0035770418..a60dfba3622 100644
--- a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl
@@ -15,6 +15,13 @@ ghost-role-information-clarpy-name = Clarpy
 ghost-role-information-clarpy-description = Avast ye mail! wanted by Nanotrasen for crimes against mice.
 ghost-role-information-clarpy-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all other pirates.
 
+ghost-role-information-cult-cat-name = Blood Cult Cat
+ghost-role-information-cult-cat-description = Founded the Blood Cult out of boredom.
+ghost-role-information-cult-cat-rules = You are a [color=red][bold]Free Agent[/bold][/color] and free to choose your course of actions.
+                                        Please note that [color=yellow]all server rules still apply.[/color] Additionally:
+                                        - [color=red]DO NOT[/color] damage player shuttles or their contents.
+                                        - [color=red]DO NOT[/color] gib players. Once they're dead, leave them be.
+
 ghost-role-information-cappy-name = Cappy
 ghost-role-information-cappy-description = Stop resisting! Certified in lethal-force and defensive tactics.
 
diff --git a/Resources/Locale/en-US/_NF/job/department.ftl b/Resources/Locale/en-US/_NF/job/department.ftl
index 0c87707cad9..092c89a1906 100644
--- a/Resources/Locale/en-US/_NF/job/department.ftl
+++ b/Resources/Locale/en-US/_NF/job/department.ftl
@@ -1,4 +1,5 @@
-department-NF = Frontier
-department-NFAntag = Criminals
-department-NFCommand = Frontier Command
-department-NFSecurity = New Frontier Sheriff's Department
\ No newline at end of file
+# Below: Department name - should match department.ID, may collide with upstream definitions
+department-Antag = Criminals
+department-Command = Frontier Command
+department-Frontier = Frontier
+department-Security = New Frontier Sheriff's Department
diff --git a/Resources/Locale/en-US/_NF/medical/medicine.ftl b/Resources/Locale/en-US/_NF/medical/medicine.ftl
index 748cc5415cd..7cff79196e8 100644
--- a/Resources/Locale/en-US/_NF/medical/medicine.ftl
+++ b/Resources/Locale/en-US/_NF/medical/medicine.ftl
@@ -1 +1 @@
-medicine-label-mannitol-clarpy = Clarpy's dementia pills
+medicine-label-mannitol-clarpy = Clarpy's prescription
diff --git a/Resources/Locale/en-US/_NF/reagents/drinks.ftl b/Resources/Locale/en-US/_NF/reagents/drinks.ftl
new file mode 100644
index 00000000000..24f7e19c2ad
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/reagents/drinks.ftl
@@ -0,0 +1 @@
+drinks-effect-nf-wassail = You feel relaxed and festive.
diff --git a/Resources/Locale/en-US/_NF/reagents/labels.ftl b/Resources/Locale/en-US/_NF/reagents/labels.ftl
new file mode 100644
index 00000000000..981cbabf836
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/reagents/labels.ftl
@@ -0,0 +1,49 @@
+# Labels for reagent barrels
+# Elements & basic reagents
+reagent-label-aluminium = [bold]Aluminium[/bold]
+reagent-label-carbon = [bold]Carbon[/bold]
+reagent-label-chlorine = [bold]Chlorine[/bold]
+reagent-label-copper = [bold]Copper[/bold]
+reagent-label-ethanol = [bold]Ethanol[/bold]
+reagent-label-fluorine = [bold]Fluorine[/bold]
+reagent-label-gold = [bold]Gold[/bold]
+reagent-label-hydrogen = [bold]Hydrogen[/bold]
+reagent-label-iodine = [bold]Iodine[/bold]
+reagent-label-iron = [bold]Iron[/bold]
+reagent-label-lithium = [bold]Lithium[/bold]
+reagent-label-mercury = [bold]Mercury[/bold]
+reagent-label-nitrogen = [bold]Nitrogen[/bold]
+reagent-label-oxygen = [bold]Oxygen[/bold]
+reagent-label-phosphorus = [bold]Phosphorus[/bold]
+reagent-label-potassium = [bold]Potassium[/bold]
+reagent-label-radium = [bold]Radium[/bold]
+reagent-label-silicon = [bold]Silicon[/bold]
+reagent-label-silver = [bold]Silver[/bold]
+reagent-label-sodium = [bold]Sodium[/bold]
+reagent-label-sugar = [bold]Sugar[/bold]
+reagent-label-sulfur = [bold]Sulfur[/bold]
+# Service & other reagents
+reagent-label-cornoil = [bold]Corn Oil[/bold]
+reagent-label-diethylamine = [bold]Diethylamine[/bold]
+reagent-label-ketchup = [bold]Ketchup[/bold]
+reagent-label-mayo = [bold]Mayonnaise[/bold]
+reagent-label-mustard = [bold]Mustard[/bold]
+reagent-label-oil = [bold]Oil[/bold]
+reagent-label-oil-olive = [bold]Olive Oil[/bold]
+reagent-label-space-cleaner = [bold]Space Cleaner[/bold]
+reagent-label-space-lube = [bold]Space Lube[/bold]
+reagent-label-welding-fuel = [bold]Welding Fuel[/bold]
+# Drinks
+reagent-label-absinthe = [bold]Absinthe[/bold]
+reagent-label-ale = [bold]Ale[/bold]
+reagent-label-beer = [bold]Beer[/bold]
+reagent-label-coffeeliqueur = [bold]Coffee Liqueur[/bold]
+reagent-label-cognac = [bold]Cognac[/bold]
+reagent-label-gin = [bold]Gin[/bold]
+reagent-label-rum = [bold]Rum[/bold]
+reagent-label-tequila = [bold]Tequila[/bold]
+reagent-label-vermouth = [bold]Vermouth[/bold]
+reagent-label-vodka = [bold]Vodka[/bold]
+reagent-label-water = [bold]Water[/bold]
+reagent-label-whiskey = [bold]Whiskey[/bold]
+reagent-label-wine = [bold]Wine[/bold]
diff --git a/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl
index b922b8b51a9..4e0579e00e3 100644
--- a/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl
+++ b/Resources/Locale/en-US/_NF/reagents/meta/consumable/drink/drinks.ftl
@@ -24,3 +24,9 @@ reagent-desc-honey = Thick, golden and sticky, the original sweetener.
 
 reagent-name-honey-iced-tea = honey iced tea
 reagent-desc-honey-iced-tea = Tea with a splash of honey.
+
+reagent-name-wassail = wassail
+reagent-desc-wassail = Hot mulled ale.
+
+reagent-name-eggnog = eggnog
+reagent-desc-eggnog = Creamy, sweet, and slightly boozy. Fully nogged.
diff --git a/Resources/Locale/en-US/_NF/research/technologies.ftl b/Resources/Locale/en-US/_NF/research/technologies.ftl
index 5822f98b35a..21d62eeeb52 100644
--- a/Resources/Locale/en-US/_NF/research/technologies.ftl
+++ b/Resources/Locale/en-US/_NF/research/technologies.ftl
@@ -13,4 +13,5 @@ research-technology-bounty-hunting = Bounty Hunting
 research-technology-arsenal-style = Punk Gear
 research-technology-industrial-medicine = Industrial Medicine
 research-technology-magnets-tech-advanced = Advanced Localized Magnetism
-research-technology-magnets-tech-combat = Localized Magnetism Combat Application
\ No newline at end of file
+research-technology-magnets-tech-combat = Localized Magnetism Combat Application
+research-technology-mobile-sanitation = Mobile Sanitation
diff --git a/Resources/Locale/en-US/alert-levels/alert-level-command.ftl b/Resources/Locale/en-US/alert-levels/alert-level-command.ftl
index dda4c0cbc64..c0d9c463935 100644
--- a/Resources/Locale/en-US/alert-levels/alert-level-command.ftl
+++ b/Resources/Locale/en-US/alert-levels/alert-level-command.ftl
@@ -1,4 +1,5 @@
-cmd-setalertlevel-desc = Set current station alert level for grid on which the player is standing.
+# Frontier: station<sector
+cmd-setalertlevel-desc = Set current sector alert level. An announcement will come from the grid the player is standing on.
 cmd-setalertlevel-help = Usage: setalertlevel <level> [locked]
 cmd-setalertlevel-invalid-grid = You must be on grid of station code that you are going to change.
 cmd-setalertlevel-invalid-level = Specified alert level does not exist on that grid.
diff --git a/Resources/Locale/en-US/alert-levels/alert-levels.ftl b/Resources/Locale/en-US/alert-levels/alert-levels.ftl
index 9476a95a209..a290b59194a 100644
--- a/Resources/Locale/en-US/alert-levels/alert-levels.ftl
+++ b/Resources/Locale/en-US/alert-levels/alert-levels.ftl
@@ -1,36 +1,57 @@
-alert-level-announcement = Attention! Station alert level is now {$name}! {$announcement}
+# Frontier: Station<Sector
+alert-level-announcement = Attention! Sector alert level is now {$name}! {$announcement}
 
 alert-level-unknown = Unknown.
 alert-level-unknown-instructions = Unknown.
 
+# Frontier: added Frontier-specific alert text
+
 alert-level-green = Green
-alert-level-green-announcement = It is now safe to return to your workplaces.
+# alert-level-green-announcement = It is now safe to return to your workplaces.
+# alert-level-green-instructions = Do your job.
+alert-level-green-announcement = The sector is now considered safe, return to operations as normal.
 alert-level-green-instructions = Do your job.
 
 alert-level-blue = Blue
-alert-level-blue-announcement = There is a confirmed threat to the station. Security should perform random checks. Crewmembers are advised to be vigilant and report suspicious activity to security.
-alert-level-blue-instructions = Crewmembers are advised to be vigilant and report suspicious activity to security.
+# alert-level-blue-announcement = There is a confirmed threat to the station. Security should perform random checks. Crewmembers are advised to be vigilant and report suspicious activity to security.
+# alert-level-blue-instructions = Crewmembers are advised to be vigilant and report suspicious activity to security.
+alert-level-blue-announcement = There is a confirmed threat to the sector. Crews are advised to be vigilant and report suspicious activity to NFSD officers.
+alert-level-blue-instructions = Crews are advised to be vigilant and report suspicious activity to NFSD officers.
 
 alert-level-red = Red
-alert-level-red-announcement = There is an immediate threat to the station. Security should prepare to use lethal force if necessary. Crewmembers should find a safe place to shelter in, and are advised to follow any present authorities.
-alert-level-red-instructions = Crewmembers should find a safe place to shelter in, and are advised to follow any present authorities.
+# alert-level-red-announcement = There is an immediate threat to the station. Security should prepare to use lethal force if necessary. Crewmembers should find a safe place to shelter in, and are advised to follow any present authorities.
+# alert-level-red-instructions = Crewmembers should find a safe place to shelter in, and are advised to follow any present authorities.
+alert-level-red-announcement = There is an immediate threat to the sector. Security should prepare to use lethal force if necessary. Crews should cooperate to ensure mutual safety, and are advised to follow any present authorities.
+alert-level-red-instructions = Crews should cooperate to ensure mutual safety, and are advised to follow any present authorities.
 
 alert-level-violet = Violet
-alert-level-violet-announcement = There is a viral threat on the station. Medical staff are advised to isolate crewmembers with any symptoms. Crewmembers are advised to distance themselves from others and perform safety measures to prevent further spread.
-alert-level-violet-instructions = Crewmembers are advised to distance themselves from others and perform safety measures to prevent further spread.
+# alert-level-violet-announcement = There is a viral threat on the station. Medical staff are advised to isolate crewmembers with any symptoms. Crewmembers are advised to distance themselves from others and perform safety measures to prevent further spread.
+# alert-level-violet-instructions = Crewmembers are advised to distance themselves from others and perform safety measures to prevent further spread.
+alert-level-violet-announcement = There is a viral threat in the sector. Medical staff are advised to isolate individuals showing symptoms. Crews are advised to limit interaction with others and enforce safety measures to prevent further spread.
+alert-level-violet-instructions = Crews are advised to limit interaction with others and enforce safety measures to prevent further spread.
 
 alert-level-yellow = Yellow
-alert-level-yellow-announcement = There is a structural or atmospheric threat within the station. Engineering staff are advised to immediately respond and perform safety measures. Crewmembers are advised to stay away from the threat, and stay in their workplaces if necessary.
-alert-level-yellow-instructions = Crewmembers are advised to stay away from the threat, and stay in their workplaces if necessary.
+# alert-level-yellow-announcement = There is a structural or atmospheric threat within the station. Engineering staff are advised to immediately respond and perform safety measures. Crewmembers are advised to stay away from the threat, and stay in their workplaces if necessary.
+# alert-level-yellow-instructions = Crewmembers are advised to stay away from the threat, and stay in their workplaces if necessary.
+alert-level-yellow-announcement = Sector infrastructure has been structurally or atmospherically compromised. Engineering staff are advised to immediately respond and assist where possible. Crews are advised to stay away from the threat and cooperate with sector command.
+alert-level-yellow-instructions = Crews are advised to stay away from the threat and cooperate with sector command.
 
 alert-level-gamma = Gamma
-alert-level-gamma-announcement = Central Command has ordered the Gamma security level on the station. Security is to have weapons equipped at all times, and all civilians are to immediately seek their nearest head for transportation to a secure location.
-alert-level-gamma-instructions = All civilians are to immediately seek their nearest head for transportation to a secure location.
+# alert-level-gamma-announcement = Central Command has ordered the Gamma security level on the station. Security is to have weapons equipped at all times, and all civilians are to immediately seek their nearest head for transportation to a secure location.
+# alert-level-gamma-instructions = All civilians are to immediately seek their nearest head for transportation to a secure location.
+alert-level-gamma-announcement = Central Command has ordered the Gamma security level in the sector. NFSD officers are to be on high alert, and crews are to avoid areas of conflict where possible.
+alert-level-gamma-instructions = Crews are to avoid areas of conflict where possible.
 
 alert-level-delta = Delta
-alert-level-delta-announcement = The station is currently under threat of imminent destruction. Crewmembers are advised to listen to heads of staff for more information.
-alert-level-delta-instructions = Crewmembers are advised to listen to heads of staff for more information.
+# alert-level-delta-announcement = The station is currently under threat of imminent destruction. Crewmembers are advised to listen to heads of staff for more information.
+# alert-level-delta-instructions = Crewmembers are advised to listen to heads of staff for more information.
+alert-level-delta-announcement = Sector infrastructure is currently under threat of imminent destruction. Crews are advised to listen to sector command for more information.
+alert-level-delta-instructions = Crews are advised to listen to sector command for more information.
 
 alert-level-epsilon = Epsilon
-alert-level-epsilon-announcement = Central Command has ordered the Epsilon security level on the station. Consider all contracts terminated.
+# alert-level-epsilon-announcement = Central Command has ordered the Epsilon security level on the station. Consider all contracts terminated.
+# alert-level-epsilon-instructions = Consider all contracts terminated.
+alert-level-epsilon-announcement = Central Command has ordered the Epsilon security level in the sector. Consider all contracts terminated.
 alert-level-epsilon-instructions = Consider all contracts terminated.
+
+# End Frontier
diff --git a/Resources/Locale/en-US/communications/communications-console-component.ftl b/Resources/Locale/en-US/communications/communications-console-component.ftl
index a757f9e0d10..bee8e27039e 100644
--- a/Resources/Locale/en-US/communications/communications-console-component.ftl
+++ b/Resources/Locale/en-US/communications/communications-console-component.ftl
@@ -5,7 +5,8 @@ comms-console-menu-announcement-button = Announce
 comms-console-menu-announcement-button-tooltip = Send your message as a station-wide radio announcement.
 comms-console-menu-broadcast-button = Broadcast
 comms-console-menu-broadcast-button-tooltip = Broadcast your message to wall-mounted screens around the station. Note: They fit only ten characters!
-comms-console-menu-alert-level-button-tooltip = Change the station alert level. Applies immediately on selecting.
+# Frontier: station<sector
+comms-console-menu-alert-level-button-tooltip = Change the sector alert level. Applies immediately on selecting.
 comms-console-menu-call-shuttle = Call emergency shuttle
 comms-console-menu-recall-shuttle = Recall emergency shuttle
 comms-console-menu-emergency-shuttle-button-tooltip = Calls or recalls the emergency shuttle. You can only recall when there's enough time left.
diff --git a/Resources/Locale/en-US/job/department.ftl b/Resources/Locale/en-US/job/department.ftl
index 74d9ac81d0d..c25e89f9020 100644
--- a/Resources/Locale/en-US/job/department.ftl
+++ b/Resources/Locale/en-US/job/department.ftl
@@ -1,10 +1,10 @@
 department-Cargo = Cargo
 department-Civilian = Civilian
-department-Command = Command
+# department-Command = Command # Frontier: redefined in _NF
 department-CentralCommand = Central Command
 department-Engineering = Engineering
 department-Medical = Medical
-department-Security = Security
+# department-Security = Security # Frontier: redefined in _NF
 department-Science = Science
 department-Silicon = Silicon
-department-Specific = Station specific
\ No newline at end of file
+department-Specific = Station specific
diff --git a/Resources/Locale/en-US/light/components/emergency-light-component.ftl b/Resources/Locale/en-US/light/components/emergency-light-component.ftl
index ba4a083a6d6..4cfe7ddaab1 100644
--- a/Resources/Locale/en-US/light/components/emergency-light-component.ftl
+++ b/Resources/Locale/en-US/light/components/emergency-light-component.ftl
@@ -1,5 +1,6 @@
 emergency-light-component-on-examine = The battery indicator displays: {$batteryStateText}.
-emergency-light-component-on-examine-alert = The current station alert level is: [color={$color}]{$level}[/color].
+# Frontier: station<sector
+emergency-light-component-on-examine-alert = The current sector alert level is: [color={$color}]{$level}[/color].
 emergency-light-component-light-state-full = [color=darkgreen]full[/color]
 emergency-light-component-light-state-empty = [color=darkgreen]empty[/color]
 emergency-light-component-light-state-charging = [color=darkgreen]charging[/color]
diff --git a/Resources/Locale/en-US/pda/pda-component.ftl b/Resources/Locale/en-US/pda/pda-component.ftl
index 7f17102c5f0..c2321da0455 100644
--- a/Resources/Locale/en-US/pda/pda-component.ftl
+++ b/Resources/Locale/en-US/pda/pda-component.ftl
@@ -28,7 +28,8 @@ comp-pda-ui-footer = Personal Digital Assistant
 
 comp-pda-ui-station = Station: [color=white]{$station}[/color]
 
-comp-pda-ui-station-alert-level = Alert Level: [color={ $color }]{ $level }[/color]
+# Frontier: add "Sector"
+comp-pda-ui-station-alert-level = Sector Alert Level: [color={ $color }]{ $level }[/color]
 
 comp-pda-ui-station-alert-level-instructions = Instructions: [color=white]{ $instructions }[/color]
 
diff --git a/Resources/Locale/en-US/radio/components/handheld-radio-component.ftl b/Resources/Locale/en-US/radio/components/handheld-radio-component.ftl
index ad637b0c56d..1933c19a935 100644
--- a/Resources/Locale/en-US/radio/components/handheld-radio-component.ftl
+++ b/Resources/Locale/en-US/radio/components/handheld-radio-component.ftl
@@ -5,10 +5,13 @@ handheld-radio-component-off-state = off
 handheld-radio-component-channel-set = Channel set to {$channel}
 handheld-radio-component-chennel-examine = The current channel is {$channel}.
 
+# Frontier
+handheld-radio-component-toggle = Toggle Mic
+
 # Nuclear-14-Start
 handheld-radio-menu-title = Handheld radio
 handheld-radio-current-text-frequency = Broadcast frequency
 handheld-radio-button-text-mic = Mic.
 handheld-radio-button-text-speaker = Spkr.
 handheld-radio-flavor-text-left = HandiComms, 1000-3000 kHz
-# Nuclear-14-End
\ No newline at end of file
+# Nuclear-14-End
diff --git a/Resources/Locale/en-US/reagents/meta/medicine.ftl b/Resources/Locale/en-US/reagents/meta/medicine.ftl
index 398ad8e1754..bc4a59c6552 100644
--- a/Resources/Locale/en-US/reagents/meta/medicine.ftl
+++ b/Resources/Locale/en-US/reagents/meta/medicine.ftl
@@ -97,7 +97,8 @@ reagent-name-ethylredoxrazine = ethylredoxrazine
 reagent-desc-ethylredoxrazine = Neutralises the effects of alcohol in the blood stream. Though it is commonly needed, it is rarely requested.
 
 reagent-name-cognizine = cognizine
-reagent-desc-cognizine = A mysterious chemical which is able to make any non-sentient creature sentient.
+# Frontier: edited description
+reagent-desc-cognizine = A mysterious chemical which is able to make any non-sentient creature sentient. Known to cause unpredictable behavior, apply with caution.
 
 reagent-name-ethyloxyephedrine = ethyloxyephedrine
 reagent-desc-ethyloxyephedrine = A mildly unstable medicine derived from desoxyephedrine, primarily used to combat narcolepsy.
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/Bluespace/bloodmoon.yml b/Resources/Maps/_NF/Bluespace/bloodmoon.yml
index c7c93ca0579..c801fdfb124 100644
--- a/Resources/Maps/_NF/Bluespace/bloodmoon.yml
+++ b/Resources/Maps/_NF/Bluespace/bloodmoon.yml
@@ -1089,8 +1089,6 @@ entities:
     - type: Transform
       pos: 11.5,-7.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BenchSofaRight
   entities:
   - uid: 1079
@@ -1098,8 +1096,6 @@ entities:
     - type: Transform
       pos: 10.5,-7.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BloodCollector
   entities:
   - uid: 1137
@@ -6042,6 +6038,13 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 18.5,-11.5
       parent: 1
+- proto: SpawnMobCatBloodCult
+  entities:
+  - uid: 351
+    components:
+    - type: Transform
+      pos: 17.5,13.5
+      parent: 1
 - proto: StructureMeleeWeaponRackBloodCultFilled
   entities:
   - uid: 470
diff --git a/Resources/Maps/_NF/Bluespace/cave.yml b/Resources/Maps/_NF/Bluespace/cave.yml
index 04ff8108855..cb81f9a200b 100644
--- a/Resources/Maps/_NF/Bluespace/cave.yml
+++ b/Resources/Maps/_NF/Bluespace/cave.yml
@@ -1422,6 +1422,163 @@ entities:
     - type: Transform
       pos: 3.8538454,4.824911
       parent: 1
+- proto: NFRockMineralHardRich
+  entities:
+  - uid: 21
+    components:
+    - type: Transform
+      pos: 9.5,4.5
+      parent: 1
+  - uid: 22
+    components:
+    - type: Transform
+      pos: 10.5,6.5
+      parent: 1
+  - uid: 81
+    components:
+    - type: Transform
+      pos: 10.5,4.5
+      parent: 1
+  - uid: 85
+    components:
+    - type: Transform
+      pos: 10.5,5.5
+      parent: 1
+  - uid: 86
+    components:
+    - type: Transform
+      pos: 9.5,5.5
+      parent: 1
+  - uid: 87
+    components:
+    - type: Transform
+      pos: 9.5,6.5
+      parent: 1
+  - uid: 89
+    components:
+    - type: Transform
+      pos: -9.5,-2.5
+      parent: 1
+  - uid: 90
+    components:
+    - type: Transform
+      pos: -10.5,-1.5
+      parent: 1
+  - uid: 91
+    components:
+    - type: Transform
+      pos: 8.5,5.5
+      parent: 1
+  - uid: 92
+    components:
+    - type: Transform
+      pos: -11.5,-2.5
+      parent: 1
+  - uid: 95
+    components:
+    - type: Transform
+      pos: -9.5,-3.5
+      parent: 1
+  - uid: 96
+    components:
+    - type: Transform
+      pos: -10.5,-3.5
+      parent: 1
+  - uid: 97
+    components:
+    - type: Transform
+      pos: -10.5,-2.5
+      parent: 1
+  - uid: 98
+    components:
+    - type: Transform
+      pos: 5.5,-2.5
+      parent: 1
+  - uid: 105
+    components:
+    - type: Transform
+      pos: 4.5,-2.5
+      parent: 1
+  - uid: 106
+    components:
+    - type: Transform
+      pos: 4.5,-1.5
+      parent: 1
+  - uid: 174
+    components:
+    - type: Transform
+      pos: -6.5,8.5
+      parent: 1
+  - uid: 175
+    components:
+    - type: Transform
+      pos: 11.5,6.5
+      parent: 1
+  - uid: 176
+    components:
+    - type: Transform
+      pos: 11.5,4.5
+      parent: 1
+  - uid: 177
+    components:
+    - type: Transform
+      pos: 12.5,4.5
+      parent: 1
+  - uid: 178
+    components:
+    - type: Transform
+      pos: 11.5,5.5
+      parent: 1
+  - uid: 184
+    components:
+    - type: Transform
+      pos: 10.5,7.5
+      parent: 1
+  - uid: 185
+    components:
+    - type: Transform
+      pos: 11.5,7.5
+      parent: 1
+  - uid: 212
+    components:
+    - type: Transform
+      pos: 5.5,-3.5
+      parent: 1
+  - uid: 213
+    components:
+    - type: Transform
+      pos: 4.5,-3.5
+      parent: 1
+  - uid: 215
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 225
+    components:
+    - type: Transform
+      pos: -6.5,9.5
+      parent: 1
+  - uid: 226
+    components:
+    - type: Transform
+      pos: -7.5,9.5
+      parent: 1
+  - uid: 258
+    components:
+    - type: Transform
+      pos: -13.5,3.5
+      parent: 1
+  - uid: 259
+    components:
+    - type: Transform
+      pos: -13.5,2.5
+      parent: 1
+  - uid: 261
+    components:
+    - type: Transform
+      pos: -7.5,8.5
+      parent: 1
 - proto: Pickaxe
   entities:
   - uid: 407
@@ -2964,163 +3121,6 @@ entities:
     - type: Transform
       pos: -7.5,-12.5
       parent: 1
-- proto: WallRockDiamond
-  entities:
-  - uid: 21
-    components:
-    - type: Transform
-      pos: 9.5,4.5
-      parent: 1
-  - uid: 22
-    components:
-    - type: Transform
-      pos: 10.5,6.5
-      parent: 1
-  - uid: 81
-    components:
-    - type: Transform
-      pos: 10.5,4.5
-      parent: 1
-  - uid: 85
-    components:
-    - type: Transform
-      pos: 10.5,5.5
-      parent: 1
-  - uid: 86
-    components:
-    - type: Transform
-      pos: 9.5,5.5
-      parent: 1
-  - uid: 87
-    components:
-    - type: Transform
-      pos: 9.5,6.5
-      parent: 1
-  - uid: 89
-    components:
-    - type: Transform
-      pos: -9.5,-2.5
-      parent: 1
-  - uid: 90
-    components:
-    - type: Transform
-      pos: -10.5,-1.5
-      parent: 1
-  - uid: 91
-    components:
-    - type: Transform
-      pos: 8.5,5.5
-      parent: 1
-  - uid: 92
-    components:
-    - type: Transform
-      pos: -11.5,-2.5
-      parent: 1
-  - uid: 95
-    components:
-    - type: Transform
-      pos: -9.5,-3.5
-      parent: 1
-  - uid: 96
-    components:
-    - type: Transform
-      pos: -10.5,-3.5
-      parent: 1
-  - uid: 97
-    components:
-    - type: Transform
-      pos: -10.5,-2.5
-      parent: 1
-  - uid: 98
-    components:
-    - type: Transform
-      pos: 5.5,-2.5
-      parent: 1
-  - uid: 105
-    components:
-    - type: Transform
-      pos: 4.5,-2.5
-      parent: 1
-  - uid: 106
-    components:
-    - type: Transform
-      pos: 4.5,-1.5
-      parent: 1
-  - uid: 174
-    components:
-    - type: Transform
-      pos: -6.5,8.5
-      parent: 1
-  - uid: 175
-    components:
-    - type: Transform
-      pos: 11.5,6.5
-      parent: 1
-  - uid: 176
-    components:
-    - type: Transform
-      pos: 11.5,4.5
-      parent: 1
-  - uid: 177
-    components:
-    - type: Transform
-      pos: 12.5,4.5
-      parent: 1
-  - uid: 178
-    components:
-    - type: Transform
-      pos: 11.5,5.5
-      parent: 1
-  - uid: 184
-    components:
-    - type: Transform
-      pos: 10.5,7.5
-      parent: 1
-  - uid: 185
-    components:
-    - type: Transform
-      pos: 11.5,7.5
-      parent: 1
-  - uid: 212
-    components:
-    - type: Transform
-      pos: 5.5,-3.5
-      parent: 1
-  - uid: 213
-    components:
-    - type: Transform
-      pos: 4.5,-3.5
-      parent: 1
-  - uid: 215
-    components:
-    - type: Transform
-      pos: 3.5,-2.5
-      parent: 1
-  - uid: 225
-    components:
-    - type: Transform
-      pos: -6.5,9.5
-      parent: 1
-  - uid: 226
-    components:
-    - type: Transform
-      pos: -7.5,9.5
-      parent: 1
-  - uid: 258
-    components:
-    - type: Transform
-      pos: -13.5,3.5
-      parent: 1
-  - uid: 259
-    components:
-    - type: Transform
-      pos: -13.5,2.5
-      parent: 1
-  - uid: 261
-    components:
-    - type: Transform
-      pos: -7.5,8.5
-      parent: 1
 - proto: WarpPoint
   entities:
   - uid: 136
diff --git a/Resources/Maps/_NF/Dungeon/supercompacted.yml b/Resources/Maps/_NF/Dungeon/supercompacted.yml
new file mode 100644
index 00000000000..649952f6da6
--- /dev/null
+++ b/Resources/Maps/_NF/Dungeon/supercompacted.yml
@@ -0,0 +1,3348 @@
+meta:
+  format: 6
+  postmapinit: false
+tilemap:
+  0: Space
+  2: FloorAsteroidSand
+  6: FloorAsteroidSandUnvariantized
+  5: FloorAsteroidTile
+  10: FloorAstroGrass
+  15: FloorBasalt
+  8: FloorBrokenWood
+  14: FloorCaveDrought
+  12: FloorChromite
+  13: FloorIce
+  16: FloorLowDesert
+  11: FloorRGlass
+  82: FloorShuttleOrange
+  1: FloorShuttlePurple
+  89: FloorSteel
+  9: FloorSteelDamaged
+  7: FloorWood
+  3: Plating
+  4: PlatingAsteroid
+entities:
+- proto: ""
+  entities:
+  - uid: 1
+    components:
+    - type: MetaData
+    - type: Transform
+    - type: Map
+      mapPaused: True
+    - type: PhysicsMap
+    - type: GridTree
+    - type: MovedGrids
+    - type: Broadphase
+    - type: OccluderTree
+    - type: MapGrid
+      chunks:
+        -1,-1:
+          ind: -1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAA
+          version: 6
+        0,0:
+          ind: 0,0
+          tiles: UgAAAAAAUgAAAAAADAAAAAAADAAAAAAAUgAAAAAAAQAAAAADUgAAAAAAUgAAAAAADAAAAAAADAAAAAAAUgAAAAAAAQAAAAADUgAAAAAAUgAAAAAADAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAADAAAAAAADAAAAAAAUgAAAAAAAQAAAAADUgAAAAAADAAAAAAADAAAAAAADAAAAAAAUgAAAAAAAQAAAAACUgAAAAAADAAAAAAADAAAAAAAUgAAAAAAUgAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAAQAAAAADDAAAAAAADAAAAAAADAAAAAAADAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAADAAAAAAADAAAAAAADAAAAAAAUgAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAAQAAAAADUgAAAAAAUgAAAAAADAAAAAAADAAAAAAADAAAAAAAAQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAUgAAAAAADAAAAAAADAAAAAAAUgAAAAAAUgAAAAAAAQAAAAADUgAAAAAAUgAAAAAAUgAAAAAADAAAAAAADAAAAAAAAQAAAAADUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAADAQAAAAACAQAAAAADAQAAAAACAQAAAAACAQAAAAACAQAAAAADAQAAAAADAQAAAAACAQAAAAABAQAAAAAAAQAAAAABAQAAAAABAQAAAAABAQAAAAADAQAAAAABUgAAAAAAUgAAAAAADQAAAAAADQAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAADQAAAAAADQAAAAAAUgAAAAAAAQAAAAABUgAAAAAAUgAAAAAADQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAADQAAAAAADQAAAAAAUgAAAAAAAQAAAAADUgAAAAAADQAAAAAADQAAAAAADQAAAAAAUgAAAAAAAQAAAAACUgAAAAAADQAAAAAADQAAAAAAUgAAAAAAUgAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAAAQAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAAUgAAAAAAAQAAAAACUgAAAAAADQAAAAAADQAAAAAADQAAAAAAUgAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAAAQAAAAADUgAAAAAAUgAAAAAADQAAAAAADQAAAAAADQAAAAAAAQAAAAABDQAAAAAADQAAAAAADQAAAAAADQAAAAAAUgAAAAAADQAAAAAADQAAAAAAUgAAAAAAUgAAAAAAAQAAAAABUgAAAAAAUgAAAAAAUgAAAAAADQAAAAAADQAAAAAAAQAAAAABUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAADAQAAAAACAQAAAAAAAQAAAAABAQAAAAADAQAAAAACAQAAAAADAQAAAAABAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAADAQAAAAABAQAAAAAAAQAAAAABUgAAAAAAUgAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAACUgAAAAAAUgAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAABUgAAAAAAUgAAAAAABgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAADUgAAAAAABgAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAACUgAAAAAABgAAAAAABgAAAAAAUgAAAAAAUgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAAQAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAACUgAAAAAABgAAAAAABgAAAAAABgAAAAAAUgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAAQAAAAADUgAAAAAAUgAAAAAABgAAAAAABgAAAAAABgAAAAAAAQAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAA
+          version: 6
+        0,1:
+          ind: 0,1
+          tiles: UgAAAAAABgAAAAAABgAAAAAAUgAAAAAAUgAAAAAAAQAAAAABUgAAAAAAUgAAAAAAUgAAAAAABgAAAAAABgAAAAAAAQAAAAACUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAADAQAAAAABAQAAAAACAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAACAQAAAAABAQAAAAAAAQAAAAADAQAAAAADAQAAAAADAQAAAAABAQAAAAAAAQAAAAABUgAAAAAAUgAAAAAADgAAAAAADgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAADgAAAAAADgAAAAAAUgAAAAAAAQAAAAACUgAAAAAAUgAAAAAADgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAADgAAAAAADgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAADgAAAAAADgAAAAAADgAAAAAAUgAAAAAAAQAAAAADUgAAAAAADgAAAAAADgAAAAAAUgAAAAAAUgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAAQAAAAACDgAAAAAADgAAAAAADgAAAAAADgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAADgAAAAAADgAAAAAADgAAAAAAUgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAAQAAAAADUgAAAAAAUgAAAAAADgAAAAAADgAAAAAADgAAAAAAAQAAAAADDgAAAAAADgAAAAAADgAAAAAADgAAAAAAUgAAAAAADgAAAAAADgAAAAAAUgAAAAAAUgAAAAAAAQAAAAACUgAAAAAAUgAAAAAAUgAAAAAADgAAAAAADgAAAAAAAQAAAAABUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAADAQAAAAAAAQAAAAABAQAAAAAAAQAAAAACAQAAAAAAAQAAAAAAAQAAAAACAQAAAAADAQAAAAACAQAAAAAAAQAAAAABAQAAAAAAAQAAAAABAQAAAAACAQAAAAADUgAAAAAAUgAAAAAADwAAAAAADwAAAAAAUgAAAAAAAQAAAAACUgAAAAAAUgAAAAAADwAAAAAADwAAAAAAUgAAAAAAAQAAAAADUgAAAAAAUgAAAAAADwAAAAAAUgAAAAAAUgAAAAAAUgAAAAAADwAAAAAADwAAAAAAUgAAAAAAAQAAAAABUgAAAAAADwAAAAAADwAAAAAADwAAAAAAUgAAAAAAAQAAAAAAUgAAAAAADwAAAAAADwAAAAAAUgAAAAAAUgAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAAAQAAAAADDwAAAAAADwAAAAAADwAAAAAADwAAAAAAUgAAAAAAAQAAAAABUgAAAAAADwAAAAAADwAAAAAADwAAAAAAUgAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAAAQAAAAAAUgAAAAAAUgAAAAAADwAAAAAADwAAAAAADwAAAAAAAQAAAAADDwAAAAAADwAAAAAADwAAAAAADwAAAAAAUgAAAAAADwAAAAAADwAAAAAAUgAAAAAAUgAAAAAAAQAAAAADUgAAAAAAUgAAAAAAUgAAAAAADwAAAAAADwAAAAAAAQAAAAABUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAADAQAAAAACAQAAAAABAQAAAAAAAQAAAAACAQAAAAADAQAAAAAAAQAAAAABAQAAAAABAQAAAAAAAQAAAAAAAQAAAAACAQAAAAADAQAAAAACAQAAAAAAAQAAAAACUgAAAAAAUgAAAAAAEAAAAAAAEAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAEAAAAAAAEAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAEAAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAEAAAAAAAEAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAEAAAAAAAEAAAAAAAUgAAAAAA
+          version: 6
+        0,-1:
+          ind: 0,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAQAAAAABAQAAAAAAAQAAAAACAQAAAAAAAQAAAAADAQAAAAABAQAAAAACAQAAAAACAQAAAAACAQAAAAABAQAAAAABAQAAAAADAQAAAAACAQAAAAACAQAAAAAD
+          version: 6
+        -1,0:
+          ind: -1,0
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAA
+          version: 6
+        -1,1:
+          ind: -1,1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAD
+          version: 6
+        1,-1:
+          ind: 1,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAQAAAAACAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAABAQAAAAABAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAA
+          version: 6
+        1,0:
+          ind: 1,0
+          tiles: UgAAAAAAAQAAAAABUgAAAAAAUgAAAAAADAAAAAAAUgAAAAAAUgAAAAAAAQAAAAACUgAAAAAAUgAAAAAAUgAAAAAADAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAABUgAAAAAADAAAAAAADAAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAADAAAAAAADAAAAAAADAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAADAAAAAAAAQAAAAACUgAAAAAADAAAAAAADAAAAAAADAAAAAAAUgAAAAAAAQAAAAABDAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAAQAAAAAADAAAAAAADAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAADAAAAAAADAAAAAAADAAAAAAAUgAAAAAAAQAAAAADUgAAAAAADAAAAAAADAAAAAAADAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAADAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAADAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAAQAAAAAAUgAAAAAADAAAAAAAAQAAAAACAQAAAAADAQAAAAAAAQAAAAAAAQAAAAABAQAAAAADAQAAAAADAQAAAAACAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAUgAAAAAAAQAAAAADUgAAAAAAUgAAAAAADQAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAADQAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAACUgAAAAAADQAAAAAADQAAAAAAUgAAAAAAUgAAAAAAAQAAAAADUgAAAAAADQAAAAAADQAAAAAADQAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAADQAAAAAAAQAAAAADUgAAAAAADQAAAAAADQAAAAAADQAAAAAAUgAAAAAAAQAAAAACDQAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAAAQAAAAAADQAAAAAADQAAAAAAUgAAAAAAAQAAAAACUgAAAAAADQAAAAAADQAAAAAADQAAAAAAUgAAAAAAAQAAAAADUgAAAAAADQAAAAAADQAAAAAADQAAAAAAUgAAAAAAAQAAAAAAUgAAAAAADQAAAAAAUgAAAAAAAQAAAAACUgAAAAAAUgAAAAAAUgAAAAAADQAAAAAAUgAAAAAAAQAAAAAAUgAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAAAQAAAAAAUgAAAAAADQAAAAAAAQAAAAAAAQAAAAADAQAAAAACAQAAAAABAQAAAAAAAQAAAAABAQAAAAADAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAUgAAAAAAAQAAAAABUgAAAAAAUgAAAAAABgAAAAAAUgAAAAAAUgAAAAAAAQAAAAADUgAAAAAAUgAAAAAAUgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAADUgAAAAAABgAAAAAABgAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAABgAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAABgAAAAAAAQAAAAAAUgAAAAAABgAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAAQAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAABUgAAAAAABgAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAACUgAAAAAABgAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAABgAAAAAA
+          version: 6
+        1,1:
+          ind: 1,1
+          tiles: UgAAAAAAAQAAAAABUgAAAAAAUgAAAAAAUgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAAQAAAAAAUgAAAAAABgAAAAAAAQAAAAABAQAAAAAAAQAAAAADAQAAAAACAQAAAAACAQAAAAABAQAAAAABAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAUgAAAAAAAQAAAAACUgAAAAAAUgAAAAAADgAAAAAAUgAAAAAAUgAAAAAAAQAAAAADUgAAAAAAUgAAAAAAUgAAAAAADgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAABUgAAAAAADgAAAAAADgAAAAAAUgAAAAAAUgAAAAAAAQAAAAADUgAAAAAADgAAAAAADgAAAAAADgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAADgAAAAAAAQAAAAACUgAAAAAADgAAAAAADgAAAAAADgAAAAAAUgAAAAAAAQAAAAADDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAAQAAAAAADgAAAAAADgAAAAAAUgAAAAAAAQAAAAACUgAAAAAADgAAAAAADgAAAAAADgAAAAAAUgAAAAAAAQAAAAACUgAAAAAADgAAAAAADgAAAAAADgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAADgAAAAAAUgAAAAAAAQAAAAABUgAAAAAAUgAAAAAAUgAAAAAADgAAAAAAUgAAAAAAAQAAAAADUgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAAQAAAAAAUgAAAAAADgAAAAAAAQAAAAAAAQAAAAADAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAACAQAAAAADAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAUgAAAAAAAQAAAAABUgAAAAAAUgAAAAAADwAAAAAAUgAAAAAAUgAAAAAAAQAAAAADUgAAAAAAUgAAAAAAUgAAAAAADwAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAABUgAAAAAADwAAAAAADwAAAAAAUgAAAAAAUgAAAAAAAQAAAAACUgAAAAAADwAAAAAADwAAAAAADwAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAADwAAAAAAAQAAAAAAUgAAAAAADwAAAAAADwAAAAAADwAAAAAAUgAAAAAAAQAAAAABDwAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAAAQAAAAAADwAAAAAADwAAAAAAUgAAAAAAAQAAAAABUgAAAAAADwAAAAAADwAAAAAADwAAAAAAUgAAAAAAAQAAAAACUgAAAAAADwAAAAAADwAAAAAADwAAAAAAUgAAAAAAAQAAAAAAUgAAAAAADwAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAADwAAAAAAUgAAAAAAAQAAAAAAUgAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAAAQAAAAAAUgAAAAAADwAAAAAAAQAAAAAAAQAAAAADAQAAAAAAAQAAAAABAQAAAAACAQAAAAAAAQAAAAADAQAAAAADAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAEAAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAEAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAEAAAAAAAEAAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAA
+          version: 6
+        -1,2:
+          ind: -1,2
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        0,2:
+          ind: 0,2
+          tiles: UgAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAAQAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAUgAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAAQAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAUgAAAAAAEAAAAAAAEAAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAEAAAAAAAEAAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAAQAAAAACAQAAAAADAQAAAAADAQAAAAADAQAAAAABAQAAAAACAQAAAAACAQAAAAACAQAAAAADAQAAAAAAAQAAAAADAQAAAAABAQAAAAACAQAAAAACAQAAAAAAUgAAAAAAUgAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAABgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAABgAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAABgAAAAAABgAAAAAAUgAAAAAAUgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAAQAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAABgAAAAAABgAAAAAABgAAAAAAUgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAABgAAAAAABgAAAAAABgAAAAAAAQAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAUgAAAAAABgAAAAAABgAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAABgAAAAAABgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAADAQAAAAACAQAAAAABAQAAAAADAQAAAAABAQAAAAADAQAAAAABAQAAAAACAQAAAAAAAQAAAAABAQAAAAADAQAAAAAAAQAAAAABAQAAAAAAAQAAAAACAQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        1,2:
+          ind: 1,2
+          tiles: EAAAAAAAAQAAAAAAUgAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAUgAAAAAAAQAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAAQAAAAAAEAAAAAAAEAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAEAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAEAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAAQAAAAAAUgAAAAAAEAAAAAAAAQAAAAABAQAAAAABAQAAAAABAQAAAAACAQAAAAAAAQAAAAAAAQAAAAACAQAAAAADAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAABgAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAABgAAAAAABgAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAABgAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAABgAAAAAAAQAAAAAAUgAAAAAABgAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAAQAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAABgAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAABgAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAAQAAAAAAUgAAAAAABgAAAAAAAQAAAAAAAQAAAAADAQAAAAAAAQAAAAADAQAAAAADAQAAAAAAAQAAAAABAQAAAAADAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        2,-1:
+          ind: 2,-1
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        2,0:
+          ind: 2,0
+          tiles: UgAAAAAADAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAADAAAAAAADAAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAADAAAAAAAUgAAAAAAAQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAADAAAAAAADAAAAAAAAQAAAAAAUgAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAADAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAADAAAAAAADAAAAAAADAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAADAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAADAAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAADQAAAAAAUgAAAAAAAQAAAAAAUgAAAAAADQAAAAAADQAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQAAAAAADQAAAAAAUgAAAAAAAQAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQAAAAAADQAAAAAADQAAAAAAAQAAAAAAUgAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQAAAAAADQAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAADQAAAAAADQAAAAAADQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAADQAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAADQAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAABgAAAAAABgAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAABgAAAAAABgAAAAAAAQAAAAAAUgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAABgAAAAAABgAAAAAABgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        2,1:
+          ind: 2,1
+          tiles: UgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAADgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAADgAAAAAADgAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAADgAAAAAAUgAAAAAAAQAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAADgAAAAAADgAAAAAAAQAAAAAAUgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAADgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAADgAAAAAADgAAAAAADgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAADgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAADgAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAADwAAAAAAUgAAAAAAAQAAAAAAUgAAAAAADwAAAAAADwAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAADwAAAAAAUgAAAAAAAQAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAADwAAAAAADwAAAAAAAQAAAAAAUgAAAAAADwAAAAAADwAAAAAADwAAAAAADwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAADwAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAADwAAAAAADwAAAAAADwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAADwAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAADwAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAEAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAEAAAAAAAEAAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAEAAAAAAAUgAAAAAAAQAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+        2,2:
+          ind: 2,2
+          tiles: EAAAAAAAEAAAAAAAEAAAAAAAAQAAAAAAUgAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAEAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAAEAAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAEAAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAABgAAAAAABgAAAAAAUgAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAABgAAAAAABgAAAAAAAQAAAAAAUgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAABgAAAAAABgAAAAAABgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAUgAAAAAAUgAAAAAAUgAAAAAABgAAAAAAUgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          version: 6
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
+        path: /Audio/Effects/alert.ogg
+    - type: DecalGrid
+      chunkCollection:
+        version: 2
+        nodes: []
+    - type: LoadedMap
+    - type: SpreaderGrid
+    - type: GridPathfinding
+- proto: NFAndesiteMineralHardRich
+  entities:
+  - uid: 370
+    components:
+    - type: Transform
+      pos: 37.5,18.5
+      parent: 1
+  - uid: 371
+    components:
+    - type: Transform
+      pos: 37.5,19.5
+      parent: 1
+  - uid: 372
+    components:
+    - type: Transform
+      pos: 36.5,19.5
+      parent: 1
+  - uid: 373
+    components:
+    - type: Transform
+      pos: 37.5,20.5
+      parent: 1
+  - uid: 374
+    components:
+    - type: Transform
+      pos: 38.5,20.5
+      parent: 1
+  - uid: 375
+    components:
+    - type: Transform
+      pos: 38.5,19.5
+      parent: 1
+  - uid: 376
+    components:
+    - type: Transform
+      pos: 38.5,18.5
+      parent: 1
+  - uid: 377
+    components:
+    - type: Transform
+      pos: 39.5,19.5
+      parent: 1
+  - uid: 378
+    components:
+    - type: Transform
+      pos: 39.5,20.5
+      parent: 1
+  - uid: 379
+    components:
+    - type: Transform
+      pos: 40.5,20.5
+      parent: 1
+  - uid: 380
+    components:
+    - type: Transform
+      pos: 40.5,21.5
+      parent: 1
+  - uid: 381
+    components:
+    - type: Transform
+      pos: 39.5,21.5
+      parent: 1
+  - uid: 382
+    components:
+    - type: Transform
+      pos: 39.5,22.5
+      parent: 1
+  - uid: 383
+    components:
+    - type: Transform
+      pos: 38.5,21.5
+      parent: 1
+  - uid: 384
+    components:
+    - type: Transform
+      pos: 33.5,18.5
+      parent: 1
+  - uid: 385
+    components:
+    - type: Transform
+      pos: 33.5,19.5
+      parent: 1
+  - uid: 386
+    components:
+    - type: Transform
+      pos: 32.5,19.5
+      parent: 1
+  - uid: 387
+    components:
+    - type: Transform
+      pos: 32.5,20.5
+      parent: 1
+  - uid: 388
+    components:
+    - type: Transform
+      pos: 33.5,20.5
+      parent: 1
+  - uid: 389
+    components:
+    - type: Transform
+      pos: 34.5,20.5
+      parent: 1
+  - uid: 390
+    components:
+    - type: Transform
+      pos: 33.5,21.5
+      parent: 1
+  - uid: 391
+    components:
+    - type: Transform
+      pos: 33.5,22.5
+      parent: 1
+  - uid: 392
+    components:
+    - type: Transform
+      pos: 32.5,21.5
+      parent: 1
+  - uid: 393
+    components:
+    - type: Transform
+      pos: 31.5,21.5
+      parent: 1
+  - uid: 394
+    components:
+    - type: Transform
+      pos: 31.5,22.5
+      parent: 1
+  - uid: 395
+    components:
+    - type: Transform
+      pos: 31.5,20.5
+      parent: 1
+  - uid: 396
+    components:
+    - type: Transform
+      pos: 30.5,20.5
+      parent: 1
+  - uid: 397
+    components:
+    - type: Transform
+      pos: 28.5,20.5
+      parent: 1
+  - uid: 398
+    components:
+    - type: Transform
+      pos: 27.5,20.5
+      parent: 1
+  - uid: 399
+    components:
+    - type: Transform
+      pos: 27.5,19.5
+      parent: 1
+  - uid: 400
+    components:
+    - type: Transform
+      pos: 27.5,18.5
+      parent: 1
+  - uid: 401
+    components:
+    - type: Transform
+      pos: 26.5,19.5
+      parent: 1
+  - uid: 402
+    components:
+    - type: Transform
+      pos: 25.5,19.5
+      parent: 1
+  - uid: 403
+    components:
+    - type: Transform
+      pos: 25.5,20.5
+      parent: 1
+  - uid: 404
+    components:
+    - type: Transform
+      pos: 24.5,20.5
+      parent: 1
+  - uid: 405
+    components:
+    - type: Transform
+      pos: 26.5,20.5
+      parent: 1
+  - uid: 406
+    components:
+    - type: Transform
+      pos: 25.5,21.5
+      parent: 1
+  - uid: 407
+    components:
+    - type: Transform
+      pos: 26.5,21.5
+      parent: 1
+  - uid: 408
+    components:
+    - type: Transform
+      pos: 27.5,21.5
+      parent: 1
+  - uid: 409
+    components:
+    - type: Transform
+      pos: 25.5,22.5
+      parent: 1
+  - uid: 410
+    components:
+    - type: Transform
+      pos: 26.5,22.5
+      parent: 1
+  - uid: 411
+    components:
+    - type: Transform
+      pos: 27.5,22.5
+      parent: 1
+  - uid: 412
+    components:
+    - type: Transform
+      pos: 28.5,22.5
+      parent: 1
+  - uid: 413
+    components:
+    - type: Transform
+      pos: 20.5,18.5
+      parent: 1
+  - uid: 414
+    components:
+    - type: Transform
+      pos: 20.5,19.5
+      parent: 1
+  - uid: 415
+    components:
+    - type: Transform
+      pos: 19.5,19.5
+      parent: 1
+  - uid: 416
+    components:
+    - type: Transform
+      pos: 19.5,20.5
+      parent: 1
+  - uid: 417
+    components:
+    - type: Transform
+      pos: 20.5,20.5
+      parent: 1
+  - uid: 418
+    components:
+    - type: Transform
+      pos: 21.5,20.5
+      parent: 1
+  - uid: 419
+    components:
+    - type: Transform
+      pos: 21.5,21.5
+      parent: 1
+  - uid: 420
+    components:
+    - type: Transform
+      pos: 20.5,21.5
+      parent: 1
+  - uid: 421
+    components:
+    - type: Transform
+      pos: 19.5,21.5
+      parent: 1
+  - uid: 422
+    components:
+    - type: Transform
+      pos: 21.5,22.5
+      parent: 1
+  - uid: 423
+    components:
+    - type: Transform
+      pos: 14.5,18.5
+      parent: 1
+  - uid: 424
+    components:
+    - type: Transform
+      pos: 14.5,19.5
+      parent: 1
+  - uid: 425
+    components:
+    - type: Transform
+      pos: 13.5,19.5
+      parent: 1
+  - uid: 426
+    components:
+    - type: Transform
+      pos: 13.5,20.5
+      parent: 1
+  - uid: 427
+    components:
+    - type: Transform
+      pos: 12.5,21.5
+      parent: 1
+  - uid: 428
+    components:
+    - type: Transform
+      pos: 13.5,21.5
+      parent: 1
+  - uid: 429
+    components:
+    - type: Transform
+      pos: 14.5,21.5
+      parent: 1
+  - uid: 430
+    components:
+    - type: Transform
+      pos: 14.5,20.5
+      parent: 1
+  - uid: 431
+    components:
+    - type: Transform
+      pos: 15.5,21.5
+      parent: 1
+  - uid: 432
+    components:
+    - type: Transform
+      pos: 15.5,20.5
+      parent: 1
+  - uid: 433
+    components:
+    - type: Transform
+      pos: 16.5,20.5
+      parent: 1
+  - uid: 434
+    components:
+    - type: Transform
+      pos: 9.5,18.5
+      parent: 1
+  - uid: 435
+    components:
+    - type: Transform
+      pos: 8.5,18.5
+      parent: 1
+  - uid: 436
+    components:
+    - type: Transform
+      pos: 8.5,19.5
+      parent: 1
+  - uid: 437
+    components:
+    - type: Transform
+      pos: 9.5,19.5
+      parent: 1
+  - uid: 438
+    components:
+    - type: Transform
+      pos: 9.5,20.5
+      parent: 1
+  - uid: 439
+    components:
+    - type: Transform
+      pos: 8.5,20.5
+      parent: 1
+  - uid: 440
+    components:
+    - type: Transform
+      pos: 7.5,20.5
+      parent: 1
+  - uid: 441
+    components:
+    - type: Transform
+      pos: 7.5,19.5
+      parent: 1
+  - uid: 442
+    components:
+    - type: Transform
+      pos: 6.5,20.5
+      parent: 1
+  - uid: 443
+    components:
+    - type: Transform
+      pos: 8.5,21.5
+      parent: 1
+  - uid: 444
+    components:
+    - type: Transform
+      pos: 9.5,21.5
+      parent: 1
+  - uid: 445
+    components:
+    - type: Transform
+      pos: 9.5,22.5
+      parent: 1
+  - uid: 446
+    components:
+    - type: Transform
+      pos: 10.5,22.5
+      parent: 1
+  - uid: 447
+    components:
+    - type: Transform
+      pos: 10.5,21.5
+      parent: 1
+  - uid: 448
+    components:
+    - type: Transform
+      pos: 3.5,18.5
+      parent: 1
+  - uid: 449
+    components:
+    - type: Transform
+      pos: 2.5,18.5
+      parent: 1
+  - uid: 450
+    components:
+    - type: Transform
+      pos: 2.5,19.5
+      parent: 1
+  - uid: 451
+    components:
+    - type: Transform
+      pos: 3.5,19.5
+      parent: 1
+  - uid: 452
+    components:
+    - type: Transform
+      pos: 3.5,20.5
+      parent: 1
+  - uid: 453
+    components:
+    - type: Transform
+      pos: 4.5,20.5
+      parent: 1
+  - uid: 454
+    components:
+    - type: Transform
+      pos: 4.5,21.5
+      parent: 1
+  - uid: 455
+    components:
+    - type: Transform
+      pos: 3.5,21.5
+      parent: 1
+  - uid: 456
+    components:
+    - type: Transform
+      pos: 2.5,21.5
+      parent: 1
+  - uid: 457
+    components:
+    - type: Transform
+      pos: 2.5,22.5
+      parent: 1
+  - uid: 458
+    components:
+    - type: Transform
+      pos: 1.5,22.5
+      parent: 1
+  - uid: 459
+    components:
+    - type: Transform
+      pos: 1.5,21.5
+      parent: 1
+  - uid: 460
+    components:
+    - type: Transform
+      pos: 1.5,20.5
+      parent: 1
+  - uid: 461
+    components:
+    - type: Transform
+      pos: 2.5,20.5
+      parent: 1
+- proto: NFAsteroidMineralHardRich
+  entities:
+  - uid: 186
+    components:
+    - type: Transform
+      pos: 38.5,14.5
+      parent: 1
+  - uid: 187
+    components:
+    - type: Transform
+      pos: 38.5,13.5
+      parent: 1
+  - uid: 188
+    components:
+    - type: Transform
+      pos: 38.5,12.5
+      parent: 1
+  - uid: 189
+    components:
+    - type: Transform
+      pos: 38.5,15.5
+      parent: 1
+  - uid: 190
+    components:
+    - type: Transform
+      pos: 39.5,13.5
+      parent: 1
+  - uid: 191
+    components:
+    - type: Transform
+      pos: 39.5,15.5
+      parent: 1
+  - uid: 192
+    components:
+    - type: Transform
+      pos: 39.5,16.5
+      parent: 1
+  - uid: 193
+    components:
+    - type: Transform
+      pos: 40.5,14.5
+      parent: 1
+  - uid: 194
+    components:
+    - type: Transform
+      pos: 40.5,15.5
+      parent: 1
+  - uid: 195
+    components:
+    - type: Transform
+      pos: 39.5,14.5
+      parent: 1
+  - uid: 196
+    components:
+    - type: Transform
+      pos: 37.5,13.5
+      parent: 1
+  - uid: 197
+    components:
+    - type: Transform
+      pos: 37.5,14.5
+      parent: 1
+  - uid: 198
+    components:
+    - type: Transform
+      pos: 37.5,12.5
+      parent: 1
+  - uid: 199
+    components:
+    - type: Transform
+      pos: 36.5,13.5
+      parent: 1
+  - uid: 200
+    components:
+    - type: Transform
+      pos: 31.5,16.5
+      parent: 1
+  - uid: 201
+    components:
+    - type: Transform
+      pos: 31.5,15.5
+      parent: 1
+  - uid: 202
+    components:
+    - type: Transform
+      pos: 32.5,15.5
+      parent: 1
+  - uid: 203
+    components:
+    - type: Transform
+      pos: 33.5,16.5
+      parent: 1
+  - uid: 204
+    components:
+    - type: Transform
+      pos: 33.5,15.5
+      parent: 1
+  - uid: 205
+    components:
+    - type: Transform
+      pos: 32.5,14.5
+      parent: 1
+  - uid: 206
+    components:
+    - type: Transform
+      pos: 32.5,13.5
+      parent: 1
+  - uid: 207
+    components:
+    - type: Transform
+      pos: 33.5,13.5
+      parent: 1
+  - uid: 208
+    components:
+    - type: Transform
+      pos: 34.5,14.5
+      parent: 1
+  - uid: 209
+    components:
+    - type: Transform
+      pos: 33.5,14.5
+      parent: 1
+  - uid: 210
+    components:
+    - type: Transform
+      pos: 33.5,12.5
+      parent: 1
+  - uid: 211
+    components:
+    - type: Transform
+      pos: 27.5,12.5
+      parent: 1
+  - uid: 212
+    components:
+    - type: Transform
+      pos: 30.5,14.5
+      parent: 1
+  - uid: 213
+    components:
+    - type: Transform
+      pos: 31.5,14.5
+      parent: 1
+  - uid: 214
+    components:
+    - type: Transform
+      pos: 27.5,13.5
+      parent: 1
+  - uid: 215
+    components:
+    - type: Transform
+      pos: 28.5,14.5
+      parent: 1
+  - uid: 216
+    components:
+    - type: Transform
+      pos: 27.5,14.5
+      parent: 1
+  - uid: 217
+    components:
+    - type: Transform
+      pos: 27.5,15.5
+      parent: 1
+  - uid: 218
+    components:
+    - type: Transform
+      pos: 28.5,16.5
+      parent: 1
+  - uid: 219
+    components:
+    - type: Transform
+      pos: 26.5,16.5
+      parent: 1
+  - uid: 220
+    components:
+    - type: Transform
+      pos: 27.5,16.5
+      parent: 1
+  - uid: 221
+    components:
+    - type: Transform
+      pos: 25.5,16.5
+      parent: 1
+  - uid: 222
+    components:
+    - type: Transform
+      pos: 26.5,15.5
+      parent: 1
+  - uid: 223
+    components:
+    - type: Transform
+      pos: 25.5,15.5
+      parent: 1
+  - uid: 224
+    components:
+    - type: Transform
+      pos: 26.5,14.5
+      parent: 1
+  - uid: 225
+    components:
+    - type: Transform
+      pos: 25.5,13.5
+      parent: 1
+  - uid: 226
+    components:
+    - type: Transform
+      pos: 21.5,16.5
+      parent: 1
+  - uid: 227
+    components:
+    - type: Transform
+      pos: 24.5,14.5
+      parent: 1
+  - uid: 228
+    components:
+    - type: Transform
+      pos: 26.5,13.5
+      parent: 1
+  - uid: 229
+    components:
+    - type: Transform
+      pos: 25.5,14.5
+      parent: 1
+  - uid: 230
+    components:
+    - type: Transform
+      pos: 20.5,14.5
+      parent: 1
+  - uid: 231
+    components:
+    - type: Transform
+      pos: 19.5,15.5
+      parent: 1
+  - uid: 232
+    components:
+    - type: Transform
+      pos: 20.5,15.5
+      parent: 1
+  - uid: 233
+    components:
+    - type: Transform
+      pos: 21.5,14.5
+      parent: 1
+  - uid: 234
+    components:
+    - type: Transform
+      pos: 21.5,15.5
+      parent: 1
+  - uid: 235
+    components:
+    - type: Transform
+      pos: 19.5,14.5
+      parent: 1
+  - uid: 236
+    components:
+    - type: Transform
+      pos: 20.5,12.5
+      parent: 1
+  - uid: 237
+    components:
+    - type: Transform
+      pos: 12.5,15.5
+      parent: 1
+  - uid: 238
+    components:
+    - type: Transform
+      pos: 13.5,15.5
+      parent: 1
+  - uid: 239
+    components:
+    - type: Transform
+      pos: 10.5,15.5
+      parent: 1
+  - uid: 240
+    components:
+    - type: Transform
+      pos: 13.5,14.5
+      parent: 1
+  - uid: 241
+    components:
+    - type: Transform
+      pos: 14.5,13.5
+      parent: 1
+  - uid: 242
+    components:
+    - type: Transform
+      pos: 13.5,13.5
+      parent: 1
+  - uid: 243
+    components:
+    - type: Transform
+      pos: 14.5,12.5
+      parent: 1
+  - uid: 244
+    components:
+    - type: Transform
+      pos: 14.5,15.5
+      parent: 1
+  - uid: 245
+    components:
+    - type: Transform
+      pos: 14.5,14.5
+      parent: 1
+  - uid: 246
+    components:
+    - type: Transform
+      pos: 16.5,14.5
+      parent: 1
+  - uid: 247
+    components:
+    - type: Transform
+      pos: 15.5,14.5
+      parent: 1
+  - uid: 248
+    components:
+    - type: Transform
+      pos: 19.5,13.5
+      parent: 1
+  - uid: 249
+    components:
+    - type: Transform
+      pos: 15.5,15.5
+      parent: 1
+  - uid: 250
+    components:
+    - type: Transform
+      pos: 20.5,13.5
+      parent: 1
+  - uid: 251
+    components:
+    - type: Transform
+      pos: 10.5,16.5
+      parent: 1
+  - uid: 252
+    components:
+    - type: Transform
+      pos: 9.5,16.5
+      parent: 1
+  - uid: 253
+    components:
+    - type: Transform
+      pos: 9.5,15.5
+      parent: 1
+  - uid: 254
+    components:
+    - type: Transform
+      pos: 8.5,15.5
+      parent: 1
+  - uid: 255
+    components:
+    - type: Transform
+      pos: 9.5,14.5
+      parent: 1
+  - uid: 256
+    components:
+    - type: Transform
+      pos: 8.5,14.5
+      parent: 1
+  - uid: 257
+    components:
+    - type: Transform
+      pos: 9.5,13.5
+      parent: 1
+  - uid: 258
+    components:
+    - type: Transform
+      pos: 9.5,12.5
+      parent: 1
+  - uid: 259
+    components:
+    - type: Transform
+      pos: 8.5,12.5
+      parent: 1
+  - uid: 260
+    components:
+    - type: Transform
+      pos: 8.5,13.5
+      parent: 1
+  - uid: 261
+    components:
+    - type: Transform
+      pos: 7.5,14.5
+      parent: 1
+  - uid: 262
+    components:
+    - type: Transform
+      pos: 7.5,13.5
+      parent: 1
+  - uid: 263
+    components:
+    - type: Transform
+      pos: 6.5,14.5
+      parent: 1
+  - uid: 264
+    components:
+    - type: Transform
+      pos: 1.5,16.5
+      parent: 1
+  - uid: 265
+    components:
+    - type: Transform
+      pos: 2.5,16.5
+      parent: 1
+  - uid: 266
+    components:
+    - type: Transform
+      pos: 4.5,15.5
+      parent: 1
+  - uid: 267
+    components:
+    - type: Transform
+      pos: 3.5,15.5
+      parent: 1
+  - uid: 268
+    components:
+    - type: Transform
+      pos: 3.5,14.5
+      parent: 1
+  - uid: 269
+    components:
+    - type: Transform
+      pos: 2.5,13.5
+      parent: 1
+  - uid: 270
+    components:
+    - type: Transform
+      pos: 1.5,14.5
+      parent: 1
+  - uid: 271
+    components:
+    - type: Transform
+      pos: 2.5,14.5
+      parent: 1
+  - uid: 272
+    components:
+    - type: Transform
+      pos: 4.5,14.5
+      parent: 1
+  - uid: 273
+    components:
+    - type: Transform
+      pos: 2.5,15.5
+      parent: 1
+  - uid: 274
+    components:
+    - type: Transform
+      pos: 1.5,15.5
+      parent: 1
+  - uid: 275
+    components:
+    - type: Transform
+      pos: 2.5,12.5
+      parent: 1
+  - uid: 276
+    components:
+    - type: Transform
+      pos: 3.5,12.5
+      parent: 1
+  - uid: 277
+    components:
+    - type: Transform
+      pos: 3.5,13.5
+      parent: 1
+- proto: NFBasaltMineralHardRich
+  entities:
+  - uid: 278
+    components:
+    - type: Transform
+      pos: 2.5,24.5
+      parent: 1
+  - uid: 279
+    components:
+    - type: Transform
+      pos: 2.5,25.5
+      parent: 1
+  - uid: 280
+    components:
+    - type: Transform
+      pos: 3.5,25.5
+      parent: 1
+  - uid: 281
+    components:
+    - type: Transform
+      pos: 3.5,24.5
+      parent: 1
+  - uid: 282
+    components:
+    - type: Transform
+      pos: 3.5,26.5
+      parent: 1
+  - uid: 283
+    components:
+    - type: Transform
+      pos: 4.5,26.5
+      parent: 1
+  - uid: 284
+    components:
+    - type: Transform
+      pos: 4.5,27.5
+      parent: 1
+  - uid: 285
+    components:
+    - type: Transform
+      pos: 3.5,27.5
+      parent: 1
+  - uid: 286
+    components:
+    - type: Transform
+      pos: 2.5,26.5
+      parent: 1
+  - uid: 287
+    components:
+    - type: Transform
+      pos: 1.5,26.5
+      parent: 1
+  - uid: 288
+    components:
+    - type: Transform
+      pos: 1.5,27.5
+      parent: 1
+  - uid: 289
+    components:
+    - type: Transform
+      pos: 2.5,27.5
+      parent: 1
+  - uid: 290
+    components:
+    - type: Transform
+      pos: 2.5,28.5
+      parent: 1
+  - uid: 291
+    components:
+    - type: Transform
+      pos: 1.5,28.5
+      parent: 1
+  - uid: 292
+    components:
+    - type: Transform
+      pos: 6.5,26.5
+      parent: 1
+  - uid: 293
+    components:
+    - type: Transform
+      pos: 7.5,26.5
+      parent: 1
+  - uid: 294
+    components:
+    - type: Transform
+      pos: 7.5,25.5
+      parent: 1
+  - uid: 295
+    components:
+    - type: Transform
+      pos: 8.5,24.5
+      parent: 1
+  - uid: 296
+    components:
+    - type: Transform
+      pos: 8.5,25.5
+      parent: 1
+  - uid: 297
+    components:
+    - type: Transform
+      pos: 9.5,25.5
+      parent: 1
+  - uid: 298
+    components:
+    - type: Transform
+      pos: 9.5,24.5
+      parent: 1
+  - uid: 299
+    components:
+    - type: Transform
+      pos: 9.5,26.5
+      parent: 1
+  - uid: 300
+    components:
+    - type: Transform
+      pos: 8.5,26.5
+      parent: 1
+  - uid: 301
+    components:
+    - type: Transform
+      pos: 8.5,27.5
+      parent: 1
+  - uid: 302
+    components:
+    - type: Transform
+      pos: 9.5,27.5
+      parent: 1
+  - uid: 303
+    components:
+    - type: Transform
+      pos: 9.5,28.5
+      parent: 1
+  - uid: 304
+    components:
+    - type: Transform
+      pos: 10.5,28.5
+      parent: 1
+  - uid: 305
+    components:
+    - type: Transform
+      pos: 10.5,27.5
+      parent: 1
+  - uid: 306
+    components:
+    - type: Transform
+      pos: 12.5,27.5
+      parent: 1
+  - uid: 307
+    components:
+    - type: Transform
+      pos: 13.5,27.5
+      parent: 1
+  - uid: 308
+    components:
+    - type: Transform
+      pos: 13.5,26.5
+      parent: 1
+  - uid: 309
+    components:
+    - type: Transform
+      pos: 14.5,26.5
+      parent: 1
+  - uid: 310
+    components:
+    - type: Transform
+      pos: 14.5,27.5
+      parent: 1
+  - uid: 311
+    components:
+    - type: Transform
+      pos: 15.5,27.5
+      parent: 1
+  - uid: 312
+    components:
+    - type: Transform
+      pos: 15.5,26.5
+      parent: 1
+  - uid: 313
+    components:
+    - type: Transform
+      pos: 16.5,26.5
+      parent: 1
+  - uid: 314
+    components:
+    - type: Transform
+      pos: 13.5,25.5
+      parent: 1
+  - uid: 315
+    components:
+    - type: Transform
+      pos: 14.5,25.5
+      parent: 1
+  - uid: 316
+    components:
+    - type: Transform
+      pos: 14.5,24.5
+      parent: 1
+  - uid: 317
+    components:
+    - type: Transform
+      pos: 20.5,24.5
+      parent: 1
+  - uid: 318
+    components:
+    - type: Transform
+      pos: 20.5,25.5
+      parent: 1
+  - uid: 319
+    components:
+    - type: Transform
+      pos: 19.5,25.5
+      parent: 1
+  - uid: 320
+    components:
+    - type: Transform
+      pos: 19.5,26.5
+      parent: 1
+  - uid: 321
+    components:
+    - type: Transform
+      pos: 19.5,27.5
+      parent: 1
+  - uid: 322
+    components:
+    - type: Transform
+      pos: 20.5,27.5
+      parent: 1
+  - uid: 323
+    components:
+    - type: Transform
+      pos: 20.5,26.5
+      parent: 1
+  - uid: 324
+    components:
+    - type: Transform
+      pos: 21.5,26.5
+      parent: 1
+  - uid: 325
+    components:
+    - type: Transform
+      pos: 21.5,27.5
+      parent: 1
+  - uid: 326
+    components:
+    - type: Transform
+      pos: 21.5,28.5
+      parent: 1
+  - uid: 327
+    components:
+    - type: Transform
+      pos: 24.5,26.5
+      parent: 1
+  - uid: 328
+    components:
+    - type: Transform
+      pos: 25.5,26.5
+      parent: 1
+  - uid: 329
+    components:
+    - type: Transform
+      pos: 25.5,25.5
+      parent: 1
+  - uid: 330
+    components:
+    - type: Transform
+      pos: 26.5,25.5
+      parent: 1
+  - uid: 331
+    components:
+    - type: Transform
+      pos: 27.5,25.5
+      parent: 1
+  - uid: 332
+    components:
+    - type: Transform
+      pos: 27.5,24.5
+      parent: 1
+  - uid: 333
+    components:
+    - type: Transform
+      pos: 28.5,26.5
+      parent: 1
+  - uid: 334
+    components:
+    - type: Transform
+      pos: 27.5,26.5
+      parent: 1
+  - uid: 335
+    components:
+    - type: Transform
+      pos: 26.5,26.5
+      parent: 1
+  - uid: 336
+    components:
+    - type: Transform
+      pos: 26.5,27.5
+      parent: 1
+  - uid: 337
+    components:
+    - type: Transform
+      pos: 27.5,27.5
+      parent: 1
+  - uid: 338
+    components:
+    - type: Transform
+      pos: 27.5,28.5
+      parent: 1
+  - uid: 339
+    components:
+    - type: Transform
+      pos: 28.5,28.5
+      parent: 1
+  - uid: 340
+    components:
+    - type: Transform
+      pos: 26.5,28.5
+      parent: 1
+  - uid: 341
+    components:
+    - type: Transform
+      pos: 25.5,28.5
+      parent: 1
+  - uid: 342
+    components:
+    - type: Transform
+      pos: 25.5,27.5
+      parent: 1
+  - uid: 343
+    components:
+    - type: Transform
+      pos: 30.5,26.5
+      parent: 1
+  - uid: 344
+    components:
+    - type: Transform
+      pos: 31.5,26.5
+      parent: 1
+  - uid: 345
+    components:
+    - type: Transform
+      pos: 31.5,27.5
+      parent: 1
+  - uid: 346
+    components:
+    - type: Transform
+      pos: 31.5,28.5
+      parent: 1
+  - uid: 347
+    components:
+    - type: Transform
+      pos: 32.5,27.5
+      parent: 1
+  - uid: 348
+    components:
+    - type: Transform
+      pos: 32.5,26.5
+      parent: 1
+  - uid: 349
+    components:
+    - type: Transform
+      pos: 32.5,25.5
+      parent: 1
+  - uid: 350
+    components:
+    - type: Transform
+      pos: 33.5,25.5
+      parent: 1
+  - uid: 351
+    components:
+    - type: Transform
+      pos: 33.5,24.5
+      parent: 1
+  - uid: 352
+    components:
+    - type: Transform
+      pos: 33.5,26.5
+      parent: 1
+  - uid: 353
+    components:
+    - type: Transform
+      pos: 34.5,26.5
+      parent: 1
+  - uid: 354
+    components:
+    - type: Transform
+      pos: 33.5,27.5
+      parent: 1
+  - uid: 355
+    components:
+    - type: Transform
+      pos: 33.5,28.5
+      parent: 1
+  - uid: 356
+    components:
+    - type: Transform
+      pos: 36.5,25.5
+      parent: 1
+  - uid: 357
+    components:
+    - type: Transform
+      pos: 37.5,25.5
+      parent: 1
+  - uid: 358
+    components:
+    - type: Transform
+      pos: 37.5,24.5
+      parent: 1
+  - uid: 359
+    components:
+    - type: Transform
+      pos: 38.5,24.5
+      parent: 1
+  - uid: 360
+    components:
+    - type: Transform
+      pos: 38.5,25.5
+      parent: 1
+  - uid: 361
+    components:
+    - type: Transform
+      pos: 39.5,25.5
+      parent: 1
+  - uid: 362
+    components:
+    - type: Transform
+      pos: 37.5,26.5
+      parent: 1
+  - uid: 363
+    components:
+    - type: Transform
+      pos: 38.5,26.5
+      parent: 1
+  - uid: 364
+    components:
+    - type: Transform
+      pos: 38.5,27.5
+      parent: 1
+  - uid: 365
+    components:
+    - type: Transform
+      pos: 39.5,28.5
+      parent: 1
+  - uid: 366
+    components:
+    - type: Transform
+      pos: 39.5,27.5
+      parent: 1
+  - uid: 367
+    components:
+    - type: Transform
+      pos: 39.5,26.5
+      parent: 1
+  - uid: 368
+    components:
+    - type: Transform
+      pos: 40.5,26.5
+      parent: 1
+  - uid: 369
+    components:
+    - type: Transform
+      pos: 40.5,27.5
+      parent: 1
+- proto: NFChromiteMineralHardRich
+  entities:
+  - uid: 2
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 1
+  - uid: 3
+    components:
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 1
+  - uid: 4
+    components:
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 1
+  - uid: 5
+    components:
+    - type: Transform
+      pos: 3.5,1.5
+      parent: 1
+  - uid: 6
+    components:
+    - type: Transform
+      pos: 3.5,2.5
+      parent: 1
+  - uid: 7
+    components:
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 1
+  - uid: 8
+    components:
+    - type: Transform
+      pos: 4.5,3.5
+      parent: 1
+  - uid: 9
+    components:
+    - type: Transform
+      pos: 3.5,3.5
+      parent: 1
+  - uid: 10
+    components:
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 1
+  - uid: 11
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 1
+  - uid: 12
+    components:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 1
+  - uid: 13
+    components:
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 1
+  - uid: 14
+    components:
+    - type: Transform
+      pos: 1.5,4.5
+      parent: 1
+  - uid: 15
+    components:
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 1
+  - uid: 16
+    components:
+    - type: Transform
+      pos: 6.5,2.5
+      parent: 1
+  - uid: 17
+    components:
+    - type: Transform
+      pos: 7.5,2.5
+      parent: 1
+  - uid: 18
+    components:
+    - type: Transform
+      pos: 7.5,1.5
+      parent: 1
+  - uid: 19
+    components:
+    - type: Transform
+      pos: 8.5,1.5
+      parent: 1
+  - uid: 20
+    components:
+    - type: Transform
+      pos: 8.5,0.5
+      parent: 1
+  - uid: 21
+    components:
+    - type: Transform
+      pos: 9.5,0.5
+      parent: 1
+  - uid: 22
+    components:
+    - type: Transform
+      pos: 9.5,1.5
+      parent: 1
+  - uid: 23
+    components:
+    - type: Transform
+      pos: 9.5,2.5
+      parent: 1
+  - uid: 24
+    components:
+    - type: Transform
+      pos: 8.5,2.5
+      parent: 1
+  - uid: 25
+    components:
+    - type: Transform
+      pos: 8.5,3.5
+      parent: 1
+  - uid: 26
+    components:
+    - type: Transform
+      pos: 9.5,3.5
+      parent: 1
+  - uid: 27
+    components:
+    - type: Transform
+      pos: 9.5,4.5
+      parent: 1
+  - uid: 28
+    components:
+    - type: Transform
+      pos: 10.5,4.5
+      parent: 1
+  - uid: 29
+    components:
+    - type: Transform
+      pos: 10.5,3.5
+      parent: 1
+  - uid: 30
+    components:
+    - type: Transform
+      pos: 12.5,3.5
+      parent: 1
+  - uid: 31
+    components:
+    - type: Transform
+      pos: 13.5,3.5
+      parent: 1
+  - uid: 32
+    components:
+    - type: Transform
+      pos: 13.5,2.5
+      parent: 1
+  - uid: 33
+    components:
+    - type: Transform
+      pos: 13.5,1.5
+      parent: 1
+  - uid: 34
+    components:
+    - type: Transform
+      pos: 14.5,0.5
+      parent: 1
+  - uid: 35
+    components:
+    - type: Transform
+      pos: 14.5,1.5
+      parent: 1
+  - uid: 36
+    components:
+    - type: Transform
+      pos: 14.5,2.5
+      parent: 1
+  - uid: 37
+    components:
+    - type: Transform
+      pos: 14.5,3.5
+      parent: 1
+  - uid: 38
+    components:
+    - type: Transform
+      pos: 15.5,3.5
+      parent: 1
+  - uid: 39
+    components:
+    - type: Transform
+      pos: 15.5,2.5
+      parent: 1
+  - uid: 40
+    components:
+    - type: Transform
+      pos: 16.5,2.5
+      parent: 1
+  - uid: 41
+    components:
+    - type: Transform
+      pos: 20.5,0.5
+      parent: 1
+  - uid: 42
+    components:
+    - type: Transform
+      pos: 20.5,1.5
+      parent: 1
+  - uid: 43
+    components:
+    - type: Transform
+      pos: 19.5,1.5
+      parent: 1
+  - uid: 44
+    components:
+    - type: Transform
+      pos: 19.5,2.5
+      parent: 1
+  - uid: 45
+    components:
+    - type: Transform
+      pos: 19.5,3.5
+      parent: 1
+  - uid: 46
+    components:
+    - type: Transform
+      pos: 20.5,3.5
+      parent: 1
+  - uid: 47
+    components:
+    - type: Transform
+      pos: 20.5,2.5
+      parent: 1
+  - uid: 48
+    components:
+    - type: Transform
+      pos: 21.5,2.5
+      parent: 1
+  - uid: 49
+    components:
+    - type: Transform
+      pos: 21.5,3.5
+      parent: 1
+  - uid: 50
+    components:
+    - type: Transform
+      pos: 21.5,4.5
+      parent: 1
+  - uid: 51
+    components:
+    - type: Transform
+      pos: 24.5,2.5
+      parent: 1
+  - uid: 52
+    components:
+    - type: Transform
+      pos: 25.5,2.5
+      parent: 1
+  - uid: 53
+    components:
+    - type: Transform
+      pos: 25.5,1.5
+      parent: 1
+  - uid: 54
+    components:
+    - type: Transform
+      pos: 26.5,1.5
+      parent: 1
+  - uid: 55
+    components:
+    - type: Transform
+      pos: 27.5,0.5
+      parent: 1
+  - uid: 56
+    components:
+    - type: Transform
+      pos: 27.5,1.5
+      parent: 1
+  - uid: 57
+    components:
+    - type: Transform
+      pos: 27.5,2.5
+      parent: 1
+  - uid: 58
+    components:
+    - type: Transform
+      pos: 28.5,2.5
+      parent: 1
+  - uid: 59
+    components:
+    - type: Transform
+      pos: 26.5,2.5
+      parent: 1
+  - uid: 60
+    components:
+    - type: Transform
+      pos: 27.5,3.5
+      parent: 1
+  - uid: 61
+    components:
+    - type: Transform
+      pos: 26.5,3.5
+      parent: 1
+  - uid: 62
+    components:
+    - type: Transform
+      pos: 25.5,3.5
+      parent: 1
+  - uid: 63
+    components:
+    - type: Transform
+      pos: 25.5,4.5
+      parent: 1
+  - uid: 64
+    components:
+    - type: Transform
+      pos: 26.5,4.5
+      parent: 1
+  - uid: 65
+    components:
+    - type: Transform
+      pos: 27.5,4.5
+      parent: 1
+  - uid: 66
+    components:
+    - type: Transform
+      pos: 28.5,4.5
+      parent: 1
+  - uid: 67
+    components:
+    - type: Transform
+      pos: 30.5,2.5
+      parent: 1
+  - uid: 68
+    components:
+    - type: Transform
+      pos: 31.5,4.5
+      parent: 1
+  - uid: 69
+    components:
+    - type: Transform
+      pos: 31.5,3.5
+      parent: 1
+  - uid: 70
+    components:
+    - type: Transform
+      pos: 31.5,2.5
+      parent: 1
+  - uid: 71
+    components:
+    - type: Transform
+      pos: 32.5,3.5
+      parent: 1
+  - uid: 72
+    components:
+    - type: Transform
+      pos: 32.5,2.5
+      parent: 1
+  - uid: 73
+    components:
+    - type: Transform
+      pos: 32.5,1.5
+      parent: 1
+  - uid: 74
+    components:
+    - type: Transform
+      pos: 33.5,0.5
+      parent: 1
+  - uid: 75
+    components:
+    - type: Transform
+      pos: 33.5,1.5
+      parent: 1
+  - uid: 76
+    components:
+    - type: Transform
+      pos: 33.5,2.5
+      parent: 1
+  - uid: 77
+    components:
+    - type: Transform
+      pos: 34.5,2.5
+      parent: 1
+  - uid: 78
+    components:
+    - type: Transform
+      pos: 33.5,3.5
+      parent: 1
+  - uid: 79
+    components:
+    - type: Transform
+      pos: 33.5,4.5
+      parent: 1
+  - uid: 80
+    components:
+    - type: Transform
+      pos: 37.5,0.5
+      parent: 1
+  - uid: 81
+    components:
+    - type: Transform
+      pos: 36.5,1.5
+      parent: 1
+  - uid: 82
+    components:
+    - type: Transform
+      pos: 37.5,1.5
+      parent: 1
+  - uid: 83
+    components:
+    - type: Transform
+      pos: 37.5,2.5
+      parent: 1
+  - uid: 84
+    components:
+    - type: Transform
+      pos: 38.5,2.5
+      parent: 1
+  - uid: 85
+    components:
+    - type: Transform
+      pos: 38.5,1.5
+      parent: 1
+  - uid: 86
+    components:
+    - type: Transform
+      pos: 38.5,0.5
+      parent: 1
+  - uid: 87
+    components:
+    - type: Transform
+      pos: 39.5,1.5
+      parent: 1
+  - uid: 88
+    components:
+    - type: Transform
+      pos: 39.5,2.5
+      parent: 1
+  - uid: 89
+    components:
+    - type: Transform
+      pos: 40.5,2.5
+      parent: 1
+  - uid: 90
+    components:
+    - type: Transform
+      pos: 40.5,3.5
+      parent: 1
+  - uid: 91
+    components:
+    - type: Transform
+      pos: 39.5,3.5
+      parent: 1
+  - uid: 92
+    components:
+    - type: Transform
+      pos: 39.5,4.5
+      parent: 1
+  - uid: 93
+    components:
+    - type: Transform
+      pos: 38.5,3.5
+      parent: 1
+- proto: NFIceMineralHardRich
+  entities:
+  - uid: 94
+    components:
+    - type: Transform
+      pos: 36.5,7.5
+      parent: 1
+  - uid: 95
+    components:
+    - type: Transform
+      pos: 37.5,7.5
+      parent: 1
+  - uid: 96
+    components:
+    - type: Transform
+      pos: 37.5,6.5
+      parent: 1
+  - uid: 97
+    components:
+    - type: Transform
+      pos: 38.5,6.5
+      parent: 1
+  - uid: 98
+    components:
+    - type: Transform
+      pos: 38.5,7.5
+      parent: 1
+  - uid: 99
+    components:
+    - type: Transform
+      pos: 39.5,7.5
+      parent: 1
+  - uid: 100
+    components:
+    - type: Transform
+      pos: 39.5,8.5
+      parent: 1
+  - uid: 101
+    components:
+    - type: Transform
+      pos: 38.5,8.5
+      parent: 1
+  - uid: 102
+    components:
+    - type: Transform
+      pos: 37.5,8.5
+      parent: 1
+  - uid: 103
+    components:
+    - type: Transform
+      pos: 38.5,9.5
+      parent: 1
+  - uid: 104
+    components:
+    - type: Transform
+      pos: 39.5,9.5
+      parent: 1
+  - uid: 105
+    components:
+    - type: Transform
+      pos: 40.5,9.5
+      parent: 1
+  - uid: 106
+    components:
+    - type: Transform
+      pos: 40.5,8.5
+      parent: 1
+  - uid: 107
+    components:
+    - type: Transform
+      pos: 39.5,10.5
+      parent: 1
+  - uid: 108
+    components:
+    - type: Transform
+      pos: 33.5,6.5
+      parent: 1
+  - uid: 109
+    components:
+    - type: Transform
+      pos: 33.5,7.5
+      parent: 1
+  - uid: 110
+    components:
+    - type: Transform
+      pos: 32.5,7.5
+      parent: 1
+  - uid: 111
+    components:
+    - type: Transform
+      pos: 34.5,8.5
+      parent: 1
+  - uid: 112
+    components:
+    - type: Transform
+      pos: 33.5,8.5
+      parent: 1
+  - uid: 113
+    components:
+    - type: Transform
+      pos: 33.5,9.5
+      parent: 1
+  - uid: 114
+    components:
+    - type: Transform
+      pos: 33.5,10.5
+      parent: 1
+  - uid: 115
+    components:
+    - type: Transform
+      pos: 32.5,9.5
+      parent: 1
+  - uid: 116
+    components:
+    - type: Transform
+      pos: 32.5,8.5
+      parent: 1
+  - uid: 117
+    components:
+    - type: Transform
+      pos: 31.5,8.5
+      parent: 1
+  - uid: 118
+    components:
+    - type: Transform
+      pos: 31.5,9.5
+      parent: 1
+  - uid: 119
+    components:
+    - type: Transform
+      pos: 30.5,8.5
+      parent: 1
+  - uid: 120
+    components:
+    - type: Transform
+      pos: 31.5,10.5
+      parent: 1
+  - uid: 121
+    components:
+    - type: Transform
+      pos: 27.5,6.5
+      parent: 1
+  - uid: 122
+    components:
+    - type: Transform
+      pos: 27.5,7.5
+      parent: 1
+  - uid: 123
+    components:
+    - type: Transform
+      pos: 25.5,7.5
+      parent: 1
+  - uid: 124
+    components:
+    - type: Transform
+      pos: 26.5,7.5
+      parent: 1
+  - uid: 125
+    components:
+    - type: Transform
+      pos: 26.5,8.5
+      parent: 1
+  - uid: 126
+    components:
+    - type: Transform
+      pos: 25.5,8.5
+      parent: 1
+  - uid: 127
+    components:
+    - type: Transform
+      pos: 24.5,8.5
+      parent: 1
+  - uid: 128
+    components:
+    - type: Transform
+      pos: 25.5,9.5
+      parent: 1
+  - uid: 129
+    components:
+    - type: Transform
+      pos: 25.5,10.5
+      parent: 1
+  - uid: 130
+    components:
+    - type: Transform
+      pos: 26.5,10.5
+      parent: 1
+  - uid: 131
+    components:
+    - type: Transform
+      pos: 26.5,9.5
+      parent: 1
+  - uid: 132
+    components:
+    - type: Transform
+      pos: 27.5,9.5
+      parent: 1
+  - uid: 133
+    components:
+    - type: Transform
+      pos: 27.5,8.5
+      parent: 1
+  - uid: 134
+    components:
+    - type: Transform
+      pos: 28.5,8.5
+      parent: 1
+  - uid: 135
+    components:
+    - type: Transform
+      pos: 27.5,10.5
+      parent: 1
+  - uid: 136
+    components:
+    - type: Transform
+      pos: 28.5,10.5
+      parent: 1
+  - uid: 137
+    components:
+    - type: Transform
+      pos: 20.5,6.5
+      parent: 1
+  - uid: 138
+    components:
+    - type: Transform
+      pos: 20.5,7.5
+      parent: 1
+  - uid: 139
+    components:
+    - type: Transform
+      pos: 19.5,7.5
+      parent: 1
+  - uid: 140
+    components:
+    - type: Transform
+      pos: 19.5,8.5
+      parent: 1
+  - uid: 141
+    components:
+    - type: Transform
+      pos: 20.5,8.5
+      parent: 1
+  - uid: 142
+    components:
+    - type: Transform
+      pos: 21.5,8.5
+      parent: 1
+  - uid: 143
+    components:
+    - type: Transform
+      pos: 21.5,9.5
+      parent: 1
+  - uid: 144
+    components:
+    - type: Transform
+      pos: 20.5,9.5
+      parent: 1
+  - uid: 145
+    components:
+    - type: Transform
+      pos: 19.5,9.5
+      parent: 1
+  - uid: 146
+    components:
+    - type: Transform
+      pos: 21.5,10.5
+      parent: 1
+  - uid: 147
+    components:
+    - type: Transform
+      pos: 14.5,6.5
+      parent: 1
+  - uid: 148
+    components:
+    - type: Transform
+      pos: 14.5,7.5
+      parent: 1
+  - uid: 149
+    components:
+    - type: Transform
+      pos: 13.5,7.5
+      parent: 1
+  - uid: 150
+    components:
+    - type: Transform
+      pos: 13.5,8.5
+      parent: 1
+  - uid: 151
+    components:
+    - type: Transform
+      pos: 14.5,8.5
+      parent: 1
+  - uid: 152
+    components:
+    - type: Transform
+      pos: 16.5,8.5
+      parent: 1
+  - uid: 153
+    components:
+    - type: Transform
+      pos: 15.5,8.5
+      parent: 1
+  - uid: 154
+    components:
+    - type: Transform
+      pos: 15.5,9.5
+      parent: 1
+  - uid: 155
+    components:
+    - type: Transform
+      pos: 14.5,9.5
+      parent: 1
+  - uid: 156
+    components:
+    - type: Transform
+      pos: 13.5,9.5
+      parent: 1
+  - uid: 157
+    components:
+    - type: Transform
+      pos: 12.5,9.5
+      parent: 1
+  - uid: 158
+    components:
+    - type: Transform
+      pos: 8.5,6.5
+      parent: 1
+  - uid: 159
+    components:
+    - type: Transform
+      pos: 9.5,6.5
+      parent: 1
+  - uid: 160
+    components:
+    - type: Transform
+      pos: 9.5,7.5
+      parent: 1
+  - uid: 161
+    components:
+    - type: Transform
+      pos: 8.5,7.5
+      parent: 1
+  - uid: 162
+    components:
+    - type: Transform
+      pos: 7.5,7.5
+      parent: 1
+  - uid: 163
+    components:
+    - type: Transform
+      pos: 6.5,8.5
+      parent: 1
+  - uid: 164
+    components:
+    - type: Transform
+      pos: 7.5,8.5
+      parent: 1
+  - uid: 165
+    components:
+    - type: Transform
+      pos: 8.5,8.5
+      parent: 1
+  - uid: 166
+    components:
+    - type: Transform
+      pos: 9.5,8.5
+      parent: 1
+  - uid: 167
+    components:
+    - type: Transform
+      pos: 8.5,9.5
+      parent: 1
+  - uid: 168
+    components:
+    - type: Transform
+      pos: 9.5,9.5
+      parent: 1
+  - uid: 169
+    components:
+    - type: Transform
+      pos: 9.5,10.5
+      parent: 1
+  - uid: 170
+    components:
+    - type: Transform
+      pos: 10.5,10.5
+      parent: 1
+  - uid: 171
+    components:
+    - type: Transform
+      pos: 10.5,9.5
+      parent: 1
+  - uid: 172
+    components:
+    - type: Transform
+      pos: 2.5,6.5
+      parent: 1
+  - uid: 173
+    components:
+    - type: Transform
+      pos: 3.5,6.5
+      parent: 1
+  - uid: 174
+    components:
+    - type: Transform
+      pos: 3.5,7.5
+      parent: 1
+  - uid: 175
+    components:
+    - type: Transform
+      pos: 2.5,7.5
+      parent: 1
+  - uid: 176
+    components:
+    - type: Transform
+      pos: 1.5,8.5
+      parent: 1
+  - uid: 177
+    components:
+    - type: Transform
+      pos: 2.5,8.5
+      parent: 1
+  - uid: 178
+    components:
+    - type: Transform
+      pos: 2.5,9.5
+      parent: 1
+  - uid: 179
+    components:
+    - type: Transform
+      pos: 1.5,9.5
+      parent: 1
+  - uid: 180
+    components:
+    - type: Transform
+      pos: 1.5,10.5
+      parent: 1
+  - uid: 181
+    components:
+    - type: Transform
+      pos: 2.5,10.5
+      parent: 1
+  - uid: 182
+    components:
+    - type: Transform
+      pos: 3.5,9.5
+      parent: 1
+  - uid: 183
+    components:
+    - type: Transform
+      pos: 3.5,8.5
+      parent: 1
+  - uid: 184
+    components:
+    - type: Transform
+      pos: 4.5,8.5
+      parent: 1
+  - uid: 185
+    components:
+    - type: Transform
+      pos: 4.5,9.5
+      parent: 1
+- proto: NFRockMineralHardRich
+  entities:
+  - uid: 546
+    components:
+    - type: Transform
+      pos: 40.5,38.5
+      parent: 1
+  - uid: 553
+    components:
+    - type: Transform
+      pos: 37.5,36.5
+      parent: 1
+  - uid: 554
+    components:
+    - type: Transform
+      pos: 38.5,36.5
+      parent: 1
+  - uid: 555
+    components:
+    - type: Transform
+      pos: 38.5,37.5
+      parent: 1
+  - uid: 556
+    components:
+    - type: Transform
+      pos: 37.5,37.5
+      parent: 1
+  - uid: 557
+    components:
+    - type: Transform
+      pos: 36.5,37.5
+      parent: 1
+  - uid: 558
+    components:
+    - type: Transform
+      pos: 37.5,38.5
+      parent: 1
+  - uid: 559
+    components:
+    - type: Transform
+      pos: 38.5,38.5
+      parent: 1
+  - uid: 560
+    components:
+    - type: Transform
+      pos: 39.5,38.5
+      parent: 1
+  - uid: 561
+    components:
+    - type: Transform
+      pos: 39.5,37.5
+      parent: 1
+  - uid: 562
+    components:
+    - type: Transform
+      pos: 38.5,39.5
+      parent: 1
+  - uid: 563
+    components:
+    - type: Transform
+      pos: 39.5,39.5
+      parent: 1
+  - uid: 564
+    components:
+    - type: Transform
+      pos: 39.5,40.5
+      parent: 1
+  - uid: 565
+    components:
+    - type: Transform
+      pos: 40.5,39.5
+      parent: 1
+  - uid: 566
+    components:
+    - type: Transform
+      pos: 33.5,36.5
+      parent: 1
+  - uid: 567
+    components:
+    - type: Transform
+      pos: 33.5,37.5
+      parent: 1
+  - uid: 568
+    components:
+    - type: Transform
+      pos: 33.5,38.5
+      parent: 1
+  - uid: 569
+    components:
+    - type: Transform
+      pos: 34.5,38.5
+      parent: 1
+  - uid: 570
+    components:
+    - type: Transform
+      pos: 33.5,39.5
+      parent: 1
+  - uid: 571
+    components:
+    - type: Transform
+      pos: 33.5,40.5
+      parent: 1
+  - uid: 572
+    components:
+    - type: Transform
+      pos: 32.5,39.5
+      parent: 1
+  - uid: 573
+    components:
+    - type: Transform
+      pos: 32.5,38.5
+      parent: 1
+  - uid: 574
+    components:
+    - type: Transform
+      pos: 32.5,37.5
+      parent: 1
+  - uid: 575
+    components:
+    - type: Transform
+      pos: 31.5,38.5
+      parent: 1
+  - uid: 576
+    components:
+    - type: Transform
+      pos: 31.5,39.5
+      parent: 1
+  - uid: 577
+    components:
+    - type: Transform
+      pos: 31.5,40.5
+      parent: 1
+  - uid: 578
+    components:
+    - type: Transform
+      pos: 30.5,38.5
+      parent: 1
+  - uid: 579
+    components:
+    - type: Transform
+      pos: 28.5,38.5
+      parent: 1
+  - uid: 580
+    components:
+    - type: Transform
+      pos: 28.5,40.5
+      parent: 1
+  - uid: 581
+    components:
+    - type: Transform
+      pos: 27.5,40.5
+      parent: 1
+  - uid: 582
+    components:
+    - type: Transform
+      pos: 27.5,39.5
+      parent: 1
+  - uid: 583
+    components:
+    - type: Transform
+      pos: 27.5,38.5
+      parent: 1
+  - uid: 584
+    components:
+    - type: Transform
+      pos: 27.5,37.5
+      parent: 1
+  - uid: 585
+    components:
+    - type: Transform
+      pos: 27.5,36.5
+      parent: 1
+  - uid: 586
+    components:
+    - type: Transform
+      pos: 26.5,37.5
+      parent: 1
+  - uid: 587
+    components:
+    - type: Transform
+      pos: 25.5,37.5
+      parent: 1
+  - uid: 588
+    components:
+    - type: Transform
+      pos: 25.5,38.5
+      parent: 1
+  - uid: 589
+    components:
+    - type: Transform
+      pos: 24.5,38.5
+      parent: 1
+  - uid: 590
+    components:
+    - type: Transform
+      pos: 26.5,38.5
+      parent: 1
+  - uid: 591
+    components:
+    - type: Transform
+      pos: 26.5,39.5
+      parent: 1
+  - uid: 592
+    components:
+    - type: Transform
+      pos: 25.5,39.5
+      parent: 1
+  - uid: 593
+    components:
+    - type: Transform
+      pos: 25.5,40.5
+      parent: 1
+  - uid: 594
+    components:
+    - type: Transform
+      pos: 26.5,40.5
+      parent: 1
+  - uid: 595
+    components:
+    - type: Transform
+      pos: 20.5,36.5
+      parent: 1
+  - uid: 596
+    components:
+    - type: Transform
+      pos: 20.5,37.5
+      parent: 1
+  - uid: 597
+    components:
+    - type: Transform
+      pos: 19.5,37.5
+      parent: 1
+  - uid: 598
+    components:
+    - type: Transform
+      pos: 19.5,38.5
+      parent: 1
+  - uid: 599
+    components:
+    - type: Transform
+      pos: 20.5,38.5
+      parent: 1
+  - uid: 600
+    components:
+    - type: Transform
+      pos: 21.5,38.5
+      parent: 1
+  - uid: 601
+    components:
+    - type: Transform
+      pos: 21.5,39.5
+      parent: 1
+  - uid: 602
+    components:
+    - type: Transform
+      pos: 21.5,40.5
+      parent: 1
+  - uid: 603
+    components:
+    - type: Transform
+      pos: 20.5,39.5
+      parent: 1
+  - uid: 604
+    components:
+    - type: Transform
+      pos: 19.5,39.5
+      parent: 1
+  - uid: 605
+    components:
+    - type: Transform
+      pos: 14.5,36.5
+      parent: 1
+  - uid: 606
+    components:
+    - type: Transform
+      pos: 14.5,37.5
+      parent: 1
+  - uid: 607
+    components:
+    - type: Transform
+      pos: 14.5,38.5
+      parent: 1
+  - uid: 608
+    components:
+    - type: Transform
+      pos: 15.5,38.5
+      parent: 1
+  - uid: 609
+    components:
+    - type: Transform
+      pos: 16.5,38.5
+      parent: 1
+  - uid: 610
+    components:
+    - type: Transform
+      pos: 15.5,39.5
+      parent: 1
+  - uid: 611
+    components:
+    - type: Transform
+      pos: 14.5,39.5
+      parent: 1
+  - uid: 612
+    components:
+    - type: Transform
+      pos: 13.5,39.5
+      parent: 1
+  - uid: 613
+    components:
+    - type: Transform
+      pos: 13.5,38.5
+      parent: 1
+  - uid: 614
+    components:
+    - type: Transform
+      pos: 13.5,37.5
+      parent: 1
+  - uid: 615
+    components:
+    - type: Transform
+      pos: 12.5,39.5
+      parent: 1
+  - uid: 616
+    components:
+    - type: Transform
+      pos: 9.5,36.5
+      parent: 1
+  - uid: 617
+    components:
+    - type: Transform
+      pos: 8.5,36.5
+      parent: 1
+  - uid: 618
+    components:
+    - type: Transform
+      pos: 8.5,37.5
+      parent: 1
+  - uid: 619
+    components:
+    - type: Transform
+      pos: 9.5,37.5
+      parent: 1
+  - uid: 620
+    components:
+    - type: Transform
+      pos: 9.5,38.5
+      parent: 1
+  - uid: 621
+    components:
+    - type: Transform
+      pos: 8.5,38.5
+      parent: 1
+  - uid: 622
+    components:
+    - type: Transform
+      pos: 7.5,38.5
+      parent: 1
+  - uid: 623
+    components:
+    - type: Transform
+      pos: 7.5,37.5
+      parent: 1
+  - uid: 624
+    components:
+    - type: Transform
+      pos: 6.5,38.5
+      parent: 1
+  - uid: 625
+    components:
+    - type: Transform
+      pos: 8.5,39.5
+      parent: 1
+  - uid: 626
+    components:
+    - type: Transform
+      pos: 10.5,39.5
+      parent: 1
+  - uid: 627
+    components:
+    - type: Transform
+      pos: 9.5,39.5
+      parent: 1
+  - uid: 628
+    components:
+    - type: Transform
+      pos: 9.5,40.5
+      parent: 1
+  - uid: 629
+    components:
+    - type: Transform
+      pos: 10.5,40.5
+      parent: 1
+  - uid: 630
+    components:
+    - type: Transform
+      pos: 3.5,36.5
+      parent: 1
+  - uid: 631
+    components:
+    - type: Transform
+      pos: 2.5,36.5
+      parent: 1
+  - uid: 632
+    components:
+    - type: Transform
+      pos: 3.5,37.5
+      parent: 1
+  - uid: 633
+    components:
+    - type: Transform
+      pos: 2.5,37.5
+      parent: 1
+  - uid: 634
+    components:
+    - type: Transform
+      pos: 2.5,38.5
+      parent: 1
+  - uid: 635
+    components:
+    - type: Transform
+      pos: 3.5,38.5
+      parent: 1
+  - uid: 636
+    components:
+    - type: Transform
+      pos: 4.5,38.5
+      parent: 1
+  - uid: 637
+    components:
+    - type: Transform
+      pos: 4.5,39.5
+      parent: 1
+  - uid: 638
+    components:
+    - type: Transform
+      pos: 3.5,39.5
+      parent: 1
+  - uid: 639
+    components:
+    - type: Transform
+      pos: 2.5,39.5
+      parent: 1
+  - uid: 640
+    components:
+    - type: Transform
+      pos: 2.5,40.5
+      parent: 1
+  - uid: 641
+    components:
+    - type: Transform
+      pos: 1.5,40.5
+      parent: 1
+  - uid: 642
+    components:
+    - type: Transform
+      pos: 1.5,38.5
+      parent: 1
+  - uid: 643
+    components:
+    - type: Transform
+      pos: 1.5,39.5
+      parent: 1
+- proto: NFSandMineralHardRich
+  entities:
+  - uid: 462
+    components:
+    - type: Transform
+      pos: 2.5,30.5
+      parent: 1
+  - uid: 463
+    components:
+    - type: Transform
+      pos: 3.5,30.5
+      parent: 1
+  - uid: 464
+    components:
+    - type: Transform
+      pos: 3.5,31.5
+      parent: 1
+  - uid: 465
+    components:
+    - type: Transform
+      pos: 2.5,31.5
+      parent: 1
+  - uid: 466
+    components:
+    - type: Transform
+      pos: 2.5,32.5
+      parent: 1
+  - uid: 467
+    components:
+    - type: Transform
+      pos: 1.5,32.5
+      parent: 1
+  - uid: 468
+    components:
+    - type: Transform
+      pos: 1.5,33.5
+      parent: 1
+  - uid: 469
+    components:
+    - type: Transform
+      pos: 1.5,34.5
+      parent: 1
+  - uid: 470
+    components:
+    - type: Transform
+      pos: 2.5,34.5
+      parent: 1
+  - uid: 471
+    components:
+    - type: Transform
+      pos: 2.5,33.5
+      parent: 1
+  - uid: 472
+    components:
+    - type: Transform
+      pos: 3.5,33.5
+      parent: 1
+  - uid: 473
+    components:
+    - type: Transform
+      pos: 3.5,32.5
+      parent: 1
+  - uid: 474
+    components:
+    - type: Transform
+      pos: 4.5,32.5
+      parent: 1
+  - uid: 475
+    components:
+    - type: Transform
+      pos: 4.5,33.5
+      parent: 1
+  - uid: 476
+    components:
+    - type: Transform
+      pos: 6.5,32.5
+      parent: 1
+  - uid: 477
+    components:
+    - type: Transform
+      pos: 7.5,32.5
+      parent: 1
+  - uid: 478
+    components:
+    - type: Transform
+      pos: 7.5,31.5
+      parent: 1
+  - uid: 479
+    components:
+    - type: Transform
+      pos: 8.5,31.5
+      parent: 1
+  - uid: 480
+    components:
+    - type: Transform
+      pos: 8.5,30.5
+      parent: 1
+  - uid: 481
+    components:
+    - type: Transform
+      pos: 9.5,30.5
+      parent: 1
+  - uid: 482
+    components:
+    - type: Transform
+      pos: 9.5,31.5
+      parent: 1
+  - uid: 483
+    components:
+    - type: Transform
+      pos: 9.5,32.5
+      parent: 1
+  - uid: 484
+    components:
+    - type: Transform
+      pos: 8.5,32.5
+      parent: 1
+  - uid: 485
+    components:
+    - type: Transform
+      pos: 8.5,33.5
+      parent: 1
+  - uid: 486
+    components:
+    - type: Transform
+      pos: 9.5,33.5
+      parent: 1
+  - uid: 487
+    components:
+    - type: Transform
+      pos: 9.5,34.5
+      parent: 1
+  - uid: 488
+    components:
+    - type: Transform
+      pos: 10.5,34.5
+      parent: 1
+  - uid: 489
+    components:
+    - type: Transform
+      pos: 10.5,33.5
+      parent: 1
+  - uid: 490
+    components:
+    - type: Transform
+      pos: 12.5,33.5
+      parent: 1
+  - uid: 491
+    components:
+    - type: Transform
+      pos: 13.5,33.5
+      parent: 1
+  - uid: 492
+    components:
+    - type: Transform
+      pos: 14.5,33.5
+      parent: 1
+  - uid: 493
+    components:
+    - type: Transform
+      pos: 15.5,33.5
+      parent: 1
+  - uid: 494
+    components:
+    - type: Transform
+      pos: 15.5,32.5
+      parent: 1
+  - uid: 495
+    components:
+    - type: Transform
+      pos: 16.5,32.5
+      parent: 1
+  - uid: 496
+    components:
+    - type: Transform
+      pos: 14.5,32.5
+      parent: 1
+  - uid: 497
+    components:
+    - type: Transform
+      pos: 13.5,32.5
+      parent: 1
+  - uid: 498
+    components:
+    - type: Transform
+      pos: 13.5,31.5
+      parent: 1
+  - uid: 499
+    components:
+    - type: Transform
+      pos: 14.5,31.5
+      parent: 1
+  - uid: 500
+    components:
+    - type: Transform
+      pos: 14.5,30.5
+      parent: 1
+  - uid: 501
+    components:
+    - type: Transform
+      pos: 20.5,30.5
+      parent: 1
+  - uid: 502
+    components:
+    - type: Transform
+      pos: 20.5,31.5
+      parent: 1
+  - uid: 503
+    components:
+    - type: Transform
+      pos: 19.5,31.5
+      parent: 1
+  - uid: 504
+    components:
+    - type: Transform
+      pos: 19.5,32.5
+      parent: 1
+  - uid: 505
+    components:
+    - type: Transform
+      pos: 19.5,33.5
+      parent: 1
+  - uid: 506
+    components:
+    - type: Transform
+      pos: 20.5,33.5
+      parent: 1
+  - uid: 507
+    components:
+    - type: Transform
+      pos: 20.5,32.5
+      parent: 1
+  - uid: 508
+    components:
+    - type: Transform
+      pos: 21.5,32.5
+      parent: 1
+  - uid: 509
+    components:
+    - type: Transform
+      pos: 21.5,33.5
+      parent: 1
+  - uid: 510
+    components:
+    - type: Transform
+      pos: 21.5,34.5
+      parent: 1
+  - uid: 511
+    components:
+    - type: Transform
+      pos: 24.5,32.5
+      parent: 1
+  - uid: 512
+    components:
+    - type: Transform
+      pos: 25.5,32.5
+      parent: 1
+  - uid: 513
+    components:
+    - type: Transform
+      pos: 25.5,31.5
+      parent: 1
+  - uid: 514
+    components:
+    - type: Transform
+      pos: 26.5,31.5
+      parent: 1
+  - uid: 515
+    components:
+    - type: Transform
+      pos: 27.5,31.5
+      parent: 1
+  - uid: 516
+    components:
+    - type: Transform
+      pos: 27.5,30.5
+      parent: 1
+  - uid: 517
+    components:
+    - type: Transform
+      pos: 28.5,32.5
+      parent: 1
+  - uid: 518
+    components:
+    - type: Transform
+      pos: 27.5,32.5
+      parent: 1
+  - uid: 519
+    components:
+    - type: Transform
+      pos: 26.5,32.5
+      parent: 1
+  - uid: 520
+    components:
+    - type: Transform
+      pos: 26.5,33.5
+      parent: 1
+  - uid: 521
+    components:
+    - type: Transform
+      pos: 25.5,33.5
+      parent: 1
+  - uid: 522
+    components:
+    - type: Transform
+      pos: 25.5,34.5
+      parent: 1
+  - uid: 523
+    components:
+    - type: Transform
+      pos: 26.5,34.5
+      parent: 1
+  - uid: 524
+    components:
+    - type: Transform
+      pos: 27.5,34.5
+      parent: 1
+  - uid: 525
+    components:
+    - type: Transform
+      pos: 28.5,34.5
+      parent: 1
+  - uid: 526
+    components:
+    - type: Transform
+      pos: 27.5,33.5
+      parent: 1
+  - uid: 527
+    components:
+    - type: Transform
+      pos: 30.5,32.5
+      parent: 1
+  - uid: 528
+    components:
+    - type: Transform
+      pos: 31.5,32.5
+      parent: 1
+  - uid: 529
+    components:
+    - type: Transform
+      pos: 31.5,33.5
+      parent: 1
+  - uid: 530
+    components:
+    - type: Transform
+      pos: 31.5,34.5
+      parent: 1
+  - uid: 531
+    components:
+    - type: Transform
+      pos: 32.5,33.5
+      parent: 1
+  - uid: 532
+    components:
+    - type: Transform
+      pos: 33.5,33.5
+      parent: 1
+  - uid: 533
+    components:
+    - type: Transform
+      pos: 33.5,34.5
+      parent: 1
+  - uid: 534
+    components:
+    - type: Transform
+      pos: 32.5,32.5
+      parent: 1
+  - uid: 535
+    components:
+    - type: Transform
+      pos: 33.5,32.5
+      parent: 1
+  - uid: 536
+    components:
+    - type: Transform
+      pos: 34.5,32.5
+      parent: 1
+  - uid: 537
+    components:
+    - type: Transform
+      pos: 32.5,31.5
+      parent: 1
+  - uid: 538
+    components:
+    - type: Transform
+      pos: 33.5,31.5
+      parent: 1
+  - uid: 539
+    components:
+    - type: Transform
+      pos: 33.5,30.5
+      parent: 1
+  - uid: 540
+    components:
+    - type: Transform
+      pos: 36.5,31.5
+      parent: 1
+  - uid: 541
+    components:
+    - type: Transform
+      pos: 37.5,31.5
+      parent: 1
+  - uid: 542
+    components:
+    - type: Transform
+      pos: 37.5,30.5
+      parent: 1
+  - uid: 543
+    components:
+    - type: Transform
+      pos: 38.5,30.5
+      parent: 1
+  - uid: 544
+    components:
+    - type: Transform
+      pos: 38.5,31.5
+      parent: 1
+  - uid: 545
+    components:
+    - type: Transform
+      pos: 39.5,31.5
+      parent: 1
+  - uid: 547
+    components:
+    - type: Transform
+      pos: 38.5,32.5
+      parent: 1
+  - uid: 548
+    components:
+    - type: Transform
+      pos: 37.5,32.5
+      parent: 1
+  - uid: 549
+    components:
+    - type: Transform
+      pos: 38.5,33.5
+      parent: 1
+  - uid: 550
+    components:
+    - type: Transform
+      pos: 39.5,33.5
+      parent: 1
+  - uid: 551
+    components:
+    - type: Transform
+      pos: 39.5,34.5
+      parent: 1
+  - uid: 552
+    components:
+    - type: Transform
+      pos: 40.5,33.5
+      parent: 1
+  - uid: 644
+    components:
+    - type: Transform
+      pos: 39.5,32.5
+      parent: 1
+  - uid: 645
+    components:
+    - type: Transform
+      pos: 40.5,32.5
+      parent: 1
+...
diff --git a/Resources/Maps/_NF/POI/courthouse.yml b/Resources/Maps/_NF/POI/courthouse.yml
index 7020d0e8226..0baeb12540e 100644
--- a/Resources/Maps/_NF/POI/courthouse.yml
+++ b/Resources/Maps/_NF/POI/courthouse.yml
@@ -24,7 +24,7 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: dwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAaQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAADdwAAAAADdwAAAAADdwAAAAABegAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAABdwAAAAACdwAAAAADdwAAAAAAegAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAADdwAAAAADdwAAAAACdwAAAAADegAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAegAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAdwAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: dwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAaQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAADdwAAAAADdwAAAAADdwAAAAABegAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAABdwAAAAACdwAAAAADdwAAAAAAegAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAADdwAAAAADdwAAAAACdwAAAAADegAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAaQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAdwAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAdwAAAAAAaQAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAaQAAAAAAAgAAAAAAAgAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,0:
           ind: -1,0
@@ -48,11 +48,11 @@ entities:
           version: 6
         1,-2:
           ind: 1,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -2,-2:
           ind: -2,-2
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -318,7 +318,7 @@ entities:
           0,2:
             0: 65535
           -1,2:
-            0: 65535
+            0: 65533
           0,3:
             1: 3904
           -1,3:
@@ -490,11 +490,11 @@ entities:
           4,-6:
             0: 3823
           5,-7:
-            0: 13056
+            0: 13072
           5,-6:
             0: 3
           -6,-7:
-            0: 65484
+            0: 65516
           -6,-6:
             0: 3279
         uniqueMixes:
@@ -608,7 +608,7 @@ entities:
       - 123
 - proto: AirlockEngineering
   entities:
-  - uid: 92
+  - uid: 83
     components:
     - type: Transform
       pos: 7.5,-6.5
@@ -667,6 +667,16 @@ entities:
     - type: Transform
       pos: 4.5,-25.5
       parent: 1
+  - uid: 84
+    components:
+    - type: Transform
+      pos: -0.5,-12.5
+      parent: 1
+  - uid: 92
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 1
   - uid: 139
     components:
     - type: Transform
@@ -695,21 +705,11 @@ entities:
     - type: Transform
       pos: 6.5,-10.5
       parent: 1
-  - uid: 445
-    components:
-    - type: Transform
-      pos: -0.5,-12.5
-      parent: 1
   - uid: 446
     components:
     - type: Transform
       pos: 2.5,-10.5
       parent: 1
-  - uid: 712
-    components:
-    - type: Transform
-      pos: -0.5,-0.5
-      parent: 1
   - uid: 775
     components:
     - type: Transform
@@ -826,33 +826,32 @@ entities:
       parent: 1
 - proto: AirlockNfsdBrigLocked
   entities:
-  - uid: 83
+  - uid: 419
     components:
     - type: Transform
       pos: 5.5,-1.5
       parent: 1
-  - uid: 84
+  - uid: 434
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: 4.5,0.5
       parent: 1
-  - uid: 496
+  - uid: 445
     components:
     - type: Transform
-      pos: 4.5,10.5
+      pos: 4.5,8.5
       parent: 1
-  - uid: 565
+  - uid: 496
     components:
     - type: Transform
-      pos: 4.5,8.5
+      pos: 4.5,10.5
       parent: 1
-  - uid: 714
+  - uid: 565
     components:
     - type: Transform
       pos: 4.5,4.5
       parent: 1
-  - uid: 1174
+  - uid: 712
     components:
     - type: Transform
       pos: -4.5,-1.5
@@ -1636,32 +1635,24 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,2.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 974
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -4.5,2.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 1047
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 0.5,1.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 1414
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -4.5,1.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BenchPewMiddle
   entities:
   - uid: 439
@@ -1670,32 +1661,24 @@ entities:
       rot: 3.141592653589793 rad
       pos: -3.5,2.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 475
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5,2.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 1106
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5,1.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 1176
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,1.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BenchPewRight
   entities:
   - uid: 521
@@ -1704,32 +1687,24 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,2.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 950
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5,2.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 1050
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 2.5,1.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 1181
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5,1.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BenchSteelLeft
   entities:
   - uid: 55
@@ -1738,32 +1713,36 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,-16.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 74
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -7.5,-20.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 125
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 5.5,-14.5
       parent: 1
-    - type: Physics
-      bodyType: Static
+  - uid: 146
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-16.5
+      parent: 1
+  - uid: 549
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-18.5
+      parent: 1
   - uid: 573
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,-16.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BenchSteelMiddle
   entities:
   - uid: 73
@@ -1772,114 +1751,62 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -7.5,-19.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 128
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -7.5,-15.5
       parent: 1
-    - type: Physics
-      bodyType: Static
-  - uid: 146
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-18.5
-      parent: 1
-    - type: Physics
-      bodyType: Static
-  - uid: 549
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-16.5
-      parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 569
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 5.5,-19.5
       parent: 1
-    - type: Physics
-      bodyType: Static
-  - uid: 572
+  - uid: 1129
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 5.5,-16.5
+      pos: 5.5,-15.5
       parent: 1
-    - type: Physics
-      bodyType: Static
-  - uid: 899
+- proto: BenchSteelRight
+  entities:
+  - uid: 23
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -7.5,-17.5
-      parent: 1
-    - type: Physics
-      bodyType: Static
-  - uid: 1128
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-18.5
-      parent: 1
-    - type: Physics
-      bodyType: Static
-  - uid: 1129
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-15.5
+      pos: -7.5,-18.5
       parent: 1
-    - type: Physics
-      bodyType: Static
-  - uid: 1217
+  - uid: 637
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 5.5,-17.5
+      pos: 5.5,-16.5
       parent: 1
-    - type: Physics
-      bodyType: Static
-- proto: BenchSteelRight
-  entities:
   - uid: 942
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -4.5,-16.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 1277
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 5.5,-20.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 1401
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5,-16.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 1431
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -7.5,-14.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BookshelfFilled
   entities:
   - uid: 230
@@ -1922,6 +1849,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: -4.5,-10.5
       parent: 1
+- proto: BrigTimer
+  entities:
+  - uid: 1222
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-1.5
+      parent: 1
 - proto: CableApcExtension
   entities:
   - uid: 2
@@ -3770,32 +3705,19 @@ entities:
       rot: 3.141592653589793 rad
       pos: 7.5,-5.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
   - uid: 279
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 3.5,-4.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
+- proto: ClothingHeadHatPwig
+  entities:
+  - uid: 1854
+    components:
+    - type: Transform
+      pos: 0.328125,7.907011
+      parent: 1
 - proto: ClothingNeckMedalNfsdBloodDrop
   entities:
   - uid: 494
@@ -3840,6 +3762,13 @@ entities:
     - type: Transform
       pos: -4.5,-5.5
       parent: 1
+- proto: ClothingOuterRobesJudge
+  entities:
+  - uid: 1855
+    components:
+    - type: Transform
+      pos: 0.6875,7.768122
+      parent: 1
 - proto: ComfyChair
   entities:
   - uid: 1101
@@ -3887,37 +3816,11 @@ entities:
     - type: Transform
       pos: -4.5,-22.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        bank-ATM-cashSlot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-    - type: Physics
-      canCollide: False
-    - type: ItemSlots
   - uid: 934
     components:
     - type: Transform
       pos: 2.5,-22.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        bank-ATM-cashSlot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-    - type: Physics
-      canCollide: False
-    - type: ItemSlots
 - proto: ConveyorBelt
   entities:
   - uid: 239
@@ -5383,6 +5286,14 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 1652
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasPipeFourway
   entities:
   - uid: 387
@@ -6385,6 +6296,14 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 966
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 971
     components:
     - type: Transform
@@ -7229,13 +7148,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1570
-    components:
-    - type: Transform
-      pos: -1.5,8.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 1572
     components:
     - type: Transform
@@ -7478,6 +7390,14 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 899
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 972
     components:
     - type: Transform
@@ -7539,6 +7459,13 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 1217
+    components:
+    - type: Transform
+      pos: -2.5,8.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 1223
     components:
     - type: Transform
@@ -7605,22 +7532,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1564
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,7.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 1569
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,7.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 1571
     components:
     - type: Transform
@@ -8045,6 +7956,14 @@ entities:
       - 1604
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 963
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 1082
     components:
     - type: Transform
@@ -8073,6 +7992,14 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 1128
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 1156
     components:
     - type: Transform
@@ -8085,13 +8012,6 @@ entities:
       - 1610
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1222
-    components:
-    - type: Transform
-      pos: -2.5,8.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 1270
     components:
     - type: Transform
@@ -8179,14 +8099,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 1583
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,7.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 1598
     components:
     - type: Transform
@@ -8203,6 +8115,20 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+- proto: Gavel
+  entities:
+  - uid: 1023
+    components:
+    - type: Transform
+      pos: -0.06,7.67
+      parent: 1
+- proto: GavelBlock
+  entities:
+  - uid: 1853
+    components:
+    - type: Transform
+      pos: -0.44,7.5
+      parent: 1
 - proto: GeneratorBasic15kW
   entities:
   - uid: 241
@@ -8421,6 +8347,12 @@ entities:
     - type: Transform
       pos: -8.5,-18.5
       parent: 1
+  - uid: 1857
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,8.5
+      parent: 1
 - proto: GrilleSpawner
   entities:
   - uid: 41
@@ -8964,6 +8896,16 @@ entities:
     - type: Transform
       pos: -3.5,-0.5
       parent: 1
+  - uid: 572
+    components:
+    - type: Transform
+      pos: -7.5,-17.5
+      parent: 1
+  - uid: 686
+    components:
+    - type: Transform
+      pos: 5.5,-17.5
+      parent: 1
   - uid: 1393
     components:
     - type: Transform
@@ -9678,13 +9620,11 @@ entities:
     - type: Transform
       pos: -11.5,-6.5
       parent: 1
-- proto: ScreenTimer
-  entities:
-  - uid: 686
+  - uid: 1653
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-1.5
+      rot: 1.5707963267948966 rad
+      pos: -2.5,8.5
       parent: 1
 - proto: SellOnlyMothershipComputer
   entities:
@@ -9694,16 +9634,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,-26.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        ShipyardConsole-targetId: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
 - proto: ShelfRWood
   entities:
   - uid: 413
@@ -9816,12 +9746,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,-22.5
       parent: 1
-  - uid: 637
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 20.5,-26.5
-      parent: 1
   - uid: 638
     components:
     - type: Transform
@@ -9834,12 +9758,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -22.5,-22.5
       parent: 1
-  - uid: 963
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -22.5,-26.5
-      parent: 1
   - uid: 964
     components:
     - type: Transform
@@ -10034,7 +9952,7 @@ entities:
   - uid: 1030
     components:
     - type: Transform
-      pos: -2.5,8.5
+      pos: -2.5,7.5
       parent: 1
 - proto: TableFancyGreen
   entities:
@@ -10262,12 +10180,13 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,-11.5
       parent: 1
-- proto: ToyHammer
+- proto: TrialTimer
   entities:
-  - uid: 1023
+  - uid: 1856
     components:
     - type: Transform
-      pos: -0.41327053,7.5674677
+      rot: 1.5707963267948966 rad
+      pos: -2.5,8.5
       parent: 1
 - proto: TwoWayLever
   entities:
@@ -10295,15 +10214,15 @@ entities:
       parent: 1
 - proto: VendingMachineFuelVend
   entities:
-  - uid: 1652
+  - uid: 1570
     components:
     - type: Transform
-      pos: 18.5,-24.5
+      pos: -22.5,-26.5
       parent: 1
-  - uid: 1653
+  - uid: 1583
     components:
     - type: Transform
-      pos: -20.5,-24.5
+      pos: 20.5,-26.5
       parent: 1
 - proto: VendingMachineLawDrobe
   entities:
@@ -10333,12 +10252,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-12.5
       parent: 1
-  - uid: 23
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 20.5,-26.5
-      parent: 1
   - uid: 24
     components:
     - type: Transform
@@ -10937,12 +10850,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,12.5
       parent: 1
-  - uid: 966
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 20.5,-27.5
-      parent: 1
   - uid: 967
     components:
     - type: Transform
@@ -11125,8 +11032,8 @@ entities:
   - uid: 1186
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -22.5,-27.5
+      rot: 1.5707963267948966 rad
+      pos: 20.5,-27.5
       parent: 1
   - uid: 1187
     components:
@@ -11343,8 +11250,8 @@ entities:
   - uid: 1312
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -22.5,-26.5
+      rot: 1.5707963267948966 rad
+      pos: -22.5,-27.5
       parent: 1
   - uid: 1315
     components:
@@ -11667,6 +11574,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,-13.5
       parent: 1
+  - uid: 1564
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 21.5,-27.5
+      parent: 1
+  - uid: 1569
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -23.5,-27.5
+      parent: 1
 - proto: WarpPoint
   entities:
   - uid: 1318
@@ -12026,12 +11945,12 @@ entities:
       parent: 1
 - proto: WoodDoor
   entities:
-  - uid: 419
+  - uid: 714
     components:
     - type: Transform
       pos: -10.5,-8.5
       parent: 1
-  - uid: 434
+  - uid: 1174
     components:
     - type: Transform
       pos: -6.5,-8.5
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/Maps/_NF/Shuttles/spectre.yml b/Resources/Maps/_NF/Shuttles/spectre.yml
index d914f9e33f1..bb485f8a521 100644
--- a/Resources/Maps/_NF/Shuttles/spectre.yml
+++ b/Resources/Maps/_NF/Shuttles/spectre.yml
@@ -7222,8 +7222,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -8.5,4.5
       parent: 3
-    - type: Thruster
-      enabled: False
   - uid: 217
     components:
     - type: Transform
@@ -8921,7 +8919,7 @@ entities:
     - type: Transform
       pos: 5.5,12.5
       parent: 3
-- proto: WarpPointShip
+- proto: WarpPoint
   entities:
   - uid: 1203
     components:
diff --git a/Resources/Maps/_NF/Test/dev_map.yml b/Resources/Maps/_NF/Test/dev_map.yml
index 17d9cb3c7fa..c8dab44962e 100644
--- a/Resources/Maps/_NF/Test/dev_map.yml
+++ b/Resources/Maps/_NF/Test/dev_map.yml
@@ -112,7 +112,7 @@ entities:
           -4,3:
             1: 8738
           -4,4:
-            1: 230
+            1: 238
           -3,0:
             0: 65524
           -3,1:
@@ -120,8 +120,7 @@ entities:
           -3,2:
             1: 35071
           -3,-1:
-            2: 17
-            0: 56780
+            0: 56797
           -2,0:
             0: 65534
           -2,1:
@@ -156,9 +155,14 @@ entities:
             1: 4352
           -4,-2:
             0: 65535
+          -5,-2:
+            0: 34952
+            1: 8704
+          -5,-1:
+            0: 34952
+            1: 8738
           -3,-2:
-            0: 52477
-            3: 4352
+            0: 56829
           -2,-2:
             0: 3838
           -2,-4:
@@ -185,7 +189,7 @@ entities:
             1: 17
             0: 3276
           -1,4:
-            1: 240
+            1: 255
           0,5:
             0: 52428
           0,6:
@@ -236,14 +240,15 @@ entities:
             1: 8738
           2,1:
             1: 2
+            0: 60928
           2,-1:
             1: 8738
+          3,1:
+            0: 56780
           3,2:
             0: 36828
           3,0:
             0: 36590
-          3,1:
-            0: 52428
           3,-1:
             0: 36044
           4,0:
@@ -271,9 +276,11 @@ entities:
           2,-5:
             1: 57344
           3,-4:
-            1: 13107
+            1: 13105
+            0: 2
           3,-5:
-            1: 12288
+            1: 4096
+            0: 8192
           3,-2:
             0: 52224
           4,-2:
@@ -303,13 +310,9 @@ entities:
           8,-1:
             0: 819
           -5,0:
-            1: 17476
-          -5,-1:
-            1: 17476
+            1: 17506
           -5,1:
             1: 17476
-          -5,-2:
-            1: 16384
           5,1:
             0: 48051
           5,2:
@@ -323,9 +326,9 @@ entities:
           6,3:
             0: 626
           -3,4:
-            1: 240
+            1: 255
           -2,4:
-            1: 240
+            1: 255
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -357,36 +360,6 @@ entities:
           - 0
           - 0
           - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 22.831823
-          - 85.89114
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.14996
-          moles:
-          - 20.078888
-          - 75.53487
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
         chunkSize: 4
     - type: GasTileOverlay
     - type: BecomesStation
@@ -989,6 +962,13 @@ entities:
     - type: Transform
       pos: -2.5,-16.5
       parent: 179
+- proto: BlueprintLithograph
+  entities:
+  - uid: 1088
+    components:
+    - type: Transform
+      pos: 13.5,17.5
+      parent: 179
 - proto: BluespaceMatterBinStockPart
   entities:
   - uid: 1254
@@ -4024,10 +4004,10 @@ entities:
       parent: 179
 - proto: CrateScienceLabBundle
   entities:
-  - uid: 1428
+  - uid: 1504
     components:
     - type: Transform
-      pos: 13.5,17.5
+      pos: 13.5,19.5
       parent: 179
 - proto: CrewMonitoringServer
   entities:
@@ -4745,6 +4725,14 @@ entities:
     - type: Transform
       pos: -0.982072,-3.4785347
       parent: 179
+- proto: HoloGraffitiProjector
+  entities:
+  - uid: 1495
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.00722605,4.669485
+      parent: 179
 - proto: HolosignWetFloor
   entities:
   - uid: 848
@@ -5377,6 +5365,13 @@ entities:
     - type: Transform
       pos: -16.5,-5.5
       parent: 179
+- proto: MercenaryTechFabHacked
+  entities:
+  - uid: 1508
+    components:
+    - type: Transform
+      pos: -14.5,-5.5
+      parent: 179
 - proto: MicroManipulatorStockPart
   entities:
   - uid: 712
@@ -5443,6 +5438,13 @@ entities:
     - type: Transform
       pos: -6.3051395,8.791253
       parent: 179
+- proto: NFEnergyPickaxe
+  entities:
+  - uid: 1497
+    components:
+    - type: Transform
+      pos: -3.6757717,-2.0560873
+      parent: 179
 - proto: NfsdTechFab
   entities:
   - uid: 498
@@ -5478,6 +5480,21 @@ entities:
     - type: Transform
       pos: -3.5,10.5
       parent: 179
+- proto: NFWeaponHoloflareGun
+  entities:
+  - uid: 1496
+    components:
+    - type: Transform
+      pos: -3.8007717,-2.545206
+      parent: 179
+    - type: Item
+      heldPrefix: cyan
+    - type: EnergyGun
+      currentFireMode:
+        state: cyan
+        name: cyan
+        fireCost: 240
+        proto: HoloFlareCyan
 - proto: NitrogenCanister
   entities:
   - uid: 459
@@ -6060,6 +6077,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,17.5
       parent: 179
+  - uid: 1231
+    components:
+    - type: Transform
+      pos: 21.5,14.5
+      parent: 179
   - uid: 1232
     components:
     - type: Transform
@@ -6072,11 +6094,11 @@ entities:
       parent: 179
 - proto: RailingCorner
   entities:
-  - uid: 1231
+  - uid: 1428
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 21.5,14.5
+      pos: 20.5,14.5
       parent: 179
 - proto: RailingCornerSmall
   entities:
@@ -6205,6 +6227,40 @@ entities:
     - type: Transform
       pos: -13.5,-7.5
       parent: 179
+- proto: ScrapOre
+  entities:
+  - uid: 1499
+    components:
+    - type: Transform
+      pos: 3.3558059,17.606743
+      parent: 179
+  - uid: 1500
+    components:
+    - type: Transform
+      pos: 3.5589309,17.528618
+      parent: 179
+  - uid: 1501
+    components:
+    - type: Transform
+      pos: 3.3401809,17.294243
+      parent: 179
+  - uid: 1502
+    components:
+    - type: Transform
+      pos: 3.6995559,17.731743
+      parent: 179
+  - uid: 1503
+    components:
+    - type: Transform
+      pos: 3.8089309,17.247368
+      parent: 179
+- proto: ScrapProcessor
+  entities:
+  - uid: 1498
+    components:
+    - type: Transform
+      pos: 3.5,18.5
+      parent: 179
 - proto: Screen
   entities:
   - uid: 1192
@@ -6279,6 +6335,18 @@ entities:
     - type: Transform
       pos: -11.5,-5.5
       parent: 179
+- proto: SheetPaper
+  entities:
+  - uid: 1506
+    components:
+    - type: Transform
+      pos: 13.352237,16.538458
+      parent: 179
+  - uid: 1507
+    components:
+    - type: Transform
+      pos: 13.695987,16.538458
+      parent: 179
 - proto: SheetPGlass
   entities:
   - uid: 416
@@ -6597,6 +6665,13 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -10.425851,2.3130608
       parent: 179
+- proto: SpawnMobCatBloodCult
+  entities:
+  - uid: 1493
+    components:
+    - type: Transform
+      pos: 20.5,14.5
+      parent: 179
 - proto: SpawnMobCatCappy
   entities:
   - uid: 1230
@@ -7313,6 +7388,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -0.5,8.5
       parent: 179
+  - uid: 1505
+    components:
+    - type: Transform
+      pos: 13.5,16.5
+      parent: 179
 - proto: TableGlass
   entities:
   - uid: 964
@@ -9408,6 +9488,13 @@ entities:
     - type: Transform
       pos: -3.433327,-1.5
       parent: 179
+- proto: WeaponLaserTurboNF
+  entities:
+  - uid: 1494
+    components:
+    - type: Transform
+      pos: -3.471971,0.6138556
+      parent: 179
 - proto: WeaponLauncherMultipleRocket
   entities:
   - uid: 671
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
index e1c67ee941c..280d386c87a 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
@@ -75,12 +75,13 @@
   category: cargoproduct-category-name-food
   group: market
 
-# - type: cargoProduct
-  # id: FoodSoftdrinksLarge
-  # icon:
-    # sprite: Objects/Consumable/Drinks/colabottle.rsi
-    # state: icon
-  # product: CrateFoodSoftdrinksLarge
-  # cost: 2400
-  # category: cargoproduct-category-name-food
-  # group: market
+- type: cargoProduct
+  id: FoodSoftdrinksLarge
+  abstract: true # Frontier
+  icon:
+    sprite: Objects/Consumable/Drinks/colabottle.rsi
+    state: icon
+  product: CrateFoodSoftdrinksLarge
+  cost: 2400
+  category: cargoproduct-category-name-food
+  group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
index 9475f346ba4..bcdb0e417dc 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
@@ -130,6 +130,7 @@
 
 - type: cargoProduct
   id: ChemistryP
+  abstract: true # Frontier
   icon:
     sprite: Structures/Storage/Crates/chemcrate_secure.rsi
     state: icon
@@ -140,6 +141,7 @@
 
 - type: cargoProduct
   id: ChemistryS
+  abstract: true # Frontier
   icon:
     sprite: Structures/Storage/Crates/chemcrate_secure.rsi
     state: icon
@@ -150,6 +152,7 @@
 
 - type: cargoProduct
   id: CrateChemistryD
+  abstract: true # Frontier
   icon:
     sprite: Structures/Storage/Crates/chemcrate_secure.rsi
     state: icon
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
index b5eb2c20dc6..7a1d8763ce2 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
@@ -10,18 +10,16 @@
 #    FoodCondimentPacketSalt: 4 # Frontier - Replaced with big salt
     ReagentContainerSalt: 5 # Frontier
     ReagentContainerPepper: 5 # Frontier
-    DrinkKegPlasticKetchup: 1 # Frontier - Refills
-    DrinkKegPlasticMustard: 1 # Frontier - Refills
     FoodCondimentBottleEnzyme: 5 # Frontier 2<5
     FoodCondimentBottleHotsauce: 2
     FoodCondimentBottleKetchup: 2
     FoodCondimentBottleBBQ: 2
     FoodCondimentBottleVinegar: 5  # Frontier 2<5
 #    ReagentContainerOliveoil: 2 # Frontier - Replaced with OilJarOlive
-    OilJarOlive: 3
-    OilJarCorn: 3
-    OilJarGhee: 3
     ReagentContainerMayo: 2
+    OilJarOlive: 1 # Frontier
+    OilJarCorn: 1 # Frontier
+    OilJarGhee: 1 # Frontier
     #VariantCubeBox: 3 # Frontier
     MonkeyCubeBox: 2 # Frontier
     KoboldCubeBox: 2 # Frontier
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml
new file mode 100644
index 00000000000..52f5286e34a
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavel.yml
@@ -0,0 +1,21 @@
+- type: entity
+  parent: BaseItem
+  id: Gavel
+  name: gavel
+  description: A hardwood mallet made to keep order in the court.
+  components:
+    - type: Sprite
+      sprite: DeltaV/Objects/Specific/Justice/gavel.rsi
+      layers:
+        - state: icon
+    - type: MeleeWeapon
+      wideAnimationRotation: -90
+      damage:
+        types:
+          Blunt: 2
+    - type: Item
+      size: Small
+      sprite: DeltaV/Objects/Specific/Justice/gavel.rsi
+    - type: Tag
+      tags:
+        - Gavel
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml
new file mode 100644
index 00000000000..e96d5acf348
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/gavelblock.yml
@@ -0,0 +1,20 @@
+- type: entity
+  parent: BaseItem
+  id: GavelBlock
+  name: gavel block
+  description: A hardwood block that, when hit with a gavel, emits an aura of authority.
+  components:
+    - type: Sprite
+      sprite: DeltaV/Objects/Specific/Justice/gavelblock.rsi
+      layers:
+        - state: icon
+    - type: Item
+      size: Small
+    - type: Clickable
+    - type: EmitSoundOnInteractUsing
+      sound:
+        # path: /Audio/DeltaV/Items/gavel.ogg # Frontier
+        collection: NFGavel # Frontier
+      whitelist:
+        tags:
+          - Gavel
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml
new file mode 100644
index 00000000000..aaa912ab246
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Justice/trialtimer.yml
@@ -0,0 +1,22 @@
+- type: entity
+  id: TrialTimer
+  parent: SignalTimer
+  name: trial timer
+  description: A fancy timer with a screen, designed to keep trials within their time limit.
+  components:
+  - type: SignalTimer
+    canEditLabel: true
+  - type: TextScreenVisuals
+    color: "#fffaf0" # Frontier: b03060<fffaf0 for readability
+    textOffset: 1,8
+    timerOffset: 1,8
+    textLength: 5
+    rows: 1
+  - type: Sprite
+    drawdepth: SmallObjects
+    sprite: DeltaV/Objects/Specific/Justice/trialtimer.rsi
+    state: trialtimer
+    noRot: true
+  - type: Construction
+    graph: Timer
+    node: screen
diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml
index 9d1af4678a2..44d7f118b72 100644
--- a/Resources/Prototypes/DeltaV/tags.yml
+++ b/Resources/Prototypes/DeltaV/tags.yml
@@ -18,6 +18,9 @@
 - type: Tag
   id: ForensicBeltEquip
 
+- type: Tag
+  id: Gavel
+
 - type: Tag
   id: HandLabeler
 
diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
index 55a37914cfb..e7709dbecae 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -78,13 +78,13 @@
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatPwig
-  name: pwig
-  description: To be honest, those look ridiculous.
+  name: powdered wig # Frontier: pwig < powdered wig
+  description: A foppish article, fit for but the most conspicuous of dandies. # Frontier: "To be honest, those look ridiculous."
   components:
   - type: Sprite
-    sprite: Clothing/Head/Misc/pwig.rsi
+    sprite: _NF/Clothing/Head/Misc/pwig.rsi # Frontier: add _NF prefix
   - type: Clothing
-    sprite: Clothing/Head/Misc/pwig.rsi
+    sprite: _NF/Clothing/Head/Misc/pwig.rsi # Frontier: add _NF prefix
 
 - type: entity
   parent: ClothingHeadBase
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/Markers/Spawners/vehicles.yml b/Resources/Prototypes/Entities/Markers/Spawners/vehicles.yml
index d9309d51e7d..8ffba5a01a5 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/vehicles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/vehicles.yml
@@ -24,7 +24,7 @@
         state: keys
   - type: ConditionalSpawner
     prototypes:
-      - VehicleJanicart
+      - NFVehicleJanicart # Frontier: add NF prefix
 
 - type: entity
   name: ATV Spawner
@@ -38,7 +38,7 @@
         state: keys
   - type: ConditionalSpawner
     prototypes:
-      - VehicleATVNF # Frontier
+      - VehicleATVNF # Frontier: add NF suffix
 
 - type: entity
   name: Motobike Spawner
@@ -52,7 +52,7 @@
         state: keys
   - type: ConditionalSpawner
     prototypes:
-      - VehicleSkeletonMotorcycleNF # Frontier
+      - VehicleSkeletonMotorcycleNF # Frontier: add NF suffix
       
 - type: entity
   name: Wheelchair Spawner
@@ -80,4 +80,4 @@
         state: vehicle_folded
   - type: ConditionalSpawner
     prototypes:
-      - VehicleWheelchairFolded
\ No newline at end of file
+      - VehicleWheelchairFolded
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 819ac170786..c432019c106 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1987,7 +1987,7 @@
       state: slug
       sprite: Mobs/Animals/slug.rsi
   - type: Carriable #DeltaV
-    freeHandsRequired: 1 
+    freeHandsRequired: 1
   - type: Physics
   - type: Fixtures
     fixtures:
@@ -3537,4 +3537,4 @@
   suffix: Accent
   components:
   - type: ReplacementAccent
-    accent: nymph
\ No newline at end of file
+    accent: nymph
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml
index 0d942ebf96c..1f9038650a1 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml
@@ -28,6 +28,7 @@
     solution: food
   - type: RefillableSolution
     solution: food
+    preventTransferOut: true # Frontier
 
 # usable by any food that can be opened
 # handles appearance with states "icon" and "icon-open"
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml
index 4abd8eb53ce..b47277d5407 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml
@@ -76,8 +76,8 @@
 - type: entity
   id: ShuttleGunKineticCircuitboard
   parent: BaseMachineCircuitboard
-  name: PTK-800 "Matter Dematerializer" machine board
-  description: A machine printed circuit board for an PTK-800 "Matter Dematerializer".
+  name: PTK-1500e "Matter Dematerializer" machine board # Frontier: 800<1500e
+  description: A machine printed circuit board for an PTK-1500e "Matter Dematerializer". # Frontier: 800<1500e
   suffix: DO NOT MAP, Machine Board
   components:
   - type: Sprite
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/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
index cd8d3f0638c..121cf43c778 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
@@ -11,7 +11,7 @@
       cube:
         maxVol: 11 # needs room for water
         reagents:
-        - ReagentId: Nutriment
+        - ReagentId: Enzyme # Nutriment<Enzyme
           Quantity: 10
   - type: Food
     solution: cube
@@ -172,7 +172,7 @@
       plushie:
         maxVol: 11 # needs room for water
         reagents:
-        - ReagentId: Nutriment #contains nutriment like other dehydrated animals, but isn't edible? Who is grinding dehydrated carp to eat them??
+        - ReagentId: CarpoToxin #Frontier Nutriment<CarpoToxin
           Quantity: 10
   - type: RefillableSolution
     solution: plushie
@@ -232,7 +232,7 @@
       cube:
         maxVol: 11 # needs room for water
         reagents:
-        - ReagentId: Nutriment
+        - ReagentId: Ipecac # Nutriment<Ipecac
           Quantity: 10
   - type: Food
     solution: cube
diff --git a/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml b/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml
index c0dc2b5ba46..9ab61acc4d2 100644
--- a/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml
+++ b/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml
@@ -89,6 +89,7 @@
   parent: BaseVehicleRideable
   name: janicart
   description: The janitor's trusty steed.
+  abstract: true # Frontier
   components:
   - type: Vehicle
     southOver: true
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
index 654422a3149..526259ef63a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -309,14 +309,12 @@
       types:
         Heat: 14
   # mining laser real
-#  - type: GatheringProjectile # Frontier
+#  - type: GatheringProjectile # Frontier - if restoring, add MiningGatheringSoft
   - type: Tag
     tags:
     - EmitterBolt
   - type: TimedDespawn
     lifetime: 3
-  - type: Reflective # Frontier
-    reflective: ShuttleKinetic # Frontier
 
 - type: entity
   name: watcher bolt
@@ -405,6 +403,7 @@
   - type: TimedDespawn
     lifetime: 0.4
   - type: GatheringProjectile
+  - type: MiningGatheringSoft # Frontier
 
 - type: entity
   id: BulletKineticShuttle
@@ -414,11 +413,10 @@
   - type: Sprite
     noRot: false
     sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
+    color: "#FF8888" # Frontier: color it red vs. handheld bolts
     layers:
     - state: chronobolt
       shader: unshaded
-  - type: Reflective # Frontier
-    reflective: ShuttleKinetic # Frontier
   - type: Projectile
     impactEffect: BulletImpactEffectKinetic
     damage:
@@ -431,9 +429,10 @@
     lifetime: 1 # Frontier 1.5<1
   - type: PointLight
     radius: 2.5
-    color: white
+    color: "#FF8888" # Frontier: white<FF8888
     energy: 0.5
   - type: GatheringProjectile
+  - type: MiningGatheringHard # Frontier
 
 - type: entity
   id: BulletCharge
@@ -468,6 +467,7 @@
   # Short lifespan
   - type: TimedDespawn
     lifetime: 0.4
+  - type: MiningGatheringSoft # Frontier
 
 - type: entity
   parent: BaseBullet
@@ -987,7 +987,7 @@
       - HideContextMenu
 
 - type: entity
-  name: laser bolt 
+  name: laser bolt
   id: BulletLaser
   parent: BaseBullet
   categories: [ HideSpawnMenu ]
@@ -1033,7 +1033,7 @@
   - type: ProjectileSpread
     proto: BulletLaser
     count: 5 #65 heat damage if you hit all your shots, but wide spread
-    spread: 30 
+    spread: 30
 
 - type: entity
   name: narrow laser barrage
@@ -1055,7 +1055,7 @@
   - type: ProjectileSpread
     proto: BulletDisablerSmg
     count: 3 #bit stronger than a disabler if you hit your shots you goober, still not a 2 hit stun though
-    spread: 9 
+    spread: 9
 
 # Frontier projectiles
 # The game wont allow them to sit under _NF.
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index 20b7d3bf078..7bc75720aa3 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -84,6 +84,7 @@
         Brute: 6
       types:
         Structural: 30
+  - type: MiningGatheringHard # Frontier
 
 
 - type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 81cb8b9722b..b88f4904de5 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -406,6 +406,7 @@
       - ConstructionBagOfHolding # Frontier
       - ServiceSelectiveDropper # Frontier
       - PlantAnalyzer # Frontier
+      - JanicartFlatpack # Frontier
   - type: EmagLatheRecipes
     emagDynamicRecipes:
       - BoxBeanbag
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
index d5756f98bdb..b507245245a 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml
@@ -164,12 +164,11 @@
       # a decent curve
       fuelEfficiencyConstant: 0.95
     - type: SolidFuelGeneratorAdapter
-      fuelMaterial: Plasma
-      ejectedFuelProtoId: FuelPlasma # Frontier
+      fuelMaterial: FuelGradePlasma # Frontier: Plasma<FuelGradePlasma
       multiplier: 0.01
     - type: MaterialStorage
       storageLimit: 3000
-      materialWhiteList: [Plasma]
+      materialWhiteList: [Plasma, FuelGradePlasma] # Frontier: add FuelGradePlasma
     - type: PortableGenerator
       startChance: 0.8
     - type: UpgradePowerSupplier
@@ -191,6 +190,9 @@
       supplyRampTolerance: 1500
     - type: MaterialStorageMagnetPickup # Frontier
       range: 0.30 # Frontier
+    - type: FuelGradeAdapter # Frontier
+      inputMaterial: Plasma # Frontier
+      outputMaterial: FuelGradePlasma # Frontier
 
 - type: entity
   name: S.U.P.E.R.P.A.C.M.A.N.-type portable generator
@@ -231,12 +233,11 @@
       # still decent power curve
       fuelEfficiencyConstant: 0.75
     - type: SolidFuelGeneratorAdapter
-      fuelMaterial: Uranium
-      ejectedFuelProtoId: FuelUranium # Frontier
+      fuelMaterial: FuelGradeUranium # Frontier: Uranium<FuelGradeUranium
       multiplier: 0.01
     - type: MaterialStorage
       storageLimit: 3000
-      materialWhiteList: [Uranium]
+      materialWhiteList: [Uranium, FuelGradeUranium] # Frontier: add FuelGradeUranium
     - type: PortableGenerator
     - type: UpgradePowerSupplier
       powerSupplyMultiplier: 1.25
@@ -253,6 +254,9 @@
       supplyRampTolerance: 2500
     - type: MaterialStorageMagnetPickup # Frontier
       range: 0.30 # Frontier
+    - type: FuelGradeAdapter # Frontier
+      inputMaterial: Uranium # Frontier
+      outputMaterial: FuelGradeUranium # Frontier
 
 - type: entity
   name: J.R.P.A.C.M.A.N.-type portable generator
diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
index bcbc9b9f787..2bddea4fd0c 100644
--- a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
+++ b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
@@ -328,8 +328,8 @@
 - type: entity
   id: ShuttleGunKinetic
   parent: [ ShuttleGunBase, ConstructibleMachine]
-  name: PTK-800 "Matter Dematerializer"
-  description: Salvage stationary mining turret. Gradually accumulates charges on its own, extremely effective for asteroid excavation.
+  name: PTK-1500e "Matter Dematerializer" # Frontier: "800"<"1500e" (consistent with naming scheme)
+  description: Mining turret, effective for blasting hardened targets, but overpowered for softer rock. Gradually accumulates charges on its own. # Frontier: description changed
   suffix: DO NOT MAP
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
index b93a03b60aa..dac25956234 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -52,12 +52,15 @@
   - type: Gatherable # Frontier
     toolWhitelist: # Frontier
       tags: # Frontier
-        - Pickaxe # Frontier
+      - Pickaxe # Frontier
+      components: # Frontier
+      - MiningGatheringHard # Frontier
+      - MiningGatheringSoft # Frontier
 
 # Ore veins
 - type: entity
   id: AsteroidRockCoal
-  parent: AsteroidRock
+  parent: NFAsteroidRockOre # Frontier: AsteroidRock<NFAsteroidRockOre
   description: An ore vein rich with coal.
   suffix: Coal
   components:
@@ -80,7 +83,7 @@
 
 - type: entity
   id: AsteroidRockGold
-  parent: AsteroidRock
+  parent: NFAsteroidRockOre # Frontier: AsteroidRock<NFAsteroidRockOre
   description: An ore vein rich with gold.
   suffix: Gold
   components:
@@ -103,7 +106,7 @@
 
 - type: entity
   id: AsteroidRockDiamond
-  parent: AsteroidRock
+  parent: NFAsteroidRockOre # Frontier: AsteroidRock<NFAsteroidRockOre
   description: An ore vein rich with diamonds.
   suffix: Diamond
   components:
@@ -126,7 +129,7 @@
 
 - type: entity
   id: AsteroidRockPlasma
-  parent: AsteroidRock
+  parent: NFAsteroidRockOre # Frontier: AsteroidRock<NFAsteroidRockOre
   description: An ore vein rich with plasma.
   suffix: Plasma
   components:
@@ -149,7 +152,7 @@
 
 - type: entity
   id: AsteroidRockQuartz
-  parent: AsteroidRock
+  parent: NFAsteroidRockOre # Frontier: AsteroidRock<NFAsteroidRockOre
   description: An ore vein rich with quartz.
   suffix: Quartz
   components:
@@ -172,7 +175,7 @@
 
 - type: entity
   id: AsteroidRockQuartzCrab
-  parent: AsteroidRock
+  parent: NFAsteroidRockOre # Frontier: AsteroidRock<NFAsteroidRockOre
   description: An ore vein rich with quartz.
   suffix: Quartz Crab
   components:
@@ -195,7 +198,7 @@
 
 - type: entity
   id: AsteroidRockSilver
-  parent: AsteroidRock
+  parent: NFAsteroidRockOre # Frontier: AsteroidRock<NFAsteroidRockOre
   description: An ore vein rich with silver.
   suffix: Silver
   components:
@@ -228,7 +231,7 @@
 # Yes I know it drops steel but we may get smelting at some point
 - type: entity
   id: AsteroidRockTin
-  parent: AsteroidRock
+  parent: NFAsteroidRockOre # Frontier: AsteroidRock<NFAsteroidRockOre
   description: An ore vein rich with iron.
   suffix: Iron
   components:
@@ -260,7 +263,7 @@
 
 - type: entity
   id: AsteroidRockUranium
-  parent: AsteroidRock
+  parent: NFAsteroidRockOre # Frontier: AsteroidRock<NFAsteroidRockOre
   description: An ore vein rich with uranium.
   suffix: Uranium
   components:
@@ -292,7 +295,7 @@
 
 - type: entity
   id: AsteroidRockBananium
-  parent: AsteroidRock
+  parent: NFAsteroidRockOre # Frontier: AsteroidRock<NFAsteroidRockOre
   description: An ore vein rich with bananium.
   suffix: Bananium
   components:
@@ -315,7 +318,7 @@
 
 - type: entity
   id: AsteroidRockSalt
-  parent: AsteroidRock
+  parent: NFAsteroidRockOre # Frontier: AsteroidRock<NFAsteroidRockOre
   description: An ore vein rich with salt.
   suffix: Salt
   components:
@@ -338,7 +341,7 @@
 
 - type: entity
   id: AsteroidRockArtifactFragment
-  parent: AsteroidRock
+  parent: NFAsteroidRockOre # Frontier: AsteroidRock<NFAsteroidRockOre
   description: A rock wall. What's that sticking out of it?
   suffix: Artifact Fragment
   components:
@@ -361,7 +364,7 @@
 
 - type: entity
   id: AsteroidRockMining
-  parent: AsteroidRock
+  parent: NFAsteroidRockOre # Frontier: AsteroidRock<NFAsteroidRockOre
   name: asteroid rock
   suffix: higher ore yield .33
   description: An asteroid.
@@ -372,7 +375,7 @@
 
 - type: entity
   id: IronRock
-  parent: AsteroidRock
+  parent: NFAsteroidRockOre # Frontier: AsteroidRock<NFAsteroidRockOre
   name: ironrock
   suffix: Low Ore Yield
   description: A rocky asteroid.
@@ -399,7 +402,7 @@
 
 - type: entity
   id: IronRockMining
-  parent: IronRock
+  parent: NFIronRockOre # Frontier: IronRock<NFIronRockOre
   name: ironrock
   suffix: higher ore yield
   description: An asteroid.
@@ -411,7 +414,7 @@
 # Ore veins
 - type: entity
   id: IronRockCoal
-  parent: IronRock
+  parent: NFIronRockOre # Frontier: IronRock<NFIronRockOre
   description: An ore vein rich with coal.
   suffix: Coal
   components:
@@ -434,7 +437,7 @@
 
 - type: entity
   id: IronRockGold
-  parent: IronRock
+  parent: NFIronRockOre # Frontier: IronRock<NFIronRockOre
   description: An ore vein rich with gold.
   suffix: Gold
   components:
@@ -457,7 +460,7 @@
 
 - type: entity
   id: IronRockPlasma
-  parent: IronRock
+  parent: NFIronRockOre # Frontier: IronRock<NFIronRockOre
   description: An ore vein rich with plasma.
   suffix: Plasma
   components:
@@ -480,7 +483,7 @@
 
 - type: entity
   id: IronRockQuartz
-  parent: IronRock
+  parent: NFIronRockOre # Frontier: IronRock<NFIronRockOre
   description: An ore vein rich with quartz.
   suffix: Quartz
   components:
@@ -503,7 +506,7 @@
 
 - type: entity
   id: IronRockSilver
-  parent: IronRock
+  parent: NFIronRockOre # Frontier: IronRock<NFIronRockOre
   description: An ore vein rich with silver.
   suffix: Silver
   components:
@@ -526,7 +529,7 @@
 
 - type: entity
   id: IronRockIron
-  parent: IronRock
+  parent: NFIronRockOre # Frontier: IronRock<NFIronRockOre
   description: An ore vein rich with iron.
   suffix: Iron
   components:
@@ -549,7 +552,7 @@
 
 - type: entity
   id: IronRockUranium
-  parent: IronRock
+  parent: NFIronRockOre # Frontier: IronRock<NFIronRockOre
   description: An ore vein rich with uranium.
   suffix: Uranium
   components:
@@ -572,7 +575,7 @@
 
 - type: entity
   id: IronRockBananium
-  parent: IronRock
+  parent: NFIronRockOre # Frontier: IronRock<NFIronRockOre
   description: An ore vein rich with bananium.
   suffix: Bananium
   components:
@@ -595,7 +598,7 @@
 
 - type: entity
   id: IronRockSalt
-  parent: IronRock
+  parent: NFIronRockOre # Frontier: IronRock<NFIronRockOre
   description: An ore vein rich with salt.
   suffix: Salt
   components:
@@ -618,7 +621,7 @@
 
 - type: entity
   id: IronRockArtifactFragment
-  parent: IronRock
+  parent: NFIronRockOre # Frontier: IronRock<NFIronRockOre
   description: A rock wall. What's that sticking out of it?
   suffix: Artifact Fragment
   components:
@@ -641,7 +644,7 @@
 
 - type: entity
   id: IronRockDiamond
-  parent: IronRock
+  parent: NFIronRockOre # Frontier: IronRock<NFIronRockOre
   description: An ore vein rich with diamonds.
   suffix: Diamond
   components:
@@ -676,6 +679,9 @@
       toolWhitelist:
         tags:
           - Pickaxe
+        components: # Frontier
+          - MiningGatheringHard # Frontier
+          - MiningGatheringSoft # Frontier
     - type: Damageable
       damageContainer: StructuralInorganic
       damageModifierSet: Metallic
@@ -711,7 +717,7 @@
 # Ore veins
 - type: entity
   id: WallRockCoal
-  parent: WallRock
+  parent: NFWallRockOre # Frontier: WallRock<NFWallRockOre
   description: An ore vein rich with coal.
   suffix: Coal
   components:
@@ -741,7 +747,7 @@
 
 - type: entity
   id: WallRockGold
-  parent: WallRock
+  parent: NFWallRockOre # Frontier: WallRock<NFWallRockOre
   description: An ore vein rich with gold.
   suffix: Gold
   components:
@@ -771,7 +777,7 @@
 
 - type: entity
   id: WallRockDiamond
-  parent: WallRock
+  parent: NFWallRockOre # Frontier: WallRock<NFWallRockOre
   description: An ore vein rich with diamonds.
   suffix: Diamond
   components:
@@ -794,7 +800,7 @@
 
 - type: entity
   id: WallRockPlasma
-  parent: WallRock
+  parent: NFWallRockOre # Frontier: WallRock<NFWallRockOre
   description: An ore vein rich with plasma.
   suffix: Plasma
   components:
@@ -824,7 +830,7 @@
 
 - type: entity
   id: WallRockQuartz
-  parent: WallRock
+  parent: NFWallRockOre # Frontier: WallRock<NFWallRockOre
   description: An ore vein rich with quartz.
   suffix: Quartz
   components:
@@ -854,7 +860,7 @@
 
 - type: entity
   id: WallRockSilver
-  parent: WallRock
+  parent: NFWallRockOre # Frontier: WallRock<NFWallRockOre
   description: An ore vein rich with silver.
   suffix: Silver
   components:
@@ -885,7 +891,7 @@
 # Yes I know it drops steel but we may get smelting at some point
 - type: entity
   id: WallRockTin
-  parent: WallRock
+  parent: NFWallRockOre # Frontier: WallRock<NFWallRockOre
   description: An ore vein rich with iron.
   suffix: Iron
   components:
@@ -915,7 +921,7 @@
 
 - type: entity
   id: WallRockUranium
-  parent: WallRock
+  parent: NFWallRockOre # Frontier: WallRock<NFWallRockOre
   description: An ore vein rich with uranium.
   suffix: Uranium
   components:
@@ -946,7 +952,7 @@
 
 - type: entity
   id: WallRockBananium
-  parent: WallRock
+  parent: NFWallRockOre # Frontier: WallRock<NFWallRockOre
   description: An ore vein rich with bananium.
   suffix: Bananium
   components:
@@ -976,7 +982,7 @@
 
 - type: entity
   id: WallRockArtifactFragment
-  parent: WallRock
+  parent: NFWallRockOre # Frontier: WallRock<NFWallRockOre
   description: A rock wall. What's that sticking out of it?
   suffix: Artifact Fragment
   components:
@@ -1006,7 +1012,7 @@
 
 - type: entity
   id: WallRockSalt
-  parent: WallRock
+  parent: NFWallRockOre # Frontier: WallRock<NFWallRockOre
   description: An ore vein rich with salt.
   suffix: Salt
   components:
@@ -1058,7 +1064,7 @@
 
 - type: entity
   id: WallRockBasaltCoal
-  parent: WallRockBasalt
+  parent: NFWallRockBasaltOre # Frontier: WallRockBasalt<NFWallRockBasaltOre
   description: An ore vein rich with coal.
   suffix: Coal
   components:
@@ -1081,7 +1087,7 @@
 
 - type: entity
   id: WallRockBasaltGold
-  parent: WallRockBasalt
+  parent: NFWallRockBasaltOre # Frontier: WallRockBasalt<NFWallRockBasaltOre
   description: An ore vein rich with gold.
   suffix: Gold
   components:
@@ -1104,7 +1110,7 @@
 
 - type: entity
   id: WallRockBasaltDiamond
-  parent: WallRockBasalt
+  parent: NFWallRockBasaltOre # Frontier: WallRockBasalt<NFWallRockBasaltOre
   description: An ore vein rich with diamonds.
   suffix: Diamond
   components:
@@ -1127,7 +1133,7 @@
 
 - type: entity
   id: WallRockBasaltPlasma
-  parent: WallRockBasalt
+  parent: NFWallRockBasaltOre # Frontier: WallRockBasalt<NFWallRockBasaltOre
   description: An ore vein rich with plasma.
   suffix: Plasma
   components:
@@ -1150,7 +1156,7 @@
 
 - type: entity
   id: WallRockBasaltQuartz
-  parent: WallRockBasalt
+  parent: NFWallRockBasaltOre # Frontier: WallRockBasalt<NFWallRockBasaltOre
   description: An ore vein rich with quartz.
   suffix: Quartz
   components:
@@ -1173,7 +1179,7 @@
 
 - type: entity
   id: WallRockBasaltSilver
-  parent: WallRockBasalt
+  parent: NFWallRockBasaltOre # Frontier: WallRockBasalt<NFWallRockBasaltOre
   description: An ore vein rich with silver.
   suffix: Silver
   components:
@@ -1196,7 +1202,7 @@
 
 - type: entity
   id: WallRockBasaltTin
-  parent: WallRockBasalt
+  parent: NFWallRockBasaltOre # Frontier: WallRockBasalt<NFWallRockBasaltOre
   description: An ore vein rich with iron.
   suffix: Iron
   components:
@@ -1219,7 +1225,7 @@
 
 - type: entity
   id: WallRockBasaltUranium
-  parent: WallRockBasalt
+  parent: NFWallRockBasaltOre # Frontier: WallRockBasalt<NFWallRockBasaltOre
   description: An ore vein rich with uranium.
   suffix: Uranium
   components:
@@ -1243,7 +1249,7 @@
 
 - type: entity
   id: WallRockBasaltBananium
-  parent: WallRockBasalt
+  parent: NFWallRockBasaltOre # Frontier: WallRockBasalt<NFWallRockBasaltOre
   description: An ore vein rich with bananium.
   suffix: Bananium
   components:
@@ -1266,7 +1272,7 @@
 
 - type: entity
   id: WallRockBasaltArtifactFragment
-  parent: WallRockBasalt
+  parent: NFWallRockBasaltOre # Frontier: WallRockBasalt<NFWallRockBasaltOre
   description: A rock wall. What's that sticking out of it?
   suffix: Artifact Fragment
   components:
@@ -1289,7 +1295,7 @@
 
 - type: entity
   id: WallRockBasaltSalt
-  parent: WallRockBasalt
+  parent: NFWallRockBasaltOre # Frontier: WallRockBasalt<NFWallRockBasaltOre
   description: An ore vein rich with salt.
   suffix: Salt
   components:
@@ -1334,7 +1340,7 @@
 
 - type: entity
   id: WallRockSnowCoal
-  parent: WallRockSnow
+  parent: NFWallRockSnowOre # Frontier: WallRockSnow<NFWallRockSnowOre
   description: An ore vein rich with coal.
   suffix: Coal
   components:
@@ -1357,7 +1363,7 @@
 
 - type: entity
   id: WallRockSnowGold
-  parent: WallRockSnow
+  parent: NFWallRockSnowOre # Frontier: WallRockSnow<NFWallRockSnowOre
   description: An ore vein rich with gold.
   suffix: Gold
   components:
@@ -1380,7 +1386,7 @@
 
 - type: entity
   id: WallRockSnowDiamond
-  parent: WallRockSnow
+  parent: NFWallRockSnowOre # Frontier: WallRockSnow<NFWallRockSnowOre
   description: An ore vein rich with diamonds.
   suffix: Diamond
   components:
@@ -1403,7 +1409,7 @@
 
 - type: entity
   id: WallRockSnowPlasma
-  parent: WallRockSnow
+  parent: NFWallRockSnowOre # Frontier: WallRockSnow<NFWallRockSnowOre
   description: An ore vein rich with plasma.
   suffix: Plasma
   components:
@@ -1426,7 +1432,7 @@
 
 - type: entity
   id: WallRockSnowQuartz
-  parent: WallRockSnow
+  parent: NFWallRockSnowOre # Frontier: WallRockSnow<NFWallRockSnowOre
   description: An ore vein rich with quartz.
   suffix: Quartz
   components:
@@ -1449,7 +1455,7 @@
 
 - type: entity
   id: WallRockSnowSilver
-  parent: WallRockSnow
+  parent: NFWallRockSnowOre # Frontier: WallRockSnow<NFWallRockSnowOre
   description: An ore vein rich with silver.
   suffix: Silver
   components:
@@ -1472,7 +1478,7 @@
 
 - type: entity
   id: WallRockSnowTin
-  parent: WallRockSnow
+  parent: NFWallRockSnowOre # Frontier: WallRockSnow<NFWallRockSnowOre
   description: An ore vein rich with iron.
   suffix: Iron
   components:
@@ -1495,7 +1501,7 @@
 
 - type: entity
   id: WallRockSnowUranium
-  parent: WallRockSnow
+  parent: NFWallRockSnowOre # Frontier: WallRockSnow<NFWallRockSnowOre
   description: An ore vein rich with uranium.
   suffix: Uranium
   components:
@@ -1519,7 +1525,7 @@
 
 - type: entity
   id: WallRockSnowBananium
-  parent: WallRockSnow
+  parent: NFWallRockSnowOre # Frontier: WallRockSnow<NFWallRockSnowOre
   description: An ore vein rich with bananium.
   suffix: Bananium
   components:
@@ -1542,7 +1548,7 @@
 
 - type: entity
   id: WallRockSnowArtifactFragment
-  parent: WallRockSnow
+  parent: NFWallRockSnowOre # Frontier: WallRockSnow<NFWallRockSnowOre
   description: A rock wall. What's that sticking out of it?
   suffix: Artifact Fragment
   components:
@@ -1565,7 +1571,7 @@
 
 - type: entity
   id: WallRockSnowSalt
-  parent: WallRockSnow
+  parent: NFWallRockSnowOre # Frontier: WallRockSnow<NFWallRockSnowOre
   description: An ore vein rich with salt.
   suffix: Salt
   components:
@@ -1610,7 +1616,7 @@
 
 - type: entity
   id: WallRockSandCoal
-  parent: WallRockSand
+  parent: NFWallRockSandOre # Frontier: WallRockSand<NFWallRockSandOre
   description: An ore vein rich with coal.
   suffix: Coal
   components:
@@ -1633,7 +1639,7 @@
 
 - type: entity
   id: WallRockSandGold
-  parent: WallRockSand
+  parent: NFWallRockSandOre # Frontier: WallRockSand<NFWallRockSandOre
   description: An ore vein rich with gold.
   suffix: Gold
   components:
@@ -1656,7 +1662,7 @@
 
 - type: entity
   id: WallRockSandDiamond
-  parent: WallRockSand
+  parent: NFWallRockSandOre # Frontier: WallRockSand<NFWallRockSandOre
   description: An ore vein rich with diamonds.
   suffix: Diamond
   components:
@@ -1679,7 +1685,7 @@
 
 - type: entity
   id: WallRockSandPlasma
-  parent: WallRockSand
+  parent: NFWallRockSandOre # Frontier: WallRockSand<NFWallRockSandOre
   description: An ore vein rich with plasma.
   suffix: Plasma
   components:
@@ -1702,7 +1708,7 @@
 
 - type: entity
   id: WallRockSandQuartz
-  parent: WallRockSand
+  parent: NFWallRockSandOre # Frontier: WallRockSand<NFWallRockSandOre
   description: An ore vein rich with quartz.
   suffix: Quartz
   components:
@@ -1725,7 +1731,7 @@
 
 - type: entity
   id: WallRockSandSilver
-  parent: WallRockSand
+  parent: NFWallRockSandOre # Frontier: WallRockSand<NFWallRockSandOre
   description: An ore vein rich with silver.
   suffix: Silver
   components:
@@ -1748,7 +1754,7 @@
 
 - type: entity
   id: WallRockSandTin
-  parent: WallRockSand
+  parent: NFWallRockSandOre # Frontier: WallRockSand<NFWallRockSandOre
   description: An ore vein rich with iron.
   suffix: Iron
   components:
@@ -1771,7 +1777,7 @@
 
 - type: entity
   id: WallRockSandUranium
-  parent: WallRockSand
+  parent: NFWallRockSandOre # Frontier: WallRockSand<NFWallRockSandOre
   description: An ore vein rich with uranium.
   suffix: Uranium
   components:
@@ -1794,7 +1800,7 @@
 
 - type: entity
   id: WallRockSandBananium
-  parent: WallRockSand
+  parent: NFWallRockSandOre # Frontier: WallRockSand<NFWallRockSandOre
   description: An ore vein rich with bananium.
   suffix: Bananium
   components:
@@ -1817,7 +1823,7 @@
 
 - type: entity
   id: WallRockSandArtifactFragment
-  parent: WallRockSand
+  parent: NFWallRockSandOre # Frontier: WallRockSand<NFWallRockSandOre
   description: A rock wall. What's that sticking out of it?
   suffix: Artifact Fragment
   components:
@@ -1840,7 +1846,7 @@
 
 - type: entity
   id: WallRockSandSalt
-  parent: WallRockSand
+  parent: NFWallRockSandOre # Frontier: WallRockSand<NFWallRockSandOre
   description: An ore vein rich with salt.
   suffix: Salt
   components:
@@ -1865,7 +1871,7 @@
 - type: entity
   id: WallRockChromite
   name: chromite
-  parent: WallRock
+  parent: NFWallRockOre # Frontier: WallRock<NFWallRockOre
   components:
     - type: Icon
       sprite: Structures/Walls/rock.rsi
@@ -1885,7 +1891,7 @@
 
 - type: entity
   id: WallRockChromiteCoal
-  parent: WallRockChromite
+  parent: NFWallRockChromiteOre # Frontier: WallRockChromite<NFWallRockChromiteOre
   description: An ore vein rich with coal.
   suffix: Coal
   components:
@@ -1908,7 +1914,7 @@
 
 - type: entity
   id: WallRockChromiteGold
-  parent: WallRockChromite
+  parent: NFWallRockChromiteOre # Frontier: WallRockChromite<NFWallRockChromiteOre
   description: An ore vein rich with gold.
   suffix: Gold
   components:
@@ -1931,7 +1937,7 @@
 
 - type: entity
   id: WallRockChromiteDiamond
-  parent: WallRockChromite
+  parent: NFWallRockChromiteOre # Frontier: WallRockChromite<NFWallRockChromiteOre
   description: An ore vein rich with diamonds.
   suffix: Diamond
   components:
@@ -1954,7 +1960,7 @@
 
 - type: entity
   id: WallRockChromitePlasma
-  parent: WallRockChromite
+  parent: NFWallRockChromiteOre # Frontier: WallRockChromite<NFWallRockChromiteOre
   description: An ore vein rich with plasma.
   suffix: Plasma
   components:
@@ -1977,7 +1983,7 @@
 
 - type: entity
   id: WallRockChromiteQuartz
-  parent: WallRockChromite
+  parent: NFWallRockChromiteOre # Frontier: WallRockChromite<NFWallRockChromiteOre
   description: An ore vein rich with quartz.
   suffix: Quartz
   components:
@@ -2000,7 +2006,7 @@
 
 - type: entity
   id: WallRockChromiteSilver
-  parent: WallRockChromite
+  parent: NFWallRockChromiteOre # Frontier: WallRockChromite<NFWallRockChromiteOre
   description: An ore vein rich with silver.
   suffix: Silver
   components:
@@ -2023,7 +2029,7 @@
 
 - type: entity
   id: WallRockChromiteTin
-  parent: WallRockChromite
+  parent: NFWallRockChromiteOre # Frontier: WallRockChromite<NFWallRockChromiteOre
   description: An ore vein rich with iron.
   suffix: Iron
   components:
@@ -2046,7 +2052,7 @@
 
 - type: entity
   id: WallRockChromiteUranium
-  parent: WallRockChromite
+  parent: NFWallRockChromiteOre # Frontier: WallRockChromite<NFWallRockChromiteOre
   description: An ore vein rich with uranium.
   suffix: Uranium
   components:
@@ -2070,7 +2076,7 @@
 
 - type: entity
   id: WallRockChromiteBananium
-  parent: WallRockChromite
+  parent: NFWallRockChromiteOre # Frontier: WallRockChromite<NFWallRockChromiteOre
   description: An ore vein rich with bananium.
   suffix: Bananium
   components:
@@ -2093,7 +2099,7 @@
 
 - type: entity
   id: WallRockChromiteArtifactFragment
-  parent: WallRockChromite
+  parent: NFWallRockChromiteOre # Frontier: WallRockChromite<NFWallRockChromiteOre
   description: A rock wall. What's that sticking out of it?
   suffix: Artifact Fragment
   components:
@@ -2116,7 +2122,7 @@
 
 - type: entity
   id: WallRockChromiteSalt
-  parent: WallRockChromite
+  parent: NFWallRockChromiteOre # Frontier: WallRockChromite<NFWallRockChromiteOre
   description: An ore vein rich with salt.
   suffix: Salt
   components:
@@ -2141,7 +2147,7 @@
 - type: entity
   id: WallRockAndesite
   name: andesite
-  parent: WallRock
+  parent: NFWallRockOre # Frontier: WallRock<NFWallRockOre
   components:
     - type: Icon
       sprite: Structures/Walls/rock.rsi
@@ -2161,7 +2167,7 @@
 
 - type: entity
   id: WallRockAndesiteCoal
-  parent: WallRockAndesite
+  parent: NFWallRockAndesiteOre # Frontier: WallRockAndesite<NFWallRockAndesiteOre
   description: An ore vein rich with coal.
   suffix: Coal
   components:
@@ -2184,7 +2190,7 @@
 
 - type: entity
   id: WallRockAndesiteGold
-  parent: WallRockAndesite
+  parent: NFWallRockAndesiteOre # Frontier: WallRockAndesite<NFWallRockAndesiteOre
   description: An ore vein rich with gold.
   suffix: Gold
   components:
@@ -2207,7 +2213,7 @@
 
 - type: entity
   id: WallRockAndesiteDiamond
-  parent: WallRockAndesite
+  parent: NFWallRockAndesiteOre # Frontier: WallRockAndesite<NFWallRockAndesiteOre
   description: An ore vein rich with diamonds.
   suffix: Diamond
   components:
@@ -2230,7 +2236,7 @@
 
 - type: entity
   id: WallRockAndesitePlasma
-  parent: WallRockAndesite
+  parent: NFWallRockAndesiteOre # Frontier: WallRockAndesite<NFWallRockAndesiteOre
   description: An ore vein rich with plasma.
   suffix: Plasma
   components:
@@ -2253,7 +2259,7 @@
 
 - type: entity
   id: WallRockAndesiteQuartz
-  parent: WallRockAndesite
+  parent: NFWallRockAndesiteOre # Frontier: WallRockAndesite<NFWallRockAndesiteOre
   description: An ore vein rich with quartz.
   suffix: Quartz
   components:
@@ -2276,7 +2282,7 @@
 
 - type: entity
   id: WallRockAndesiteSilver
-  parent: WallRockAndesite
+  parent: NFWallRockAndesiteOre # Frontier: WallRockAndesite<NFWallRockAndesiteOre
   description: An ore vein rich with silver.
   suffix: Silver
   components:
@@ -2299,7 +2305,7 @@
 
 - type: entity
   id: WallRockAndesiteTin
-  parent: WallRockAndesite
+  parent: NFWallRockAndesiteOre # Frontier: WallRockAndesite<NFWallRockAndesiteOre
   description: An ore vein rich with iron.
   suffix: Iron
   components:
@@ -2322,7 +2328,7 @@
 
 - type: entity
   id: WallRockAndesiteUranium
-  parent: WallRockAndesite
+  parent: NFWallRockAndesiteOre # Frontier: WallRockAndesite<NFWallRockAndesiteOre
   description: An ore vein rich with uranium.
   suffix: Uranium
   components:
@@ -2346,7 +2352,7 @@
 
 - type: entity
   id: WallRockAndesiteBananium
-  parent: WallRockAndesite
+  parent: NFWallRockAndesiteOre # Frontier: WallRockAndesite<NFWallRockAndesiteOre
   description: An ore vein rich with bananium.
   suffix: Bananium
   components:
@@ -2369,7 +2375,7 @@
 
 - type: entity
   id: WallRockAndesiteArtifactFragment
-  parent: WallRockAndesite
+  parent: NFWallRockAndesiteOre # Frontier: WallRockAndesite<NFWallRockAndesiteOre
   description: A rock wall. What's that sticking out of it?
   suffix: Artifact Fragment
   components:
@@ -2392,7 +2398,7 @@
 
 - type: entity
   id: WallRockAndesiteSalt
-  parent: WallRockAndesite
+  parent: NFWallRockAndesiteOre # Frontier: WallRockAndesite<NFWallRockAndesiteOre
   description: An ore vein rich with salt.
   suffix: Salt
   components:
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml
index 3b42b110d0b..a682b80a0b3 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Species/felinid.yml
@@ -21,9 +21,14 @@
     tags:
     - Recyclable
     - Trash
-  - type: FoodSequenceElement # Frontier
+  # Frontier: edible hairballs
+  - type: FoodSequenceElement
     entries:
       Burger: Hairball
       Taco: Hairball
       Skewer: Hairball
-    solution: hairball # Frontier
\ No newline at end of file
+    solution: hairball
+  - type: Food
+    requiresSpecialDigestion: true
+    solution: hairball
+  # End Frontier: edible hairballs
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index 2e3334ea753..ed3c69a87a8 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -1236,7 +1236,7 @@
             Heat: -3.0
             Shock: -3.0
             Cold: -3.0 # Frontier
-            Caustic: -1.0
+            Caustic: -3.0 # Frontier
 
 - type: reagent
   id : Mannitol # currently this is just a way to create psicodine
diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml
index 566c61b71b4..d2405b71898 100644
--- a/Resources/Prototypes/Recipes/Lathes/medical.yml
+++ b/Resources/Prototypes/Recipes/Lathes/medical.yml
@@ -188,7 +188,7 @@
   result: Jug
   completetime: 4
   materials:
-    Plastic: 400
+    Plastic: 200 # Frontier: 400<200
 
 - type: latheRecipe
   id: VehicleWheelchairFolded
diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
index a444271c820..1fc9b4b2e91 100644
--- a/Resources/Prototypes/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -55,7 +55,7 @@
 
 - type: department
   id: Command
-  name: department-NFCommand # Frontier
+  name: department-Command
   description: department-NFCommand-description # Frontier
   color: "#334E6D"
   roles:
@@ -101,7 +101,7 @@
 
 - type: department
   id: Security
-  name: department-NFSecurity # Frontier
+  name: department-Security
   description: department-NFSecurity-description # Frontier
   color: "#5C7D4D" # Frontier: DE3A3A<5C7D4D
   weight: 1 # Frontier: 20<1 - accounted for in jobs
@@ -148,4 +148,4 @@
   color: "#9FED58"
   weight: -91
   primary: false
-  editorHidden: true # Frontier
\ No newline at end of file
+  editorHidden: true # Frontier
diff --git a/Resources/Prototypes/_NF/Actions/types.yml b/Resources/Prototypes/_NF/Actions/types.yml
new file mode 100644
index 00000000000..29225918c64
--- /dev/null
+++ b/Resources/Prototypes/_NF/Actions/types.yml
@@ -0,0 +1,9 @@
+- type: entity
+  id: ActionActivateDissonantWhispersImplant
+  name: Dissonant Whispers
+  description: Utter unharmonious and disquieting whispers giving form to eldritch horrors.
+  components:
+  - type: InstantAction
+    icon: { sprite: Objects/Fun/bikehorn.rsi, state: icon }
+    event: !type:ActivateImplantEvent
+    useDelay: 5
diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_medical.yml
index 8b4eb3385d1..98b52d524af 100644
--- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_medical.yml
+++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_medical.yml
@@ -7,3 +7,302 @@
   cost: 3000
   category: cargoproduct-category-name-medical
   group: market
+
+- type: cargoProduct
+  id: CargoBarrel
+  name: barrel (empty)
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/white.rsi
+    state: icon
+  product: MetalBarrelWhite
+  cost: 2000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelCarbon
+  name: barrel of carbon
+  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/black.rsi
+    state: icon
+  product: ChemicalBarrelCarbon
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelIodine
+  name: barrel of iodine
+  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/red.rsi
+    state: icon
+  product: ChemicalBarrelIodine
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelFluorine
+  name: barrel of fluorine
+#  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/blue.rsi
+    state: icon
+  product: ChemicalBarrelFluorine
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelChlorine
+  name: barrel of chlorine
+  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/green.rsi
+    state: icon
+  product: ChemicalBarrelChlorine
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelAluminium
+  name: barrel of aluminium
+#  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/white.rsi
+    state: icon
+  product: ChemicalBarrelAluminium
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelPhosphorus
+  name: barrel of phosphorus
+#  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/red.rsi
+    state: icon
+  product: ChemicalBarrelPhosphorus
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelSulfur
+  name: barrel of sulfur
+  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/yellow.rsi
+    state: icon
+  product: ChemicalBarrelSulfur
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelSilicon
+  name: barrel of silicon
+  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/black.rsi
+    state: icon
+  product: ChemicalBarrelSilicon
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelHydrogen
+  name: barrel of hydrogen
+  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/white.rsi
+    state: icon
+  product: ChemicalBarrelHydrogen
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelLithium
+  name: barrel of lithium
+#  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/grey.rsi
+    state: icon
+  product: ChemicalBarrelLithium
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelSodium
+  name: barrel of sodium
+  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/grey.rsi
+    state: icon
+  product: ChemicalBarrelSodium
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelPotassium
+  name: barrel of potassium
+  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/yellow.rsi
+    state: icon
+  product: ChemicalBarrelPotassium
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelRadium
+  name: barrel of radium
+#  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/green.rsi
+    state: icon
+  product: ChemicalBarrelRadium
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelIron
+  name: barrel of iron
+  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/grey.rsi
+    state: icon
+  product: ChemicalBarrelIron
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelCopper
+  name: barrel of copper
+#  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/red.rsi
+    state: icon
+  product: ChemicalBarrelCopper
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelGold
+  name: barrel of gold
+  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/yellow.rsi
+    state: icon
+  product: ChemicalBarrelGold
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelMercury
+  name: barrel of mercury
+#  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/grey.rsi
+    state: icon
+  product: ChemicalBarrelMercury
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelSilver
+  name: barrel of silver
+  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/white.rsi
+    state: icon
+  product: ChemicalBarrelSilver
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelEthanol
+  name: barrel of ethanol
+#  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/blue.rsi
+    state: icon
+  product: ChemicalBarrelEthanol
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelSugar
+  name: barrel of sugar
+  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/white.rsi
+    state: icon
+  product: ChemicalBarrelSugar
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelNitrogen
+  name: barrel of nitrogen
+#  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/red.rsi
+    state: icon
+  product: ChemicalBarrelNitrogen
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelOxygen
+  name: barrel of oxygen
+  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/blue.rsi
+    state: icon
+  product: ChemicalBarrelOxygen
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelOil
+  name: barrel of oil
+  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/black.rsi
+    state: icon
+  product: ChemicalBarrelOil
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: CargoBarrelDiethylamine
+  name: barrel of diethylamine
+  abstract: true
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/green.rsi
+    state: icon
+  product: ChemicalBarrelDiethylamine
+  cost: 5000
+  category: cargoproduct-category-name-medical
+  group: market
diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_service.yml
index 206d951c793..d471a927a03 100644
--- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_service.yml
+++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_service.yml
@@ -1,10 +1,10 @@
 - type: cargoProduct
-  id: BulkSpaceCleaner
+  id: CargoBarreSpaceCleaner
   icon:
-    sprite: Objects/Specific/Chemistry/jug.rsi
-    state: jug
-  product: CrateSpaceCleaner
-  cost: 2000
+    sprite: _NF/Objects/Storage/Barrels/blue.rsi
+    state: icon
+  product: ChemicalBarrelSpaceCleaner
+  cost: 3500
   category: cargoproduct-category-name-service
   group: market
 
@@ -20,6 +20,7 @@
 
 - type: cargoProduct
   id: ServiceVehicleJanicart
+  abstract: true
   icon:
     sprite: Objects/Vehicles/janicart.rsi
     state: icon
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml
deleted file mode 100644
index 18dee491c22..00000000000
--- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/chemistry.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-- type: entity
-  id: CrateSpaceCleaner
-  parent: CrateGenericSteel
-  name: bulk space cleaner crate
-  description: For a large mess.
-  components:
-    - type: StorageFill
-      contents:
-        - id: JugSpaceCleaner
-          amount: 5
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/service.yml
index 95d5db560b3..51c472147f9 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/service.yml
@@ -20,5 +20,5 @@
   components:
   - type: StorageFill
     contents:
-      - id: VehicleJanicart
+      - id: NFVehicleJanicart
       - id: VehicleKeyJanicart
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml
index 89f7965f863..8462d556753 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml
@@ -60,6 +60,9 @@
     CrazyGlue: 1
   emaggedInventory:
     PlushieJester: 3
+    PlushieJanitor: 3
+    PlushieMailVulp: 3
+    PlushieYarrMoth: 3
     PlushieNuke: 3
     PlushieRGBee: 3
     BalloonCorgi: 2
diff --git a/Resources/Prototypes/_NF/Datasets/Names/cat_cult.yml b/Resources/Prototypes/_NF/Datasets/Names/cat_cult.yml
new file mode 100644
index 00000000000..f0cf1b90b76
--- /dev/null
+++ b/Resources/Prototypes/_NF/Datasets/Names/cat_cult.yml
@@ -0,0 +1,36 @@
+- type: dataset # Mostly names of towns that held witch trials
+  id: names_cat_cult
+  values:
+  # Towns
+  - Salem
+  - Valais
+  - Trier
+  - Fulda
+  - Berwick
+  - Pendle
+  - Würzburg
+  - Bamberg
+  - Torsåker
+  - Danube
+  - Montpezat
+  - Nördlingen
+  - Kirkwall
+  - Denbigh
+  - Tyburn
+  - Bamberg
+  - Beaumaris
+  - Braunschweig
+  - Carrickfergus
+  - Belvoir
+  # Witches
+  - Glamis
+  - Soulmother
+  - Leatherlips
+  - Kolgrim
+  - Dacal
+  - Koldings
+  - Balfour
+  - Burroughs
+  - Wardwell
+  - Guilladot
+  - Saenger von Mossau
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_argocyte.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_argocyte.yml
new file mode 100644
index 00000000000..2952b1454e2
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_argocyte.yml
@@ -0,0 +1,17 @@
+- type: entity
+  name: leviathing spawner
+  id: SpawnMobArgocyteLeviathingExpeditions
+  parent: MarkerBase
+  suffix: AI, Hostile
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Mobs/Aliens/Argocyte/argocyte_large.rsi
+      state: leviathing
+    - sprite: _NF/Markers/general.rsi
+      state: questionmark
+      color: red
+  - type: ConditionalSpawner
+    prototypes:
+    - MobArgocyteLeviathingExpeditions
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_bloodcult.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_bloodcult.yml
index f88f8ac1441..8bdcb696a5c 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_bloodcult.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_bloodcult.yml
@@ -1,5 +1,5 @@
 - type: entity
-  name: Blood Cult Priest Spawner
+  name: blood cult priest spawner
   suffix: AI, Hostile, Caster
   id: SpawnMobBloodCultistPriest
   parent: MarkerBase
@@ -23,7 +23,7 @@
       - MobBloodCultistPriest
 
 - type: entity
-  name: Blood Cult Acolyte
+  name: blood cult acolyte spawner
   suffix: AI, Hostile, Melee
   id: SpawnMobBloodCultistAcolyte
   parent: MarkerBase
@@ -47,7 +47,7 @@
       - MobBloodCultistAcolyte
 
 - type: entity
-  name: Blood Cult Zealot
+  name: blood cult zealot spawner
   suffix: AI, Hostile, Melee
   id: SpawnMobBloodCultistZealotMelee
   parent: MarkerBase
@@ -71,7 +71,7 @@
       - MobBloodCultistZealotMelee
 
 - type: entity
-  name: Blood Cult Zealot
+  name: blood cult zealot spawner
   suffix: AI, Hostile, Ranged
   id: SpawnMobBloodCultistZealotRanged
   parent: MarkerBase
@@ -95,7 +95,7 @@
       - MobBloodCultistZealotRanged
 
 - type: entity
-  name: Blood Cult Zealot
+  name: blood cult zealot spawner
   suffix: AI, Hostile, Caster
   id: SpawnMobBloodCultistCaster
   parent: MarkerBase
@@ -119,7 +119,7 @@
       - MobBloodCultistCaster
 
 - type: entity
-  name: Blood Cult Leech
+  name: blood cult leech spawner
   suffix: AI, Hostile, Melee, Fast
   id: SpawnMobBloodCultLeech
   parent: MarkerBase
@@ -135,7 +135,7 @@
       - MobBloodCultLeech
 
 - type: entity
-  name: Ascended Cultist
+  name: ascended cultist spawner
   suffix: AI, Hostile, Caster, Megafauna
   id: SpawnMobBloodCultistAscended
   parent: MarkerBase
@@ -151,7 +151,7 @@
       - MobBloodCultistAscended
 
 - type: entity
-  name: Blood Cult Janitor
+  name: blood cult janitor spawner
   suffix: AI, Hostile, Melee
   id: SpawnMobBloodCultistJanitor
   parent: MarkerBase
@@ -175,3 +175,18 @@
   - type: ConditionalSpawner
     prototypes:
       - MobBloodCultistJanitor
+
+- type: entity
+  name: blood cult cat spawner
+  suffix: Ghost
+  id: SpawnMobCatBloodCult
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - sprite: _NF/Mobs/Pets/cat.rsi
+        state: cultcat
+  - type: ConditionalSpawner
+    prototypes:
+      - MobCatBloodCult
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_explorers.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_explorers.yml
new file mode 100644
index 00000000000..8012865997f
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_explorers.yml
@@ -0,0 +1,24 @@
+
+- type: entity
+  name: explorer boss spawner
+  id: SpawnMobExplorerBoss
+  parent: MarkerBase
+  suffix: AI, Hostile, Boss
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - state: ai
+    - sprite: _NF/Mobs/Species/Templates/human.rsi
+      state: human
+    - sprite: _NF/Clothing/OuterClothing/Hardsuits/maxim_prototype.rsi
+      state: equipped-OUTERCLOTHING
+    - sprite: _NF/Clothing/Head/Hardsuits/maxim_prototype.rsi
+      state: off-equipped-HELMET
+    - sprite: _NF/Objects/Weapons/Melee/energy_pickaxe.rsi
+      state: inhand-left
+    - sprite: _NF/Objects/Weapons/Melee/energy_pickaxe.rsi
+      state: inhand-left-blade
+  - type: ConditionalSpawner
+    prototypes:
+    - MobExplorerBoss
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_mercenaries.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_mercenaries.yml
new file mode 100644
index 00000000000..a27bcb3c21b
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_mercenaries.yml
@@ -0,0 +1,34 @@
+- type: entity
+  name: mercenary boss spawner
+  id: SpawnMobMercenaryCaptain
+  parent: MarkerBase
+  suffix: AI, Hostile
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - state: ai
+    - sprite: _NF/Mobs/Species/Templates/human.rsi
+      state: human
+    - sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+      state: equipped-INNERCLOTHING
+      color: "#d3bf86"
+    - sprite: Clothing/OuterClothing/Armor/bulletproof.rsi
+      state: equipped-OUTERCLOTHING
+    - sprite: Clothing/Mask/gassecurity.rsi
+      state: equipped-MASK
+    - sprite: Clothing/Head/Helmets/security.rsi
+      state: equipped-HELMET
+    - sprite: Clothing/Belt/militarywebbing.rsi
+      state: equipped-BELT
+    - sprite: Clothing/Neck/mantles/qmmantle.rsi
+      state: equipped-NECK
+    - sprite: _NF/Clothing/Neck/Misc/mercenary_iff.rsi
+      state: equipped-NECK-off
+    - sprite: _NF/Clothing/Neck/Misc/mercenary_iff.rsi
+      state: equipped-NECK-on
+      color: "#a9b6bd"
+      shader: unshaded
+  - type: ConditionalSpawner
+    prototypes:
+    - MobMercenaryCaptain
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_rogue_ai.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_rogue_ai.yml
index 7b8718b7c62..344457b7c99 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_rogue_ai.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_rogue_ai.yml
@@ -15,3 +15,37 @@
   - type: ConditionalSpawner
     prototypes:
     - MobRogueSiliconViscerator
+
+- type: entity
+  name: one star unit spawner
+  suffix: AI, Hostile
+  id: SpawnMobRogueSiliconBoss
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - state: ai
+      - sprite: Mobs/Silicon/onestar.rsi
+        state: onestar_boss
+      - sprite: Mobs/Silicon/onestar.rsi
+        state: onestar_boss_screen
+  - type: ConditionalSpawner
+    prototypes:
+    - MobRogueSiliconBoss
+
+- type: entity
+  name: guardian unit spawner
+  suffix: AI, Hostile
+  id: SpawnMobRogueSiliconGuardian
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - state: ai
+      - sprite: _NF/Mobs/RogueSilicons/netguardian.rsi
+        state: netguardian
+  - type: ConditionalSpawner
+    prototypes:
+    - MobRogueSiliconGuardian
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/Salvage/minerals.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/Salvage/minerals.yml
new file mode 100644
index 00000000000..f3312adf38f
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/Salvage/minerals.yml
@@ -0,0 +1,1016 @@
+# Mineral tables for asteroids
+# region Rock Spawner
+- type: entityTable
+  id: NFRockMineralSoft
+  table: !type:GroupSelector
+    children:
+    - id: WallRock
+      weight: 0.4
+    - id: WallRockCoal
+      weight: 0.1
+    - id: WallRockTin
+      weight: 0.16
+    - id: WallRockQuartz
+      weight: 0.06
+    - id: WallRockSalt
+      weight: 0.06
+    - id: WallRockGold
+      weight: 0.01
+    - id: WallRockSilver
+      weight: 0.04
+    - id: WallRockPlasma
+      weight: 0.07
+    - id: WallRockUranium
+      weight: 0.04
+    - id: WallRockBananium
+      weight: 0.01
+    - id: WallRockArtifactFragment
+      weight: 0.01
+    - id: WallRockDiamond
+      weight: 0.002
+    - id: WallRockBluespace
+      weight: 0.003
+    - id: RockElementalSpawner
+      weight: 0.06
+
+- type: entity
+  id: NFRockMineralSoft
+  parent: MarkerBase
+  name: rock mineral spawner
+  suffix: Soft
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Structures/Walls/rock.rsi
+      state: rock
+    - state: green
+    - sprite: Objects/Weapons/Melee/pickaxe.rsi
+      state: pickaxe
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: NFRockMineralSoft
+
+- type: entityTable
+  id: NFRockMineralHard
+  table: !type:GroupSelector
+    children:
+    - id: NFWallCobblebrick
+      weight: 0.06
+    - id: NFWallCobblebrickCoal
+      weight: 0.01
+    - id: NFWallCobblebrickTin
+      weight: 0.016
+    - id: NFWallCobblebrickQuartz
+      weight: 0.006
+    - id: NFWallCobblebrickSalt
+      weight: 0.006
+    - id: NFWallCobblebrickGold
+      weight: 0.001
+    - id: NFWallCobblebrickSilver
+      weight: 0.004
+    - id: NFWallCobblebrickPlasma
+      weight: 0.007
+    - id: NFWallCobblebrickUranium
+      weight: 0.004
+    - id: NFWallCobblebrickBananium
+      weight: 0.001
+    - id: NFWallCobblebrickArtifactFragment
+      weight: 0.001
+    - id: NFWallCobblebrickBluespace
+      weight: 0.0003
+    - id: CobblebrickElementalSpawner
+      weight: 0.006
+
+- type: entity
+  id: NFRockMineralHard
+  parent: NFRockMineralSoft
+  suffix: Hard
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Structures/Walls/cobblebrick.rsi
+      state: full
+    - state: green
+    - sprite: Objects/Tools/handdrilldiamond.rsi
+      state: handdrill
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: NFRockMineralHard
+
+- type: entityTable
+  id: NFRockMineralHardRich
+  table: !type:GroupSelector
+    children:
+    - id: NFWallCobblebrick
+      weight: 0.3
+    - id: NFWallCobblebrickArtifactFragment
+      weight: 0.1
+    - id: NFWallCobblebrickBluespace
+      weight: 0.3
+    - id: NFWallCobblebrickDiamond
+      weight: 0.3
+
+- type: entity
+  id: NFRockMineralHardRich
+  parent: NFRockMineralSoft
+  suffix: Hard, Rich
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Structures/Walls/cobblebrick.rsi
+      state: full
+    - state: green
+    - sprite: Objects/Materials/materials.rsi
+      state: diamond
+    - sprite: Objects/Tools/handdrilldiamond.rsi
+      state: handdrill
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: NFRockMineralHardRich
+# endregion Rock Spawners
+
+# region Ice Spawners
+- type: entityTable
+  id: NFIceMineralSoft
+  table: !type:GroupSelector
+    children:
+    - id: WallRockSnow
+      weight: 0.5
+    - id: WallRockSnowCoal
+      weight: 0.02
+    - id: WallRockSnowTin
+      weight: 0.04
+    - id: WallRockSnowQuartz
+      weight: 0.01
+    - id: WallRockSnowSalt
+      weight: 0.01
+    - id: WallRockSnowGold
+      weight: 0.02
+    - id: WallRockSnowSilver
+      weight: 0.02
+    - id: WallRockSnowPlasma
+      weight: 0.05
+    - id: WallRockSnowUranium
+      weight: 0.01
+    - id: WallRockSnowBananium
+      weight: 0.005
+    - id: WallRockSnowArtifactFragment
+      weight: 0.04
+    - id: WallRockSnowDiamond
+      weight: 0.002
+    - id: WallRockSnowBluespace
+      weight: 0.01
+    - id: SnowElementalSpawner
+      weight: 0.07
+
+- type: entity
+  id: NFIceMineralSoft
+  parent: MarkerBase
+  name: ice mineral spawner
+  suffix: Soft
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Structures/Walls/rock.rsi
+      state: rock_snow
+    - state: green
+    - sprite: Objects/Weapons/Melee/pickaxe.rsi
+      state: pickaxe
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: NFIceMineralSoft
+
+- type: entityTable
+  id: NFIceMineralHard
+  table: !type:GroupSelector
+    children:
+    - id: NFWallIce
+      weight: 0.1
+    - id: NFWallIceCoal
+      weight: 0.002
+    - id: NFWallIceTin
+      weight: 0.004
+    - id: NFWallIceQuartz
+      weight: 0.001
+    - id: NFWallIceSalt
+      weight: 0.001
+    - id: NFWallIceGold
+      weight: 0.002
+    - id: NFWallIceSilver
+      weight: 0.002
+    - id: NFWallIcePlasma
+      weight: 0.005
+    - id: NFWallIceUranium
+      weight: 0.001
+    - id: NFWallIceBananium
+      weight: 0.0005
+    - id: NFWallIceArtifactFragment
+      weight: 0.004
+    # - id: NFWallIceDiamond
+    #   weight: 0.0002
+    - id: NFWallIceBluespace
+      weight: 0.001
+    - id: IceElementalSpawner
+      weight: 0.007
+
+- type: entity
+  id: NFIceMineralHard
+  parent: NFIceMineralSoft
+  suffix: Hard
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Structures/Walls/ice.rsi
+      state: full
+    - state: green
+    - sprite: Objects/Tools/handdrilldiamond.rsi
+      state: handdrill
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: NFIceMineralHard
+
+- type: entityTable
+  id: NFIceMineralHardRich
+  table: !type:GroupSelector
+    children:
+    - id: NFWallIce
+      weight: 0.3
+    - id: NFWallIceArtifactFragment
+      weight: 0.5
+    - id: NFWallIceBluespace
+      weight: 0.1
+    - id: NFWallIceDiamond
+      weight: 0.1
+
+- type: entity
+  id: NFIceMineralHardRich
+  parent: NFIceMineralSoft
+  suffix: Hard, Rich
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Structures/Walls/ice.rsi
+      state: full
+    - state: green
+    - sprite: Objects/Materials/materials.rsi
+      state: diamond
+    - sprite: Objects/Tools/handdrilldiamond.rsi
+      state: handdrill
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: NFIceMineralHardRich
+# endregion Ice Spawners
+
+# region Andesite Spawners
+- type: entityTable
+  id: NFAndesiteMineralSoft
+  table: !type:GroupSelector
+    children:
+    - id: WallRockAndesite
+      weight: 0.6
+    - id: WallRockAndesiteCoal
+      weight: 0.04
+    - id: WallRockAndesiteTin
+      weight: 0.08
+    - id: WallRockAndesiteQuartz
+      weight: 0.05
+    - id: WallRockAndesiteSalt
+      weight: 0.01
+    - id: WallRockAndesiteGold
+      weight: 0.01
+    - id: WallRockAndesiteSilver
+      weight: 0.01
+    - id: WallRockAndesitePlasma
+      weight: 0.01
+    - id: WallRockAndesiteUranium
+      weight: 0.01
+    - id: WallRockAndesiteBananium
+      weight: 0.005
+    - id: WallRockAndesiteArtifactFragment
+      weight: 0.01
+    - id: WallRockAndesiteDiamond
+      weight: 0.008
+    - id: WallRockAndesiteBluespace
+      weight: 0.002
+    - id: AndesiteElementalSpawner
+      weight: 0.08
+
+- type: entity
+  id: NFAndesiteMineralSoft
+  parent: MarkerBase
+  name: andesite mineral spawner
+  suffix: Soft
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Structures/Walls/rock.rsi
+      state: rock_andesite
+    - state: green
+    - sprite: Objects/Weapons/Melee/pickaxe.rsi
+      state: pickaxe
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: NFAndesiteMineralSoft
+
+- type: entityTable
+  id: NFAndesiteMineralHard
+  table: !type:GroupSelector
+    children:
+    - id: NFWallAndesiteCobblebrick
+      weight: 0.1
+    - id: NFWallAndesiteCobblebrickCoal
+      weight: 0.004
+    - id: NFWallAndesiteCobblebrickTin
+      weight: 0.008
+    - id: NFWallAndesiteCobblebrickQuartz
+      weight: 0.005
+    - id: NFWallAndesiteCobblebrickSalt
+      weight: 0.001
+    - id: NFWallAndesiteCobblebrickGold
+      weight: 0.001
+    - id: NFWallAndesiteCobblebrickSilver
+      weight: 0.001
+    - id: NFWallAndesiteCobblebrickPlasma
+      weight: 0.001
+    - id: NFWallAndesiteCobblebrickUranium
+      weight: 0.001
+    - id: NFWallAndesiteCobblebrickBananium
+      weight: 0.0005
+    - id: NFWallAndesiteCobblebrickArtifactFragment
+      weight: 0.001
+    # - id: NFWallAndesiteCobblebrickDiamond
+    #   weight: 0.0012
+    - id: NFWallAndesiteCobblebrickBluespace
+      weight: 0.0002
+    - id: AndesiteCobblebrickElementalSpawner
+      weight: 0.008
+
+- type: entity
+  id: NFAndesiteMineralHard
+  parent: NFAndesiteMineralSoft
+  suffix: Hard
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Structures/Walls/cobblebrick_andesite.rsi
+      state: full
+    - state: green
+    - sprite: Objects/Tools/handdrilldiamond.rsi
+      state: handdrill
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: NFAndesiteMineralHard
+
+- type: entityTable
+  id: NFAndesiteMineralHardRich
+  table: !type:GroupSelector
+    children:
+    - id: NFWallAndesiteCobblebrick
+      weight: 0.3
+    - id: NFWallAndesiteCobblebrickArtifactFragment
+      weight: 0.1
+    - id: NFWallAndesiteCobblebrickBluespace
+      weight: 0.1
+    - id: NFWallAndesiteCobblebrickDiamond
+      weight: 0.5
+
+- type: entity
+  id: NFAndesiteMineralHardRich
+  parent: NFAndesiteMineralSoft
+  suffix: Hard, Rich
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Structures/Walls/cobblebrick_andesite.rsi
+      state: full
+    - state: green
+    - sprite: Objects/Materials/materials.rsi
+      state: diamond
+    - sprite: Objects/Tools/handdrilldiamond.rsi
+      state: handdrill
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: NFAndesiteMineralHardRich
+# endregion Andesite Spawners
+
+# region Basalt Spawners
+- type: entityTable
+  id: NFBasaltMineralSoft
+  table: !type:GroupSelector
+    children:
+    - id: WallRockBasalt
+      weight: 0.55
+    - id: WallRockBasaltCoal
+      weight: 0.02
+    - id: WallRockBasaltTin
+      weight: 0.05
+    - id: WallRockBasaltQuartz
+      weight: 0.01
+    - id: WallRockBasaltSalt
+      weight: 0.01
+    - id: WallRockBasaltGold
+      weight: 0.01
+    - id: WallRockBasaltSilver
+      weight: 0.03
+    - id: WallRockBasaltPlasma
+      weight: 0.1
+    - id: WallRockBasaltUranium
+      weight: 0.05
+    - id: WallRockBasaltBananium
+      weight: 0.005
+    - id: WallRockBasaltArtifactFragment
+      weight: 0.01
+    - id: WallRockBasaltDiamond
+      weight: 0.005
+    - id: WallRockBasaltBluespace
+      weight: 0.005
+    - id: BasaltElementalSpawner
+      weight: 0.05
+
+- type: entity
+  id: NFBasaltMineralSoft
+  parent: MarkerBase
+  name: basalt mineral spawner
+  suffix: Soft
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Structures/Walls/rock.rsi
+      state: rock_wall
+    - state: green
+    - sprite: Objects/Weapons/Melee/pickaxe.rsi
+      state: pickaxe
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: NFBasaltMineralSoft
+
+- type: entityTable
+  id: NFBasaltMineralHard
+  table: !type:GroupSelector
+    children:
+    - id: NFWallBasaltCobblebrick
+      weight: 0.08
+    - id: NFWallBasaltCobblebrickCoal
+      weight: 0.002
+    - id: NFWallBasaltCobblebrickTin
+      weight: 0.005
+    - id: NFWallBasaltCobblebrickQuartz
+      weight: 0.001
+    - id: NFWallBasaltCobblebrickSalt
+      weight: 0.001
+    - id: NFWallBasaltCobblebrickGold
+      weight: 0.001
+    - id: NFWallBasaltCobblebrickSilver
+      weight: 0.003
+    - id: NFWallBasaltCobblebrickPlasma
+      weight: 0.01
+    - id: NFWallBasaltCobblebrickUranium
+      weight: 0.005
+    - id: NFWallBasaltCobblebrickBananium
+      weight: 0.0005
+    - id: NFWallBasaltCobblebrickArtifactFragment
+      weight: 0.001
+    # - id: NFWallBasaltCobblebrickDiamond
+    #   weight: 0.0005
+    - id: NFWallBasaltCobblebrickBluespace
+      weight: 0.0005
+    - id: BasaltCobblebrickElementalSpawner
+      weight: 0.005
+
+- type: entity
+  id: NFBasaltMineralHard
+  parent: NFBasaltMineralSoft
+  suffix: Hard
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Structures/Walls/cobblebrick_basalt.rsi
+      state: full
+    - state: green
+    - sprite: Objects/Tools/handdrilldiamond.rsi
+      state: handdrill
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: NFBasaltMineralHard
+
+- type: entityTable
+  id: NFBasaltMineralHardRich
+  table: !type:GroupSelector
+    children:
+    - id: NFWallBasaltCobblebrick
+      weight: 0.3
+    - id: NFWallBasaltCobblebrickArtifactFragment
+      weight: 0.25
+    - id: NFWallBasaltCobblebrickBluespace
+      weight: 0.25
+    - id: NFWallBasaltCobblebrickDiamond
+      weight: 0.2
+
+- type: entity
+  id: NFBasaltMineralHardRich
+  parent: NFBasaltMineralSoft
+  suffix: Hard, Rich
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Structures/Walls/cobblebrick_basalt.rsi
+      state: full
+    - state: green
+    - sprite: Objects/Materials/materials.rsi
+      state: diamond
+    - sprite: Objects/Tools/handdrilldiamond.rsi
+      state: handdrill
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: NFBasaltMineralHardRich
+# endregion Basalt Spawners
+
+# region Sand Spawners
+- type: entityTable
+  id: NFSandMineralSoft
+  table: !type:GroupSelector
+    children:
+    - id: WallRockSand
+      weight: 0.5
+    - id: WallRockSandCoal
+      weight: 0.01
+    - id: WallRockSandTin
+      weight: 0.015
+    - id: WallRockSandQuartz
+      weight: 0.12
+    - id: WallRockSandSalt
+      weight: 0.01
+    - id: WallRockSandSilver
+      weight: 0.08
+    - id: WallRockSandGold
+      weight: 0.07
+    - id: WallRockSandPlasma
+      weight: 0.01
+    - id: WallRockSandUranium
+      weight: 0.01
+    - id: WallRockSandBananium
+      weight: 0.01
+    - id: WallRockSandArtifactFragment
+      weight: 0.01
+    - id: WallRockSandDiamond
+      weight: 0.002
+    - id: WallRockSandBluespace
+      weight: 0.002
+    - id: SandElementalSpawner
+      weight: 0.05
+
+- type: entity
+  id: NFSandMineralSoft
+  parent: MarkerBase
+  name: sand mineral spawner
+  suffix: Soft
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Structures/Walls/rock.rsi
+      state: rock_sand
+    - state: green
+    - sprite: Objects/Weapons/Melee/pickaxe.rsi
+      state: pickaxe
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: NFSandMineralSoft
+
+- type: entityTable
+  id: NFSandMineralHard
+  table: !type:GroupSelector
+    children:
+    - id: NFWallSandstone
+      weight: 0.08
+    - id: NFWallSandstoneCoal
+      weight: 0.001
+    - id: NFWallSandstoneTin
+      weight: 0.0015
+    - id: NFWallSandstoneQuartz
+      weight: 0.012
+    - id: NFWallSandstoneSalt
+      weight: 0.001
+    - id: NFWallSandstoneSilver
+      weight: 0.008
+    - id: NFWallSandstoneGold
+      weight: 0.007
+    - id: NFWallSandstonePlasma
+      weight: 0.001
+    - id: NFWallSandstoneUranium
+      weight: 0.001
+    - id: NFWallSandstoneBananium
+      weight: 0.001
+    - id: NFWallSandstoneArtifactFragment
+      weight: 0.001
+    # - id: NFWallSandstoneDiamond
+    #   weight: 0.0002
+    - id: NFWallSandstoneBluespace
+      weight: 0.0002
+    - id: SandstoneCobblebrickElementalSpawner
+      weight: 0.008
+
+- type: entity
+  id: NFSandMineralHard
+  parent: NFSandMineralSoft
+  suffix: Hard
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Structures/Walls/sandstone.rsi
+      state: full
+    - state: green
+    - sprite: Objects/Tools/handdrilldiamond.rsi
+      state: handdrill
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: NFSandMineralHard
+
+- type: entityTable
+  id: NFSandMineralHardRich
+  table: !type:GroupSelector
+    children:
+    - id: NFWallBasaltCobblebrick
+      weight: 0.3
+    - id: NFWallBasaltCobblebrickArtifactFragment
+      weight: 0.3
+    - id: NFWallBasaltCobblebrickBluespace
+      weight: 0.1
+    - id: NFWallBasaltCobblebrickDiamond
+      weight: 0.3
+
+- type: entity
+  id: NFSandMineralHardRich
+  parent: NFSandMineralSoft
+  suffix: Hard, Rich
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Structures/Walls/sandstone.rsi
+      state: full
+    - state: green
+    - sprite: Objects/Materials/materials.rsi
+      state: diamond
+    - sprite: Objects/Tools/handdrilldiamond.rsi
+      state: handdrill
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: NFSandMineralHardRich
+# endregion Sand Spawners
+
+# region Chromite Spawners
+- type: entityTable
+  id: NFChromiteMineralSoft
+  table: !type:GroupSelector
+    children:
+    - id: WallRockChromite
+      weight: 0.5
+    - id: WallRockChromiteCoal
+      weight: 0.01
+    - id: WallRockChromiteTin
+      weight: 0.03
+    - id: WallRockChromiteQuartz
+      weight: 0.01
+    - id: WallRockChromiteSalt
+      weight: 0.04
+    - id: WallRockChromiteGold
+      weight: 0.01
+    - id: WallRockChromiteSilver
+      weight: 0.01
+    - id: WallRockChromitePlasma
+      weight: 0.04
+    - id: WallRockChromiteUranium
+      weight: 0.09
+    - id: WallRockChromiteBananium
+      weight: 0.015
+    - id: WallRockChromiteArtifactFragment
+      weight: 0.01
+    - id: WallRockChromiteDiamond
+      weight: 0.005
+    - id: WallRockChromiteBluespace
+      weight: 0.0025
+    - id: ChromiteElementalSpawner
+      weight: 0.05
+
+- type: entity
+  id: NFChromiteMineralSoft
+  parent: MarkerBase
+  name: chromite mineral spawner
+  suffix: Soft
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Structures/Walls/rock.rsi
+      state: rock_chromite
+    - state: green
+    - sprite: Objects/Weapons/Melee/pickaxe.rsi
+      state: pickaxe
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: NFChromiteMineralSoft
+
+- type: entityTable
+  id: NFChromiteMineralHard
+  table: !type:GroupSelector
+    children:
+    - id: NFWallChromiteCobblebrick
+      weight: 0.08
+    - id: NFWallChromiteCobblebrickCoal
+      weight: 0.001
+    - id: NFWallChromiteCobblebrickTin
+      weight: 0.003
+    - id: NFWallChromiteCobblebrickQuartz
+      weight: 0.001
+    - id: NFWallChromiteCobblebrickSalt
+      weight: 0.004
+    - id: NFWallChromiteCobblebrickGold
+      weight: 0.001
+    - id: NFWallChromiteCobblebrickSilver
+      weight: 0.001
+    - id: NFWallChromiteCobblebrickPlasma
+      weight: 0.004
+    - id: NFWallChromiteCobblebrickUranium
+      weight: 0.009
+    - id: NFWallChromiteCobblebrickBananium
+      weight: 0.0015
+    - id: NFWallChromiteCobblebrickArtifactFragment
+      weight: 0.001
+    # - id: NFWallChromiteCobblebrickDiamond
+    #   weight: 0.0005
+    - id: NFWallChromiteCobblebrickBluespace
+      weight: 0.00025
+    - id: ChromiteCobblebrickElementalSpawner
+      weight: 0.005
+
+- type: entity
+  id: NFChromiteMineralHard
+  parent: NFChromiteMineralSoft
+  suffix: Hard
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Structures/Walls/cobblebrick_chromite.rsi
+      state: full
+    - state: green
+    - sprite: Objects/Tools/handdrilldiamond.rsi
+      state: handdrill
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: NFChromiteMineralHard
+
+- type: entityTable
+  id: NFChromiteMineralHardRich
+  table: !type:GroupSelector
+    children:
+    - id: NFWallBasaltCobblebrick
+      weight: 0.3
+    - id: NFWallBasaltCobblebrickArtifactFragment
+      weight: 0.25
+    - id: NFWallBasaltCobblebrickBluespace
+      weight: 0.25
+    - id: NFWallBasaltCobblebrickDiamond
+      weight: 0.2
+
+- type: entity
+  id: NFChromiteMineralHardRich
+  parent: NFChromiteMineralSoft
+  suffix: Hard, Rich
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Structures/Walls/cobblebrick_chromite.rsi
+      state: full
+    - state: green
+    - sprite: Objects/Materials/materials.rsi
+      state: diamond
+    - sprite: Objects/Tools/handdrilldiamond.rsi
+      state: handdrill
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: NFChromiteMineralHardRich
+# endregion Chromite Spawners
+
+# region AsteroidRock Spawners
+- type: entityTable
+  id: NFAsteroidMineralSoft
+  table: !type:GroupSelector
+    children:
+    - id: AsteroidRock
+      weight: 0.7
+    - id: AsteroidRockCoal
+      weight: 0.04
+    - id: AsteroidRockTin
+      weight: 0.06
+    - id: AsteroidRockQuartz
+      weight: 0.1
+    - id: AsteroidRockSalt
+      weight: 0.15
+    - id: AsteroidRockGold
+      weight: 0.06
+    - id: AsteroidRockSilver
+      weight: 0.03
+    - id: AsteroidRockPlasma
+      weight: 0.07
+    - id: AsteroidRockUranium
+      weight: 0.04
+    - id: AsteroidRockBananium
+      weight: 0.04
+    - id: AsteroidRockArtifactFragment
+      weight: 0.01
+    - id: AsteroidRockBluespace
+      weight: 0.002
+    - id: AsteroidRockDiamond
+      weight: 0.01
+    - id: AsteroidRockElementalSpawner
+      weight: 0.08
+
+- type: entity
+  id: NFAsteroidMineralSoft
+  parent: MarkerBase
+  name: asteroid mineral spawner
+  suffix: Soft
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Structures/Walls/rock.rsi
+      state: rock_asteroid
+    - state: green
+    - sprite: Objects/Weapons/Melee/pickaxe.rsi
+      state: pickaxe
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: NFAsteroidMineralSoft
+
+- type: entityTable
+  id: NFAsteroidMineralHard
+  table: !type:GroupSelector
+    children:
+    - id: NFWallNecropolis
+      weight: 0.1
+    - id: NFWallNecropolisCoal
+      weight: 0.004
+    - id: NFWallNecropolisTin
+      weight: 0.006
+    - id: NFWallNecropolisQuartz
+      weight: 0.01
+    - id: NFWallNecropolisSalt
+      weight: 0.015
+    - id: NFWallNecropolisGold
+      weight: 0.006
+    - id: NFWallNecropolisSilver
+      weight: 0.003
+    - id: NFWallNecropolisPlasma
+      weight: 0.007
+    - id: NFWallNecropolisUranium
+      weight: 0.004
+    - id: NFWallNecropolisBananium
+      weight: 0.004
+    - id: NFWallNecropolisArtifactFragment
+      weight: 0.001
+    - id: NFWallNecropolisBluespace
+      weight: 0.0002
+    # - id: NFWallNecropolisDiamond
+    #   weight: 0.001
+    - id: NecropolisElementalSpawner
+      weight: 0.008
+
+- type: entity
+  id: NFAsteroidMineralHard
+  parent: NFAsteroidMineralSoft
+  suffix: Hard
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Structures/Walls/necropolis.rsi
+      state: full
+    - state: green
+    - sprite: Objects/Tools/handdrilldiamond.rsi
+      state: handdrill
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: NFAsteroidMineralHard
+
+- type: entityTable
+  id: NFAsteroidMineralHardRich
+  table: !type:GroupSelector
+    children:
+    - id: NFWallNecropolis
+      weight: 0.3
+    - id: NFWallNecropolisArtifactFragment
+      weight: 0.2
+    - id: NFWallNecropolisBluespace
+      weight: 0.25
+    - id: NFWallNecropolisDiamond
+      weight: 0.25
+
+- type: entity
+  id: NFAsteroidMineralHardRich
+  parent: NFAsteroidMineralSoft
+  suffix: Hard, Rich
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Structures/Walls/necropolis.rsi
+      state: full
+    - state: green
+    - sprite: Objects/Materials/materials.rsi
+      state: diamond
+    - sprite: Objects/Tools/handdrilldiamond.rsi
+      state: handdrill
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: NFAsteroidMineralHardRich
+# endregion AsteroidRock Spawners
+
+# region Scrap Spawners
+- type: entityTable
+  id: NFScrapMineralSoft
+  table: !type:GroupSelector
+    children:
+    - id: WallRockScrapPile
+      weight: 0.5
+    - id: WallRockScrapPileCoal
+      weight: 0.02
+    - id: WallRockScrapPileIron
+      weight: 0.04
+    - id: WallRockScrapPileQuartz
+      weight: 0.01
+    - id: WallRockScrapPileSalt
+      weight: 0.01
+    - id: WallRockScrapPileGold
+      weight: 0.02
+    - id: WallRockScrapPileSilver
+      weight: 0.02
+    - id: WallRockScrapPilePlasma
+      weight: 0.05
+    - id: WallRockScrapPileUranium
+      weight: 0.01
+    - id: WallRockScrapPileBananium
+      weight: 0.005
+    - id: WallRockScrapPileArtifactFragment
+      weight: 0.02
+    - id: WallRockScrapPileDiamond
+      weight: 0.002
+    - id: WallRockScrapPileBluespace
+      weight: 0.003
+
+- type: entity
+  id: NFScrapMineralSoft
+  parent: MarkerBase
+  name: scrap mineral spawner
+  suffix: Soft
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: _NF/Structures/Walls/rock.rsi
+      state: scraprock01
+    - state: green
+    - sprite: Objects/Weapons/Melee/pickaxe.rsi
+      state: pickaxe
+  - type: EntityTableSpawner
+    offset: 0
+    table: !type:NestedSelector
+      tableId: NFScrapMineralSoft
+# endregion Scrap Spawners
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_kitchen.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_kitchen.yml
index db2775f1a85..9da9c833bfc 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_kitchen.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_kitchen.yml
@@ -225,7 +225,6 @@
     - CrateMousetrapBoxes
     - CrateFoodBarSupply
     - CrateServiceBoozeDispenser
-    - CrateSpaceCleaner
     - CrateServiceKitCleanades
     chance: 0.9
     offset: 0.0
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_bloodcult.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_bloodcult.yml
new file mode 100644
index 00000000000..4b997ad99a1
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_bloodcult.yml
@@ -0,0 +1,16 @@
+- type: entity
+  name: blood cult cat spawner
+  suffix: Ghost, 5% Spawn Chance
+  id: SpawnMobCatBloodCultLowChance
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - sprite: _NF/Mobs/Pets/cat.rsi
+        state: cultcat
+  - type: RandomSpawner
+    prototypes:
+      - MobCatBloodCult
+    chance: 0.05
+    offset: 0.0
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_silicons.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_silicons.yml
index b7f3883ad98..ee89e0813df 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_silicons.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_silicons.yml
@@ -135,3 +135,22 @@
     rarePrototypes:
     - MobRogueSiliconGuardian
     rareChance: 0.05
+
+- type: entity
+  name: rogue silicon boss spawner
+  id: SpawnMobRogueSiliconBossRandom
+  parent: MarkerBase
+  suffix: AI, Hostile, Random
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - state: ai
+    - sprite: _NF/Mobs/RogueSilicons/netguardian.rsi
+      state: netguardian
+  - type: RandomSpawner
+    prototypes:
+    - MobRogueSiliconBoss
+    - MobRogueSiliconGuardian
+    chance: 1
+    offset: 0.0
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/salvage.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/salvage.yml
index ce6a811dda9..2b765ff8072 100644
--- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/salvage.yml
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/salvage.yml
@@ -1,5 +1,6 @@
 # Frontier
 
+# region Elemental Spawners
 - type: entity
   name: andesite elemental spawner
   id: AndesiteElementalSpawner
@@ -250,11 +251,264 @@
         - AsteroidRockSilverCrabNF
         - AsteroidRockUraniumCrabNF
 
+- type: entity
+  name: Cobblebrick Elemental Spawner
+  id: CobblebrickElementalSpawner
+  parent: MarkerBase
+  suffix: 45
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: /Textures/Mobs/Elemental/orecrab.rsi
+          state: uranium_crab
+    - type: RandomSpawner
+      rarePrototypes:
+      - NFWallCobblebrickBananiumGolem
+      - NFWallCobblebrickCoalGolem
+      - NFWallCobblebrickGoldGolem
+      - NFWallCobblebrickIronGolem
+      - NFWallCobblebrickPlasmaGolem
+      - NFWallCobblebrickQuartzGolem
+      - NFWallCobblebrickSaltGolem
+      - NFWallCobblebrickSilverGolem
+      - NFWallCobblebrickUraniumGolem
+      rareChance: 0.1
+      prototypes:
+        - NFWallCobblebrickBananiumCrab
+        - NFWallCobblebrickCoalCrab
+        - NFWallCobblebrickGoldCrab
+        - NFWallCobblebrickTinCrab
+        - NFWallCobblebrickPlasmaCrab
+        - NFWallCobblebrickQuartzCrab
+        - NFWallCobblebrickSaltCrab
+        - NFWallCobblebrickSilverCrab
+        - NFWallCobblebrickUraniumCrab
+      chance: 0.45
+      offset: 0.2
+
+- type: entity
+  name: Ice Elemental Spawner
+  id: IceElementalSpawner
+  parent: MarkerBase
+  suffix: 45
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: /Textures/Mobs/Elemental/orecrab.rsi
+          state: uranium_crab
+    - type: RandomSpawner
+      rarePrototypes:
+      - NFWallIceBananiumGolem
+      - NFWallIceCoalGolem
+      - NFWallIceGoldGolem
+      - NFWallIceIronGolem
+      - NFWallIcePlasmaGolem
+      - NFWallIceQuartzGolem
+      - NFWallIceSaltGolem
+      - NFWallIceSilverGolem
+      - NFWallIceUraniumGolem
+      rareChance: 0.1
+      prototypes:
+        - NFWallIceBananiumCrab
+        - NFWallIceCoalCrab
+        - NFWallIceGoldCrab
+        - NFWallIceTinCrab
+        - NFWallIcePlasmaCrab
+        - NFWallIceQuartzCrab
+        - NFWallIceSaltCrab
+        - NFWallIceSilverCrab
+        - NFWallIceUraniumCrab
+      chance: 0.45
+      offset: 0.2
+
+- type: entity
+  name: Andesite Cobblebrick Elemental Spawner
+  id: AndesiteCobblebrickElementalSpawner
+  parent: MarkerBase
+  suffix: 45
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: /Textures/Mobs/Elemental/orecrab.rsi
+          state: uranium_crab
+    - type: RandomSpawner
+      rarePrototypes:
+      - NFWallAndesiteCobblebrickBananiumGolem
+      - NFWallAndesiteCobblebrickCoalGolem
+      - NFWallAndesiteCobblebrickGoldGolem
+      - NFWallAndesiteCobblebrickIronGolem
+      - NFWallAndesiteCobblebrickPlasmaGolem
+      - NFWallAndesiteCobblebrickQuartzGolem
+      - NFWallAndesiteCobblebrickSaltGolem
+      - NFWallAndesiteCobblebrickSilverGolem
+      - NFWallAndesiteCobblebrickUraniumGolem
+      rareChance: 0.1
+      prototypes:
+        - NFWallAndesiteCobblebrickBananiumCrab
+        - NFWallAndesiteCobblebrickCoalCrab
+        - NFWallAndesiteCobblebrickGoldCrab
+        - NFWallAndesiteCobblebrickTinCrab
+        - NFWallAndesiteCobblebrickPlasmaCrab
+        - NFWallAndesiteCobblebrickQuartzCrab
+        - NFWallAndesiteCobblebrickSaltCrab
+        - NFWallAndesiteCobblebrickSilverCrab
+        - NFWallAndesiteCobblebrickUraniumCrab
+      chance: 0.45
+      offset: 0.2
+
+- type: entity
+  name: Basalt Cobblebrick Elemental Spawner
+  id: BasaltCobblebrickElementalSpawner
+  parent: MarkerBase
+  suffix: 45
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: /Textures/Mobs/Elemental/orecrab.rsi
+          state: uranium_crab
+    - type: RandomSpawner
+      rarePrototypes:
+      - NFWallBasaltCobblebrickBananiumGolem
+      - NFWallBasaltCobblebrickCoalGolem
+      - NFWallBasaltCobblebrickGoldGolem
+      - NFWallBasaltCobblebrickIronGolem
+      - NFWallBasaltCobblebrickPlasmaGolem
+      - NFWallBasaltCobblebrickQuartzGolem
+      - NFWallBasaltCobblebrickSaltGolem
+      - NFWallBasaltCobblebrickSilverGolem
+      - NFWallBasaltCobblebrickUraniumGolem
+      rareChance: 0.1
+      prototypes:
+        - NFWallBasaltCobblebrickBananiumCrab
+        - NFWallBasaltCobblebrickCoalCrab
+        - NFWallBasaltCobblebrickGoldCrab
+        - NFWallBasaltCobblebrickTinCrab
+        - NFWallBasaltCobblebrickPlasmaCrab
+        - NFWallBasaltCobblebrickQuartzCrab
+        - NFWallBasaltCobblebrickSaltCrab
+        - NFWallBasaltCobblebrickSilverCrab
+        - NFWallBasaltCobblebrickUraniumCrab
+      chance: 0.45
+      offset: 0.2
+
+- type: entity
+  name: Sandstone Cobblebrick Elemental Spawner
+  id: SandstoneCobblebrickElementalSpawner
+  parent: MarkerBase
+  suffix: 45
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: /Textures/Mobs/Elemental/orecrab.rsi
+          state: uranium_crab
+    - type: RandomSpawner
+      rarePrototypes:
+      - NFWallSandstoneBananiumGolem
+      - NFWallSandstoneCoalGolem
+      - NFWallSandstoneGoldGolem
+      - NFWallSandstoneIronGolem
+      - NFWallSandstonePlasmaGolem
+      - NFWallSandstoneQuartzGolem
+      - NFWallSandstoneSaltGolem
+      - NFWallSandstoneSilverGolem
+      - NFWallSandstoneUraniumGolem
+      rareChance: 0.1
+      prototypes:
+        - NFWallSandstoneBananiumCrab
+        - NFWallSandstoneCoalCrab
+        - NFWallSandstoneGoldCrab
+        - NFWallSandstoneTinCrab
+        - NFWallSandstonePlasmaCrab
+        - NFWallSandstoneQuartzCrab
+        - NFWallSandstoneSaltCrab
+        - NFWallSandstoneSilverCrab
+        - NFWallSandstoneUraniumCrab
+      chance: 0.45
+      offset: 0.2
+
+- type: entity
+  name: Chromite Cobblebrick Elemental Spawner
+  id: ChromiteCobblebrickElementalSpawner
+  parent: MarkerBase
+  suffix: 45
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: /Textures/Mobs/Elemental/orecrab.rsi
+          state: uranium_crab
+    - type: RandomSpawner
+      rarePrototypes:
+      - NFWallChromiteCobblebrickBananiumGolem
+      - NFWallChromiteCobblebrickCoalGolem
+      - NFWallChromiteCobblebrickGoldGolem
+      - NFWallChromiteCobblebrickIronGolem
+      - NFWallChromiteCobblebrickPlasmaGolem
+      - NFWallChromiteCobblebrickQuartzGolem
+      - NFWallChromiteCobblebrickSaltGolem
+      - NFWallChromiteCobblebrickSilverGolem
+      - NFWallChromiteCobblebrickUraniumGolem
+      rareChance: 0.1
+      prototypes:
+        - NFWallChromiteCobblebrickBananiumCrab
+        - NFWallChromiteCobblebrickCoalCrab
+        - NFWallChromiteCobblebrickGoldCrab
+        - NFWallChromiteCobblebrickTinCrab
+        - NFWallChromiteCobblebrickPlasmaCrab
+        - NFWallChromiteCobblebrickQuartzCrab
+        - NFWallChromiteCobblebrickSaltCrab
+        - NFWallChromiteCobblebrickSilverCrab
+        - NFWallChromiteCobblebrickUraniumCrab
+      chance: 0.45
+      offset: 0.2
+
+- type: entity
+  name: Necropolis Elemental Spawner
+  id: NecropolisElementalSpawner
+  parent: MarkerBase
+  suffix: 45
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: /Textures/Mobs/Elemental/orecrab.rsi
+          state: uranium_crab
+    - type: RandomSpawner
+      rarePrototypes:
+      - NFWallNecropolisBananiumGolem
+      - NFWallNecropolisCoalGolem
+      - NFWallNecropolisGoldGolem
+      - NFWallNecropolisIronGolem
+      - NFWallNecropolisPlasmaGolem
+      - NFWallNecropolisQuartzGolem
+      - NFWallNecropolisSaltGolem
+      - NFWallNecropolisSilverGolem
+      - NFWallNecropolisUraniumGolem
+      rareChance: 0.1
+      prototypes:
+        - NFWallNecropolisBananiumCrab
+        - NFWallNecropolisCoalCrab
+        - NFWallNecropolisGoldCrab
+        - NFWallNecropolisTinCrab
+        - NFWallNecropolisPlasmaCrab
+        - NFWallNecropolisQuartzCrab
+        - NFWallNecropolisSaltCrab
+        - NFWallNecropolisSilverCrab
+        - NFWallNecropolisUraniumCrab
+      chance: 0.45
+      offset: 0.2
+# endregion Elemental Spawners
+
+# region Scrap Spawners
 - type: entity
   name: asteroid scrap bot spawner
   id: AsteroidScrapBotSpawner
   parent: MarkerBase
-  suffix: 45
   components:
   - type: Sprite
     layers:
@@ -324,7 +578,9 @@
     - WallRockScrapPileBot
     chance: 0.45
     offset: 0.2
+# endregion Scrap Spawners
 
+# region Wreck/Expedition Spawners
 - type: entity
   name: Salvage Material Crate Spawner
   id: NFSalvageMaterialCrateSpawner
@@ -350,8 +606,9 @@
 
 - type: entity
   name: salvage tank spawner
-  id: SalvageTankSpawner
+  id: SalvageTankSpawnerHighCapacity
   parent: MarkerBase
+  suffix: High Capacity, 95%
   components:
   - type: Sprite
     layers:
@@ -360,15 +617,9 @@
       state: fueltank
   - type: RandomSpawner
     prototypes:
-    - WaterTankFull
-    - WeldingFuelTankFull
-#    - WaterCooler
-    chance: 0.95
-    rarePrototypes:
-    - WeldingFuelTankHighCapacity
+#    - WeldingFuelTankHighCapacity
     - WaterTankHighCapacity
-    rareChance: 0.05
-    offset: 0.0
+    chance: 0.95
 
 - type: entity
   name: salvage locker spawner
@@ -596,3 +847,113 @@
 #    - SpawnMobPurpleSnake # Why are they xeno
     rareChance: 0.2
     offset: 0.0
+
+- type: entity
+  id: NFSalvageChemicalBarrelSpawner
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: _NF/Objects/Storage/Barrels/grey.rsi
+      state: icon
+  - type: RandomSpawner
+    prototypes: # Filled versions
+    - ChemicalBarrelCarbon
+    - ChemicalBarrelIodine
+    - ChemicalBarrelFluorine
+    - ChemicalBarrelChlorine
+    - ChemicalBarrelAluminium
+    - ChemicalBarrelPhosphorus
+    - ChemicalBarrelSulfur
+    - ChemicalBarrelSilicon
+    - ChemicalBarrelHydrogen
+    - ChemicalBarrelLithium
+    - ChemicalBarrelSodium
+    - ChemicalBarrelPotassium
+    - ChemicalBarrelRadium
+    - ChemicalBarrelIron
+    - ChemicalBarrelCopper
+    - ChemicalBarrelGold
+    - ChemicalBarrelMercury
+    - ChemicalBarrelSilver
+    - ChemicalBarrelEthanol
+    - ChemicalBarrelSugar
+    - ChemicalBarrelNitrogen
+    - ChemicalBarrelOxygen
+    chance: 0.95
+    offset: 0.1 # Little offset, it's free-standing
+
+- type: entity
+  id: NFSalvageServiceBarrelSpawner
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: _NF/Objects/Storage/Barrels/grey.rsi
+      state: icon
+  - type: RandomSpawner
+    prototypes: # Filled versions
+    - ChemicalBarrelOil
+    - ChemicalBarrelDiethylamine
+    - ChemicalBarrelMustard
+    - ChemicalBarrelKetchup
+    - ChemicalBarrelMayo
+    - ChemicalBarrelCornoil
+    - ChemicalBarrelOliveoil
+    - ChemicalBarrelSpaceLube
+    - ChemicalBarrelSpaceCleaner
+    chance: 0.95
+    offset: 0.1 # Little offset, it's free-standing
+
+- type: entity
+  id: NFSalvageDrinkableBarrelSpawner
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: _NF/Objects/Storage/Barrels/red.rsi
+      state: icon
+  - type: RandomSpawner
+    prototypes: # Filled versions
+    - ChemicalBarrelWater
+    rarePrototypes:
+    - ChemicalBarrelAbsinthe
+    - ChemicalBarrelAle
+    - ChemicalBarrelBeer
+    - ChemicalBarrelCoffeeLiqueur
+    - ChemicalBarrelCognac
+    - ChemicalBarrelGin
+    - ChemicalBarrelMead
+    - ChemicalBarrelRum
+    - ChemicalBarrelTequila
+    - ChemicalBarrelVermouth
+    - ChemicalBarrelVodka
+    - ChemicalBarrelWhiskey
+    - ChemicalBarrelWine
+    rareChance: 0.5
+    chance: 0.95
+    offset: 0.1 # Little offset, it's free-standing
+
+- type: entity
+  id: NFSalvageEmptyBarrelSpawner
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: _NF/Objects/Storage/Barrels/red.rsi
+      state: icon
+  - type: RandomSpawner
+    prototypes:
+    - MetalBarrelGrey
+    - MetalBarrelBlue
+    - MetalBarrelRed
+    - MetalBarrelYellow
+    - MetalBarrelGreen
+    - MetalBarrelWhite
+    - MetalBarrelBlack
+    - ChemicalBarrelExplosiveEmpty
+    offset: 0.1 # Little offset, it's free-standing
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml
index a42e580a398..027d9adfeb6 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml
@@ -4,6 +4,7 @@
   components:
   - type: GhostRole
   - type: IntrinsicRadioReceiver
+  - type: CargoSellBlacklist
 
 - type: entity
   name: Clippy
@@ -40,7 +41,6 @@
       - Cat
       - PetsNT
   - type: ShowJobIcons
-  - type: CargoSellBlacklist
 
 - type: entity
   name: Clarpy
@@ -59,9 +59,9 @@
       Alive:
         Base: piratecat
       Critical:
-        Base: piratecat_dead
+        Base: piratecat
       Dead:
-        Base: piratecat_dead
+        Base: piratecat
   - type: GhostRole
     name: ghost-role-information-clarpy-name
     description: ghost-role-information-clarpy-description
@@ -86,7 +86,6 @@
     factions:
       - Cat
       - PirateNF
-  - type: CargoSellBlacklist
   - type: PirateAccent
   - type: Speech
     audioParams:
@@ -154,7 +153,6 @@
   - type: InteractionPopup
     interactSuccessSound:
       path: /Audio/_NF/Animals/nfsdcat_meow.ogg
-  - type: CargoSellBlacklist
   - type: PirateBountyItem
     id: Cappy
   - type: SouthernAccent
@@ -197,7 +195,6 @@
   description: "???"
   components:
   - type: Sprite
-    drawdepth: Mobs
     sprite: _NF/Mobs/Pets/cat.rsi
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
@@ -224,11 +221,113 @@
     successChance: 0.0
     interactFailureString: petting-failure-mistake
   - type: MovementSpeedModifier
-    baseWalkSpeed : 8
-    baseSprintSpeed : 8
+    baseWalkSpeed : 6
+    baseSprintSpeed : 6
+  - type: NFSalvageMobRestrictions
+    despawnIfOffLinkedGrid: false
+    addComponentsOnDeath: []
+    removeComponentsOnDeath: []
   - type: NpcFactionMember
     factions:
       - Cat
+  - type: Respirator # Paranormal cat: doesn't need to breathe (but it will)
+    updateInterval: 99999 # Shouldn't run often, if ever.
+    suffocationThreshold: -100 # Should never happen.
+    damage:
+      types: {}
+    damageRecovery:
+      types: {}
+
+- type: entity
+  name: blood cult cat
+  parent: [NFMobPet, MobCatMistake]
+  id: MobCatBloodCult
+  description: Founded the Blood Cult out of boredom.
+  components:
+  - type: Body
+    prototype: Bloodsucker
+    requiredLegs: 1
+  - type: MeleeWeapon
+    damage:
+      types:
+        Slash: 1
+        Bloodloss: 1
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: _NF/Mobs/Pets/cat.rsi
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: cultcat
+    - map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
+      state: cultcat_unshaded
+      shader: unshaded
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: cultcat
+        BaseUnshaded: cultcat_unshaded
+      Critical:
+        Base: cultcat
+        BaseUnshaded: mask_null
+      Dead:
+        Base: cultcat
+        BaseUnshaded: mask_null
+  - type: GhostRole
+    name: ghost-role-information-cult-cat-name
+    description: ghost-role-information-cult-cat-description
+    rules: ghost-role-information-cult-cat-rules
+    prototype: CatBloodCult
+  - type: RandomMetadata
+    nameSegments: [ names_cat_cult ]
+  - type: AutoImplant
+    implants:
+    - RedLightImplant
+    - DissonantWhispersImplant
+    - MedicalTrackingImplant
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Science
+  - type: ActiveRadio
+    channels:
+    - Science
+  - type: ActionGun
+    action: ActionEldritchPush
+    gunProto: EldritchPushGun
+
+- type: entity
+  id: EldritchPushGun
+  name: eldritch hand gun
+  description: Shoots an eldritch hand.
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: RechargeBasicEntityAmmo
+    rechargeCooldown: 300
+    rechargeSound:
+      path: /Audio/Magic/fireball.ogg
+  - type: BasicEntityAmmoProvider
+    proto: BulletEldritchHand
+    capacity: 1
+    count: 1
+  - type: Gun
+    soundGunshot:
+      path: /Audio/Effects/teleport_arrival.ogg
+    soundEmpty: null
+    projectileSpeed: 3
+
+- type: entity
+  id: ActionEldritchPush
+  categories: [ HideSpawnMenu ]
+  name: "[color=yellow]Force Push[/color]"
+  description: "Summon forth an eldritch hand. [color=yellow]5 minute cooldown.[/color]"
+  components:
+  - type: WorldTargetAction
+    icon: { sprite : _NF/Effects/bloodcultprojectiles.rsi, state: hand }
+    event: !type:ActionGunShootEvent
+    priority: 2
+    checkCanAccess: false
+    range: 0
+    itemIconStyle: BigAction
+    useDelay: 300
 
 # Adopted from space-wizards #26265 (Thank you, PolterTzi)
 - type: entity
@@ -259,6 +358,7 @@
     - CannotSuicide
     - DoorBumpOpener
     - VimPilot
+    - AnomalyHost
   - type: Loadout
     prototypes: [ MobKoboldGear ]
   - type: Grammar
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml
index 62da2be141d..0703cc52627 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml
@@ -75,36 +75,6 @@
         - ReagentId: CocoaPowder
           Quantity: 50
 
-- type: entity
-  parent: DrinkKegPlastic
-  id: DrinkKegPlasticKetchup
-  name: ketchup keg
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 600
-        reagents:
-        - ReagentId: Ketchup
-          Quantity: 600
-  - type: StaticPrice
-    price: 60
-
-- type: entity
-  parent: DrinkKegPlastic
-  id: DrinkKegPlasticMustard
-  name: mustard keg
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 600
-        reagents:
-        - ReagentId: Mustard
-          Quantity: 600
-  - type: StaticPrice
-    price: 60
-
 - type: entity
   name: raw coffee beans
   parent: FoodProduceBase
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml
index 13d1ace68b4..27abddaeaa7 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml
@@ -370,11 +370,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 +384,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
@@ -494,8 +498,8 @@
 - type: entity
   parent: BaseNFFlatpack
   id: ShuttleGunKineticFlatpack
-  name: PTK-800 "Matter Dematerializer" flatpack
-  description: A flatpack used for constructing a PTK-800 "Matter Dematerializer".
+  name: PTK-1500e "Matter Dematerializer" flatpack
+  description: A flatpack used for constructing a PTK-1500e "Matter Dematerializer".
   components:
   - type: Flatpack
     entity: ShuttleGunKinetic
@@ -669,9 +673,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.
@@ -879,6 +886,17 @@
   - type: StaticPrice
     price: 750
 
+- type: entity
+  parent: BaseNFFlatpack
+  id: JanicartFlatpack
+  name: janicart flatpack
+  description: A flatpack used for constructing a Janicart. Keys already slotted in the ignition. Mop sold separately.
+  components:
+  - type: Flatpack
+    entity: NFVehicleJanicartKey
+  - type: StaticPrice
+    price: 375 # 1.25 * base value of input materials
+
 # Vendomats
 - type: entity
   parent: UniformPrinterFlatpack
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml
index e35e2cb4e45..740fe682122 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/toys.yml
@@ -420,6 +420,26 @@
     sprite: _NF/Objects/Fun/toys.rsi
     state: plushie_vulp
 
+- type: entity
+  parent: BasePlushieVulp
+  id: PlushieMailVulp
+  name: mail vulp plushie
+  description: Smells minty and reminds you of unopened mail. You should check your mail!
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Fun/toys.rsi
+    state: plushie_mailvulp
+
+- type: entity
+  parent: BasePlushieMoff
+  id: PlushieYarrMoth
+  name: yarr moth plushie
+  description: It's dastardly and has a dashing cloak. It chitters when you squeeze it!
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Fun/toys.rsi
+    state: plushie_yarrmoth
+
 - type: entity
   parent: BasePlushieVulp
   id: PlushieCorgi
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/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/subdermal_implants.yml
index 3c8f2bb85d3..eac7d21d3b1 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Misc/subdermal_implants.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/subdermal_implants.yml
@@ -107,3 +107,44 @@
   - type: SubdermalImplant
     permanent: true
   - type: BibleUserImplant
+
+- type: entity
+  parent: BaseSubdermalImplant
+  id: RedLightImplant
+  name: light implant (red)
+  description: This implant emits light from the user's skin on activation.
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SubdermalImplant
+    implantAction: ActionToggleLight
+    permanent: true
+  - type: PointLight
+    enabled: false
+    radius: 2.5
+    softness: 5
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+    color: "#ff0000"
+  - type: UnpoweredFlashlight
+  - type: Tag
+    tags:
+    - SubdermalImplant
+    - HideContextMenu
+    - Flashlight
+
+- type: entity
+  parent: BaseSubdermalImplant
+  id: DissonantWhispersImplant
+  name: dissonant whispers implant
+  description: This implant allows user to emmit dissonant whispers.
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: SubdermalImplant
+    implantAction: ActionActivateDissonantWhispersImplant
+    permanent: true
+  - type: TriggerImplantAction
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/_NF/Effects/bloodcult/whispers.ogg
+      params:
+        variation: 0.125
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml
index c6cceb5ffe1..7bb29f92987 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml
@@ -1,18 +1,3 @@
-- type: entity
-  parent: Jug
-  id: JugSpaceCleaner
-  suffix: space cleaner
-  categories: [ HideSpawnMenu ]
-  components:
-    - type: Label
-      currentLabel: reagent-name-space-cleaner
-    - type: SolutionContainerManager
-      solutions:
-        beaker:
-          reagents:
-          - ReagentId: SpaceCleaner
-            Quantity: 200
-
 - type: entity
   name: bluespace jug
   parent: Jug
@@ -162,54 +147,99 @@
   id: FuelPlasma
   name: fuel-grade plasma
   description: A rod made of desaturated plasma, suitable for fuel.
+  suffix: 20
   components:
   - type: Material
   - type: PhysicalComposition
     materialComposition:
-      Plasma: 2000
+      FuelGradePlasma: 100
   - type: Sprite
     sprite: _NF/Objects/Specific/Fuel/fuelgrade_material.rsi
     layers:
     - state: plasma
+      map: ["base"]
   - type: Appearance
   - type: StaticPrice
     price: 0
     vendPrice: 1200
+  - type: Stack
+    stackType: FuelPlasma
+    count: 20
+
+- type: entity
+  parent: FuelPlasma
+  id: FuelPlasma1
+  suffix: Single
+  components:
+  - type: Stack
+    count: 1
+  - type: StaticPrice
+    vendPrice: 0
 
 - type: entity
   parent: BaseItem
   id: FuelUranium
   name: fuel-grade uranium
   description: A rod made of semi-processed uranium, suitable for fuel.
+  suffix: 20
   components:
   - type: Material
   - type: PhysicalComposition
     materialComposition:
-      Uranium: 2000
+      FuelGradeUranium: 100
   - type: Sprite
     sprite: _NF/Objects/Specific/Fuel/fuelgrade_material.rsi
     layers:
     - state: uranium
+      map: ["base"]
   - type: Appearance
   - type: StaticPrice
     price: 0
     vendPrice: 2500
+  - type: Stack
+    stackType: FuelUranium
+    count: 20
+
+- type: entity
+  parent: FuelUranium
+  id: FuelUranium1
+  suffix: Single
+  components:
+  - type: Stack
+    count: 1
+  - type: StaticPrice
+    vendPrice: 0
 
 - type: entity
   parent: BaseItem
   id: FuelBananium
   name: fuel-grade bananium
   description: A rod made from pressed bananium peels, suitable for fuel.
+  suffix: 20
   components:
   - type: Material
   - type: PhysicalComposition
     materialComposition:
-      Bananium: 2000
+      FuelGradeBananium: 100
   - type: Sprite
     sprite: _NF/Objects/Specific/Fuel/fuelgrade_material.rsi
     layers:
     - state: bananium
+      map: ["base"]
   - type: Appearance
   - type: StaticPrice
     price: 0
     vendPrice: 5000
+  - type: Stack
+    stackType: FuelBananium
+    count: 20
+
+- type: entity
+  parent: FuelBananium
+  id: FuelBananium1
+  suffix: Single
+  components:
+  - type: Stack
+    count: 1
+  - type: StaticPrice
+    vendPrice: 0
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml b/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml
index 877240261c7..7554d0c970f 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml
@@ -183,6 +183,148 @@
           params:
             volume: -3
 
+# Enhanced version of the vanilla Janicart that adds a bucket and mop slot.
+- type: entity
+  id: NFVehicleJanicart
+  parent: VehicleJanicart
+  components:
+  - type: ItemSlots
+    slots:
+      key_slot:
+        name: vehicle-slot-component-slot-name-keys
+        whitelist:
+          requireAll: true
+          tags:
+          - VehicleKey
+          - JanicartKeys
+        insertSound:
+          path: /Audio/Effects/Vehicle/vehiclestartup.ogg
+          params:
+            volume: -3
+        priority: 10
+      mop_slot: &mopSlot
+        name: janitorial-trolley-slot-component-slot-name-mop
+        whitelist:
+          tags:
+            - Mop
+        insertOnInteract: false # or it conflicts with bucket logic
+        priority: 9 # Higher than bucket slot
+      plunger_slot: &plungerSlot
+        name: janitorial-trolley-slot-component-slot-name-plunger
+        whitelist:
+          tags:
+            - Plunger
+        priority: 8
+      wetfloorsign_slot4: &wetFloorSignSlot
+        name: janitorial-trolley-slot-component-slot-name-sign
+        whitelist:
+          tags:
+            - WetFloorSign
+        priority: 7
+      wetfloorsign_slot3: *wetFloorSignSlot
+      wetfloorsign_slot2: *wetFloorSignSlot
+      wetfloorsign_slot1: *wetFloorSignSlot
+      lightreplacer_slot: &lightReplacerSlot
+        name: janitorial-trolley-slot-component-slot-name-lightreplacer
+        whitelist:
+          components:
+            - LightReplacer
+        priority: 6
+      spraybottle_slot: &sprayBottleSlot
+        name: janitorial-trolley-slot-component-slot-name-spray
+        whitelist:
+          tags:
+            - Spray
+        insertOnInteract: false # or it conflicts with bucket logic
+        priority: 5 # Higher than bucket slot
+      bucket_slot: &bucketSlot
+        name: janitorial-trolley-slot-component-slot-name-bucket
+        whitelist:
+          tags:
+            - Bucket
+        insertOnInteract: false # or it also conflicts with bucket logic
+        priority: 4 # Higher than trash bag slot
+      trashbag_slot: &trashBagSlot
+        name: janitorial-trolley-slot-component-slot-name-trashbag
+        whitelist:
+          tags:
+            - TrashBag
+        priority: 3 # Higher than drinking priority
+  - type: ItemMapper
+    mapLayers:
+      storage:
+        whitelist:
+          tags:
+            - TrashBag
+    sprite: Objects/Vehicles/janicart.rsi
+  - type: Appearance
+  - type: Spillable
+    solution: bucket
+    spillDelay: 3.0
+    spillWhenThrown: false
+  - type: SolutionContainerManager
+    solutions:
+      bucket:
+        maxVol: 800
+  - type: DrainableSolution
+    solution: bucket
+  - type: RefillableSolution
+    solution: bucket
+  - type: ExaminableSolution
+    solution: bucket
+  - type: Tag
+    tags:
+      - Wringer
+  - type: Drink
+    solution: bucket
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+      mop_slot: !type:ContainerSlot {}
+      plunger_slot: !type:ContainerSlot {}
+      wetfloorsign_slot4: !type:ContainerSlot {}
+      wetfloorsign_slot3: !type:ContainerSlot {}
+      wetfloorsign_slot2: !type:ContainerSlot {}
+      wetfloorsign_slot1: !type:ContainerSlot {}
+      lightreplacer_slot: !type:ContainerSlot {}
+      spraybottle_slot: !type:ContainerSlot {}
+      bucket_slot: !type:ContainerSlot {}
+      trashbag_slot: !type:ContainerSlot {}
+  - type: StaticPrice
+    price: 375 # Same as flatpack
+
+- type: entity
+  parent: NFVehicleJanicart
+  id: NFVehicleJanicartKey
+  suffix: With key
+  components:
+  - type: ItemSlots
+    slots:
+      key_slot:
+        name: vehicle-slot-component-slot-name-keys
+        whitelist:
+          requireAll: true
+          tags:
+          - VehicleKey
+          - JanicartKeys
+        startingItem: VehicleKeyJanicart
+        insertSound:
+          path: /Audio/Effects/Vehicle/vehiclestartup.ogg
+          params:
+            volume: -3
+        priority: 9
+      mop_slot: *mopSlot
+      plunger_slot: *plungerSlot
+      wetfloorsign_slot4: *wetFloorSignSlot
+      wetfloorsign_slot3: *wetFloorSignSlot
+      wetfloorsign_slot2: *wetFloorSignSlot
+      wetfloorsign_slot1: *wetFloorSignSlot
+      lightreplacer_slot: *lightReplacerSlot
+      spraybottle_slot: *sprayBottleSlot
+      bucket_slot: *bucketSlot
+      trashbag_slot: *trashBagSlot
+
 # Mail carrier
 - type: entity
   parent: VehicleSkeletonMotorcycleNF
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
index 1e7999e12e4..82b11c40536 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
@@ -71,3 +71,23 @@
   impactFlash:
     sprite: _NF/Effects/bloodcultbeams.rsi
     state: red_lightning
+
+- type: entity # For blood cult cat
+  parent: BaseBullet
+  id: BulletEldritchHand
+  name: eldritch hand
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: StaminaDamageOnCollide
+    damage: 100
+  - type: Projectile
+    damage:
+      types:
+        Asphyxiation: 0
+  - type: Sprite
+    noRot: false
+    sprite: _NF/Effects/bloodcultprojectiles.rsi
+    layers:
+    - state: hand
+  - type: Ammo
+    muzzleFlash: null
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/e_sword.yml
index d7b9ea6299b..91baf1af959 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -62,3 +62,5 @@
     - Pickaxe
   - type: StaticPrice
     price: 200
+  - type: MiningGatheringSoft
+  - type: MiningGatheringHard
diff --git a/Resources/Prototypes/_NF/Entities/Stations/nanotrasen.yml b/Resources/Prototypes/_NF/Entities/Stations/nanotrasen.yml
index b5b5a121f16..ee27052d3f0 100644
--- a/Resources/Prototypes/_NF/Entities/Stations/nanotrasen.yml
+++ b/Resources/Prototypes/_NF/Entities/Stations/nanotrasen.yml
@@ -6,7 +6,6 @@
   - BaseStationCargo
   - BaseStationJobsSpawning
   - BaseStationRecords
-  - BaseStationAlertLevels
   - BaseStationSiliconLawFrontierStation
   - BaseStationSectorNews
   - BaseStationMail # Mail
@@ -66,7 +65,6 @@
   - BaseStationCargo # Cargo
   - BaseStationJobsSpawning # Records and jobsspawning
   - BaseStationRecords
-  - BaseStationAlertLevels # Has a comms console
   - BaseStationSiliconLawFrontierStation # No funny borg laws
   - BaseStationDampening
   categories: [ HideSpawnMenu ]
@@ -79,7 +77,6 @@
   - BaseStation
   - BaseStationJobsSpawning
   - BaseStationRecords
-  - BaseStationAlertLevels
   - BaseStationAllEventsEligible
   - BaseStationRenameFaxes
   - BaseStationRenameWarpPoints
@@ -96,7 +93,6 @@
   - BaseStation
   - BaseStationJobsSpawning
   - BaseStationRecords
-  - BaseStationAlertLevels
   - BaseStationAllEventsEligible
   - BaseStationRenameFaxes
   - BaseStationRenameWarpPoints
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
index 22e526b8a5d..d6a9f857edb 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -268,6 +268,7 @@
       - SyringeBluespace
       - PlantBagOfHolding
       - PlantAnalyzer
+      - JanicartFlatpack
   - type: EmagLatheRecipes
     emagStaticRecipes:
       - NFHappyHonkNukieEmpty
@@ -1207,6 +1208,8 @@
       - NFPlushieEngineerRecipe
       - PlushieJesterRecipe
       - PlushieJanitorRecipe
+      - PlushieYarrMothRecipe
+      - PlushieMailVulpRecipe
       - PlushieNukeRecipe
       - PlushieRGBeeRecipe
       - BalloonCorgiRecipe
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Power/Generation/portable_generator.yml b/Resources/Prototypes/_NF/Entities/Structures/Power/Generation/portable_generator.yml
index e8731f68083..590eece566d 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Power/Generation/portable_generator.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Power/Generation/portable_generator.yml
@@ -19,7 +19,7 @@
   components:
   - type: MaterialStorage
     storage:
-      Plasma: 1000
+      FuelGradePlasma: 1000
 
 - type: entity
   parent:
@@ -30,7 +30,7 @@
   components:
   - type: MaterialStorage
     storage:
-      Uranium: 1000
+      FuelGradeUranium: 1000
 
 - type: entity
   parent:
@@ -53,7 +53,7 @@
     Next gen generator for powering stations.
     Runs off bananium and is rated for up to 100 kW.
     Very radioactive without protection.
-  parent: 
+  parent:
   - PortableGeneratorSuperPacman
   - BaseC3Contraband # Why will you have this thing?
   id: PortableGeneratorHyperPacman
@@ -91,10 +91,9 @@
       fuelEfficiencyConstant: 0.75
       radiationColor: "#00bfff"
     - type: SolidFuelGeneratorAdapter
-      fuelMaterial: Bananium
-      ejectedFuelProtoId: FuelBananium
+      fuelMaterial: FuelGradeBananium
     - type: MaterialStorage
-      materialWhiteList: [Bananium]
+      materialWhiteList: [Bananium, FuelGradeBananium]
     - type: PowerMonitoringDevice
       sprite: _NF/Structures/Power/Generation/portable_generator.rsi
       state: portgen1
@@ -108,6 +107,9 @@
     - type: PowerSupplier
       supplyRampRate: 10000
       supplyRampTolerance: 3000
+    - type: FuelGradeAdapter
+      inputMaterial: Bananium
+      outputMaterial: FuelGradeBananium
 
 - type: entity
   parent:
@@ -119,4 +121,4 @@
   components:
     - type: MaterialStorage
       storage:
-        Bananium: 1000
+        FuelGradeBananium: 1000
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/barrel.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/barrel.yml
new file mode 100644
index 00000000000..1b568262482
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/barrel.yml
@@ -0,0 +1,1326 @@
+- type: entity
+  parent: CrateGeneric
+  id: WoodenBarrel
+  name: wooden barrel
+  description: A musty old wooden barrel.
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Storage/Barrels/wood.rsi
+    layers:
+    - state: icon
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+  - type: Icon
+    sprite: _NF/Objects/Storage/Barrels/wood.rsi
+    state: icon
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: Wood
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 30
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWoodPlank1:
+            min: 1
+            max: 4
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Construction
+    graph: WoodenBarrel
+    node: woodenbarrel
+    containers:
+    - entity_storage
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.2,-0.3,0.2,0.4"
+        density: 150
+        mask:
+        - SmallMobMask #this is so they can go under plastic flaps
+        layer:
+        - MachineLayer
+  - type: Climbable
+  - type: StaticPrice
+    price: 50
+
+- type: entity
+  parent: StorageTank
+  id: BaseBarrel
+  name: metal barrel
+  description: A metal barrel. It can be filled with liquid.
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Storage/Barrels/grey.rsi
+    layers:
+    - state: icon
+    - state: icon_open
+      map: ["enum.OpenableVisuals.Layer"]
+      visible: false
+    - state: paper
+      map: ["enum.PaperLabelVisuals.Layer"]
+      visible: false
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        maxVol: 1000
+  - type: ExaminableSolution
+    solution: tank
+  - type: UserInterface
+    interfaces:
+      enum.TransferAmountUiKey.Key:
+        type: TransferAmountBoundUserInterface
+  - type: DrawableSolution
+    solution: tank
+  - type: InjectableSolution
+    solution: tank
+  - type: Spillable
+    solution: tank
+    spillDelay: 10
+  - type: DumpableSolution
+    solution: tank
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.2,-0.3,0.2,0.4"
+        density: 200
+        mask:
+        - SmallMobMask #this is so they can go under plastic flaps
+        layer:
+        - MachineLayer
+  - type: Transform
+    noRot: false
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: Metallic
+  - type: GenericVisualizer
+    visuals:
+      enum.OpenableVisuals.Opened:
+        enum.OpenableVisuals.Layer:
+          True: { visible: true }
+          False: { visible: false }
+      enum.PaperLabelVisuals.HasLabel:
+        enum.PaperLabelVisuals.Layer:
+          True: { visible: true }
+          False: { visible: false }
+      enum.PaperLabelVisuals.LabelType:
+        enum.PaperLabelVisuals.Layer:
+          Paper: { state: paper }
+          Bounty: { state: paper }
+          CaptainsPaper: { state: paper }
+          Invoice: { state: paper }
+  - type: Appearance
+  - type: PaperLabel
+    labelSlot:
+      insertVerbText: Attach Label
+      ejectVerbText: Remove Label
+      whitelist:
+        components:
+        - Paper
+  - type: ItemSlots
+  - type: ContainerContainer
+    containers:
+      paper_label: !type:ContainerSlot
+  - type: Openable
+    sound:
+      collection: valveSqueak
+    closeable: true
+    closeSound:
+      collection: valveSqueak
+  - type: Sealable
+  - type: StaticPrice
+    price: 1000
+
+- type: entity
+  id: MetalBarrelGrey
+  parent: BaseBarrel
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Storage/Barrels/grey.rsi
+
+- type: entity
+  id: MetalBarrelBlue
+  parent: BaseBarrel
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Storage/Barrels/blue.rsi
+
+- type: entity
+  id: MetalBarrelRed
+  parent: BaseBarrel
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Storage/Barrels/red.rsi
+
+- type: entity
+  id: MetalBarrelYellow
+  parent: BaseBarrel
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Storage/Barrels/yellow.rsi
+
+- type: entity
+  id: MetalBarrelGreen
+  parent: BaseBarrel
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Storage/Barrels/green.rsi
+
+- type: entity
+  id: MetalBarrelWhite
+  parent: BaseBarrel
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Storage/Barrels/white.rsi
+
+- type: entity
+  id: MetalBarrelBlack
+  parent: BaseBarrel
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Storage/Barrels/black.rsi
+
+- type: entity
+  id: ChemicalBarrelExplosiveEmpty
+  parent: MetalBarrelRed
+  name: explosive barrel
+  suffix: Empty
+  description: The ancient and mysterious symbol on the front is believed to have once meant 'Use me as cover!' in days of yore.
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Storage/Barrels/red.rsi
+    layers:
+    - state: icon
+    - state: icon_open
+      map: ["enum.OpenableVisuals.Layer"]
+      visible: false
+    - state: metal_explosive_label
+    - state: paper
+      map: ["enum.PaperLabelVisuals.Layer"]
+      visible: false
+
+- type: entity
+  id: ChemicalBarrelExplosiveFilled
+  parent: ChemicalBarrelExplosiveEmpty
+  suffix: Filled
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: WeldingFuel
+            Quantity: 1000
+  - type: DamageOnToolInteract
+    tools: Welding
+    weldingDamage:
+      types:
+        Heat: 10
+  - type: PacifismDangerousAttack
+  - type: Explosive # This is dumb since you can refill it with water and it will still explode, so be it.
+    explosionType: Default
+    totalIntensity: 60
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelWeldingFuel
+
+- type: entity
+  id: LabelWeldingFuel
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-welding-fuel
+
+- type: entity
+  parent: MetalBarrelBlack
+  id: ChemicalBarrelCarbon
+  suffix: Carbon
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Carbon
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelCarbon
+
+- type: entity
+  id: LabelCarbon
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-carbon
+
+- type: entity
+  parent: MetalBarrelRed
+  id: ChemicalBarrelIodine
+  suffix: Iodine
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Iodine
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelIodine
+
+- type: entity
+  id: LabelIodine
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-iodine
+
+- type: entity
+  parent: MetalBarrelBlue
+  id: ChemicalBarrelFluorine
+  suffix: Fluorine
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Fluorine
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelFluorine
+
+- type: entity
+  id: LabelFluorine
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-fluorine
+
+- type: entity
+  parent: MetalBarrelGreen
+  id: ChemicalBarrelChlorine
+  suffix: Chlorine
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Chlorine
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelChlorine
+
+- type: entity
+  id: LabelChlorine
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-chlorine
+
+- type: entity
+  parent: MetalBarrelWhite
+  id: ChemicalBarrelAluminium
+  suffix: Aluminium
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Aluminium
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelAluminium
+
+- type: entity
+  id: LabelAluminium
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-aluminium
+
+- type: entity
+  parent: MetalBarrelRed
+  id: ChemicalBarrelPhosphorus
+  suffix: Phosphorus
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Phosphorus
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelPhosphorus
+
+- type: entity
+  id: LabelPhosphorus
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-phosphorus
+
+- type: entity
+  parent: MetalBarrelYellow
+  id: ChemicalBarrelSulfur
+  suffix: Sulfur
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Sulfur
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelSulfur
+
+- type: entity
+  id: LabelSulfur
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-sulfur
+
+- type: entity
+  parent: MetalBarrelBlack
+  id: ChemicalBarrelSilicon
+  suffix: Silicon
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Silicon
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelSilicon
+
+- type: entity
+  id: LabelSilicon
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-silicon
+
+- type: entity
+  parent: MetalBarrelWhite
+  id: ChemicalBarrelHydrogen
+  suffix: Hydrogen
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Hydrogen
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelHydrogen
+
+- type: entity
+  id: LabelHydrogen
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-hydrogen
+
+- type: entity
+  parent: MetalBarrelGrey
+  id: ChemicalBarrelLithium
+  suffix: Lithium
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Lithium
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelLithium
+
+- type: entity
+  id: LabelLithium
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-lithium
+
+- type: entity
+  parent: MetalBarrelGrey
+  id: ChemicalBarrelSodium
+  suffix: Sodium
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Sodium
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelSodium
+
+- type: entity
+  id: LabelSodium
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-sodium
+
+- type: entity
+  parent: MetalBarrelYellow
+  id: ChemicalBarrelPotassium
+  suffix: Potassium
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Potassium
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelPotassium
+
+- type: entity
+  id: LabelPotassium
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-potassium
+
+- type: entity
+  parent: MetalBarrelGreen
+  id: ChemicalBarrelRadium
+  suffix: Radium
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Radium
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelRadium
+
+- type: entity
+  id: LabelRadium
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-radium
+
+- type: entity
+  parent: MetalBarrelGrey
+  id: ChemicalBarrelIron
+  suffix: Iron
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Iron
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelIron
+
+- type: entity
+  id: LabelIron
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-iron
+
+- type: entity
+  parent: MetalBarrelRed
+  id: ChemicalBarrelCopper
+  suffix: Copper
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Copper
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelCopper
+
+- type: entity
+  id: LabelCopper
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-copper
+
+- type: entity
+  parent: MetalBarrelYellow
+  id: ChemicalBarrelGold
+  suffix: Gold
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Gold
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelGold
+
+- type: entity
+  id: LabelGold
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-gold
+
+- type: entity
+  parent: MetalBarrelGrey
+  id: ChemicalBarrelMercury
+  suffix: Mercury
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Mercury
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelMercury
+
+- type: entity
+  id: LabelMercury
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-mercury
+
+- type: entity
+  parent: MetalBarrelWhite
+  id: ChemicalBarrelSilver
+  suffix: Silver
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Silver
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelSilver
+
+- type: entity
+  id: LabelSilver
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-silver
+
+- type: entity
+  parent: MetalBarrelBlue
+  id: ChemicalBarrelEthanol
+  suffix: Ethanol
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Ethanol
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelEthanol
+
+- type: entity
+  id: LabelEthanol
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-ethanol
+
+- type: entity
+  parent: MetalBarrelWhite
+  id: ChemicalBarrelSugar
+  suffix: Sugar
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Sugar
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelSugar
+
+- type: entity
+  id: LabelSugar
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-sugar
+
+- type: entity
+  parent: MetalBarrelRed
+  id: ChemicalBarrelNitrogen
+  suffix: Nitrogen
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Nitrogen
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelNitrogen
+
+- type: entity
+  id: LabelNitrogen
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-nitrogen
+
+- type: entity
+  parent: MetalBarrelBlue
+  id: ChemicalBarrelOxygen
+  suffix: Oxygen
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Oxygen
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelOxygen
+
+- type: entity
+  id: LabelOxygen
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-oxygen
+
+- type: entity
+  parent: MetalBarrelBlack
+  id: ChemicalBarrelOil
+  suffix: Oil
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Oil
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelOil
+
+- type: entity
+  id: LabelOil
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-oil
+
+- type: entity
+  parent: MetalBarrelGreen
+  id: ChemicalBarrelDiethylamine
+  suffix: Diethylamine
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Diethylamine
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelDiethylamine
+
+- type: entity
+  id: LabelDiethylamine
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-diethylamine
+
+- type: entity
+  parent: MetalBarrelYellow
+  id: ChemicalBarrelMustard
+  suffix: Mustard
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Mustard
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelMustard
+
+- type: entity
+  id: LabelMustard
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-mustard
+
+- type: entity
+  parent: MetalBarrelRed
+  id: ChemicalBarrelKetchup
+  suffix: Ketchup
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Ketchup
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelKetchup
+
+- type: entity
+  id: LabelKetchup
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-ketchup
+
+- type: entity
+  parent: MetalBarrelWhite
+  id: ChemicalBarrelMayo
+  suffix: Mayo
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Mayo
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelMayo
+
+- type: entity
+  id: LabelMayo
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-mayo
+
+- type: entity
+  parent: MetalBarrelYellow
+  id: ChemicalBarrelCornoil
+  suffix: Cornoil
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Cornoil
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelCornoil
+
+- type: entity
+  id: LabelCornoil
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-cornoil
+
+- type: entity
+  parent: MetalBarrelGreen
+  id: ChemicalBarrelOliveoil
+  suffix: Olive Oil
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: OilOlive
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelOilOlive
+
+- type: entity
+  id: LabelOilOlive
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-oil-olive
+
+- type: entity
+  parent: MetalBarrelGreen
+  id: ChemicalBarrelSpaceLube
+  suffix: Space Lube
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: SpaceLube
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelSpaceLube
+
+- type: entity
+  id: LabelSpaceLube
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-space-lube
+
+- type: entity
+  parent: MetalBarrelBlue
+  id: ChemicalBarrelSpaceCleaner
+  suffix: Space Cleaner
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: SpaceCleaner
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelSpaceCleaner
+
+- type: entity
+  id: LabelSpaceCleaner
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-space-cleaner
+
+- type: entity
+  parent: MetalBarrelBlue
+  id: ChemicalBarrelWater
+  suffix: Water
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Water
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelWater
+
+- type: entity
+  id: LabelWater
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-water
+
+- type: entity
+  parent: MetalBarrelYellow
+  id: ChemicalBarrelWhiskey
+  suffix: Whiskey
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Whiskey
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelWhiskey
+
+- type: entity
+  id: LabelWhiskey
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-whiskey
+
+- type: entity
+  parent: MetalBarrelWhite
+  id: ChemicalBarrelVodka
+  suffix: Vodka
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Vodka
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelVodka
+
+- type: entity
+  id: LabelVodka
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-vodka
+
+- type: entity
+  parent: MetalBarrelGreen
+  id: ChemicalBarrelTequila
+  suffix: Tequila
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Tequila
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelTequila
+
+- type: entity
+  id: LabelTequila
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-tequila
+
+- type: entity
+  parent: MetalBarrelRed
+  id: ChemicalBarrelRum
+  suffix: Rum
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Rum
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelRum
+
+- type: entity
+  id: LabelRum
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-rum
+
+- type: entity
+  parent: MetalBarrelBlue
+  id: ChemicalBarrelGin
+  suffix: Gin
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Gin
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelGin
+
+- type: entity
+  id: LabelGin
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-gin
+
+- type: entity
+  parent: MetalBarrelRed
+  id: ChemicalBarrelCoffeeLiqueur
+  suffix: Coffee Liqeueur
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: CoffeeLiqueur
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelCoffeeLiqueur
+
+- type: entity
+  id: LabelCoffeeLiqueur
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-coffeeliqueur
+
+- type: entity
+  parent: MetalBarrelGreen
+  id: ChemicalBarrelAbsinthe
+  suffix: Absinthe
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Absinthe
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelAbsinthe
+
+- type: entity
+  id: LabelAbsinthe
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-absinthe
+
+- type: entity
+  parent: MetalBarrelRed
+  id: ChemicalBarrelAle
+  suffix: Ale
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Ale
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelAle
+
+- type: entity
+  id: LabelAle
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-ale
+
+- type: entity
+  parent: MetalBarrelGreen
+  id: ChemicalBarrelVermouth
+  suffix: Vermouth
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Vermouth
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelVermouth
+
+- type: entity
+  id: LabelVermouth
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-vermouth
+
+- type: entity
+  parent: MetalBarrelRed
+  id: ChemicalBarrelWine
+  suffix: Wine
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Wine
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelWine
+
+- type: entity
+  id: LabelWine
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-wine
+
+- type: entity
+  parent: MetalBarrelGrey
+  id: ChemicalBarrelBeer
+  suffix: Beer
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Beer
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelBeer
+
+- type: entity
+  id: LabelBeer
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-beer
+
+- type: entity
+  parent: MetalBarrelBlack
+  id: ChemicalBarrelCognac
+  suffix: Cognac
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Cognac
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelCognac
+
+- type: entity
+  id: LabelCognac
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-cognac
+
+- type: entity
+  parent: MetalBarrelYellow
+  id: ChemicalBarrelMead
+  suffix: Mead
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+          - ReagentId: Mead
+            Quantity: 1000
+  - type: ContainerFill
+    containers:
+      paper_label:
+      - LabelMead
+
+- type: entity
+  id: LabelMead
+  parent: Paper
+  categories: [HideSpawnMenu]
+  components:
+  - type: Paper
+    content: reagent-label-mead
+
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/_NF/Entities/Structures/Walls/asteroid.yml
index 84f13b5d3aa..3acfd23d13b 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Walls/asteroid.yml
@@ -1,4 +1,56 @@
-# Upstream
+- type: entity
+  parent: AsteroidRock
+  id: NFAsteroidRockOre
+  abstract: true
+  components: &softRockComps
+  - type: OreVein
+    gatherDestructionWhitelist:
+      components:
+      - MiningGatheringHard
+
+- type: entity
+  parent: IronRock
+  id: NFIronRockOre
+  abstract: true
+  components: *softRockComps
+
+- type: entity
+  parent: WallRock
+  id: NFWallRockOre
+  abstract: true
+  components: *softRockComps
+
+- type: entity
+  parent: WallRockBasalt
+  id: NFWallRockBasaltOre
+  abstract: true
+  components: *softRockComps
+
+- type: entity
+  parent: WallRockSnow
+  id: NFWallRockSnowOre
+  abstract: true
+  components: *softRockComps
+
+- type: entity
+  parent: WallRockSand
+  id: NFWallRockSandOre
+  abstract: true
+  components: *softRockComps
+
+- type: entity
+  parent: WallRockChromite
+  id: NFWallRockChromiteOre
+  abstract: true
+  components: *softRockComps
+
+- type: entity
+  parent: WallRockAndesite
+  id: NFWallRockAndesiteOre
+  abstract: true
+  components: *softRockComps
+
+# region Upstream
 - type: entity
   id: AsteroidRockBananiumCrab
   parent: AsteroidRockBananium
@@ -6,7 +58,7 @@
   components:
     - type: OreVein
       oreChance: 1.0
-      currentOre: OreBananiumCrab
+      currentOre: OreBananiumCrabNF
 
 - type: entity
   id: AsteroidRockCoalCrab
@@ -15,7 +67,7 @@
   components:
     - type: OreVein
       oreChance: 1.0
-      currentOre: OreCoalCrab
+      currentOre: OreCoalCrabNF
 
 - type: entity
   id: AsteroidRockGoldCrab
@@ -24,7 +76,7 @@
   components:
     - type: OreVein
       oreChance: 1.0
-      currentOre: OreGoldCrab
+      currentOre: OreGoldCrabNF
 
 - type: entity
   id: AsteroidRockPlasmaCrab
@@ -33,7 +85,7 @@
   components:
     - type: OreVein
       oreChance: 1.0
-      currentOre: OrePlasmaCrab
+      currentOre: OrePlasmaCrabNF
 
 - type: entity
   id: AsteroidRockSaltCrab
@@ -42,18 +94,19 @@
   components:
     - type: OreVein
       oreChance: 1.0
-      currentOre: OreSaltCrab
+      currentOre: OreSaltCrabNF
+# endregion Upstream
 
-# Frontier - Ore
+# region Ore
 - type: entity
   id: AsteroidRockBluespace
-  parent: AsteroidRock
+  parent: NFAsteroidRockOre
   description: An ore vein with bluespace.
   suffix: Bluespace
   components:
   - type: OreVein
     oreChance: 1.0
-    currentOre: OreBluespace
+    currentOre: NFOreBluespace
   - type: Sprite
     layers:
     - state: rock_asteroid
@@ -71,13 +124,13 @@
 
 - type: entity
   id: IronRockBluespace
-  parent: IronRock
+  parent: NFIronRockOre
   description: An ore vein with bluespace.
   suffix: Bluespace
   components:
     - type: OreVein
       oreChance: 1.0
-      currentOre: OreBluespace
+      currentOre: NFOreBluespace
     - type: Sprite
       layers:
       - state: ironrock
@@ -95,7 +148,7 @@
 
 - type: entity
   id: WallRockBluespace
-  parent: WallRock
+  parent: NFWallRockOre
   description: An ore vein with bluespace.
   suffix: Bluespace
   components:
@@ -108,7 +161,7 @@
       WallRockSnow: WallRockSnowBluespace
   - type: OreVein
     oreChance: 1.0
-    currentOre: OreBluespace
+    currentOre: NFOreBluespace
   - type: Sprite
     layers:
       - state: rock
@@ -126,13 +179,13 @@
 
 - type: entity
   id: WallRockBasaltBluespace
-  parent: WallRockBasalt
+  parent: NFWallRockBasaltOre
   description: An ore vein with bluespace.
   suffix: Bluespace
   components:
     - type: OreVein
       oreChance: 1.0
-      currentOre: OreBluespace
+      currentOre: NFOreBluespace
     - type: Sprite
       layers:
       - state: rock_wall
@@ -150,13 +203,13 @@
 
 - type: entity
   id: WallRockSnowBluespace
-  parent: WallRockSnow
+  parent: NFWallRockSnowOre
   description: An ore vein with bluespace.
   suffix: Bluespace
   components:
     - type: OreVein
       oreChance: 1.0
-      currentOre: OreBluespace
+      currentOre: NFOreBluespace
     - type: Sprite
       layers:
       - state: rock_snow
@@ -174,13 +227,13 @@
 
 - type: entity
   id: WallRockSandBluespace
-  parent: WallRockSand
+  parent: NFWallRockSandOre
   description: An ore vein with bluespace.
   suffix: Bluespace
   components:
     - type: OreVein
       oreChance: 1.0
-      currentOre: OreBluespace
+      currentOre: NFOreBluespace
     - type: Sprite
       layers:
       - state: rock_sand
@@ -198,13 +251,13 @@
 
 - type: entity
   id: WallRockChromiteBluespace
-  parent: WallRockChromite
+  parent: NFWallRockChromiteOre
   description: An ore vein with bluespace.
   suffix: Bluespace
   components:
     - type: OreVein
       oreChance: 1.0
-      currentOre: OreBluespace
+      currentOre: NFOreBluespace
     - type: Sprite
       layers:
       - state: rock_chromite
@@ -222,13 +275,13 @@
 
 - type: entity
   id: WallRockAndesiteBluespace
-  parent: WallRockAndesite
+  parent: NFWallRockAndesiteOre
   description: An ore vein with bluespace.
   suffix: Bluespace
   components:
     - type: OreVein
       oreChance: 1.0
-      currentOre: OreBluespace
+      currentOre: NFOreBluespace
     - type: Sprite
       layers:
       - state: rock_andesite
@@ -243,12 +296,12 @@
       - sprite: _NF/Structures/Walls/rock.rsi
         state: rock_bluespace
         map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+# endregion Ore
 
-# Frontier - scrap pile with ore
-
+# region Scrap with Ore
 - type: entity
   id: WallRockScrapPile
-  parent: WallRockAndesite
+  parent: NFWallRockAndesiteOre
   name: scrap pile
   description: A pile of scrap.
   suffix: Scrap
@@ -664,7 +717,7 @@
   components:
   - type: OreVein
     oreChance: 1.0
-    currentOre: OreBluespace
+    currentOre: NFOreBluespace
   - type: Sprite
     layers:
     - state: scraprock01
@@ -696,8 +749,9 @@
   - type: OreVein
     oreChance: 0.33
     oreRarityPrototypeId: RandomOreDistributionStandard
+# endregion Scrap with Ore
 
-# Frontier - Mobs
+# region AsteroidRock Crabs
 - type: entity
   id: AsteroidRockQuartzCrabNF
   parent: AsteroidRockQuartzCrab
@@ -729,10 +783,9 @@
     - type: OreVein
       oreChance: 1.0
       currentOre: OreUraniumCrabNF
+# endregion AsteroidRock Crabs
 
-# Bananium
-## Bananium CrabNFs
-
+# region Bananium Crabs
 - type: entity
   id: WallRockAndesiteBananiumCrabNF
   parent: WallRockAndesiteBananium
@@ -795,9 +848,9 @@
     - type: OreVein
       oreChance: 1.0
       currentOre: OreBananiumCrabNF
+# endregion Bananium Crabs
 
-## Bananium golems
-
+# region Bananium Golems
 - type: entity
   id: WallRockAndesiteBananiumGolem
   parent: WallRockAndesiteBananium
@@ -860,10 +913,9 @@
     - type: OreVein
       oreChance: 1.0
       currentOre: OreBananiumGolem
+# endregion Bananium Golems
 
-# Coal
-## Coal crabs
-
+# region Coal Crabs
 - type: entity
   id: WallRockAndesiteCoalCrabNF
   parent: WallRockAndesiteCoal
@@ -926,9 +978,9 @@
     - type: OreVein
       oreChance: 1.0
       currentOre: OreCoalCrabNF
+# endregion Coal Crabs
 
-## Coal golems
-
+# region Coal Golems
 - type: entity
   id: WallRockAndesiteCoalGolem
   parent: WallRockAndesiteCoal
@@ -991,10 +1043,9 @@
     - type: OreVein
       oreChance: 1.0
       currentOre: OreCoalGolem
+# endregion Coal Golems
 
-# Gold
-## Gold crabs
-
+# region Gold Crabs
 - type: entity
   id: WallRockAndesiteGoldCrabNF
   parent: WallRockAndesiteGold
@@ -1057,9 +1108,9 @@
     - type: OreVein
       oreChance: 1.0
       currentOre: OreGoldCrabNF
+# endregion Gold Crabs
 
-## Gold golems
-
+# region Gold Golems
 - type: entity
   id: WallRockAndesiteGoldGolem
   parent: WallRockAndesiteGold
@@ -1122,10 +1173,9 @@
     - type: OreVein
       oreChance: 1.0
       currentOre: OreGoldGolem
+# endregion Gold Golems
 
-# Iron. Steel?
-## Iron crabs
-
+# region Iron Crabs
 - type: entity
   id: WallRockAndesiteIronCrabNF
   parent: WallRockAndesiteTin
@@ -1179,9 +1229,9 @@
     - type: OreVein
       oreChance: 1.0
       currentOre: OreIronCrabNF
+# endregion Iron Crabs
 
-## Iron golems
-
+# region Iron Golems
 - type: entity
   id: WallRockAndesiteIronGolem
   parent: WallRockAndesiteTin
@@ -1244,10 +1294,9 @@
     - type: OreVein
       oreChance: 1.0
       currentOre: OreIronGolem
+# endregion Iron Golems
 
-# Plasma
-## Plasma crabs
-
+# region Plasma Crabs
 - type: entity
   id: WallRockAndesitePlasmaCrabNF
   parent: WallRockAndesitePlasma
@@ -1310,9 +1359,9 @@
     - type: OreVein
       oreChance: 1.0
       currentOre: OrePlasmaCrabNF
+# endregion Plasma Crabs
 
-## Plasma golems
-
+# region Plasma Golems
 - type: entity
   id: WallRockAndesitePlasmaGolem
   parent: WallRockAndesitePlasma
@@ -1375,10 +1424,9 @@
     - type: OreVein
       oreChance: 1.0
       currentOre: OrePlasmaGolem
+# endregion Plasma Golems
 
-# Quartz
-## Quartz crabs
-
+# region Quartz Crabs
 - type: entity
   id: WallRockAndesiteQuartzCrabNF
   parent: WallRockAndesiteQuartz
@@ -1432,9 +1480,9 @@
     - type: OreVein
       oreChance: 1.0
       currentOre: OreQuartzCrabNF
+# endregion Quartz Crabs
 
-## Quartz golems
-
+# region Quartz Golems
 - type: entity
   id: WallRockAndesiteQuartzGolem
   parent: WallRockAndesiteQuartz
@@ -1497,10 +1545,9 @@
     - type: OreVein
       oreChance: 1.0
       currentOre: OreQuartzGolem
+# endregion Quartz Golems
 
-# Salt
-## Salt crabs
-
+# region Salt Crabs
 - type: entity
   id: WallRockAndesiteSaltCrabNF
   parent: WallRockAndesiteSalt
@@ -1563,9 +1610,9 @@
     - type: OreVein
       oreChance: 1.0
       currentOre: OreSaltCrabNF
+# endregion Salt Crabs
 
-## Salt golems
-
+# region Salt Golems
 - type: entity
   id: WallRockAndesiteSaltGolem
   parent: WallRockAndesiteSalt
@@ -1628,10 +1675,9 @@
     - type: OreVein
       oreChance: 1.0
       currentOre: OreSaltGolem
+# endregion Salt Golems
 
- # Silver
-## Silver crabs
-
+# region Silver Crabs
 - type: entity
   id: WallRockAndesiteSilverCrabNF
   parent: WallRockAndesiteSilver
@@ -1685,9 +1731,9 @@
     - type: OreVein
       oreChance: 1.0
       currentOre: OreSilverCrabNF
+# endregion Silver Crabs
 
-## Silver golems
-
+# region Silver Golems
 - type: entity
   id: WallRockAndesiteSilverGolem
   parent: WallRockAndesiteSilver
@@ -1750,10 +1796,9 @@
     - type: OreVein
       oreChance: 1.0
       currentOre: OreSilverGolem
+# endregion Silver Golems
 
- # Uranium
-## Uranium crabs
-
+# region Uranium Crabs
 - type: entity
   id: WallRockAndesiteUraniumCrabNF
   parent: WallRockAndesiteUranium
@@ -1807,9 +1852,9 @@
     - type: OreVein
       oreChance: 1.0
       currentOre: OreUraniumCrabNF
+# endregion Uranium Crabs
 
-## Uranium golems
-
+# region Uranium Golems
 - type: entity
   id: WallRockAndesiteUraniumGolem
   parent: WallRockAndesiteUranium
@@ -1872,4 +1917,4 @@
     - type: OreVein
       oreChance: 1.0
       currentOre: OreUraniumGolem
-
+#endregion Uranium Golems
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/_NF/Entities/Structures/Walls/walls.yml
index de2501b8867..b6a34c8e9aa 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Walls/walls.yml
@@ -1,69 +1,3296 @@
-# Partially reflective 
+# region Base Walls
 - type: entity
   parent: BaseStructureDisableToolUse
-  id: AsteroidWallNF
+  id: NFAsteroidWall
+  name: supercompacted rock
+  description: Harder than hard. You'll need some special equipment to blast through this.
   abstract: true
   components:
-  - type: Reflect
-    reflectProb: 0.4
-    spread: 10 # Narrow spread, need to balance vs. max projectile distance
-    reflects:
-    - ShuttleKinetic # Only reflects PTK (otherwise RIP miners)
   - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 1000
-      behaviors:
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
+    thresholds: []
+  - type: SoundOnGather
+  - type: Gatherable
+    toolWhitelist:
+      components:
+      - MiningGatheringHard
+  - type: MiningScannerViewable
 
 - type: entity
-  parent: [AsteroidWallNF, WallIce]
-  id: WallIceNF
+  parent: [NFAsteroidWall, WallIce]
+  id: NFWallIce
+  name: supercompacted ice # special name
   categories: [ HideSpawnMenu ]
 
 - type: entity
-  parent: [AsteroidWallNF, WallSandstone]
-  id: WallSandstoneNF
+  parent: [NFAsteroidWall, WallSandstone]
+  id: NFWallSandstone
   categories: [ HideSpawnMenu ]
 
 - type: entity
-  parent: [AsteroidWallNF, WallNecropolis]
-  id: WallNecropolisNF
+  parent: [NFAsteroidWall, WallNecropolis]
+  id: NFWallNecropolis
   categories: [ HideSpawnMenu ]
 
 - type: entity
-  parent: [AsteroidWallNF, WallCobblebrick]
-  id: WallCobblebrickNF
+  parent: [NFAsteroidWall, WallCobblebrick]
+  id: NFWallCobblebrick
   categories: [ HideSpawnMenu ]
 
 - type: entity
-  parent: [AsteroidWallNF, WallBasaltCobblebrick]
-  id: WallBasaltCobblebrickNF
+  parent: [NFAsteroidWall, WallBasaltCobblebrick]
+  id: NFWallBasaltCobblebrick
   categories: [ HideSpawnMenu ]
 
 - type: entity
-  parent: [AsteroidWallNF, WallSnowCobblebrick]
-  id: WallSnowCobblebrickNF
+  parent: [NFAsteroidWall, WallSnowCobblebrick]
+  id: NFWallSnowCobblebrick
   categories: [ HideSpawnMenu ]
 
 - type: entity
-  parent: [AsteroidWallNF, WallAsteroidCobblebrick]
-  id: WallAsteroidCobblebrickNF
+  parent: [NFAsteroidWall, WallAsteroidCobblebrick]
+  id: NFWallAsteroidCobblebrick
   categories: [ HideSpawnMenu ]
 
 - type: entity
-  parent: [AsteroidWallNF, WallSandCobblebrick]
-  id: WallSandCobblebrickNF
+  parent: [NFAsteroidWall, WallSandCobblebrick]
+  id: NFWallSandCobblebrick
   categories: [ HideSpawnMenu ]
 
 - type: entity
-  parent: [AsteroidWallNF, WallChromiteCobblebrick]
-  id: WallChromiteCobblebrickNF
+  parent: [NFAsteroidWall, WallChromiteCobblebrick]
+  id: NFWallChromiteCobblebrick
   categories: [ HideSpawnMenu ]
 
 - type: entity
-  parent: [AsteroidWallNF, WallAndesiteCobblebrick]
-  id: WallAndesiteCobblebrickNF
+  parent: [NFAsteroidWall, WallAndesiteCobblebrick]
+  id: NFWallAndesiteCobblebrick
   categories: [ HideSpawnMenu ]
+# endregion Base Walls
+
+# region Cobblebrick Ores
+- type: entity
+  id: NFWallIceBananium
+  parent: NFWallIce
+  description: A dense ore vein rich with bananium. Extremely hard.
+  suffix: Bananium
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreBananium
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: ice0
+        - state: rock_bananium
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallIceBluespace
+  parent: NFWallIce
+  description: A dense ore vein rich with bluespace. Extremely hard.
+  suffix: Bluespace
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreBluespace
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: ice0
+        - state: rock_bluespace
+          sprite: _NF/Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallIceCoal
+  parent: NFWallIce
+  name: supercompacted coal
+  description: A dense ore vein rich with coal. Extremely hard.
+  suffix: Coal
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreCoalDense
+    - type: Sprite
+      layers: # Hack to get these layers set up
+        - map: [ "enum.CornerLayers.SE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: ice0
+        - state: rock_coal
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallIceDiamond
+  parent: NFWallIce
+  description: A dense ore vein rich with diamonds. Extremely hard.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreDiamondDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: ice0
+        - state: rock_diamond
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallIceGold
+  parent: NFWallIce
+  description: A dense ore vein rich with gold. Extremely hard.
+  suffix: Gold
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreGoldDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: ice0
+        - state: rock_gold
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallIceTin
+  parent: NFWallIce
+  description: An ore vein rich with iron.
+  suffix: Iron
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSteel
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: ice0
+        - state: rock_tin
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallIcePlasma
+  parent: NFWallIce
+  description: A dense ore vein rich with plasma. Extremely hard.
+  suffix: Plasma
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOrePlasmaDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: ice0
+        - state: rock_phoron
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallIceQuartz
+  parent: NFWallIce
+  description: A dense ore vein rich with quartz. Extremely hard.
+  suffix: Quartz
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSpaceQuartzDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: ice0
+        - state: rock_quartz
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallIceSalt
+  parent: NFWallIce
+  description: A dense ore vein rich with salt. Extremely hard.
+  suffix: Salt
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSaltDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: ice0
+        - state: rock_salt
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallIceSilver
+  parent: NFWallIce
+  description: A dense ore vein rich with silver. Extremely hard.
+  suffix: Silver
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSilverDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: ice0
+        - state: rock_silver
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallIceUranium
+  parent: NFWallIce
+  description: A dense ore vein rich with uranium. Extremely hard.
+  suffix: Uranium
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreUraniumDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: ice0
+        - state: rock_uranium
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallIceArtifactFragment
+  parent: NFWallIce
+  description: Harder than hard. You'll need some special equipment to- what's that sticking out of it?
+  suffix: Artifact Fragment
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreArtifactFragment
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: ice0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: ice0
+        - state: rock_artifact_fragment
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+# endregion Cobblebrick Ores
+
+# region Cobblebrick Mobs
+- type: entity
+  id: NFWallCobblebrickBananiumCrab
+  parent: NFWallCobblebrickBananium
+  suffix: Bananium Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreBananiumCrabNF
+
+- type: entity
+  id: NFWallCobblebrickCoalCrab
+  parent: NFWallCobblebrickCoal
+  suffix: Coal Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreCoalCrabNF
+
+# - type: entity
+#   id: NFWallCobblebrickDiamondCrab
+#   parent: NFWallCobblebrickDiamond
+#   suffix: Diamond Crab
+#   components:
+#     - type: OreVein
+#       oreChance: 1.0
+#       currentOre: OreDiamondCrabNF
+
+- type: entity
+  id: NFWallCobblebrickGoldCrab
+  parent: NFWallCobblebrickGold
+  suffix: Gold Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreGoldCrabNF
+
+- type: entity
+  id: NFWallCobblebrickTinCrab
+  parent: NFWallCobblebrickTin
+  suffix: Iron Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreIronCrabNF
+
+- type: entity
+  id: NFWallCobblebrickPlasmaCrab
+  parent: NFWallCobblebrickPlasma
+  suffix: Plasma Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OrePlasmaCrabNF
+
+- type: entity
+  id: NFWallCobblebrickQuartzCrab
+  parent: NFWallCobblebrickQuartz
+  suffix: Quartz Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreQuartzCrabNF
+
+- type: entity
+  id: NFWallCobblebrickSaltCrab
+  parent: NFWallCobblebrickSalt
+  suffix: Salt Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSaltCrabNF
+
+- type: entity
+  id: NFWallCobblebrickSilverCrab
+  parent: NFWallCobblebrickSilver
+  suffix: Silver Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSilverCrabNF
+
+- type: entity
+  id: NFWallCobblebrickUraniumCrab
+  parent: NFWallCobblebrickUranium
+  suffix: Uranium Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreUraniumCrabNF
+
+- type: entity
+  id: NFWallCobblebrickBananiumGolem
+  parent: NFWallCobblebrickBananium
+  suffix: Bananium Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreBananiumGolem
+
+- type: entity
+  id: NFWallCobblebrickCoalGolem
+  parent: NFWallCobblebrickCoal
+  suffix: Coal Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreCoalGolem
+
+# - type: entity
+#   id: NFWallCobblebrickDiamondGolem
+#   parent: NFWallCobblebrickDiamond
+#   suffix: Diamond Golem
+#   components:
+#     - type: OreVein
+#       oreChance: 1.0
+#       currentOre: OreDiamondGolem
+
+- type: entity
+  id: NFWallCobblebrickGoldGolem
+  parent: NFWallCobblebrickGold
+  suffix: Gold Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreGoldGolem
+
+- type: entity
+  id: NFWallCobblebrickIronGolem
+  parent: NFWallCobblebrickTin
+  suffix: Iron Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreIronGolem
+
+- type: entity
+  id: NFWallCobblebrickPlasmaGolem
+  parent: NFWallCobblebrickPlasma
+  suffix: Plasma Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OrePlasmaGolem
+
+- type: entity
+  id: NFWallCobblebrickQuartzGolem
+  parent: NFWallCobblebrickQuartz
+  suffix: Quartz Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreQuartzGolem
+
+- type: entity
+  id: NFWallCobblebrickSaltGolem
+  parent: NFWallCobblebrickSalt
+  suffix: Salt Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSaltGolem
+
+- type: entity
+  id: NFWallCobblebrickSilverGolem
+  parent: NFWallCobblebrickSilver
+  suffix: Silver Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSilverGolem
+
+- type: entity
+  id: NFWallCobblebrickUraniumGolem
+  parent: NFWallCobblebrickUranium
+  suffix: Uranium Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreUraniumGolem
+# endregion Cobblebrick Mobs
+
+# region Ice Ores
+- type: entity
+  id: NFWallCobblebrickBananium
+  parent: NFWallCobblebrick
+  description: A dense ore vein rich with bananium. Extremely hard.
+  suffix: Bananium
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreBananium
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_bananium
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallCobblebrickBluespace
+  parent: NFWallCobblebrick
+  description: A dense ore vein rich with bluespace. Extremely hard.
+  suffix: Bluespace
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreBluespace
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_bluespace
+          sprite: _NF/Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallCobblebrickCoal
+  parent: NFWallCobblebrick
+  name: supercompacted coal
+  description: A dense ore vein rich with coal. Extremely hard.
+  suffix: Coal
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreCoalDense
+    - type: Sprite
+      layers: # Hack to get these layers set up
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_coal
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallCobblebrickDiamond
+  parent: NFWallCobblebrick
+  description: A dense ore vein rich with diamonds. Extremely hard.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreDiamondDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_diamond
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallCobblebrickGold
+  parent: NFWallCobblebrick
+  description: A dense ore vein rich with gold. Extremely hard.
+  suffix: Gold
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreGoldDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_gold
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallCobblebrickTin
+  parent: NFWallCobblebrick
+  description: An ore vein rich with iron.
+  suffix: Iron
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSteel
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_tin
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallCobblebrickPlasma
+  parent: NFWallCobblebrick
+  description: A dense ore vein rich with plasma. Extremely hard.
+  suffix: Plasma
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOrePlasmaDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_phoron
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallCobblebrickQuartz
+  parent: NFWallCobblebrick
+  description: A dense ore vein rich with quartz. Extremely hard.
+  suffix: Quartz
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSpaceQuartzDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_quartz
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallCobblebrickSalt
+  parent: NFWallCobblebrick
+  description: A dense ore vein rich with salt. Extremely hard.
+  suffix: Salt
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSaltDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_salt
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallCobblebrickSilver
+  parent: NFWallCobblebrick
+  description: A dense ore vein rich with silver. Extremely hard.
+  suffix: Silver
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSilverDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_silver
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallCobblebrickUranium
+  parent: NFWallCobblebrick
+  description: A dense ore vein rich with uranium. Extremely hard.
+  suffix: Uranium
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreUraniumDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_uranium
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallCobblebrickArtifactFragment
+  parent: NFWallCobblebrick
+  description: Harder than hard. You'll need some special equipment to- what's that sticking out of it?
+  suffix: Artifact Fragment
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreArtifactFragment
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_artifact_fragment
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+# endregion Ice Ores
+
+# region Ice Mobs
+- type: entity
+  id: NFWallIceBananiumCrab
+  parent: NFWallIceBananium
+  suffix: Bananium Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreBananiumCrabNF
+
+- type: entity
+  id: NFWallIceCoalCrab
+  parent: NFWallIceCoal
+  suffix: Coal Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreCoalCrabNF
+
+# - type: entity
+#   id: NFWallIceDiamondCrab
+#   parent: NFWallIceDiamond
+#   suffix: Diamond Crab
+#   components:
+#     - type: OreVein
+#       oreChance: 1.0
+#       currentOre: OreDiamondCrabNF
+
+- type: entity
+  id: NFWallIceGoldCrab
+  parent: NFWallIceGold
+  suffix: Gold Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreGoldCrabNF
+
+- type: entity
+  id: NFWallIceTinCrab
+  parent: NFWallIceTin
+  suffix: Iron Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreIronCrabNF
+
+- type: entity
+  id: NFWallIcePlasmaCrab
+  parent: NFWallIcePlasma
+  suffix: Plasma Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OrePlasmaCrabNF
+
+- type: entity
+  id: NFWallIceQuartzCrab
+  parent: NFWallIceQuartz
+  suffix: Quartz Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreQuartzCrabNF
+
+- type: entity
+  id: NFWallIceSaltCrab
+  parent: NFWallIceSalt
+  suffix: Salt Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSaltCrabNF
+
+- type: entity
+  id: NFWallIceSilverCrab
+  parent: NFWallIceSilver
+  suffix: Silver Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSilverCrabNF
+
+- type: entity
+  id: NFWallIceUraniumCrab
+  parent: NFWallIceUranium
+  suffix: Uranium Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreUraniumCrabNF
+
+- type: entity
+  id: NFWallIceBananiumGolem
+  parent: NFWallIceBananium
+  suffix: Bananium Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreBananiumGolem
+
+- type: entity
+  id: NFWallIceCoalGolem
+  parent: NFWallIceCoal
+  suffix: Coal Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreCoalGolem
+
+# - type: entity
+#   id: NFWallIceDiamondGolem
+#   parent: NFWallIceDiamond
+#   suffix: Diamond Golem
+#   components:
+#     - type: OreVein
+#       oreChance: 1.0
+#       currentOre: OreDiamondGolem
+
+- type: entity
+  id: NFWallIceGoldGolem
+  parent: NFWallIceGold
+  suffix: Gold Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreGoldGolem
+
+- type: entity
+  id: NFWallIceIronGolem
+  parent: NFWallIceTin
+  suffix: Iron Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreIronGolem
+
+- type: entity
+  id: NFWallIcePlasmaGolem
+  parent: NFWallIcePlasma
+  suffix: Plasma Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OrePlasmaGolem
+
+- type: entity
+  id: NFWallIceQuartzGolem
+  parent: NFWallIceQuartz
+  suffix: Quartz Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreQuartzGolem
+
+- type: entity
+  id: NFWallIceSaltGolem
+  parent: NFWallIceSalt
+  suffix: Salt Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSaltGolem
+
+- type: entity
+  id: NFWallIceSilverGolem
+  parent: NFWallIceSilver
+  suffix: Silver Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSilverGolem
+
+- type: entity
+  id: NFWallIceUraniumGolem
+  parent: NFWallIceUranium
+  suffix: Uranium Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreUraniumGolem
+# endregion Ice Mobs
+
+# region Sandstone Ores
+- type: entity
+  id: NFWallSandstoneBananium
+  parent: NFWallSandstone
+  description: A dense ore vein rich with bananium. Extremely hard.
+  suffix: Bananium
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreBananium
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: sandstone0
+        - state: rock_bananium
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallSandstoneBluespace
+  parent: NFWallSandstone
+  description: A dense ore vein rich with bluespace. Extremely hard.
+  suffix: Bluespace
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreBluespace
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: sandstone0
+        - state: rock_bluespace
+          sprite: _NF/Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallSandstoneCoal
+  parent: NFWallSandstone
+  name: supercompacted coal
+  description: A dense ore vein rich with coal. Extremely hard.
+  suffix: Coal
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreCoalDense
+    - type: Sprite
+      layers: # Hack to get these layers set up
+        - map: [ "enum.CornerLayers.SE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: sandstone0
+        - state: rock_coal
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallSandstoneDiamond
+  parent: NFWallSandstone
+  description: A dense ore vein rich with diamonds. Extremely hard.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreDiamondDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: sandstone0
+        - state: rock_diamond
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallSandstoneGold
+  parent: NFWallSandstone
+  description: A dense ore vein rich with gold. Extremely hard.
+  suffix: Gold
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreGoldDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: sandstone0
+        - state: rock_gold
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallSandstoneTin
+  parent: NFWallSandstone
+  description: An ore vein rich with iron.
+  suffix: Iron
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSteel
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: sandstone0
+        - state: rock_tin
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallSandstonePlasma
+  parent: NFWallSandstone
+  description: A dense ore vein rich with plasma. Extremely hard.
+  suffix: Plasma
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOrePlasmaDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: sandstone0
+        - state: rock_phoron
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallSandstoneQuartz
+  parent: NFWallSandstone
+  description: A dense ore vein rich with quartz. Extremely hard.
+  suffix: Quartz
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSpaceQuartzDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: sandstone0
+        - state: rock_quartz
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallSandstoneSalt
+  parent: NFWallSandstone
+  description: A dense ore vein rich with salt. Extremely hard.
+  suffix: Salt
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSaltDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: sandstone0
+        - state: rock_salt
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallSandstoneSilver
+  parent: NFWallSandstone
+  description: A dense ore vein rich with silver. Extremely hard.
+  suffix: Silver
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSilverDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: sandstone0
+        - state: rock_silver
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallSandstoneUranium
+  parent: NFWallSandstone
+  description: A dense ore vein rich with uranium. Extremely hard.
+  suffix: Uranium
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreUraniumDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: sandstone0
+        - state: rock_uranium
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallSandstoneArtifactFragment
+  parent: NFWallSandstone
+  description: Harder than hard. You'll need some special equipment to- what's that sticking out of it?
+  suffix: Artifact Fragment
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreArtifactFragment
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: sandstone0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: sandstone0
+        - state: rock_artifact_fragment
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+# endregion Sandstone Ores
+
+# region Sandstone Mobs
+- type: entity
+  id: NFWallSandstoneBananiumCrab
+  parent: NFWallSandstoneBananium
+  suffix: Bananium Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreBananiumCrabNF
+
+- type: entity
+  id: NFWallSandstoneCoalCrab
+  parent: NFWallSandstoneCoal
+  suffix: Coal Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreCoalCrabNF
+
+# - type: entity
+#   id: NFWallSandstoneDiamondCrab
+#   parent: NFWallSandstoneDiamond
+#   suffix: Diamond Crab
+#   components:
+#     - type: OreVein
+#       oreChance: 1.0
+#       currentOre: OreDiamondCrabNF
+
+- type: entity
+  id: NFWallSandstoneGoldCrab
+  parent: NFWallSandstoneGold
+  suffix: Gold Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreGoldCrabNF
+
+- type: entity
+  id: NFWallSandstoneTinCrab
+  parent: NFWallSandstoneTin
+  suffix: Iron Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreIronCrabNF
+
+- type: entity
+  id: NFWallSandstonePlasmaCrab
+  parent: NFWallSandstonePlasma
+  suffix: Plasma Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OrePlasmaCrabNF
+
+- type: entity
+  id: NFWallSandstoneQuartzCrab
+  parent: NFWallSandstoneQuartz
+  suffix: Quartz Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreQuartzCrabNF
+
+- type: entity
+  id: NFWallSandstoneSaltCrab
+  parent: NFWallSandstoneSalt
+  suffix: Salt Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSaltCrabNF
+
+- type: entity
+  id: NFWallSandstoneSilverCrab
+  parent: NFWallSandstoneSilver
+  suffix: Silver Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSilverCrabNF
+
+- type: entity
+  id: NFWallSandstoneUraniumCrab
+  parent: NFWallSandstoneUranium
+  suffix: Uranium Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreUraniumCrabNF
+
+- type: entity
+  id: NFWallSandstoneBananiumGolem
+  parent: NFWallSandstoneBananium
+  suffix: Bananium Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreBananiumGolem
+
+- type: entity
+  id: NFWallSandstoneCoalGolem
+  parent: NFWallSandstoneCoal
+  suffix: Coal Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreCoalGolem
+
+# - type: entity
+#   id: NFWallSandstoneDiamondGolem
+#   parent: NFWallSandstoneDiamond
+#   suffix: Diamond Golem
+#   components:
+#     - type: OreVein
+#       oreChance: 1.0
+#       currentOre: OreDiamondGolem
+
+- type: entity
+  id: NFWallSandstoneGoldGolem
+  parent: NFWallSandstoneGold
+  suffix: Gold Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreGoldGolem
+
+- type: entity
+  id: NFWallSandstoneIronGolem
+  parent: NFWallSandstoneTin
+  suffix: Iron Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreIronGolem
+
+- type: entity
+  id: NFWallSandstonePlasmaGolem
+  parent: NFWallSandstonePlasma
+  suffix: Plasma Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OrePlasmaGolem
+
+- type: entity
+  id: NFWallSandstoneQuartzGolem
+  parent: NFWallSandstoneQuartz
+  suffix: Quartz Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreQuartzGolem
+
+- type: entity
+  id: NFWallSandstoneSaltGolem
+  parent: NFWallSandstoneSalt
+  suffix: Salt Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSaltGolem
+
+- type: entity
+  id: NFWallSandstoneSilverGolem
+  parent: NFWallSandstoneSilver
+  suffix: Silver Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSilverGolem
+
+- type: entity
+  id: NFWallSandstoneUraniumGolem
+  parent: NFWallSandstoneUranium
+  suffix: Uranium Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreUraniumGolem
+# endregion Sandstone Mobs
+
+# region Necropolis Ores
+- type: entity
+  id: NFWallNecropolisBananium
+  parent: NFWallNecropolis
+  description: A dense ore vein rich with bananium. Extremely hard.
+  suffix: Bananium
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreBananium
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: necropolis0
+        - state: rock_bananium
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallNecropolisBluespace
+  parent: NFWallNecropolis
+  description: A dense ore vein rich with bluespace. Extremely hard.
+  suffix: Bluespace
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreBluespace
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: necropolis0
+        - state: rock_bluespace
+          sprite: _NF/Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallNecropolisCoal
+  parent: NFWallNecropolis
+  name: supercompacted coal
+  description: A dense ore vein rich with coal. Extremely hard.
+  suffix: Coal
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreCoalDense
+    - type: Sprite
+      layers: # Hack to get these layers set up
+        - map: [ "enum.CornerLayers.SE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: necropolis0
+        - state: rock_coal
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallNecropolisDiamond
+  parent: NFWallNecropolis
+  description: A dense ore vein rich with diamonds. Extremely hard.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreDiamondDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: necropolis0
+        - state: rock_diamond
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallNecropolisGold
+  parent: NFWallNecropolis
+  description: A dense ore vein rich with gold. Extremely hard.
+  suffix: Gold
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreGoldDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: necropolis0
+        - state: rock_gold
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallNecropolisTin
+  parent: NFWallNecropolis
+  description: An ore vein rich with iron.
+  suffix: Iron
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSteel
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: necropolis0
+        - state: rock_tin
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallNecropolisPlasma
+  parent: NFWallNecropolis
+  description: A dense ore vein rich with plasma. Extremely hard.
+  suffix: Plasma
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOrePlasmaDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: necropolis0
+        - state: rock_phoron
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallNecropolisQuartz
+  parent: NFWallNecropolis
+  description: A dense ore vein rich with quartz. Extremely hard.
+  suffix: Quartz
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSpaceQuartzDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: necropolis0
+        - state: rock_quartz
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallNecropolisSalt
+  parent: NFWallNecropolis
+  description: A dense ore vein rich with salt. Extremely hard.
+  suffix: Salt
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSaltDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: necropolis0
+        - state: rock_salt
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallNecropolisSilver
+  parent: NFWallNecropolis
+  description: A dense ore vein rich with silver. Extremely hard.
+  suffix: Silver
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSilverDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: necropolis0
+        - state: rock_silver
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallNecropolisUranium
+  parent: NFWallNecropolis
+  description: A dense ore vein rich with uranium. Extremely hard.
+  suffix: Uranium
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreUraniumDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: necropolis0
+        - state: rock_uranium
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallNecropolisArtifactFragment
+  parent: NFWallNecropolis
+  description: Harder than hard. You'll need some special equipment to- what's that sticking out of it?
+  suffix: Artifact Fragment
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreArtifactFragment
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: necropolis0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: necropolis0
+        - state: rock_artifact_fragment
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+# endregion Necropolis Ores
+
+# region Necropolis Mobs
+- type: entity
+  id: NFWallNecropolisBananiumCrab
+  parent: NFWallNecropolisBananium
+  suffix: Bananium Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreBananiumCrabNF
+
+- type: entity
+  id: NFWallNecropolisCoalCrab
+  parent: NFWallNecropolisCoal
+  suffix: Coal Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreCoalCrabNF
+
+# - type: entity
+#   id: NFWallNecropolisDiamondCrab
+#   parent: NFWallNecropolisDiamond
+#   suffix: Diamond Crab
+#   components:
+#     - type: OreVein
+#       oreChance: 1.0
+#       currentOre: OreDiamondCrabNF
+
+- type: entity
+  id: NFWallNecropolisGoldCrab
+  parent: NFWallNecropolisGold
+  suffix: Gold Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreGoldCrabNF
+
+- type: entity
+  id: NFWallNecropolisTinCrab
+  parent: NFWallNecropolisTin
+  suffix: Iron Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreIronCrabNF
+
+- type: entity
+  id: NFWallNecropolisPlasmaCrab
+  parent: NFWallNecropolisPlasma
+  suffix: Plasma Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OrePlasmaCrabNF
+
+- type: entity
+  id: NFWallNecropolisQuartzCrab
+  parent: NFWallNecropolisQuartz
+  suffix: Quartz Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreQuartzCrabNF
+
+- type: entity
+  id: NFWallNecropolisSaltCrab
+  parent: NFWallNecropolisSalt
+  suffix: Salt Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSaltCrabNF
+
+- type: entity
+  id: NFWallNecropolisSilverCrab
+  parent: NFWallNecropolisSilver
+  suffix: Silver Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSilverCrabNF
+
+- type: entity
+  id: NFWallNecropolisUraniumCrab
+  parent: NFWallNecropolisUranium
+  suffix: Uranium Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreUraniumCrabNF
+
+- type: entity
+  id: NFWallNecropolisBananiumGolem
+  parent: NFWallNecropolisBananium
+  suffix: Bananium Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreBananiumGolem
+
+- type: entity
+  id: NFWallNecropolisCoalGolem
+  parent: NFWallNecropolisCoal
+  suffix: Coal Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreCoalGolem
+
+# - type: entity
+#   id: NFWallNecropolisDiamondGolem
+#   parent: NFWallNecropolisDiamond
+#   suffix: Diamond Golem
+#   components:
+#     - type: OreVein
+#       oreChance: 1.0
+#       currentOre: OreDiamondGolem
+
+- type: entity
+  id: NFWallNecropolisGoldGolem
+  parent: NFWallNecropolisGold
+  suffix: Gold Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreGoldGolem
+
+- type: entity
+  id: NFWallNecropolisIronGolem
+  parent: NFWallNecropolisTin
+  suffix: Iron Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreIronGolem
+
+- type: entity
+  id: NFWallNecropolisPlasmaGolem
+  parent: NFWallNecropolisPlasma
+  suffix: Plasma Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OrePlasmaGolem
+
+- type: entity
+  id: NFWallNecropolisQuartzGolem
+  parent: NFWallNecropolisQuartz
+  suffix: Quartz Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreQuartzGolem
+
+- type: entity
+  id: NFWallNecropolisSaltGolem
+  parent: NFWallNecropolisSalt
+  suffix: Salt Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSaltGolem
+
+- type: entity
+  id: NFWallNecropolisSilverGolem
+  parent: NFWallNecropolisSilver
+  suffix: Silver Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSilverGolem
+
+- type: entity
+  id: NFWallNecropolisUraniumGolem
+  parent: NFWallNecropolisUranium
+  suffix: Uranium Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreUraniumGolem
+# endregion Necropolis Mobs
+
+# region BasaltCobblebrick Ores
+- type: entity
+  id: NFWallBasaltCobblebrickBananium
+  parent: NFWallBasaltCobblebrick
+  description: A dense ore vein rich with bananium. Extremely hard.
+  suffix: Bananium
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreBananium
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_bananium
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallBasaltCobblebrickBluespace
+  parent: NFWallBasaltCobblebrick
+  description: A dense ore vein rich with bluespace. Extremely hard.
+  suffix: Bluespace
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreBluespace
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_bluespace
+          sprite: _NF/Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallBasaltCobblebrickCoal
+  parent: NFWallBasaltCobblebrick
+  name: supercompacted coal
+  description: A dense ore vein rich with coal. Extremely hard.
+  suffix: Coal
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreCoalDense
+    - type: Sprite
+      layers: # Hack to get these layers set up
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_coal
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallBasaltCobblebrickDiamond
+  parent: NFWallBasaltCobblebrick
+  description: A dense ore vein rich with diamonds. Extremely hard.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreDiamondDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_diamond
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallBasaltCobblebrickGold
+  parent: NFWallBasaltCobblebrick
+  description: A dense ore vein rich with gold. Extremely hard.
+  suffix: Gold
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreGoldDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_gold
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallBasaltCobblebrickTin
+  parent: NFWallBasaltCobblebrick
+  description: An ore vein rich with iron.
+  suffix: Iron
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSteel
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_tin
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallBasaltCobblebrickPlasma
+  parent: NFWallBasaltCobblebrick
+  description: A dense ore vein rich with plasma. Extremely hard.
+  suffix: Plasma
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOrePlasmaDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_phoron
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallBasaltCobblebrickQuartz
+  parent: NFWallBasaltCobblebrick
+  description: A dense ore vein rich with quartz. Extremely hard.
+  suffix: Quartz
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSpaceQuartzDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_quartz
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallBasaltCobblebrickSalt
+  parent: NFWallBasaltCobblebrick
+  description: A dense ore vein rich with salt. Extremely hard.
+  suffix: Salt
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSaltDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_salt
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallBasaltCobblebrickSilver
+  parent: NFWallBasaltCobblebrick
+  description: A dense ore vein rich with silver. Extremely hard.
+  suffix: Silver
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSilverDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_silver
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallBasaltCobblebrickUranium
+  parent: NFWallBasaltCobblebrick
+  description: A dense ore vein rich with uranium. Extremely hard.
+  suffix: Uranium
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreUraniumDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_uranium
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallBasaltCobblebrickArtifactFragment
+  parent: NFWallBasaltCobblebrick
+  description: Harder than hard. You'll need some special equipment to- what's that sticking out of it?
+  suffix: Artifact Fragment
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreArtifactFragment
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_artifact_fragment
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+# endregion BasaltCobblebrick Ores
+
+# region BasaltCobblebrick Mobs
+- type: entity
+  id: NFWallBasaltCobblebrickBananiumCrab
+  parent: NFWallBasaltCobblebrickBananium
+  suffix: Bananium Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreBananiumCrabNF
+
+- type: entity
+  id: NFWallBasaltCobblebrickCoalCrab
+  parent: NFWallBasaltCobblebrickCoal
+  suffix: Coal Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreCoalCrabNF
+
+# - type: entity
+#   id: NFWallBasaltCobblebrickDiamondCrab
+#   parent: NFWallBasaltCobblebrickDiamond
+#   suffix: Diamond Crab
+#   components:
+#     - type: OreVein
+#       oreChance: 1.0
+#       currentOre: OreDiamondCrabNF
+
+- type: entity
+  id: NFWallBasaltCobblebrickGoldCrab
+  parent: NFWallBasaltCobblebrickGold
+  suffix: Gold Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreGoldCrabNF
+
+- type: entity
+  id: NFWallBasaltCobblebrickTinCrab
+  parent: NFWallBasaltCobblebrickTin
+  suffix: Iron Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreIronCrabNF
+
+- type: entity
+  id: NFWallBasaltCobblebrickPlasmaCrab
+  parent: NFWallBasaltCobblebrickPlasma
+  suffix: Plasma Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OrePlasmaCrabNF
+
+- type: entity
+  id: NFWallBasaltCobblebrickQuartzCrab
+  parent: NFWallBasaltCobblebrickQuartz
+  suffix: Quartz Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreQuartzCrabNF
+
+- type: entity
+  id: NFWallBasaltCobblebrickSaltCrab
+  parent: NFWallBasaltCobblebrickSalt
+  suffix: Salt Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSaltCrabNF
+
+- type: entity
+  id: NFWallBasaltCobblebrickSilverCrab
+  parent: NFWallBasaltCobblebrickSilver
+  suffix: Silver Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSilverCrabNF
+
+- type: entity
+  id: NFWallBasaltCobblebrickUraniumCrab
+  parent: NFWallBasaltCobblebrickUranium
+  suffix: Uranium Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreUraniumCrabNF
+
+- type: entity
+  id: NFWallBasaltCobblebrickBananiumGolem
+  parent: NFWallBasaltCobblebrickBananium
+  suffix: Bananium Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreBananiumGolem
+
+- type: entity
+  id: NFWallBasaltCobblebrickCoalGolem
+  parent: NFWallBasaltCobblebrickCoal
+  suffix: Coal Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreCoalGolem
+
+# - type: entity
+#   id: NFWallBasaltCobblebrickDiamondGolem
+#   parent: NFWallBasaltCobblebrickDiamond
+#   suffix: Diamond Golem
+#   components:
+#     - type: OreVein
+#       oreChance: 1.0
+#       currentOre: OreDiamondGolem
+
+- type: entity
+  id: NFWallBasaltCobblebrickGoldGolem
+  parent: NFWallBasaltCobblebrickGold
+  suffix: Gold Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreGoldGolem
+
+- type: entity
+  id: NFWallBasaltCobblebrickIronGolem
+  parent: NFWallBasaltCobblebrickTin
+  suffix: Iron Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreIronGolem
+
+- type: entity
+  id: NFWallBasaltCobblebrickPlasmaGolem
+  parent: NFWallBasaltCobblebrickPlasma
+  suffix: Plasma Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OrePlasmaGolem
+
+- type: entity
+  id: NFWallBasaltCobblebrickQuartzGolem
+  parent: NFWallBasaltCobblebrickQuartz
+  suffix: Quartz Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreQuartzGolem
+
+- type: entity
+  id: NFWallBasaltCobblebrickSaltGolem
+  parent: NFWallBasaltCobblebrickSalt
+  suffix: Salt Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSaltGolem
+
+- type: entity
+  id: NFWallBasaltCobblebrickSilverGolem
+  parent: NFWallBasaltCobblebrickSilver
+  suffix: Silver Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSilverGolem
+
+- type: entity
+  id: NFWallBasaltCobblebrickUraniumGolem
+  parent: NFWallBasaltCobblebrickUranium
+  suffix: Uranium Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreUraniumGolem
+# endregion BasaltCobblebrick Mobs
+
+# region ChromiteCobblebrick Ores
+- type: entity
+  id: NFWallChromiteCobblebrickBananium
+  parent: NFWallChromiteCobblebrick
+  description: A dense ore vein rich with bananium. Extremely hard.
+  suffix: Bananium
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreBananium
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_bananium
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallChromiteCobblebrickBluespace
+  parent: NFWallChromiteCobblebrick
+  description: A dense ore vein rich with bluespace. Extremely hard.
+  suffix: Bluespace
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreBluespace
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_bluespace
+          sprite: _NF/Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallChromiteCobblebrickCoal
+  parent: NFWallChromiteCobblebrick
+  name: supercompacted coal
+  description: A dense ore vein rich with coal. Extremely hard.
+  suffix: Coal
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreCoalDense
+    - type: Sprite
+      layers: # Hack to get these layers set up
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_coal
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallChromiteCobblebrickDiamond
+  parent: NFWallChromiteCobblebrick
+  description: A dense ore vein rich with diamonds. Extremely hard.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreDiamondDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_diamond
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallChromiteCobblebrickGold
+  parent: NFWallChromiteCobblebrick
+  description: A dense ore vein rich with gold. Extremely hard.
+  suffix: Gold
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreGoldDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_gold
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallChromiteCobblebrickTin
+  parent: NFWallChromiteCobblebrick
+  description: An ore vein rich with iron.
+  suffix: Iron
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSteel
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_tin
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallChromiteCobblebrickPlasma
+  parent: NFWallChromiteCobblebrick
+  description: A dense ore vein rich with plasma. Extremely hard.
+  suffix: Plasma
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOrePlasmaDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_phoron
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallChromiteCobblebrickQuartz
+  parent: NFWallChromiteCobblebrick
+  description: A dense ore vein rich with quartz. Extremely hard.
+  suffix: Quartz
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSpaceQuartzDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_quartz
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallChromiteCobblebrickSalt
+  parent: NFWallChromiteCobblebrick
+  description: A dense ore vein rich with salt. Extremely hard.
+  suffix: Salt
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSaltDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_salt
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallChromiteCobblebrickSilver
+  parent: NFWallChromiteCobblebrick
+  description: A dense ore vein rich with silver. Extremely hard.
+  suffix: Silver
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSilverDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_silver
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallChromiteCobblebrickUranium
+  parent: NFWallChromiteCobblebrick
+  description: A dense ore vein rich with uranium. Extremely hard.
+  suffix: Uranium
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreUraniumDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_uranium
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallChromiteCobblebrickArtifactFragment
+  parent: NFWallChromiteCobblebrick
+  description: Harder than hard. You'll need some special equipment to- what's that sticking out of it?
+  suffix: Artifact Fragment
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreArtifactFragment
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_artifact_fragment
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+# endregion ChromiteCobblebrick Ores
+
+# region ChromiteCobblebrick Mobs
+- type: entity
+  id: NFWallChromiteCobblebrickBananiumCrab
+  parent: NFWallChromiteCobblebrickBananium
+  suffix: Bananium Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreBananiumCrabNF
+
+- type: entity
+  id: NFWallChromiteCobblebrickCoalCrab
+  parent: NFWallChromiteCobblebrickCoal
+  suffix: Coal Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreCoalCrabNF
+
+# - type: entity
+#   id: NFWallChromiteCobblebrickDiamondCrab
+#   parent: NFWallChromiteCobblebrickDiamond
+#   suffix: Diamond Crab
+#   components:
+#     - type: OreVein
+#       oreChance: 1.0
+#       currentOre: OreDiamondCrabNF
+
+- type: entity
+  id: NFWallChromiteCobblebrickGoldCrab
+  parent: NFWallChromiteCobblebrickGold
+  suffix: Gold Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreGoldCrabNF
+
+- type: entity
+  id: NFWallChromiteCobblebrickTinCrab
+  parent: NFWallChromiteCobblebrickTin
+  suffix: Iron Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreIronCrabNF
+
+- type: entity
+  id: NFWallChromiteCobblebrickPlasmaCrab
+  parent: NFWallChromiteCobblebrickPlasma
+  suffix: Plasma Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OrePlasmaCrabNF
+
+- type: entity
+  id: NFWallChromiteCobblebrickQuartzCrab
+  parent: NFWallChromiteCobblebrickQuartz
+  suffix: Quartz Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreQuartzCrabNF
+
+- type: entity
+  id: NFWallChromiteCobblebrickSaltCrab
+  parent: NFWallChromiteCobblebrickSalt
+  suffix: Salt Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSaltCrabNF
+
+- type: entity
+  id: NFWallChromiteCobblebrickSilverCrab
+  parent: NFWallChromiteCobblebrickSilver
+  suffix: Silver Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSilverCrabNF
+
+- type: entity
+  id: NFWallChromiteCobblebrickUraniumCrab
+  parent: NFWallChromiteCobblebrickUranium
+  suffix: Uranium Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreUraniumCrabNF
+
+- type: entity
+  id: NFWallChromiteCobblebrickBananiumGolem
+  parent: NFWallChromiteCobblebrickBananium
+  suffix: Bananium Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreBananiumGolem
+
+- type: entity
+  id: NFWallChromiteCobblebrickCoalGolem
+  parent: NFWallChromiteCobblebrickCoal
+  suffix: Coal Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreCoalGolem
+
+# - type: entity
+#   id: NFWallChromiteCobblebrickDiamondGolem
+#   parent: NFWallChromiteCobblebrickDiamond
+#   suffix: Diamond Golem
+#   components:
+#     - type: OreVein
+#       oreChance: 1.0
+#       currentOre: OreDiamondGolem
+
+- type: entity
+  id: NFWallChromiteCobblebrickGoldGolem
+  parent: NFWallChromiteCobblebrickGold
+  suffix: Gold Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreGoldGolem
+
+- type: entity
+  id: NFWallChromiteCobblebrickIronGolem
+  parent: NFWallChromiteCobblebrickTin
+  suffix: Iron Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreIronGolem
+
+- type: entity
+  id: NFWallChromiteCobblebrickPlasmaGolem
+  parent: NFWallChromiteCobblebrickPlasma
+  suffix: Plasma Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OrePlasmaGolem
+
+- type: entity
+  id: NFWallChromiteCobblebrickQuartzGolem
+  parent: NFWallChromiteCobblebrickQuartz
+  suffix: Quartz Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreQuartzGolem
+
+- type: entity
+  id: NFWallChromiteCobblebrickSaltGolem
+  parent: NFWallChromiteCobblebrickSalt
+  suffix: Salt Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSaltGolem
+
+- type: entity
+  id: NFWallChromiteCobblebrickSilverGolem
+  parent: NFWallChromiteCobblebrickSilver
+  suffix: Silver Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSilverGolem
+
+- type: entity
+  id: NFWallChromiteCobblebrickUraniumGolem
+  parent: NFWallChromiteCobblebrickUranium
+  suffix: Uranium Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreUraniumGolem
+# endregion ChromiteCobblebrick Mobs
+
+# region AndesiteCobblebrick Ores
+- type: entity
+  id: NFWallAndesiteCobblebrickBananium
+  parent: NFWallAndesiteCobblebrick
+  description: A dense ore vein rich with bananium. Extremely hard.
+  suffix: Bananium
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreBananium
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_bananium
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallAndesiteCobblebrickBluespace
+  parent: NFWallAndesiteCobblebrick
+  description: A dense ore vein rich with bluespace. Extremely hard.
+  suffix: Bluespace
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreBluespace
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_bluespace
+          sprite: _NF/Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallAndesiteCobblebrickCoal
+  parent: NFWallAndesiteCobblebrick
+  name: supercompacted coal
+  description: A dense ore vein rich with coal. Extremely hard.
+  suffix: Coal
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreCoalDense
+    - type: Sprite
+      layers: # Hack to get these layers set up
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_coal
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallAndesiteCobblebrickDiamond
+  parent: NFWallAndesiteCobblebrick
+  description: A dense ore vein rich with diamonds. Extremely hard.
+  suffix: Diamond
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreDiamondDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_diamond
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallAndesiteCobblebrickGold
+  parent: NFWallAndesiteCobblebrick
+  description: A dense ore vein rich with gold. Extremely hard.
+  suffix: Gold
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreGoldDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_gold
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallAndesiteCobblebrickTin
+  parent: NFWallAndesiteCobblebrick
+  description: An ore vein rich with iron.
+  suffix: Iron
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSteel
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_tin
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallAndesiteCobblebrickPlasma
+  parent: NFWallAndesiteCobblebrick
+  description: A dense ore vein rich with plasma. Extremely hard.
+  suffix: Plasma
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOrePlasmaDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_phoron
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallAndesiteCobblebrickQuartz
+  parent: NFWallAndesiteCobblebrick
+  description: A dense ore vein rich with quartz. Extremely hard.
+  suffix: Quartz
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSpaceQuartzDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_quartz
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallAndesiteCobblebrickSalt
+  parent: NFWallAndesiteCobblebrick
+  description: A dense ore vein rich with salt. Extremely hard.
+  suffix: Salt
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSaltDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_salt
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallAndesiteCobblebrickSilver
+  parent: NFWallAndesiteCobblebrick
+  description: A dense ore vein rich with silver. Extremely hard.
+  suffix: Silver
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreSilverDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_silver
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallAndesiteCobblebrickUranium
+  parent: NFWallAndesiteCobblebrick
+  description: A dense ore vein rich with uranium. Extremely hard.
+  suffix: Uranium
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: NFOreUraniumDense
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_uranium
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+
+- type: entity
+  id: NFWallAndesiteCobblebrickArtifactFragment
+  parent: NFWallAndesiteCobblebrick
+  description: Harder than hard. You'll need some special equipment to- what's that sticking out of it?
+  suffix: Artifact Fragment
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreArtifactFragment
+    - type: Sprite
+      layers:
+        - map: [ "enum.CornerLayers.SE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.SW" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NE" ]
+          state: cobblebrick0
+        - map: [ "enum.CornerLayers.NW" ]
+          state: cobblebrick0
+        - state: rock_artifact_fragment
+          sprite: Structures/Walls/rock.rsi
+          map: [ "enum.MiningScannerVisualLayers.Overlay" ]
+# endregion AndesiteCobblebrick Ores
+
+# region AndesiteCobblebrick Mobs
+- type: entity
+  id: NFWallAndesiteCobblebrickBananiumCrab
+  parent: NFWallAndesiteCobblebrickBananium
+  suffix: Bananium Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreBananiumCrabNF
+
+- type: entity
+  id: NFWallAndesiteCobblebrickCoalCrab
+  parent: NFWallAndesiteCobblebrickCoal
+  suffix: Coal Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreCoalCrabNF
+
+# - type: entity
+#   id: NFWallAndesiteCobblebrickDiamondCrab
+#   parent: NFWallAndesiteCobblebrickDiamond
+#   suffix: Diamond Crab
+#   components:
+#     - type: OreVein
+#       oreChance: 1.0
+#       currentOre: OreDiamondCrabNF
+
+- type: entity
+  id: NFWallAndesiteCobblebrickGoldCrab
+  parent: NFWallAndesiteCobblebrickGold
+  suffix: Gold Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreGoldCrabNF
+
+- type: entity
+  id: NFWallAndesiteCobblebrickTinCrab
+  parent: NFWallAndesiteCobblebrickTin
+  suffix: Iron Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreIronCrabNF
+
+- type: entity
+  id: NFWallAndesiteCobblebrickPlasmaCrab
+  parent: NFWallAndesiteCobblebrickPlasma
+  suffix: Plasma Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OrePlasmaCrabNF
+
+- type: entity
+  id: NFWallAndesiteCobblebrickQuartzCrab
+  parent: NFWallAndesiteCobblebrickQuartz
+  suffix: Quartz Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreQuartzCrabNF
+
+- type: entity
+  id: NFWallAndesiteCobblebrickSaltCrab
+  parent: NFWallAndesiteCobblebrickSalt
+  suffix: Salt Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSaltCrabNF
+
+- type: entity
+  id: NFWallAndesiteCobblebrickSilverCrab
+  parent: NFWallAndesiteCobblebrickSilver
+  suffix: Silver Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSilverCrabNF
+
+- type: entity
+  id: NFWallAndesiteCobblebrickUraniumCrab
+  parent: NFWallAndesiteCobblebrickUranium
+  suffix: Uranium Crab
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreUraniumCrabNF
+
+- type: entity
+  id: NFWallAndesiteCobblebrickBananiumGolem
+  parent: NFWallAndesiteCobblebrickBananium
+  suffix: Bananium Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreBananiumGolem
+
+- type: entity
+  id: NFWallAndesiteCobblebrickCoalGolem
+  parent: NFWallAndesiteCobblebrickCoal
+  suffix: Coal Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreCoalGolem
+
+# - type: entity
+#   id: NFWallAndesiteCobblebrickDiamondGolem
+#   parent: NFWallAndesiteCobblebrickDiamond
+#   suffix: Diamond Golem
+#   components:
+#     - type: OreVein
+#       oreChance: 1.0
+#       currentOre: OreDiamondGolem
+
+- type: entity
+  id: NFWallAndesiteCobblebrickGoldGolem
+  parent: NFWallAndesiteCobblebrickGold
+  suffix: Gold Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreGoldGolem
+
+- type: entity
+  id: NFWallAndesiteCobblebrickIronGolem
+  parent: NFWallAndesiteCobblebrickTin
+  suffix: Iron Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreIronGolem
+
+- type: entity
+  id: NFWallAndesiteCobblebrickPlasmaGolem
+  parent: NFWallAndesiteCobblebrickPlasma
+  suffix: Plasma Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OrePlasmaGolem
+
+- type: entity
+  id: NFWallAndesiteCobblebrickQuartzGolem
+  parent: NFWallAndesiteCobblebrickQuartz
+  suffix: Quartz Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreQuartzGolem
+
+- type: entity
+  id: NFWallAndesiteCobblebrickSaltGolem
+  parent: NFWallAndesiteCobblebrickSalt
+  suffix: Salt Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSaltGolem
+
+- type: entity
+  id: NFWallAndesiteCobblebrickSilverGolem
+  parent: NFWallAndesiteCobblebrickSilver
+  suffix: Silver Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreSilverGolem
+
+- type: entity
+  id: NFWallAndesiteCobblebrickUraniumGolem
+  parent: NFWallAndesiteCobblebrickUranium
+  suffix: Uranium Golem
+  components:
+    - type: OreVein
+      oreChance: 1.0
+      currentOre: OreUraniumGolem
+# endregion AndesiteCobblebrick Mobs
diff --git a/Resources/Prototypes/_NF/Entities/World/Debris/asteroids.yml b/Resources/Prototypes/_NF/Entities/World/Debris/asteroids.yml
index 770d75e5184..8eba81938ea 100644
--- a/Resources/Prototypes/_NF/Entities/World/Debris/asteroids.yml
+++ b/Resources/Prototypes/_NF/Entities/World/Debris/asteroids.yml
@@ -1,4 +1,5 @@
 # Asteroid types & loot tables
+# region Asteroid Table
 - type: entity
   id: NFBaseAsteroidDebris
   parent: NFBaseDebris
@@ -12,56 +13,22 @@
     - type: SimpleFloorPlanPopulator
       entries:
         FloorAsteroidSand:
-          - id: WallRock
-            prob: 0.4
+          - id: NFRockMineralSoft
             orGroup: rock
-          - id: WallRockCoal
-            prob: 0.1
+            prob: 1.025
+          - id: NFRockMineralHard
             orGroup: rock
-          - id: WallRockTin
-            prob: 0.16
-            orGroup: rock
-          - id: WallRockQuartz
-            prob: 0.06
-            orGroup: rock
-          - id: WallRockSalt
-            prob: 0.06
-            orGroup: rock
-          - id: WallRockGold
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockSilver
-            prob: 0.04
-            orGroup: rock
-          - id: WallRockPlasma
-            prob: 0.07
-            orGroup: rock
-          - id: WallRockUranium
-            prob: 0.04
-            orGroup: rock
-          - id: WallRockBananium
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockArtifactFragment
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockDiamond
-            prob: 0.002
-            orGroup: rock
-          - id: WallRockBluespace
-            prob: 0.003
-            orGroup: rock
-          - id: RockElementalSpawner
-            prob: 0.06
-            orGroup: rock
-          - id: WallCobblebrickNF
-            prob: 0.06
+            prob: 0.1223
+          # Room
+          - id: NFAsteroidRoomMarker
             orGroup: rock
+            prob: 0.0002
     - type: IFF
       flags: HideLabel
       color: "#d67e27"
+# endregion Asteroid Table
 
-# Snow
+# region Snow Table
 - type: entity
   id: NFBaseAsteroidIceDebris
   parent: NFBaseAsteroidDebris
@@ -73,55 +40,21 @@
     - type: SimpleFloorPlanPopulator
       entries:
         FloorIce:
-          - id: WallRockSnow
-            prob: 0.5
-            orGroup: rock
-          - id: WallRockSnowCoal
-            prob: 0.02
-            orGroup: rock
-          - id: WallRockSnowTin
-            prob: 0.04
+          - id: NFIceMineralSoft
             orGroup: rock
-          - id: WallRockSnowQuartz
-            prob: 0.01
+            prob: 0.807
+          - id: NFIceMineralHard
             orGroup: rock
-          - id: WallRockSnowSalt
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockSnowGold
-            prob: 0.02
-            orGroup: rock
-          - id: WallRockSnowSilver
-            prob: 0.02
-            orGroup: rock
-          - id: WallRockSnowPlasma
-            prob: 0.05
-            orGroup: rock
-          - id: WallRockSnowUranium
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockSnowBananium
-            prob: 0.005
-            orGroup: rock
-          - id: WallRockSnowArtifactFragment
-            prob: 0.04
-            orGroup: rock
-          - id: WallRockSnowDiamond
-            prob: 0.002
-            orGroup: rock
-          - id: WallRockSnowBluespace
-            prob: 0.01
-            orGroup: rock
-          - id: SnowElementalSpawner
-            prob: 0.07
-            orGroup: rock
-          - id: WallIceNF
-            prob: 0.1
+            prob: 0.1305
+          # Room
+          - id: NFSnowRoomMarker
             orGroup: rock
+            prob: 0.0002
     - type: IFF
       color: "#d6fffc"
+# endregion Snow Table
 
-# Andesite
+# region Andesite Table
 - type: entity
   id: NFBaseAsteroidAndesiteDebris
   parent: NFBaseAsteroidDebris
@@ -133,55 +66,21 @@
     - type: SimpleFloorPlanPopulator
       entries:
         FloorCaveDrought:
-          - id: WallRockAndesite
-            prob: 0.6
-            orGroup: rock
-          - id: WallRockAndesiteCoal
-            prob: 0.04
-            orGroup: rock
-          - id: WallRockAndesiteTin
-            prob: 0.08
+          - id: NFAndesiteMineralSoft
             orGroup: rock
-          - id: WallRockAndesiteQuartz
-            prob: 0.05
-            orGroup: rock
-          - id: WallRockAndesiteSalt
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockAndesiteGold
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockAndesiteSilver
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockAndesitePlasma
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockAndesiteUranium
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockAndesiteBananium
-            prob: 0.005
+            prob: 0.929
+          - id: NFAndesiteMineralHard
             orGroup: rock
-          - id: WallRockAndesiteArtifactFragment
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockAndesiteDiamond
-            prob: 0.012
-            orGroup: rock
-          - id: WallRockAndesiteBluespace
-            prob: 0.002
-            orGroup: rock
-          - id: AndesiteElementalSpawner
-            prob: 0.08
-            orGroup: rock
-          - id: WallAndesiteCobblebrickNF
-            prob: 0.1
+            prob: 0.1317
+          # Room
+          - id: NFAndesiteRoomMarker
             orGroup: rock
+            prob: 0.0003
     - type: IFF
       color: "#95c280"
+# endregion Andesite Table
 
-# Basalt
+# region Basalt Table
 - type: entity
   id: NFBaseAsteroidBasaltDebris
   parent: NFBaseAsteroidDebris
@@ -193,55 +92,21 @@
     - type: SimpleFloorPlanPopulator
       entries:
         FloorBasalt:
-          - id: WallRockBasalt
-            prob: 0.55
-            orGroup: rock
-          - id: WallRockBasaltCoal
-            prob: 0.02
-            orGroup: rock
-          - id: WallRockBasaltTin
-            prob: 0.05
+          - id: NFBasaltMineralSoft
             orGroup: rock
-          - id: WallRockBasaltQuartz
-            prob: 0.01
+            prob: 0.905
+          - id: NFBasaltMineralHard
             orGroup: rock
-          - id: WallRockBasaltSalt
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockBasaltGold
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockBasaltSilver
-            prob: 0.03
-            orGroup: rock
-          - id: WallRockBasaltPlasma
-            prob: 0.1
-            orGroup: rock
-          - id: WallRockBasaltUranium
-            prob: 0.05
-            orGroup: rock
-          - id: WallRockBasaltBananium
-            prob: 0.005
-            orGroup: rock
-          - id: WallRockBasaltArtifactFragment
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockBasaltDiamond
-            prob: 0.005
-            orGroup: rock
-          - id: WallRockBasaltBluespace
-            prob: 0.005
-            orGroup: rock
-          - id: BasaltElementalSpawner
-            prob: 0.05
-            orGroup: rock
-          - id: WallBasaltCobblebrickNF
-            prob: 0.08
+            prob: 0.115
+          # Room
+          - id: NFBasaltRoomMarker
             orGroup: rock
+            prob: 0.0002
     - type: IFF
       color: "#b5b5b5"
+# endregion Basalt Table
 
-# Sand
+# region Sand Table
 - type: entity
   id: NFBaseAsteroidSandDebris
   parent: NFBaseAsteroidDebris
@@ -253,55 +118,21 @@
     - type: SimpleFloorPlanPopulator
       entries:
         FloorLowDesert:
-          - id: WallRockSand
-            prob: 0.5
-            orGroup: rock
-          - id: WallRockSandCoal
-            prob: 0.01
+          - id: NFSandMineralSoft
             orGroup: rock
-          - id: WallRockSandTin
-            prob: 0.015
+            prob: 0.899
+          - id: NFSandMineralHard
             orGroup: rock
-          - id: WallRockSandQuartz
-            prob: 0.12
-            orGroup: rock
-          - id: WallRockSandSalt
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockSandSilver
-            prob: 0.08
-            orGroup: rock
-          - id: WallRockSandGold
-            prob: 0.07
-            orGroup: rock
-          - id: WallRockSandPlasma
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockSandUranium
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockSandBananium
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockSandArtifactFragment
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockSandDiamond
-            prob: 0.002
-            orGroup: rock
-          - id: WallRockSandBluespace
-            prob: 0.002
-            orGroup: rock
-          - id: SandElementalSpawner
-            prob: 0.05
-            orGroup: rock
-          - id: WallSandstoneNF
-            prob: 0.08
+            prob: 0.1227
+          # Room
+          - id: NFSandRoomMarker
             orGroup: rock
+            prob: 0.0002
     - type: IFF
       color: "#cad17b"
+# endregion Sand Table
 
-# Chromite
+# region Chromite Table
 - type: entity
   id: NFBaseAsteroidChromiteDebris
   parent: NFBaseAsteroidDebris
@@ -313,55 +144,21 @@
     - type: SimpleFloorPlanPopulator
       entries:
         FloorChromite:
-          - id: WallRockChromite
-            prob: 0.5
-            orGroup: rock
-          - id: WallRockChromiteCoal
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockChromiteTin
-            prob: 0.03
+          - id: NFChromiteMineralSoft
             orGroup: rock
-          - id: WallRockChromiteQuartz
-            prob: 0.01
+            prob: 0.8225
+          - id: NFChromiteMineralHard
             orGroup: rock
-          - id: WallRockChromiteSalt
-            prob: 0.04
-            orGroup: rock
-          - id: WallRockChromiteGold
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockChromiteSilver
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockChromitePlasma
-            prob: 0.04
-            orGroup: rock
-          - id: WallRockChromiteUranium
-            prob: 0.09
-            orGroup: rock
-          - id: WallRockChromiteBananium
-            prob: 0.015
-            orGroup: rock
-          - id: WallRockChromiteArtifactFragment
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockChromiteDiamond
-            prob: 0.005
-            orGroup: rock
-          - id: WallRockChromiteBluespace
-            prob: 0.0025
-            orGroup: rock
-          - id: ChromiteElementalSpawner
-            prob: 0.05
-            orGroup: rock
-          - id: WallChromiteCobblebrickNF
-            prob: 0.08
+            prob: 0.11175
+          # Room
+          - id: NFChromiteRoomMarker
             orGroup: rock
+            prob: 0.0002
     - type: IFF
       color: "#8178cc"
+# endregion Chromite Table
 
-# Asteroid Asteroid Debris, because yes, base asteroid is made NOT from asteroid
+# region AsteroidRock Table
 - type: entity
   id: NFBaseAsteroidRockDebris
   parent: NFBaseAsteroidDebris
@@ -373,55 +170,21 @@
     - type: SimpleFloorPlanPopulator
       entries:
         FloorAsteroidSand:
-          - id: AsteroidRock
-            prob: 0.7
-            orGroup: rock
-          - id: AsteroidRockCoal
-            prob: 0.04
-            orGroup: rock
-          - id: AsteroidRockTin
-            prob: 0.06
+          - id: NFAsteroidMineralSoft
             orGroup: rock
-          - id: AsteroidRockQuartz
-            prob: 0.1
+            prob: 1.392
+          - id: NFAsteroidMineralHard
             orGroup: rock
-          - id: AsteroidRockSalt
-            prob: 0.15
-            orGroup: rock
-          - id: AsteroidRockGold
-            prob: 0.06
-            orGroup: rock
-          - id: AsteroidRockSilver
-            prob: 0.03
-            orGroup: rock
-          - id: AsteroidRockPlasma
-            prob: 0.07
-            orGroup: rock
-          - id: AsteroidRockUranium
-            prob: 0.04
-            orGroup: rock
-          - id: AsteroidRockBananium
-            prob: 0.04
-            orGroup: rock
-          - id: AsteroidRockArtifactFragment
-            prob: 0.01
-            orGroup: rock
-          - id: AsteroidRockBluespace
-            prob: 0.002
-            orGroup: rock
-          - id: AsteroidRockDiamond
-            prob: 0.01
-            orGroup: rock
-          - id: AsteroidRockElementalSpawner
-            prob: 0.08
-            orGroup: rock
-          - id: WallNecropolisNF
-            prob: 0.1
+            prob: 0.1682
+          # Room
+          - id: NFAsteroidRockRoomMarker
             orGroup: rock
+            prob: 0.0002
     - type: IFF
       color: "#BF8C5C"
+# endregion AsteroidRock Table
 
-# Scrap
+# region Scrap Table
 - type: entity
   id: NFBaseAsteroidScrapDebris
   parent: NFBaseAsteroidDebris
@@ -433,55 +196,17 @@
     - type: SimpleFloorPlanPopulator
       entries:
         Lattice:
-          - id: WallRockScrapPile
-            prob: 0.5
-            orGroup: rock
-          - id: WallRockScrapPileCoal
-            prob: 0.02
-            orGroup: rock
-          - id: WallRockScrapPileIron
-            prob: 0.04
-            orGroup: rock
-          - id: WallRockScrapPileQuartz
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockScrapPileSalt
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockScrapPileGold
-            prob: 0.02
-            orGroup: rock
-          - id: WallRockScrapPileSilver
-            prob: 0.02
-            orGroup: rock
-          - id: WallRockScrapPilePlasma
-            prob: 0.05
-            orGroup: rock
-          - id: WallRockScrapPileUranium
-            prob: 0.01
-            orGroup: rock
-          - id: WallRockScrapPileBananium
-            prob: 0.005
-            orGroup: rock
-          - id: WallRockScrapPileArtifactFragment
-            prob: 0.02
-            orGroup: rock
-          - id: WallRockScrapPileDiamond
-            prob: 0.002
-            orGroup: rock
-          - id: WallRockScrapPileBluespace
-            prob: 0.003
-            orGroup: rock
-          - id: AsteroidScrapBotWallSpawner
-            prob: 0.06
+          - id: NFScrapMineralSoft
             orGroup: rock
+            prob: 0.77
           - id: WallSolidRust
-            prob: 0.05
             orGroup: rock
+            prob: 0.05
     - type: IFF
       color: "#fcdec7"
+# endregion Scrap Table
 
-# Concrete asteroids (Base type)
+# region Asteroid Entities
 - type: entity
   id: NFAsteroidDebrisSmall
   parent: NFBaseAsteroidDebris
@@ -601,8 +326,9 @@
     - type: BlobFloorPlanBuilder
       floorPlacements: 324
       radius: 28
+# endregion Asteroid Entities
 
-# Ice asteroids
+# region Ice Entities
 - type: entity
   id: NFAsteroidIceDebrisSmall
   parent: [NFBaseAsteroidIceDebris, NFAsteroidDebrisSmall]
@@ -662,8 +388,9 @@
   id: NFAsteroidIceDebrisExtraGigantic
   parent: [NFBaseAsteroidIceDebris, NFAsteroidDebrisExtraGigantic]
   categories: [ HideSpawnMenu ]
+# endregion Ice Entities
 
-# Andesite asteroids
+# region Andesite Entities
 - type: entity
   id: NFAsteroidAndesiteDebrisSmall
   parent: [NFBaseAsteroidAndesiteDebris, NFAsteroidDebrisSmall]
@@ -723,8 +450,9 @@
   id: NFAsteroidAndesiteDebrisExtraGigantic
   parent: [NFBaseAsteroidAndesiteDebris, NFAsteroidDebrisExtraGigantic]
   categories: [ HideSpawnMenu ]
+# endregion Andesite Entities
 
-# Basalt asteroids
+# region Basalt Entities
 - type: entity
   id: NFAsteroidBasaltDebrisSmall
   parent: [NFBaseAsteroidBasaltDebris, NFAsteroidDebrisSmall]
@@ -784,8 +512,9 @@
   id: NFAsteroidBasaltDebrisExtraGigantic
   parent: [NFBaseAsteroidBasaltDebris, NFAsteroidDebrisExtraGigantic]
   categories: [ HideSpawnMenu ]
+# endregion Basalt Entities
 
-# Sand asteroids
+# region Sand Entities
 - type: entity
   id: NFAsteroidSandDebrisSmall
   parent: [NFBaseAsteroidSandDebris, NFAsteroidDebrisSmall]
@@ -845,8 +574,9 @@
   id: NFAsteroidSandDebrisExtraGigantic
   parent: [NFBaseAsteroidSandDebris, NFAsteroidDebrisExtraGigantic]
   categories: [ HideSpawnMenu ]
+# endregion Sand Entities
 
-# Chromite asteroids
+# region Chromite Entities
 - type: entity
   id: NFAsteroidChromiteDebrisSmall
   parent: [NFBaseAsteroidChromiteDebris, NFAsteroidDebrisSmall]
@@ -906,8 +636,9 @@
   id: NFAsteroidChromiteDebrisExtraGigantic
   parent: [NFBaseAsteroidChromiteDebris, NFAsteroidDebrisExtraGigantic]
   categories: [ HideSpawnMenu ]
+# endregion Chromite Entities
 
-# Rock asteroids
+# region AsteroidRock Entities
 - type: entity
   id: NFAsteroidRockDebrisSmall
   parent: [NFBaseAsteroidRockDebris, NFAsteroidDebrisSmall]
@@ -967,8 +698,9 @@
   id: NFAsteroidRockDebrisExtraGigantic
   parent: [NFBaseAsteroidRockDebris, NFAsteroidDebrisExtraGigantic]
   categories: [ HideSpawnMenu ]
+# endregion AsteroidRock Entities
 
-# Scrap asteroids
+# region Scrap Entities
 - type: entity
   id: NFAsteroidScrapDebrisSmall
   parent: [NFBaseAsteroidScrapDebris, NFAsteroidDebrisSmall]
@@ -1028,3 +760,4 @@
   id: NFAsteroidScrapDebrisExtraGigantic
   parent: [NFBaseAsteroidScrapDebris, NFAsteroidDebrisExtraGigantic]
   categories: [ HideSpawnMenu ]
+# endregion Scrap Entities
diff --git a/Resources/Prototypes/_NF/Entities/World/Debris/wrecks.yml b/Resources/Prototypes/_NF/Entities/World/Debris/wrecks.yml
index 5633ac69a75..349862552d2 100644
--- a/Resources/Prototypes/_NF/Entities/World/Debris/wrecks.yml
+++ b/Resources/Prototypes/_NF/Entities/World/Debris/wrecks.yml
@@ -56,12 +56,18 @@
         # Big loot
         - id: NFSalvageMaterialCrateSpawner
           prob: 0.9
+        - id: NFSalvageChemicalBarrelSpawner
+          prob: 0.08
+        - id: NFSalvageServiceBarrelSpawner
+          prob: 0.02
+        - id: NFSalvageDrinkableBarrelSpawner
+          prob: 0.02
+        - id: NFSalvageEmptyBarrelSpawner
+          prob: 0.03
         - id: SalvageCanisterSpawner
           prob: 0.2
         - id: SalvageLockerSpawner
           prob: 0.2
-        - id: SalvageTankSpawner
-          prob: 0.15
         - id: SalvageGeneratorSpawner
           prob: 0.1
         - id: SalvageFurnitureSpawner
@@ -70,6 +76,8 @@
           prob: 0.1
         - id: RandomArtifactSpawner
           prob: 0.05
+        - id: SalvageTankSpawnerHighCapacity
+          prob: 0.0005
         # Medical
         - id: MedicalPodFilled # Medical bounties
           prob: 0.03
diff --git a/Resources/Prototypes/_NF/Events/nf_bluespace_grids_events.yml b/Resources/Prototypes/_NF/Events/nf_bluespace_grids_events.yml
index a618212d320..9ff65d1e4bf 100644
--- a/Resources/Prototypes/_NF/Events/nf_bluespace_grids_events.yml
+++ b/Resources/Prototypes/_NF/Events/nf_bluespace_grids_events.yml
@@ -31,6 +31,7 @@
         - type: Shuttle
           angularDamping: 999999
           linearDamping: 999999
+        - type: LinkedLifecycleGridParent
         paths:
         - /Maps/_NF/Bluespace/cache.yml
     rewardAccounts:
@@ -69,6 +70,7 @@
         - type: Shuttle
           angularDamping: 999999
           linearDamping: 999999
+        - type: LinkedLifecycleGridParent
         paths:
         - /Maps/_NF/Bluespace/vault.yml
     rewardAccounts:
@@ -108,6 +110,7 @@
         - type: Shuttle
           angularDamping: 999999
           linearDamping: 999999
+        - type: LinkedLifecycleGridParent
         paths:
         - /Maps/_NF/Bluespace/vaultsmall.yml
     rewardAccounts:
@@ -145,6 +148,7 @@
         - type: Shuttle
           angularDamping: 999999
           linearDamping: 999999
+        - type: LinkedLifecycleGridParent
         paths:
         - /Maps/_NF/Bluespace/syndieftlintercept.yml
 
@@ -180,6 +184,7 @@
         - type: Shuttle
           angularDamping: 999999
           linearDamping: 999999
+        - type: LinkedLifecycleGridParent
         paths:
         - /Maps/_NF/Bluespace/wizardprobealt.yml
 
@@ -215,6 +220,7 @@
         - type: Shuttle
           angularDamping: 999999
           linearDamping: 999999
+        - type: LinkedLifecycleGridParent
         paths:
         - /Maps/_NF/Bluespace/bloodmoon.yml
 
@@ -248,6 +254,7 @@
         - type: Shuttle
           angularDamping: 999999
           linearDamping: 999999
+        - type: LinkedLifecycleGridParent
         paths:
         - /Maps/_NF/Bluespace/cave.yml
 
@@ -278,5 +285,6 @@
         maximumDistance: 2500
         addComponents:
         - type: IFF
+        - type: LinkedLifecycleGridParent
         paths:
         - /Maps/_NF/Bluespace/mcevent.yml
diff --git a/Resources/Prototypes/_NF/Events/nf_bluespace_salvage_events.yml b/Resources/Prototypes/_NF/Events/nf_bluespace_salvage_events.yml
index c357c8a6218..bd126439dfc 100644
--- a/Resources/Prototypes/_NF/Events/nf_bluespace_salvage_events.yml
+++ b/Resources/Prototypes/_NF/Events/nf_bluespace_salvage_events.yml
@@ -26,6 +26,7 @@
         addComponents:
         - type: IFF
           color: "#AAAAAA"
+        - type: LinkedLifecycleGridParent
         paths:
         - /Maps/_NF/Shuttles/Scrap/bison.yml
 #        - /Maps/_NF/Shuttles/Scrap/canister.yml # Too small
diff --git a/Resources/Prototypes/_NF/Flavors/flavors.yml b/Resources/Prototypes/_NF/Flavors/flavors.yml
index d462d864a2f..3178c09951e 100644
--- a/Resources/Prototypes/_NF/Flavors/flavors.yml
+++ b/Resources/Prototypes/_NF/Flavors/flavors.yml
@@ -47,3 +47,8 @@
   id: honeycomb
   flavorType: Complex
   description: flavor-complex-honeycomb
+
+- type: flavor
+  id: wassail
+  flavorType: Complex
+  description: flavor-complex-wassail
diff --git a/Resources/Prototypes/_NF/GameRules/roundstart.yml b/Resources/Prototypes/_NF/GameRules/roundstart.yml
index 836fcc0a69b..a2214693626 100644
--- a/Resources/Prototypes/_NF/GameRules/roundstart.yml
+++ b/Resources/Prototypes/_NF/GameRules/roundstart.yml
@@ -1,9 +1,9 @@
 - type: entity
-  id: Adventure
+  id: NFAdventure
   parent: BaseGameRule
   categories: [ HideSpawnMenu ]
   components:
-  - type: AdventureRule
+  - type: NFAdventureRule
 
 - type: entity
   id: BluespaceEventScheduler
diff --git a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml
index b5bd92d67b9..16092d133df 100644
--- a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml
+++ b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml
@@ -94,6 +94,18 @@
     state: ceres
     scale: 1.2, 1.2
 
+- type: entity
+  parent: PosterBase
+  id: ShuttleMapCharon
+  name: "ITS Apothecary"
+  description: "Detailed map of a Charon shuttle."
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: _NF/Guidebook/shuttle_maps/128x96.rsi
+    state: charon
+    scale: 1.2, 1.2
+
 - type: entity
   parent: PosterBase
   id: ShuttleMapChisel
diff --git a/Resources/Prototypes/_NF/Mail/mail.yml b/Resources/Prototypes/_NF/Mail/mail.yml
index ded4374d5e2..c7bd85f8c66 100644
--- a/Resources/Prototypes/_NF/Mail/mail.yml
+++ b/Resources/Prototypes/_NF/Mail/mail.yml
@@ -537,6 +537,12 @@
     - id: PlushieJester
       prob: 0.05
       orGroup: Plushie
+    - id: PlushieMailVulp
+      prob: 0.05
+      orGroup: Plushie
+    - id: PlushieYarrMoth
+      prob: 0.05
+      orGroup: Plushie
 
 - type: entity
   categories: [ HideSpawnMenu ]
diff --git a/Resources/Prototypes/_NF/PointsOfInterest/anomalousgeode.yml b/Resources/Prototypes/_NF/PointsOfInterest/anomalousgeode.yml
index b52fb814288..00644f0686e 100644
--- a/Resources/Prototypes/_NF/PointsOfInterest/anomalousgeode.yml
+++ b/Resources/Prototypes/_NF/PointsOfInterest/anomalousgeode.yml
@@ -13,6 +13,7 @@
   name: 'Anomalous Geode'
   minimumDistance: 2100
   maximumDistance: 3800
+  spawnGamePreset: [ NFAdventure, NFPirate ]
   spawnGroup: ScienceLab
   gridPath: /Maps/_NF/POI/anomalousgeode.yml
   addComponents:
diff --git a/Resources/Prototypes/_NF/PointsOfInterest/anomalouslab.yml b/Resources/Prototypes/_NF/PointsOfInterest/anomalouslab.yml
index b3c705241ce..6d6a37e5db0 100644
--- a/Resources/Prototypes/_NF/PointsOfInterest/anomalouslab.yml
+++ b/Resources/Prototypes/_NF/PointsOfInterest/anomalouslab.yml
@@ -1,6 +1,6 @@
 # Author Info
 # GitHub: RealIHANOfficial (??)
-# Discord: 
+# Discord:
 
 # Maintainer Info
 # GitHub: ???
@@ -13,6 +13,7 @@
   name: 'Anomalous Lab'
   minimumDistance: 2100
   maximumDistance: 3800
+  spawnGamePreset: [ NFAdventure, NFPirate ]
   spawnGroup: ScienceLab
   gridPath: /Maps/_NF/POI/anomalouslab.yml
   addComponents:
diff --git a/Resources/Prototypes/_NF/PointsOfInterest/bahamamamas.yml b/Resources/Prototypes/_NF/PointsOfInterest/bahamamamas.yml
index 9c89370ccc4..794d1c19e1f 100644
--- a/Resources/Prototypes/_NF/PointsOfInterest/bahamamamas.yml
+++ b/Resources/Prototypes/_NF/PointsOfInterest/bahamamamas.yml
@@ -13,6 +13,7 @@
   name: "Bahama Mama's"
   minimumDistance: 1200
   maximumDistance: 2900
+  spawnGamePreset: [ NFAdventure, NFPirate ]
   spawnGroup: RestStop
   gridPath: /Maps/_NF/POI/bahama.yml
   addComponents:
diff --git a/Resources/Prototypes/_NF/PointsOfInterest/caseys.yml b/Resources/Prototypes/_NF/PointsOfInterest/caseys.yml
index e4ff899c439..bad9005947c 100644
--- a/Resources/Prototypes/_NF/PointsOfInterest/caseys.yml
+++ b/Resources/Prototypes/_NF/PointsOfInterest/caseys.yml
@@ -1,5 +1,5 @@
 # Author Info
-# GitHub: 
+# GitHub:
 # Discord: Terezi (??)
 
 # Maintainer Info
@@ -13,6 +13,7 @@
   name: "Crazy Casey's Casino"
   minimumDistance: 3250
   maximumDistance: 5600
+  spawnGamePreset: [ NFAdventure, NFPirate ]
   gridPath: /Maps/_NF/POI/caseyscasino.yml
   addComponents:
   - type: IFF
diff --git a/Resources/Prototypes/_NF/PointsOfInterest/courthouse.yml b/Resources/Prototypes/_NF/PointsOfInterest/courthouse.yml
index e56ca7a0ff5..a35d46d3eda 100644
--- a/Resources/Prototypes/_NF/PointsOfInterest/courthouse.yml
+++ b/Resources/Prototypes/_NF/PointsOfInterest/courthouse.yml
@@ -7,12 +7,13 @@
 # Discord: ???
 
 # Notes:
-# 
+#
 - type: pointOfInterest
   id: Courthouse
   name: "Courthouse"
   minimumDistance: 1150
   maximumDistance: 2050
+  spawnGamePreset: [ NFAdventure, NFPirate ]
   spawnGroup: Required
   gridPath: /Maps/_NF/POI/courthouse.yml
   addComponents:
diff --git a/Resources/Prototypes/_NF/PointsOfInterest/cove.yml b/Resources/Prototypes/_NF/PointsOfInterest/cove.yml
index 3a6810a9a91..57bb4d1c336 100644
--- a/Resources/Prototypes/_NF/PointsOfInterest/cove.yml
+++ b/Resources/Prototypes/_NF/PointsOfInterest/cove.yml
@@ -13,6 +13,7 @@
   name: Pirate Cove
   minimumDistance: 10000
   maximumDistance: 15000
+  spawnGamePreset: [ NFPirate ]
   spawnGroup: Required
   gridPath: /Maps/_NF/POI/cove.yml
   hideWarp: true
diff --git a/Resources/Prototypes/_NF/PointsOfInterest/depots.yml b/Resources/Prototypes/_NF/PointsOfInterest/depots.yml
index d46469c1348..d6c3105327d 100644
--- a/Resources/Prototypes/_NF/PointsOfInterest/depots.yml
+++ b/Resources/Prototypes/_NF/PointsOfInterest/depots.yml
@@ -13,6 +13,7 @@
   name: Cargo Depot
   minimumDistance: 4500
   maximumDistance: 6000
+  spawnGamePreset: [ NFAdventure, NFPirate ]
   spawnGroup: CargoDepot
   gridPath: /Maps/_NF/POI/cargodepot.yml
   addComponents:
@@ -30,6 +31,7 @@
   name: Cargo Depot
   minimumDistance: 4500
   maximumDistance: 6000
+  spawnGamePreset: [ NFAdventure, NFPirate ]
   spawnGroup: CargoDepot
   gridPath: /Maps/_NF/POI/cargodepotalt.yml
   addComponents:
@@ -64,4 +66,4 @@
       stationProto: MarketFrontierOutpost
       components:
         - type: StationNameSetup
-          mapNameTemplate: 'Cargo Depot' # Has a letter appended in NfAdventureSystem
\ No newline at end of file
+          mapNameTemplate: 'Cargo Depot' # Has a letter appended in NfAdventureSystem
diff --git a/Resources/Prototypes/_NF/PointsOfInterest/edison.yml b/Resources/Prototypes/_NF/PointsOfInterest/edison.yml
index c06777fa9bb..04bbf80b51d 100644
--- a/Resources/Prototypes/_NF/PointsOfInterest/edison.yml
+++ b/Resources/Prototypes/_NF/PointsOfInterest/edison.yml
@@ -1,5 +1,5 @@
 # Author Info
-# GitHub: 
+# GitHub:
 # Discord: Checkraze
 
 # Maintainer Info
@@ -7,14 +7,15 @@
 # Discord: ???
 
 # Notes:
-# 
+#
 # - type: pointOfInterest
   # id: Edison
   # name: 'Edison Power Plant'
   # minimumDistance: 3650
   # maximumDistance: 6400
+  # spawnGamePreset: [ NFAdventure, NFPirate ]
   # spawnGroup: Required
-  # gridPath: /Maps/_NF/POI/edison.yml 
+  # gridPath: /Maps/_NF/POI/edison.yml
   # addComponents:
   # - type: IFF
     # color: "#3737C8"
@@ -38,4 +39,4 @@
           # availableJobs:
             # Pilot: [ 0, 0 ]
             # Mercenary: [ 0, 0 ]
-            # Contractor: [ 0, 0 ]
\ No newline at end of file
+            # Contractor: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/PointsOfInterest/grifty.yml b/Resources/Prototypes/_NF/PointsOfInterest/grifty.yml
index 4b9d434f497..cb5fce22f97 100644
--- a/Resources/Prototypes/_NF/PointsOfInterest/grifty.yml
+++ b/Resources/Prototypes/_NF/PointsOfInterest/grifty.yml
@@ -1,5 +1,5 @@
 # Author Info
-# GitHub: 
+# GitHub:
 # Discord: ???
 
 # Maintainer Info
@@ -13,6 +13,7 @@
   name: "Grifty's Gas n Grub"
   minimumDistance: 3250
   maximumDistance: 5600
+  spawnGamePreset: [ NFAdventure, NFPirate ]
   spawnGroup: Scrapyard
   gridPath: /Maps/_NF/POI/grifty.yml
   addComponents:
diff --git a/Resources/Prototypes/_NF/PointsOfInterest/lodge.yml b/Resources/Prototypes/_NF/PointsOfInterest/lodge.yml
index b9d5ce3ebac..eb09273a2e4 100644
--- a/Resources/Prototypes/_NF/PointsOfInterest/lodge.yml
+++ b/Resources/Prototypes/_NF/PointsOfInterest/lodge.yml
@@ -13,6 +13,7 @@
   name: 'Expeditionary Lodge'
   minimumDistance: 1650
   maximumDistance: 3400
+  spawnGamePreset: [ NFAdventure, NFPirate ]
   spawnGroup: Required
   gridPath: /Maps/_NF/POI/lodge.yml
   addComponents:
diff --git a/Resources/Prototypes/_NF/PointsOfInterest/lpbravo.yml b/Resources/Prototypes/_NF/PointsOfInterest/lpbravo.yml
index 478b777968f..7f135395d5b 100644
--- a/Resources/Prototypes/_NF/PointsOfInterest/lpbravo.yml
+++ b/Resources/Prototypes/_NF/PointsOfInterest/lpbravo.yml
@@ -1,5 +1,5 @@
 # Author Info
-# GitHub: 
+# GitHub:
 # Discord: Checkraze
 
 # Maintainer Info
@@ -13,6 +13,7 @@
   name: 'Listening Point Bravo'
   minimumDistance: 4000
   maximumDistance: 6000
+  spawnGamePreset: [ NFAdventure, NFPirate ]
   spawnGroup: SyndicateFOB
   gridPath: /Maps/_NF/POI/lpbravo.yml
   hideWarp: true
@@ -39,4 +40,4 @@
           mapNameTemplate: 'Listening Point Bravo'
         - type: StationJobs
           availableJobs: {}
-        - type: StationDeadDropHintExempt
\ No newline at end of file
+        - type: StationDeadDropHintExempt
diff --git a/Resources/Prototypes/_NF/PointsOfInterest/mchobo.yml b/Resources/Prototypes/_NF/PointsOfInterest/mchobo.yml
index ef4b3ece947..aa6a3e70c2b 100644
--- a/Resources/Prototypes/_NF/PointsOfInterest/mchobo.yml
+++ b/Resources/Prototypes/_NF/PointsOfInterest/mchobo.yml
@@ -8,12 +8,13 @@
 
 # Notes:
 # Dumping ground of broken dreams and broken ships.
-# Based on the McCargo built by Dvir01 (https://github.com/dvir001) and ruined with drunken pride by Tych0. 
+# Based on the McCargo built by Dvir01 (https://github.com/dvir001) and ruined with drunken pride by Tych0.
 - type: pointOfInterest
   id: McHobo
   name: Derelict McCargo
   minimumDistance: 3250
   maximumDistance: 5600
+  spawnGamePreset: [ NFAdventure, NFPirate ]
   spawnGroup: Scrapyard
   gridPath: /Maps/_NF/POI/mchobo.yml
   addComponents:
diff --git a/Resources/Prototypes/_NF/PointsOfInterest/nfsd.yml b/Resources/Prototypes/_NF/PointsOfInterest/nfsd.yml
index 09336a02ce0..d993915f438 100644
--- a/Resources/Prototypes/_NF/PointsOfInterest/nfsd.yml
+++ b/Resources/Prototypes/_NF/PointsOfInterest/nfsd.yml
@@ -13,6 +13,7 @@
   name: 'NFSD Outpost'
   minimumDistance: 750
   maximumDistance: 1000
+  spawnGamePreset: [ NFAdventure, NFPirate ]
   spawnGroup: Required
   gridPath: /Maps/_NF/POI/nfsd.yml
   addComponents:
diff --git a/Resources/Prototypes/_NF/PointsOfInterest/northpole.yml b/Resources/Prototypes/_NF/PointsOfInterest/northpole.yml
index 59324e7c148..47a9c84fc8b 100644
--- a/Resources/Prototypes/_NF/PointsOfInterest/northpole.yml
+++ b/Resources/Prototypes/_NF/PointsOfInterest/northpole.yml
@@ -1,5 +1,5 @@
 # Author Info
-# GitHub: 
+# GitHub:
 # Discord: Checkraze
 
 # Maintainer Info
@@ -13,6 +13,7 @@
   name: "The North Pole"
   minimumDistance: 2150
   maximumDistance: 4850
+  spawnGamePreset: [ NFAdventure, NFPirate ]
   spawnGroup: Christmas
   spawnChance: 0
   gridPath: /Maps/_NF/POI/northpole.yml
@@ -23,4 +24,4 @@
     flags: [HideLabel]
   - type: Shuttle
     angularDamping: 999999
-    linearDamping: 999999
\ No newline at end of file
+    linearDamping: 999999
diff --git a/Resources/Prototypes/_NF/PointsOfInterest/omnichurch.yml b/Resources/Prototypes/_NF/PointsOfInterest/omnichurch.yml
index 43a8df90949..8a0861058c2 100644
--- a/Resources/Prototypes/_NF/PointsOfInterest/omnichurch.yml
+++ b/Resources/Prototypes/_NF/PointsOfInterest/omnichurch.yml
@@ -7,12 +7,13 @@
 # Discord: ???
 
 # Notes:
-# 
+#
 - type: pointOfInterest
   id: Omnichurch
   name: "Omnichurch Beacon"
   minimumDistance: 2200
   maximumDistance: 4900
+  spawnGamePreset: [ NFAdventure, NFPirate ]
   gridPath: /Maps/_NF/POI/beacon.yml
   addComponents:
   - type: IFF
@@ -20,4 +21,4 @@
     readOnly: true
   - type: Shuttle
     angularDamping: 999999
-    linearDamping: 999999
\ No newline at end of file
+    linearDamping: 999999
diff --git a/Resources/Prototypes/_NF/PointsOfInterest/thepit.yml b/Resources/Prototypes/_NF/PointsOfInterest/thepit.yml
index 80ceac9e771..8a13ec26b97 100644
--- a/Resources/Prototypes/_NF/PointsOfInterest/thepit.yml
+++ b/Resources/Prototypes/_NF/PointsOfInterest/thepit.yml
@@ -13,6 +13,7 @@
   name: "The Pit"
   minimumDistance: 2200
   maximumDistance: 4200
+  spawnGamePreset: [ NFAdventure, NFPirate ]
   spawnGroup: Arena
   gridPath: /Maps/_NF/POI/arena.yml
   addComponents:
diff --git a/Resources/Prototypes/_NF/PointsOfInterest/tinniasrest.yml b/Resources/Prototypes/_NF/PointsOfInterest/tinniasrest.yml
index 5ca2436ec0b..c7f48701a94 100644
--- a/Resources/Prototypes/_NF/PointsOfInterest/tinniasrest.yml
+++ b/Resources/Prototypes/_NF/PointsOfInterest/tinniasrest.yml
@@ -13,6 +13,7 @@
   name: "Tinnia's Rest"
   minimumDistance: 1200
   maximumDistance: 2900
+  spawnGamePreset: [ NFAdventure, NFPirate ]
   spawnGroup: RestStop
   gridPath: /Maps/_NF/POI/tinnia.yml
   addComponents:
diff --git a/Resources/Prototypes/_NF/PointsOfInterest/trade.yml b/Resources/Prototypes/_NF/PointsOfInterest/trade.yml
index 475cd67bf6a..555f321139b 100644
--- a/Resources/Prototypes/_NF/PointsOfInterest/trade.yml
+++ b/Resources/Prototypes/_NF/PointsOfInterest/trade.yml
@@ -13,6 +13,7 @@
   name: Trade Outpost
   minimumDistance: 1500
   maximumDistance: 2500
+  spawnGamePreset: [ NFAdventure, NFPirate ]
   spawnGroup: MarketStation
   gridPath: /Maps/_NF/POI/trade.yml
   addComponents:
diff --git a/Resources/Prototypes/_NF/PointsOfInterest/trademall.yml b/Resources/Prototypes/_NF/PointsOfInterest/trademall.yml
index 5c14ca2b5ae..9b7e75158fb 100644
--- a/Resources/Prototypes/_NF/PointsOfInterest/trademall.yml
+++ b/Resources/Prototypes/_NF/PointsOfInterest/trademall.yml
@@ -13,6 +13,7 @@
   name: Trade Mall
   minimumDistance: 1500
   maximumDistance: 2500
+  spawnGamePreset: [ NFAdventure, NFPirate ]
   spawnGroup: MarketStation
   gridPath: /Maps/_NF/POI/trademall.yml
   addComponents:
diff --git a/Resources/Prototypes/_NF/Procedural/Themes/supercompacted.yml b/Resources/Prototypes/_NF/Procedural/Themes/supercompacted.yml
new file mode 100644
index 00000000000..9558bd8722c
--- /dev/null
+++ b/Resources/Prototypes/_NF/Procedural/Themes/supercompacted.yml
@@ -0,0 +1,517 @@
+# Chromite: FloorChromite
+- type: dungeonRoom
+  id: NFChromite5x5a
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 0,0
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedChromite
+
+- type: dungeonRoom
+  id: NFChromite5x5b
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 6,0
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedChromite
+
+- type: dungeonRoom
+  id: NFChromite5x5c
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 12,0
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedChromite
+
+- type: dungeonRoom
+  id: NFChromite5x5d
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 18,0
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedChromite
+
+- type: dungeonRoom
+  id: NFChromite5x5e
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 24,0
+  ignoreTile: FloorShuttleOrange
+  tags:
+    - NFSuperCompactedChromite
+
+- type: dungeonRoom
+  id: NFChromite5x5f
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 30,0
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedChromite
+
+- type: dungeonRoom
+  id: NFChromite5x5g
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 36,0
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedChromite
+
+- type: entity
+  id: NFChromiteRoomMarker
+  parent: BaseRoomMarker
+  name: chromite super compacted marker
+  components:
+  - type: RoomFill
+    roomWhitelist:
+      tags:
+      - NFSuperCompactedChromite
+
+# Snow: FloorIce
+- type: dungeonRoom
+  id: NFSnow5x5a
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 0,6
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedSnow
+
+- type: dungeonRoom
+  id: NFSnow5x5b
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 6,6
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedSnow
+
+- type: dungeonRoom
+  id: NFSnow5x5c
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 12,6
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedSnow
+
+- type: dungeonRoom
+  id: NFSnow5x5d
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 18,6
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedSnow
+
+- type: dungeonRoom
+  id: NFSnow5x5e
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 24,6
+  ignoreTile: FloorShuttleOrange
+  tags:
+    - NFSuperCompactedSnow
+
+- type: dungeonRoom
+  id: NFSnow5x5f
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 36,6
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedSnow
+
+- type: dungeonRoom
+  id: NFSnow5x5g
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 36,6
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedSnow
+
+- type: entity
+  id: NFSnowRoomMarker
+  parent: BaseRoomMarker
+  name: snow super compacted marker
+  components:
+  - type: RoomFill
+    roomWhitelist:
+      tags:
+      - NFSuperCompactedSnow
+
+# Asteroid: FloorAsteroidSand
+- type: dungeonRoom
+  id: NFAsteroid5x5a
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 0,12
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedAsteroid
+
+- type: dungeonRoom
+  id: NFAsteroid5x5b
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 6,12
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedAsteroid
+
+- type: dungeonRoom
+  id: NFAsteroid5x5c
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 12,12
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedAsteroid
+
+- type: dungeonRoom
+  id: NFAsteroid5x5d
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 18,12
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedAsteroid
+
+- type: dungeonRoom
+  id: NFAsteroid5x5e
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 24,12
+  ignoreTile: FloorShuttleOrange
+  tags:
+    - NFSuperCompactedAsteroid
+
+- type: dungeonRoom
+  id: NFAsteroid5x5f
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 36,12
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedAsteroid
+
+- type: dungeonRoom
+  id: NFAsteroid5x5g
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 36,12
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedAsteroid
+
+- type: entity
+  id: NFAsteroidRoomMarker
+  parent: BaseRoomMarker
+  name: asteroid super compacted marker
+  components:
+  - type: RoomFill
+    roomWhitelist:
+      tags:
+      - NFSuperCompactedAsteroid
+
+# Andesite: FloorCaveDrought
+- type: dungeonRoom
+  id: NFAndesite5x5a
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 0,18
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedAndesite
+
+- type: dungeonRoom
+  id: NFAndesite5x5b
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 6,18
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedAndesite
+
+- type: dungeonRoom
+  id: NFAndesite5x5c
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 12,18
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedAndesite
+
+- type: dungeonRoom
+  id: NFAndesite5x5d
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 18,18
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedAndesite
+
+- type: dungeonRoom
+  id: NFAndesite5x5e
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 24,18
+  ignoreTile: FloorShuttleOrange
+  tags:
+    - NFSuperCompactedAndesite
+
+- type: dungeonRoom
+  id: NFAndesite5x5f
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 36,18
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedAndesite
+
+- type: dungeonRoom
+  id: NFAndesite5x5g
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 36,18
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedAndesite
+
+- type: entity
+  id: NFAndesiteRoomMarker
+  parent: BaseRoomMarker
+  name: andesite super compacted marker
+  components:
+  - type: RoomFill
+    roomWhitelist:
+      tags:
+      - NFSuperCompactedAndesite
+
+# Basalt: FloorBasalt
+- type: dungeonRoom
+  id: NFBasalt5x5a
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 0,24
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedBasalt
+
+- type: dungeonRoom
+  id: NFBasalt5x5b
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 6,24
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedBasalt
+
+- type: dungeonRoom
+  id: NFBasalt5x5c
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 12,24
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedBasalt
+
+- type: dungeonRoom
+  id: NFBasalt5x5d
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 18,24
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedBasalt
+
+- type: dungeonRoom
+  id: NFBasalt5x5e
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 24,24
+  ignoreTile: FloorShuttleOrange
+  tags:
+    - NFSuperCompactedBasalt
+
+- type: dungeonRoom
+  id: NFBasalt5x5f
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 36,24
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedBasalt
+
+- type: dungeonRoom
+  id: NFBasalt5x5g
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 36,24
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedBasalt
+
+- type: entity
+  id: NFBasaltRoomMarker
+  parent: BaseRoomMarker
+  name: basalt super compacted marker
+  components:
+  - type: RoomFill
+    roomWhitelist:
+      tags:
+      - NFSuperCompactedBasalt
+
+# Sand: FloorLowDesert
+- type: dungeonRoom
+  id: NFSand5x5a
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 0,30
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedSand
+
+- type: dungeonRoom
+  id: NFSand5x5b
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 6,30
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedSand
+
+- type: dungeonRoom
+  id: NFSand5x5c
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 12,30
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedSand
+
+- type: dungeonRoom
+  id: NFSand5x5d
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 18,30
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedSand
+
+- type: dungeonRoom
+  id: NFSand5x5e
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 24,30
+  ignoreTile: FloorShuttleOrange
+  tags:
+    - NFSuperCompactedSand
+
+- type: dungeonRoom
+  id: NFSand5x5f
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 36,30
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedSand
+
+- type: dungeonRoom
+  id: NFSand5x5g
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 36,30
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedSand
+
+- type: entity
+  id: NFSandRoomMarker
+  parent: BaseRoomMarker
+  name: sand super compacted marker
+  components:
+  - type: RoomFill
+    roomWhitelist:
+      tags:
+      - NFSuperCompactedSand
+
+# Asteroid Rock: FloorAsteroidSand
+- type: dungeonRoom
+  id: NFAsteroidRock5x5a
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 0,36
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedAsteroidRock
+
+- type: dungeonRoom
+  id: NFAsteroidRock5x5b
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 6,36
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedAsteroidRock
+
+- type: dungeonRoom
+  id: NFAsteroidRock5x5c
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 12,36
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedAsteroidRock
+
+- type: dungeonRoom
+  id: NFAsteroidRock5x5d
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 18,36
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedAsteroidRock
+
+- type: dungeonRoom
+  id: NFAsteroidRock5x5e
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 24,36
+  ignoreTile: FloorShuttleOrange
+  tags:
+    - NFSuperCompactedAsteroidRock
+
+- type: dungeonRoom
+  id: NFAsteroidRock5x5f
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 36,36
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedAsteroidRock
+
+- type: dungeonRoom
+  id: NFAsteroidRock5x5g
+  size: 5,5
+  atlas: /Maps/_NF/Dungeon/supercompacted.yml
+  offset: 36,36
+  ignoreTile: FloorShuttleOrange
+  tags:
+  - NFSuperCompactedAsteroidRock
+
+- type: entity
+  id: NFAsteroidRockRoomMarker
+  parent: BaseRoomMarker
+  name: asteroid rock super compacted marker
+  components:
+  - type: RoomFill
+    roomWhitelist:
+      tags:
+      - NFSuperCompactedAsteroidRock
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Procedural/basalt_vgroid.yml b/Resources/Prototypes/_NF/Procedural/basalt_vgroid.yml
index ebc16c89dea..148ebf4e5c1 100644
--- a/Resources/Prototypes/_NF/Procedural/basalt_vgroid.yml
+++ b/Resources/Prototypes/_NF/Procedural/basalt_vgroid.yml
@@ -106,7 +106,7 @@
     - !type:OreDunGen
       entityMask:
       - WallRockBasalt
-      entity: WallBasaltCobblebrickNF
+      entity: NFWallBasaltCobblebrick
       count: 100
       minGroupSize: 6
       maxGroupSize: 16
@@ -242,6 +242,18 @@
     groups:
     - id: SpawnMobMercenaryT2
       amount: 1
+  - !type:MobsDunGen
+    minCount: 1
+    maxCount: 3
+    groups:
+    - id: SpawnMobMercenaryT3
+      amount: 1
+  - !type:MobsDunGen
+    minCount: 1
+    maxCount: 1
+    groups:
+    - id: SpawnMobMercenaryCaptain
+      amount: 1
 
 #- type: dungeonConfig
 #  id: NFVGRoidInteriorDungeonsBasalt
diff --git a/Resources/Prototypes/_NF/Procedural/cave_vgroid.yml b/Resources/Prototypes/_NF/Procedural/cave_vgroid.yml
index 19ce3446c46..2671d220541 100644
--- a/Resources/Prototypes/_NF/Procedural/cave_vgroid.yml
+++ b/Resources/Prototypes/_NF/Procedural/cave_vgroid.yml
@@ -106,7 +106,7 @@
     - !type:OreDunGen
       entityMask:
       - WallRock
-      entity: WallCobblebrickNF
+      entity: NFWallCobblebrick
       count: 100
       minGroupSize: 6
       maxGroupSize: 16
@@ -242,6 +242,12 @@
     groups:
     - id: SpawnMobExplorerT2
       amount: 1
+  - !type:MobsDunGen
+    minCount: 1
+    maxCount: 1
+    groups:
+    - id: SpawnMobExplorerBoss # Boss
+      amount: 1
 
 #- type: dungeonConfig
 #  id: NFVGRoidInteriorDungeonsCave
diff --git a/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml b/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml
index 2fd1323baba..aa1a36cf9f3 100644
--- a/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml
+++ b/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml
@@ -106,7 +106,7 @@
     - !type:OreDunGen
       entityMask:
       - WallRockChromite
-      entity: WallChromiteCobblebrickNF
+      entity: NFWallChromiteCobblebrick
       count: 100
       minGroupSize: 6
       maxGroupSize: 16
@@ -266,6 +266,18 @@
     groups:
     - id: SpawnMobBloodCultistCaster
       amount: 1
+  - !type:MobsDunGen
+    minCount: 1
+    maxCount: 1
+    groups:
+    - id: SpawnMobBloodCultistAscended # Boss
+      amount: 1
+  # - !type:MobsDunGen # Dies to barotrauma - equip it for space if you want this restored
+  #   minCount: 1
+  #   maxCount: 1
+  #   groups:
+  #   - id: SpawnMobCatBloodCultLowChance
+  #     amount: 1
 
 #- type: dungeonConfig
 #  id: NFVGRoidInteriorDungeonsChromite
diff --git a/Resources/Prototypes/_NF/Procedural/scrap_vgroid.yml b/Resources/Prototypes/_NF/Procedural/scrap_vgroid.yml
index bc8f1f93728..36cc995ff06 100644
--- a/Resources/Prototypes/_NF/Procedural/scrap_vgroid.yml
+++ b/Resources/Prototypes/_NF/Procedural/scrap_vgroid.yml
@@ -142,7 +142,14 @@
       tileMask:
       - Plating
       entity: SpawnMobRogueScapT1
-      count: 25
+      count: 15
+      minGroupSize: 1
+      maxGroupSize: 2
+    - !type:OreDunGen
+      tileMask:
+      - Plating
+      entity: SpawnMobRogueDronesT1
+      count: 10
       minGroupSize: 1
       maxGroupSize: 1
 
@@ -245,6 +252,12 @@
     groups:
     - id: SpawnMobRogueSiliconsT2
       amount: 1
+  - !type:MobsDunGen
+    minCount: 1
+    maxCount: 1
+    groups:
+    - id: SpawnMobRogueSiliconBossRandom
+      amount: 1
 
 #- type: dungeonConfig
 #  id: NFVGRoidInteriorDungeonsScrap
diff --git a/Resources/Prototypes/_NF/Procedural/snow_vgroid.yml b/Resources/Prototypes/_NF/Procedural/snow_vgroid.yml
index 586194f2621..d79e23495e7 100644
--- a/Resources/Prototypes/_NF/Procedural/snow_vgroid.yml
+++ b/Resources/Prototypes/_NF/Procedural/snow_vgroid.yml
@@ -106,7 +106,7 @@
     - !type:OreDunGen
       entityMask:
       - WallRockSnow
-      entity: WallSnowCobblebrickNF
+      entity: NFWallSnowCobblebrick
       count: 100
       minGroupSize: 6
       maxGroupSize: 16
@@ -161,6 +161,13 @@
       count: 5
       minGroupSize: 1
       maxGroupSize: 1
+    - !type:OreDunGen
+      tileMask:
+      - FloorSnow
+      entity: SpawnMobArgocyteLeviathingExpeditions
+      count: 1
+      minGroupSize: 0
+      maxGroupSize: 1
 
 # Configs
 - type: dungeonConfig
@@ -256,6 +263,12 @@
     groups:
     - id: SpawnMobXenoT2
       amount: 1
+  - !type:MobsDunGen
+    minCount: 1
+    maxCount: 1
+    groups:
+    - id: SpawnMobXenoQueenDungeon
+      amount: 1
 
 #- type: dungeonConfig
 #  id: NFVGRoidInteriorDungeonsSnow
diff --git a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml
index 04c8aaa9ee8..64b434cce50 100644
--- a/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml
+++ b/Resources/Prototypes/_NF/Reagents/Consumables/Drink/drinks.yml
@@ -198,3 +198,42 @@
   metamorphicSprite:
     sprite: _NF/Objects/Consumable/Drinks/honeyicedtea.rsi
     state: icon
+
+- type: reagent
+  id: WassailMulledAle
+  name: reagent-name-wassail
+  parent: BaseAlcohol
+  desc: reagent-desc-wassail
+  physicalDesc: reagent-physical-desc-spicy
+  flavor: wassail
+  color: "#AD2D00"
+  metabolisms:
+    Drink:
+      effects:
+      - !type:PopupMessage # a nice warm soothing drink
+        type: Local
+        visualType: Medium
+        messages:
+        - "drinks-effect-nf-wassail"
+        probability: 0.1
+  metamorphicSprite:
+    sprite: _NF/Objects/Consumable/Drinks/wassail.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+
+- type: reagent
+  id: Eggnog
+  name: reagent-name-eggnog
+  parent: BaseAlcohol
+  desc: reagent-desc-eggnog
+  physicalDesc: reagent-physical-desc-thick
+  flavor: creamy
+  color: "#ffebc4"
+  metamorphicSprite:
+    sprite: _NF/Objects/Consumable/Drinks/eggnog.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 8
+  metamorphicFillBaseName: fill
+  metamorphicChangeColor: false
diff --git a/Resources/Prototypes/_NF/Reagents/Materials/fuelgrade.yml b/Resources/Prototypes/_NF/Reagents/Materials/fuelgrade.yml
new file mode 100644
index 00000000000..6570d18a1fa
--- /dev/null
+++ b/Resources/Prototypes/_NF/Reagents/Materials/fuelgrade.yml
@@ -0,0 +1,20 @@
+- type: material
+  id: FuelGradePlasma
+  stackEntity: FuelPlasma1
+  name: fuel-grade plasma
+  icon: { sprite: _NF/Objects/Specific/Fuel/fuelgrade_material.rsi, state: plasma }
+  price: 0.1 # half of regular plasma
+
+- type: material
+  id: FuelGradeUranium
+  stackEntity: FuelUranium1
+  name: fuel-grade uranium
+  icon: { sprite: _NF/Objects/Specific/Fuel/fuelgrade_material.rsi, state: uranium }
+  price: 0.1 # half of regular uranium
+
+- type: material
+  id: FuelGradeBananium
+  stackEntity: FuelBananium1
+  name: fuel-grade bananium
+  icon: { sprite: _NF/Objects/Specific/Fuel/fuelgrade_material.rsi, state: bananium }
+  price: 0.1 # half of regular bananium
diff --git a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml
index 87ec06e3dd9..7be8a8bf2ab 100644
--- a/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/_NF/Recipes/Cooking/meal_recipes.yml
@@ -281,7 +281,6 @@
     FoodDonutPlain: 1
   recipeType:
   - Assembler
-  - Assembler
 
 - type: microwaveMealRecipe
   id: RecipeDonutBluePumpkin
diff --git a/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/barrel.yml b/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/barrel.yml
new file mode 100644
index 00000000000..ac91b2e2370
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/barrel.yml
@@ -0,0 +1,26 @@
+- type: constructionGraph
+  id: WoodenBarrel
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: woodenbarrel
+          steps:
+            - material: WoodPlank
+              amount: 5
+              doAfter: 5
+
+    - node: woodenbarrel
+      entity: WoodenBarrel
+      edges:
+        - to: start
+          steps:
+            - tool: Prying
+              doAfter: 2
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialWoodPlank1
+              amount: 5
+            - !type:EmptyAllContainers
+            - !type:DeleteEntity
+
diff --git a/Resources/Prototypes/_NF/Recipes/Crafting/barrel.yml b/Resources/Prototypes/_NF/Recipes/Crafting/barrel.yml
new file mode 100644
index 00000000000..a6649928cba
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Crafting/barrel.yml
@@ -0,0 +1,12 @@
+- type: construction
+  name: wooden barrel
+  id: WoodenBarrel
+  graph: WoodenBarrel
+  startNode: start
+  targetNode: woodenbarrel
+  category: construction-category-storage
+  description: A musty old wooden barrel.
+  icon:
+    sprite: _NF/Objects/Storage/Barrels/wood.rsi
+    state: icon
+  objectType: Structure
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml
index 240e084ac2c..83021656e99 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml
@@ -146,3 +146,12 @@
   id: ColoredLightTubeFrostyBlueNF
   result: ColoredLightTubeFrostyBlue
   parent: NFBaseLightTubeRecipe
+
+- type: latheRecipe
+  id: JanicartFlatpack
+  result: JanicartFlatpack
+  materials:
+    Steel: 2000
+    Glass: 1000
+    Plastic: 800
+    Uranium: 250
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/prizecounter.yml b/Resources/Prototypes/_NF/Recipes/Lathes/prizecounter.yml
index 272df6f9c2f..78a1b496afd 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/prizecounter.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/prizecounter.yml
@@ -86,6 +86,16 @@
   result: PlushieMoff
   parent: BasePrize15Recipe
 
+- type: latheRecipe
+  id: PlushieMailVulpRecipe
+  result: PlushieMailVulp
+  parent: BasePrize15Recipe
+
+- type: latheRecipe
+  id: PlushieYarrMothRecipe
+  result: PlushieYarrMoth
+  parent: BasePrize15Recipe
+
 - type: latheRecipe
   id: PlushieMoffsicianRecipe
   result: PlushieMoffsician
diff --git a/Resources/Prototypes/_NF/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/_NF/Recipes/Reactions/chemicals.yml
index e973152cab9..7ea78e696d3 100644
--- a/Resources/Prototypes/_NF/Recipes/Reactions/chemicals.yml
+++ b/Resources/Prototypes/_NF/Recipes/Reactions/chemicals.yml
@@ -5,11 +5,11 @@
       amount: 1
     Sodium:
       amount: 1
+    SulfuricAcid:
+      amount: 1
     Carbon:
       amount: 1
     Oxygen:
       amount: 1
-    SulfuricAcid:
-      amount: 1
   products:
     SalicylicAcid: 3
diff --git a/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml
index 20d317b5ed1..f0607ddb8d0 100644
--- a/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/_NF/Recipes/Reactions/drinks.yml
@@ -100,3 +100,32 @@
       amount: 1
   products:
     HoneyIcedTea: 2
+
+- type: reaction
+  id: WassailMulledAle
+  minTemp: 350
+  reactants:
+    Ale:
+      amount: 1
+    Sugar:
+      amount: 1
+    JuiceApple:
+      amount: 1
+  products:
+    WassailMulledAle : 3
+
+- type: reaction
+  id: Eggnog
+  requiredMixerCategories:
+  - Shake # close enough to meringue?
+  reactants:
+    Sugar:
+      amount: 1
+    Cream:
+      amount: 1
+    Egg:
+      amount: 1
+    Rum:
+      amount: 1
+  products:
+    Eggnog: 4
diff --git a/Resources/Prototypes/_NF/Recipes/Reactions/medicine.yml b/Resources/Prototypes/_NF/Recipes/Reactions/medicine.yml
index 27aad1e1cda..6c8495651a7 100644
--- a/Resources/Prototypes/_NF/Recipes/Reactions/medicine.yml
+++ b/Resources/Prototypes/_NF/Recipes/Reactions/medicine.yml
@@ -36,3 +36,16 @@
       amount: 1
   products:
     Opporozidone: 3
+
+- type: reaction
+  id: NFAloxadone
+  impact: Medium
+  reactants:
+    Cryoxadone:
+      amount: 1
+    Dermaline:
+      amount: 2
+    Siderlac:
+      amount: 2
+  products:
+      Aloxadone: 4
diff --git a/Resources/Prototypes/_NF/Research/civilianservices.yml b/Resources/Prototypes/_NF/Research/civilianservices.yml
index e552f23a17d..c0c1830c70c 100644
--- a/Resources/Prototypes/_NF/Research/civilianservices.yml
+++ b/Resources/Prototypes/_NF/Research/civilianservices.yml
@@ -38,3 +38,15 @@
   - ServiceSelectiveDropper
   - KitchenAssemblerMachineCircuitboard
   - ElectricRangeMachineCircuitboard
+
+- type: technology
+  id: MobileSanitation
+  name: research-technology-mobile-sanitation
+  icon:
+    sprite: Objects/Vehicles/janicart.rsi
+    state: icon
+  discipline: CivilianServices
+  tier: 2
+  cost: 5000
+  recipeUnlocks:
+    - JanicartFlatpack
diff --git a/Resources/Prototypes/_NF/Roles/Ghostroles/whitelisted.yml b/Resources/Prototypes/_NF/Roles/Ghostroles/whitelisted.yml
index 4cd480e23af..07a855d1cfc 100644
--- a/Resources/Prototypes/_NF/Roles/Ghostroles/whitelisted.yml
+++ b/Resources/Prototypes/_NF/Roles/Ghostroles/whitelisted.yml
@@ -48,6 +48,14 @@
   entityPrototype: MobCatMistake
   whitelisted: true
 
+- type: ghostRole
+  id: CatBloodCult
+  name: ghost-role-information-cult-cat-name
+  description: ghost-role-information-cult-cat-description
+  rules:  ghost-role-information-emotional-support-rules
+  entityPrototype: MobCatBloodCult
+  whitelisted: true
+
 - type: ghostRole
   id: MonkeyPunpun
   name: ghost-role-information-punpun-name
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml
index df51b02df3e..ad70a4a987f 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml
@@ -40,4 +40,4 @@
     head: ClothingHeadHatStrawHat
     ears: ClothingHeadsetService
     jumpsuit: ClothingUniformJumpsuitHawaiRed
-    id: YipYipIDCard
\ No newline at end of file
+    id: YipYipIDCard
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/nfdetective.yml b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/nfdetective.yml
index 2ab12a7e83d..d0e85aecd72 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/nfdetective.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/nfdetective.yml
@@ -34,12 +34,12 @@
   id: NFDetectiveGear
   equipment:
     pocket1: WeaponRevolverInspector
-    pocket2: SpeedLoaderMagnum
+    pocket2: FlashlightNfsdLite
   storage:
     back:
     - Flash
-    - MagazinePistol
-    - MagazinePistolRubber
+    - SpeedLoaderMagnum
+    - SpeedLoaderMagnumRubber
     - ForensicPad
     - ForensicScanner
     - FrontierUplinkCoin10
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml
index 3441be3a23f..9057f9c8c93 100644
--- a/Resources/Prototypes/_NF/Roles/Jobs/departments.yml
+++ b/Resources/Prototypes/_NF/Roles/Jobs/departments.yml
@@ -1,6 +1,6 @@
 - type: department
   id: Frontier
-  name: department-NF
+  name: department-Frontier
   description: department-NF-description
   color: "#334E6D"
   weight: 1 # accounted for in jobs
@@ -14,7 +14,7 @@
 
 - type: department
   id: Antag
-  name: department-NFAntag
+  name: department-Antag
   description: department-NFAntag-description
   color: "#DE3A3A"
   weight: -1 # accounted for in jobs
diff --git a/Resources/Prototypes/_NF/SectorServices/services.yml b/Resources/Prototypes/_NF/SectorServices/services.yml
index eb1bac494e8..0a3345974fb 100644
--- a/Resources/Prototypes/_NF/SectorServices/services.yml
+++ b/Resources/Prototypes/_NF/SectorServices/services.yml
@@ -32,3 +32,9 @@
   id: SectorRecords
   components:
   - type: StationRecords
+
+- type: sectorService
+  id: Alerts
+  components:
+  - type: AlertLevel
+    alertLevelPrototype: stationAlerts
diff --git a/Resources/Prototypes/_NF/SoundCollections/gavel.yml b/Resources/Prototypes/_NF/SoundCollections/gavel.yml
new file mode 100644
index 00000000000..05a9f398bb1
--- /dev/null
+++ b/Resources/Prototypes/_NF/SoundCollections/gavel.yml
@@ -0,0 +1,7 @@
+- type: soundCollection
+  id: NFGavel
+  files:
+  - /Audio/_NF/Items/Gavel/gavel1.ogg
+  - /Audio/_NF/Items/Gavel/gavel2.ogg
+  - /Audio/_NF/Items/Gavel/gavel3.ogg
+  - /Audio/_NF/Items/Gavel/gavel4.ogg
diff --git a/Resources/Prototypes/_NF/Stacks/Materials/fuelgrade.yml b/Resources/Prototypes/_NF/Stacks/Materials/fuelgrade.yml
new file mode 100644
index 00000000000..ff892c4383a
--- /dev/null
+++ b/Resources/Prototypes/_NF/Stacks/Materials/fuelgrade.yml
@@ -0,0 +1,20 @@
+- type: stack
+  id: FuelPlasma
+  name: fuel-grade plasma
+  icon: { sprite: _NF/Objects/Specific/Fuel/fuelgrade_material.rsi, state: plasma }
+  spawn: FuelPlasma1
+  maxCount: 30
+
+- type: stack
+  id: FuelUranium
+  name: fuel-grade uranium
+  icon: { sprite: _NF/Objects/Specific/Fuel/fuelgrade_material.rsi, state: uranium }
+  spawn: FuelUranium1
+  maxCount: 30
+
+- type: stack
+  id: FuelBananium
+  name: fuel-grade bananium
+  icon: { sprite: _NF/Objects/Specific/Fuel/fuelgrade_material.rsi, state: bananium }
+  spawn: FuelBananium1
+  maxCount: 30
diff --git a/Resources/Prototypes/_NF/game_presets.yml b/Resources/Prototypes/_NF/game_presets.yml
index b87244e0a7f..6c39e92fdb9 100644
--- a/Resources/Prototypes/_NF/game_presets.yml
+++ b/Resources/Prototypes/_NF/game_presets.yml
@@ -1,12 +1,30 @@
 - type: gamePreset
-  id: Adventure
+  id: NFAdventure
   alias:
+    - nfadventure
     - adventure
-  name: adventure-title
-  description: adventure-description
-  showInVote: false
+  name: nf-adventure-title
+  description: nf-adventure-description
+  showInVote: true
   rules:
-    - Adventure
+    - NFAdventure
+    - BasicStationEventScheduler
+    - BluespaceEventScheduler
+    - BluespaceDungeonEventScheduler
+    - BluespaceSalvageEventScheduler
+    - SmugglingEventScheduler
+    - FrontierRoundstartVariation
+
+- type: gamePreset
+  id: NFPirate
+  alias:
+    - nfpirate
+    - pirate
+  name: nf-pirate-title
+  description: nf-pirate-description
+  showInVote: true
+  rules:
+    - NFAdventure
     - BasicStationEventScheduler
     - BluespaceEventScheduler
     - BluespaceDungeonEventScheduler
diff --git a/Resources/Prototypes/_NF/ore.yml b/Resources/Prototypes/_NF/ore.yml
index 5164e6d602d..6d552060a18 100644
--- a/Resources/Prototypes/_NF/ore.yml
+++ b/Resources/Prototypes/_NF/ore.yml
@@ -1,4 +1,7 @@
 # Ore definitions
+
+# Standard rocks
+
 # High yields
 - type: ore
   id: NFOreSteel
@@ -56,55 +59,84 @@
   minOreYield: 1
   maxOreYield: 2
 
-# Upstream mobs
 - type: ore
-  id: OreBananiumCrab
-  oreEntity: MobSpawnBananiumCrab
+  id: NFOreBluespace
+  oreEntity: BluespaceOre1
+  minOreYield: 1
+  maxOreYield: 1
 
+# Dense rocks
+
+# High yields
 - type: ore
-  id: OreCoalCrab
-  oreEntity: MobSpawnCoalCrab
+  id: NFOreSteelDense
+  oreEntity: SteelOre5
+  minOreYield: 5
+  maxOreYield: 7
 
 - type: ore
-  id: OreSaltCrab
-  oreEntity: MobSpawnSaltCrab
+  id: NFOreSpaceQuartzDense
+  oreEntity: SpaceQuartz5
+  minOreYield: 5
+  maxOreYield: 7
 
 - type: ore
-  id: OrePlasmaCrab
-  oreEntity: MobSpawnPlasmaCrab
+  id: NFOreCoalDense
+  oreEntity: Coal5
+  minOreYield: 5
+  maxOreYield: 7
 
+# Medium yields
 - type: ore
-  id: OreGoldCrab
-  oreEntity: MobSpawnGoldCrab
+  id: NFOreGoldDense
+  oreEntity: GoldOre5
+  minOreYield: 3
+  maxOreYield: 5
 
-# Frontier - Ore
 - type: ore
-  id: OreBluespace
-  oreEntity: BluespaceOre1
-  minOreYield: 1
-  maxOreYield: 1
+  id: NFOreSilverDense
+  oreEntity: SilverOre5
+  minOreYield: 3
+  maxOreYield: 5
 
-# Frontier - Mobs
 - type: ore
-  id: OreQuartzCrabNF
-  oreEntity: MobSpawnCrabNFQuartz
+  id: NFOreSaltDense
+  oreEntity: Salt5
+  minOreYield: 3
+  maxOreYield: 5
 
+# Low yields
 - type: ore
-  id: OreIronCrabNF
-  oreEntity: MobSpawnCrabNFIron
+  id: NFOrePlasmaDense
+  oreEntity: PlasmaOre5
+  minOreYield: 2
+  maxOreYield: 4
 
 - type: ore
-  id: OreSilverCrabNF
-  oreEntity: MobSpawnCrabNFSilver
+  id: NFOreUraniumDense
+  oreEntity: UraniumOre5
+  minOreYield: 2
+  maxOreYield: 4
 
 - type: ore
-  id: OreUraniumCrabNF
-  oreEntity: MobSpawnCrabNFUranium
+  id: NFOreBananiumDense
+  oreEntity: BananiumOre5
+  minOreYield: 2
+  maxOreYield: 4
 
 - type: ore
-  id: OreQuartzGolem
-  oreEntity: MobSpawnQuartzGolem
+  id: NFOreBluespaceDense
+  oreEntity: BluespaceOre1
+  minOreYield: 2
+  maxOreYield: 2
 
+- type: ore
+  id: NFOreDiamondDense
+  oreEntity: DiamondOre1
+  minOreYield: 2
+  maxOreYield: 2
+
+# Frontier - Mobs
 - type: ore
   id: OreBananiumCrabNF
   oreEntity: MobSpawnBananiumCrabNF
@@ -121,6 +153,22 @@
   id: OreCoalGolem
   oreEntity: MobSpawnCoalGolem
 
+- type: ore
+  id: OreIronCrabNF
+  oreEntity: MobSpawnCrabNFIron
+
+- type: ore
+  id: OreIronGolem
+  oreEntity: MobSpawnIronGolem
+
+- type: ore
+  id: OreSilverCrabNF
+  oreEntity: MobSpawnCrabNFSilver
+
+- type: ore
+  id: OreSilverGolem
+  oreEntity: MobSpawnSilverGolem
+
 - type: ore
   id: OreGoldCrabNF
   oreEntity: MobSpawnGoldCrabNF
@@ -129,10 +177,6 @@
   id: OreGoldGolem
   oreEntity: MobSpawnGoldGolem
 
-- type: ore
-  id: OreIronGolem
-  oreEntity: MobSpawnIronGolem
-
 - type: ore
   id: OrePlasmaCrabNF
   oreEntity: MobSpawnPlasmaCrabNF
@@ -141,6 +185,14 @@
   id: OrePlasmaGolem
   oreEntity: MobSpawnPlasmaGolem
 
+- type: ore
+  id: OreQuartzCrabNF
+  oreEntity: MobSpawnCrabNFQuartz
+
+- type: ore
+  id: OreQuartzGolem
+  oreEntity: MobSpawnQuartzGolem
+
 - type: ore
   id: OreSaltCrabNF
   oreEntity: MobSpawnSaltCrabNF
@@ -150,8 +202,8 @@
   oreEntity: MobSpawnSaltGolem
 
 - type: ore
-  id: OreSilverGolem
-  oreEntity: MobSpawnSilverGolem
+  id: OreUraniumCrabNF
+  oreEntity: MobSpawnCrabNFUranium
 
 - type: ore
   id: OreUraniumGolem
diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml
index 751cd8a092c..aee1f4b7654 100644
--- a/Resources/Prototypes/_NF/tags.yml
+++ b/Resources/Prototypes/_NF/tags.yml
@@ -1,5 +1,4 @@
 # Dungeon
-
 - type: Tag
   id: NFCaveFactory
 
@@ -30,6 +29,28 @@
 - type: Tag
   id: NFWreck
 
+# SuperCompacted
+- type: Tag
+  id: NFSuperCompactedChromite
+
+- type: Tag
+  id: NFSuperCompactedSnow
+
+- type: Tag
+  id: NFSuperCompactedAsteroid
+
+- type: Tag
+  id: NFSuperCompactedAndesite
+
+- type: Tag
+  id: NFSuperCompactedBasalt
+
+- type: Tag
+  id: NFSuperCompactedSand
+
+- type: Tag
+  id: NFSuperCompactedAsteroidRock
+
 # Misc
 - type: Tag
   id: DockTransit
diff --git a/Resources/Prototypes/game_presets.yml b/Resources/Prototypes/game_presets.yml
index 945b4a8c83b..ad66624f7f5 100644
--- a/Resources/Prototypes/game_presets.yml
+++ b/Resources/Prototypes/game_presets.yml
@@ -91,7 +91,7 @@
   showInVote: false #4boring4vote
   description: greenshift-description
   rules:
-  - SpaceTrafficControlFriendlyEventScheduler 
+  - SpaceTrafficControlFriendlyEventScheduler
   - BasicRoundstartVariation
 
 - type: gamePreset
@@ -100,7 +100,7 @@
     - secret
     - sekrit
   name: secret-title
-  showInVote: true
+  showInVote: false # Frontier: true < false
   description: secret-description
   rules:
     - Secret
@@ -126,7 +126,7 @@
   showInVote: false #Admin Use
   description: secret-description
   rules:
-  - SpaceTrafficControlFriendlyEventScheduler 
+  - SpaceTrafficControlFriendlyEventScheduler
   - BasicRoundstartVariation
 
 - type: gamePreset
@@ -164,7 +164,7 @@
   name: death-match-title
   description: death-match-description
   maxPlayers: 15
-  showInVote: true
+  showInVote: false # Frontier: true < false
   supportedMaps: DeathMatchMapPool
   rules:
     - DeathMatch31
@@ -233,4 +233,4 @@
   - BasicStationEventScheduler
   - KesslerSyndromeScheduler
   - SpaceTrafficControlEventScheduler
-  - BasicRoundstartVariation
\ No newline at end of file
+  - BasicRoundstartVariation
diff --git a/Resources/ServerInfo/Guidebook/Service/Janitorial.xml b/Resources/ServerInfo/Guidebook/Service/Janitorial.xml
index e715fe919f7..2843c197672 100644
--- a/Resources/ServerInfo/Guidebook/Service/Janitorial.xml
+++ b/Resources/ServerInfo/Guidebook/Service/Janitorial.xml
@@ -20,7 +20,7 @@ You keep things clean, it's a rough job sometimes, but someone's gotta do it. Th
 
 ## Additional Equipment
 <Box>
-<GuideEntityEmbed Entity="VehicleJanicart"/>
+<GuideEntityEmbed Entity="NFVehicleJanicart"/>
 <GuideEntityEmbed Entity="WetFloorSign"/>
 <GuideEntityEmbed Entity="Holoprojector" Caption="holosign projector"/>
 <GuideEntityEmbed Entity="LightReplacer"/>
diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Charon.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Charon.xml
index 91f1067542b..3158a7ef555 100644
--- a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Charon.xml
+++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Charon.xml
@@ -6,6 +6,9 @@
   <GuideEntityEmbed Entity="ShipyardRCD"/>
   <GuideEntityEmbed Entity="ClothingBeltUtilityEngineering"/>
   </Box>
+  <Box>
+    <GuideEntityEmbed Entity="ShuttleMapCharon" Caption=""/>
+  </Box>
   [color=#a4885c]Ship Size:[/color] Medium
 
   [color=#a4885c]Recommended Crew:[/color] 2-4
diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/icon.png
new file mode 100644
index 00000000000..3cf56d45371
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-left.png
new file mode 100644
index 00000000000..a41d27bcc71
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-left.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-right.png
new file mode 100644
index 00000000000..cbabf3b291a
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/inhand-right.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/meta.json
new file mode 100644
index 00000000000..39ff0ed9d9b
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites sourced from https://github.com/tgstation/tgstation/pull/8495. In-hand sprites edited by Timemaster99 (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/icon.png
new file mode 100644
index 00000000000..c1254bb8086
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/icon.png differ
diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/meta.json
new file mode 100644
index 00000000000..5abad9b4225
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprites sourced from https://github.com/tgstation/tgstation/pull/8495",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/meta.json
new file mode 100644
index 00000000000..8081065c329
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Original screen timer sprite by brainfood1183 (Github) for Space Station 14, modified by Leonardo_dabepis (Discord)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "trialtimer"
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/trialtimer.png b/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/trialtimer.png
new file mode 100644
index 00000000000..34c8f1b90a9
Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi/trialtimer.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000..6cb9af02e93
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/icon.png
new file mode 100644
index 00000000000..50a51759d9f
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/inhand-left.png
new file mode 100644
index 00000000000..c716e112758
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/inhand-right.png
new file mode 100644
index 00000000000..46b73daf9f7
Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/meta.json
new file mode 100644
index 00000000000..b4a19d6b0de
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/Head/Misc/pwig.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, equipped-HELMET edited by whatstone",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Effects/bloodcultprojectiles.rsi/hand.png b/Resources/Textures/_NF/Effects/bloodcultprojectiles.rsi/hand.png
new file mode 100644
index 00000000000..66d776da6ce
Binary files /dev/null and b/Resources/Textures/_NF/Effects/bloodcultprojectiles.rsi/hand.png differ
diff --git a/Resources/Textures/_NF/Effects/bloodcultprojectiles.rsi/meta.json b/Resources/Textures/_NF/Effects/bloodcultprojectiles.rsi/meta.json
new file mode 100644
index 00000000000..817c0194222
--- /dev/null
+++ b/Resources/Textures/_NF/Effects/bloodcultprojectiles.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/mob/actions/actions_cult.dmi ",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "hand"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/charon.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/charon.png
new file mode 100644
index 00000000000..a4bd1f8c64c
Binary files /dev/null and b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/charon.png differ
diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json
index 5fd0e9c7d2e..14145fba669 100644
--- a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json
+++ b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json
@@ -1,7 +1,10 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "ambition, bocadillo, brigand, bulker, ceres, chisel, comet, construct, garden, gasbender, harbormaster, investigator, kestrel, kilderkin, lantern, legman, liquidator, loader, pathfinder, pioneer, prospector, searchlight and vagabond by erhardsteinhauer (discord/github), used font from https://github.com/tgstation/tgstation/blob/master/icons/obj/signs.dmi. spirit by iNoahGuy/actualcatmoment (discord/github). apothecary, stasis by dustylens (discord/github). barge, eagle, hauler, phoenix, placebo, skipper, sparrow by Mygnol (discord/github)",
+  "copyright": "ambition, bocadillo, brigand, bulker, ceres, chisel, comet, construct, garden, gasbender, harbormaster, investigator, kestrel, kilderkin, lantern, legman, liquidator, loader, pathfinder, pioneer, prospector, searchlight and vagabond by erhardsteinhauer (discord/github), used font from https://github.com/tgstation/tgstation/blob/master/icons/obj/signs.dmi.",
+  "copyright": "spirit by iNoahGuy/actualcatmoment (discord/github).",
+  "copyright": "apothecary, charon, stasis by dustylens (discord/github).",
+  "copyright": "barge, eagle, hauler, phoenix, placebo, skipper, sparrow by Mygnol (discord/github)",
   "size": {
     "x": 128,
     "y": 96
@@ -31,6 +34,9 @@
     {
       "name": "ceres"
     },
+    {
+      "name": "charon"
+    },
     {
       "name": "chisel"
     },
diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat.png
new file mode 100644
index 00000000000..20518db471d
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat.png differ
diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_dead.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_dead.png
new file mode 100644
index 00000000000..3203daf86a1
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_dead.png differ
diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_rest.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_rest.png
new file mode 100644
index 00000000000..099de165c5f
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_rest.png differ
diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_rest_unshaded.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_rest_unshaded.png
new file mode 100644
index 00000000000..7269ce17b21
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_rest_unshaded.png differ
diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_sit.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_sit.png
new file mode 100644
index 00000000000..308c253f1f5
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_sit.png differ
diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_sit_unshaded.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_sit_unshaded.png
new file mode 100644
index 00000000000..9a2e23061d3
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_sit_unshaded.png differ
diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_unshaded.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_unshaded.png
new file mode 100644
index 00000000000..e16977956fb
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/cultcat_unshaded.png differ
diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/mask_null.png b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/mask_null.png
new file mode 100644
index 00000000000..2975c479be7
Binary files /dev/null and b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/mask_null.png differ
diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json
index e8f1d8ea4ab..3193bc67c3b 100644
--- a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json
+++ b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json
@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Modified from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b, piratecat and mistakecat edited by Dvir001, nfsdcat and cavecat edited by ghostprince",
+  "copyright": "Modified from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b, piratecat and mistakecat edited by Dvir001, nfsdcat and cavecat edited by ghostprince | Cult cat taken from tgstation at https://github.com/tgstation/tgstation/blob/master/icons/mob/simple/pets.dmi and modified by erhardsteinhauer (discord/github)",
   "states": [
     {
       "name": "piratecat",
@@ -93,6 +93,48 @@
     {
       "name": "cattag",
       "directions": 4
+    },
+    {
+      "name": "cultcat",
+      "directions": 4
+    },
+    {
+      "name": "cultcat_unshaded",
+      "directions": 4
+    },
+    {
+      "name": "cultcat_dead"
+    },
+    {
+      "name": "cultcat_rest",
+      "delays": [
+        [
+          0.1,
+          0.2,
+          0.1,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "cultcat_rest_unshaded",
+      "delays": [
+        [
+          0.1,
+          0.2,
+          0.1,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "cultcat_sit"
+    },
+    {
+      "name": "cultcat_sit_unshaded"
+    },
+    {
+      "name": "mask_null"
     }
   ]
 }
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill1.png
new file mode 100644
index 00000000000..ee3a7c08e7b
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill1.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill2.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill2.png
new file mode 100644
index 00000000000..7aaebf3894c
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill2.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill3.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill3.png
new file mode 100644
index 00000000000..2c4ad57579b
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill3.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill4.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill4.png
new file mode 100644
index 00000000000..d7d1c5b6ddd
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill4.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill5.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill5.png
new file mode 100644
index 00000000000..593f71b2ff0
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill5.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill6.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill6.png
new file mode 100644
index 00000000000..df9444923c0
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill6.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill7.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill7.png
new file mode 100644
index 00000000000..0d66df4bc0b
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill7.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill8.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill8.png
new file mode 100644
index 00000000000..ac649ea8711
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/fill8.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/icon.png
new file mode 100644
index 00000000000..c171704eff2
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/icon_empty.png
new file mode 100644
index 00000000000..ff6c74cf952
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/icon_empty.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/meta.json
new file mode 100644
index 00000000000..828ef1ea4ce
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/eggnog.rsi/meta.json
@@ -0,0 +1,43 @@
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Made by whatston3",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill1"
+        },
+        {
+            "name": "fill2"
+        },
+        {
+            "name": "fill3"
+        },
+        {
+            "name": "fill4"
+        },
+        {
+            "name": "fill5"
+        },
+        {
+            "name": "fill6"
+        },
+        {
+            "name": "fill7"
+        },
+        {
+            "name": "fill8"
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-1.png
new file mode 100644
index 00000000000..75e2d658963
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-1.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-2.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-2.png
new file mode 100644
index 00000000000..b0c10ebe94d
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-2.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-3.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-3.png
new file mode 100644
index 00000000000..bb52e312eac
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-3.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-4.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-4.png
new file mode 100644
index 00000000000..0e069c9d7db
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/fill-4.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/icon.png
new file mode 100644
index 00000000000..015a05d8baa
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/icon_empty.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/icon_empty.png
new file mode 100644
index 00000000000..f82e92693f0
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/icon_empty.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/meta.json
new file mode 100644
index 00000000000..d9fcc9963d6
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/wassail.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by dustylens (GitHub)",
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_empty"
+    },
+    {
+      "name": "fill-1"
+    },
+    {
+      "name": "fill-2"
+    },
+    {
+      "name": "fill-3"
+    },
+    {
+      "name": "fill-4"
+    }
+  ]
+}
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/Textures/_NF/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json
index 1fb57ff4e1c..81ca0475904 100644
--- a/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "plushie_jester, plushie_trystan, plushie_vulp: gentlejester-148196053781315584 / plushie_slips: mintymoo-449394523089403905 / gnome/ipc/grey/loveable/abductor/abductor_agent/deer - Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2, construction, botany, engineer and cmo lizard plushies by Created by Ghost Prince for use on Frontier Server.",
+    "copyright": "plushie_jester, plushie_trystan, plushie_vulp: gentlejester-148196053781315584 / plushie_slips: mintymoo-449394523089403905 / gnome/ipc/grey/loveable/abductor/abductor_agent/deer - Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2, construction, botany, engineer and cmo lizard plushies by Created by Ghost Prince for use on Frontier Server. Yarrmoth and Mailvulp by lvl1eevee (Discord)",
     "size": {
         "x": 32,
         "y": 32
@@ -46,6 +46,12 @@
         {
             "name": "plushie_construction"
         },
+        {
+            "name": "plushie_yarrmoth"
+        },
+        {
+            "name": "plushie_mailvulp"
+        },
         {
             "name": "gnome"
         }
diff --git a/Resources/Textures/_NF/Objects/Fun/toys.rsi/plushie_mailvulp.png b/Resources/Textures/_NF/Objects/Fun/toys.rsi/plushie_mailvulp.png
new file mode 100644
index 00000000000..08f3657ba2d
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Fun/toys.rsi/plushie_mailvulp.png differ
diff --git a/Resources/Textures/_NF/Objects/Fun/toys.rsi/plushie_yarrmoth.png b/Resources/Textures/_NF/Objects/Fun/toys.rsi/plushie_yarrmoth.png
new file mode 100644
index 00000000000..e799e7b2413
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Fun/toys.rsi/plushie_yarrmoth.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/bananium.png b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/bananium.png
index 96360749fd5..cfbcb4c29c0 100644
Binary files a/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/bananium.png and b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/bananium.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/empty.png b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/empty.png
new file mode 100644
index 00000000000..2d5ac61ad68
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/empty.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/meta.json
index 21b63619775..672dc370302 100644
--- a/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/meta.json
@@ -1,6 +1,6 @@
 {
     "version": 1,
-    "copyright": "Made by Whatstone based sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
+    "copyright": "Made by GhostPrince",
     "license": "CC-BY-SA-3.0",
     "size": {
         "x": 32,
@@ -10,6 +10,9 @@
         {
             "name": "bananium"
         },
+        {
+            "name": "empty"
+        },
         {
             "name": "plasma"
         },
diff --git a/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/plasma.png b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/plasma.png
index 6a040497614..07784f8a7f7 100644
Binary files a/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/plasma.png and b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/plasma.png differ
diff --git a/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/uranium.png b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/uranium.png
index 82e3f5c5679..1eae8262d9d 100644
Binary files a/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/uranium.png and b/Resources/Textures/_NF/Objects/Specific/Fuel/fuelgrade_material.rsi/uranium.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/icon.png
new file mode 100644
index 00000000000..ee1382a4809
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/icon_open.png b/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/icon_open.png
new file mode 100644
index 00000000000..9cc195f27d0
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/icon_open.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/meta.json
new file mode 100644
index 00000000000..a6e9f155347
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation PR https://github.com/tgstation/tgstation/pull/38977, modified by rosieposieeee & whatston3",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_open"
+    },
+    {
+      "name": "paper"
+    },
+    {
+      "name": "metal_explosive_label"
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/metal_explosive_label.png b/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/metal_explosive_label.png
new file mode 100644
index 00000000000..b1b977b07e8
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/metal_explosive_label.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/paper.png b/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/paper.png
new file mode 100644
index 00000000000..08d7f696fec
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/black.rsi/paper.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/icon.png
new file mode 100644
index 00000000000..1bf90ce9918
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/icon_open.png b/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/icon_open.png
new file mode 100644
index 00000000000..9cc195f27d0
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/icon_open.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/meta.json
new file mode 100644
index 00000000000..a6e9f155347
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation PR https://github.com/tgstation/tgstation/pull/38977, modified by rosieposieeee & whatston3",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_open"
+    },
+    {
+      "name": "paper"
+    },
+    {
+      "name": "metal_explosive_label"
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/metal_explosive_label.png b/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/metal_explosive_label.png
new file mode 100644
index 00000000000..b1b977b07e8
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/metal_explosive_label.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/paper.png b/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/paper.png
new file mode 100644
index 00000000000..08d7f696fec
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/blue.rsi/paper.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/icon.png
new file mode 100644
index 00000000000..101ec3f6d1b
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/icon_open.png b/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/icon_open.png
new file mode 100644
index 00000000000..9cc195f27d0
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/icon_open.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/meta.json
new file mode 100644
index 00000000000..a6e9f155347
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation PR https://github.com/tgstation/tgstation/pull/38977, modified by rosieposieeee & whatston3",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_open"
+    },
+    {
+      "name": "paper"
+    },
+    {
+      "name": "metal_explosive_label"
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/metal_explosive_label.png b/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/metal_explosive_label.png
new file mode 100644
index 00000000000..b1b977b07e8
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/metal_explosive_label.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/paper.png b/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/paper.png
new file mode 100644
index 00000000000..08d7f696fec
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/green.rsi/paper.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/icon.png
new file mode 100644
index 00000000000..a417ce2e29c
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/icon_open.png b/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/icon_open.png
new file mode 100644
index 00000000000..9cc195f27d0
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/icon_open.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/meta.json
new file mode 100644
index 00000000000..a6e9f155347
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation PR https://github.com/tgstation/tgstation/pull/38977, modified by rosieposieeee & whatston3",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_open"
+    },
+    {
+      "name": "paper"
+    },
+    {
+      "name": "metal_explosive_label"
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/metal_explosive_label.png b/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/metal_explosive_label.png
new file mode 100644
index 00000000000..b1b977b07e8
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/metal_explosive_label.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/paper.png b/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/paper.png
new file mode 100644
index 00000000000..08d7f696fec
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/grey.rsi/paper.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/icon.png
new file mode 100644
index 00000000000..6c37208bcfa
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/icon_open.png b/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/icon_open.png
new file mode 100644
index 00000000000..9cc195f27d0
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/icon_open.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/meta.json
new file mode 100644
index 00000000000..a6e9f155347
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation PR https://github.com/tgstation/tgstation/pull/38977, modified by rosieposieeee & whatston3",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_open"
+    },
+    {
+      "name": "paper"
+    },
+    {
+      "name": "metal_explosive_label"
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/metal_explosive_label.png b/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/metal_explosive_label.png
new file mode 100644
index 00000000000..b1b977b07e8
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/metal_explosive_label.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/paper.png b/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/paper.png
new file mode 100644
index 00000000000..08d7f696fec
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/red.rsi/paper.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/icon.png
new file mode 100644
index 00000000000..c935fef87d4
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/icon_open.png b/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/icon_open.png
new file mode 100644
index 00000000000..9cc195f27d0
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/icon_open.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/meta.json
new file mode 100644
index 00000000000..a6e9f155347
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation PR https://github.com/tgstation/tgstation/pull/38977, modified by rosieposieeee & whatston3",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_open"
+    },
+    {
+      "name": "paper"
+    },
+    {
+      "name": "metal_explosive_label"
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/metal_explosive_label.png b/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/metal_explosive_label.png
new file mode 100644
index 00000000000..b1b977b07e8
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/metal_explosive_label.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/paper.png b/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/paper.png
new file mode 100644
index 00000000000..08d7f696fec
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/white.rsi/paper.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/closed.png b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/closed.png
new file mode 100644
index 00000000000..b111827b8e5
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/closed.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/icon.png
new file mode 100644
index 00000000000..bfc92c166d4
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/meta.json
new file mode 100644
index 00000000000..8e941fd7d61
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation PR https://github.com/tgstation/tgstation/pull/38977, modified by rosieposieeee",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "icon"
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/open.png b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/open.png
new file mode 100644
index 00000000000..bfc92c166d4
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/open.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/icon.png
new file mode 100644
index 00000000000..a22bef0ff3f
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/icon.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/icon_open.png b/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/icon_open.png
new file mode 100644
index 00000000000..9cc195f27d0
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/icon_open.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/meta.json
new file mode 100644
index 00000000000..a6e9f155347
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation PR https://github.com/tgstation/tgstation/pull/38977, modified by rosieposieeee & whatston3",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_open"
+    },
+    {
+      "name": "paper"
+    },
+    {
+      "name": "metal_explosive_label"
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/metal_explosive_label.png b/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/metal_explosive_label.png
new file mode 100644
index 00000000000..b1b977b07e8
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/metal_explosive_label.png differ
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/paper.png b/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/paper.png
new file mode 100644
index 00000000000..08d7f696fec
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Storage/Barrels/yellow.rsi/paper.png differ
diff --git a/Resources/_NF/migration.yml b/Resources/_NF/migration.yml
index 5097766ff00..08df7cb5dee 100644
--- a/Resources/_NF/migration.yml
+++ b/Resources/_NF/migration.yml
@@ -169,4 +169,10 @@ NFPosterContrabandFsbSpiritDD: NFPosterContrabandFsbSpirit
 NFPosterContrabandEmsCoordsDD: NFPosterContrabandEmsCoords
 
 # 2024-12-09 Wreck
-RandomItem: null
\ No newline at end of file
+RandomItem: null
+
+# 2024-12-14
+VehicleJanicart: NFVehicleJanicart
+
+# 2024-12-22 Barrels 
+CrateSpaceCleaner: ChemicalBarrelSpaceCleaner
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 39e8d54bf1d..e394d3aa118 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -440,3 +440,5 @@ BlueprintFlare: null
 
 # 2024-10-04
 BaseAdvancedPen: Pen
+
+# Frontier: put Frontier-related migrations in _NF/migration.yml. Thank you.