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.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.Server/AlertLevel/AlertLevelSystem.cs b/Content.Server/AlertLevel/AlertLevelSystem.cs
index 8e43bf6a715..71ad018603a 100644
--- a/Content.Server/AlertLevel/AlertLevelSystem.cs
+++ b/Content.Server/AlertLevel/AlertLevelSystem.cs
@@ -172,8 +172,7 @@ public void SetLevel(EntityUid station, string level, bool playSound, bool annou
             return;
         // End Frontier
 
-        if (!Resolve(station, ref dataComponent) // Frontier: remove component
-            || component.AlertLevels == null
+        if (component.AlertLevels == null // Frontier: remove component, resolve station to data component later
             || !component.AlertLevels.Levels.TryGetValue(level, out var detail)
             || component.CurrentLevel == level)
         {
@@ -196,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();
 
@@ -232,8 +231,9 @@ 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);
         }
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 9f820bdf701..633a027ef8f 100644
--- a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
@@ -32,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)
@@ -245,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/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/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/_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..68062cdb598 100644
--- a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs
+++ b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs
@@ -1,24 +1,15 @@
 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.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.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;
@@ -29,26 +20,19 @@
 using Content.Shared.GameTicking;
 using Robust.Shared.Enums;
 using Robust.Server.Player;
-using Content.Server.Warps;
 
 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 BankSystem _bank = default!;
-    [Dependency] private readonly StationRenameWarpsSystems _renameWarps = default!;
+    [Dependency] private readonly PointOfInterestSystem _poi = default!;
 
     private readonly HttpClient _httpClient = new();
 
@@ -77,11 +61,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()
     {
@@ -92,7 +71,7 @@ public override void Initialize()
         _playerManager.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 +185,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();
@@ -237,11 +213,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,223 +225,6 @@ 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);
diff --git a/Content.Shared/_NF/GameRule/PointOfInterestPrototype.cs b/Content.Server/_NF/GameRule/PointOfInterestPrototype.cs
similarity index 83%
rename from Content.Shared/_NF/GameRule/PointOfInterestPrototype.cs
rename to Content.Server/_NF/GameRule/PointOfInterestPrototype.cs
index b1b11cd5963..f29cf76474e 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,17 @@ 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.
+    /// </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..d58a70b924a
--- /dev/null
+++ b/Content.Server/_NF/GameRule/PointOfInterestSystem.cs
@@ -0,0 +1,299 @@
+using System.Linq;
+using System.Numerics;
+using Robust.Server.GameObjects;
+using Robust.Server.Maps;
+using Robust.Shared.Configuration;
+using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using Content.Server.Maps;
+using Content.Server.Station.Systems;
+using Content.Server.GameTicking;
+using Content.Shared._NF.CCVar;
+using Content.Shared.GameTicking;
+
+namespace Content.Server._NF.GameRule;
+
+/// <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 IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+    [Dependency] private readonly MapLoaderSystem _map = default!;
+    [Dependency] private readonly MetaDataSystem _meta = default!;
+    [Dependency] private readonly StationSystem _station = default!;
+    [Dependency] private readonly StationRenameWarpsSystems _renameWarps = default!;
+    [Dependency] private readonly GameTicker _ticker = default!;
+
+    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 = _configurationManager.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);
+
+            if (!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 = _configurationManager.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)
+        {
+            if (!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 = _configurationManager.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)
+        {
+            if (!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)
+        {
+            if (!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)
+            {
+                if (!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 (_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)
+    {
+        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);
+        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.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/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/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/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/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index fa4e36c83cc..99b83bb1457 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -6041,3 +6041,72 @@ Entries:
       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'
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/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/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/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/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/trade.yml b/Resources/Maps/_NF/POI/trade.yml
index 1fab43e1778..27b2a1d9789 100644
--- a/Resources/Maps/_NF/POI/trade.yml
+++ b/Resources/Maps/_NF/POI/trade.yml
@@ -9219,18 +9219,6 @@ entities:
       parent: 1
 - proto: CargoPalletSell
   entities:
-  - uid: 225
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 61.5,22.5
-      parent: 1
-  - uid: 226
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 63.5,22.5
-      parent: 1
   - uid: 228
     components:
     - type: Transform
@@ -9461,6 +9449,16 @@ entities:
     - type: Transform
       pos: 81.5,-7.5
       parent: 1
+  - uid: 225
+    components:
+    - type: Transform
+      pos: 61.5,22.5
+      parent: 1
+  - uid: 226
+    components:
+    - type: Transform
+      pos: 63.5,22.5
+      parent: 1
   - uid: 341
     components:
     - type: Transform
diff --git a/Resources/Prototypes/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 f09cada8f7e..74692516bbe 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
@@ -10,8 +10,6 @@
 #    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
@@ -19,10 +17,10 @@
     FoodCondimentBottleVinegar: 5  # Frontier 2<5
     FoodCondimentBottleSoysauce: 5 # Frontier    
 #    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/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/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/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/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/_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/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/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/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/Specific/chemical-containers.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml
index bcd319f1ce5..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
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/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/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
index 0cb1218de5f..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
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/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/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 4e9a605f7dd..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
diff --git a/Resources/Prototypes/_NF/Procedural/cave_vgroid.yml b/Resources/Prototypes/_NF/Procedural/cave_vgroid.yml
index d737f184867..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
diff --git a/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml b/Resources/Prototypes/_NF/Procedural/chromite_vgroid.yml
index 38d0ba111ce..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
diff --git a/Resources/Prototypes/_NF/Procedural/snow_vgroid.yml b/Resources/Prototypes/_NF/Procedural/snow_vgroid.yml
index 7b7f8553404..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
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/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/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/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/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.