diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index 1c2d70c8db6..56d1a04c4ef 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -35,6 +35,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Replays;
 using Robust.Shared.Timing;
+using Content.Client._NF.Emp.Overlays; // Frontier
 
 namespace Content.Client.Entry
 {
@@ -154,6 +155,7 @@ public override void PostInit()
 
             _overlayManager.AddOverlay(new SingularityOverlay());
             _overlayManager.AddOverlay(new RadiationPulseOverlay());
+            _overlayManager.AddOverlay(new EmpBlastOverlay()); // Frontier
             _chatManager.Initialize();
             _clientPreferencesManager.Initialize();
             _euiManager.Initialize();
diff --git a/Content.Client/_NF/Emp/Overlays/EmpBlastOverlay.cs b/Content.Client/_NF/Emp/Overlays/EmpBlastOverlay.cs
new file mode 100644
index 00000000000..89e4e6fdefb
--- /dev/null
+++ b/Content.Client/_NF/Emp/Overlays/EmpBlastOverlay.cs
@@ -0,0 +1,145 @@
+using System.Numerics;
+using Content.Shared._NF.Emp.Components;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Shared.Enums;
+using Robust.Shared.Graphics;
+using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Client._NF.Emp.Overlays
+{
+    public sealed class EmpBlastOverlay : Overlay
+    {
+        [Dependency] private readonly IEntityManager _entityManager = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+        private TransformSystem? _transform;
+
+        private const float PvsDist = 25.0f;
+
+        public override OverlaySpace Space => OverlaySpace.WorldSpace;
+        public override bool RequestScreenTexture => true;
+
+        private readonly ShaderInstance _baseShader;
+        private readonly Dictionary<EntityUid, (ShaderInstance shd, EmpShaderInstance instance)> _blasts = new();
+
+        public EmpBlastOverlay()
+        {
+            IoCManager.InjectDependencies(this);
+            _baseShader = _prototypeManager.Index<ShaderPrototype>("Emp").Instance().Duplicate();
+        }
+
+        protected override bool BeforeDraw(in OverlayDrawArgs args)
+        {
+            EmpQuery(args.Viewport.Eye);
+            return _blasts.Count > 0;
+        }
+
+        protected override void Draw(in OverlayDrawArgs args)
+        {
+            if (ScreenTexture == null)
+                return;
+
+            var worldHandle = args.WorldHandle;
+            var viewport = args.Viewport;
+
+            foreach ((var shd, var instance) in _blasts.Values)
+            {
+                if (instance.CurrentMapCoords.MapId != args.MapId)
+                    continue;
+
+                // To be clear, this needs to use "inside-viewport" pixels.
+                // In other words, specifically NOT IViewportControl.WorldToScreen (which uses outer coordinates).
+                var tempCoords = viewport.WorldToLocal(instance.CurrentMapCoords.Position);
+                tempCoords.Y = viewport.Size.Y - tempCoords.Y;
+                shd?.SetParameter("renderScale", viewport.RenderScale);
+                shd?.SetParameter("positionInput", tempCoords);
+                shd?.SetParameter("range", instance.Range);
+                var life = (_gameTiming.RealTime - instance.Start).TotalSeconds / instance.Duration;
+                shd?.SetParameter("life", (float)life);
+
+                // There's probably a very good reason not to do this.
+                // Oh well!
+                shd?.SetParameter("SCREEN_TEXTURE", viewport.RenderTarget.Texture);
+
+                worldHandle.UseShader(shd);
+                worldHandle.DrawRect(Box2.CenteredAround(instance.CurrentMapCoords.Position, new Vector2(instance.Range, instance.Range) * 2f), Color.White);
+            }
+
+            worldHandle.UseShader(null);
+        }
+
+        //Queries all blasts on the map and either adds or removes them from the list of rendered blasts based on whether they should be drawn (in range? on the same z-level/map? blast entity still exists?)
+        private void EmpQuery(IEye? currentEye)
+        {
+            _transform ??= _entityManager.System<TransformSystem>();
+
+            if (currentEye == null)
+            {
+                _blasts.Clear();
+                return;
+            }
+
+            var currentEyeLoc = currentEye.Position;
+
+            var blasts = _entityManager.EntityQueryEnumerator<EmpBlastComponent>();
+            //Add all blasts that are not added yet but qualify
+            while (blasts.MoveNext(out var blastEntity, out var blast))
+            {
+                if (!_blasts.ContainsKey(blastEntity) && BlastQualifies(blastEntity, currentEyeLoc, blast))
+                {
+                    _blasts.Add(
+                            blastEntity,
+                            (
+                                _baseShader.Duplicate(),
+                                new EmpShaderInstance(
+                                    _transform.GetMapCoordinates(blastEntity),
+                                    blast.VisualRange,
+                                    blast.StartTime,
+                                    blast.VisualDuration
+                                )
+                            )
+                    );
+                }
+            }
+
+            var activeShaderIds = _blasts.Keys;
+            foreach (var blastEntity in activeShaderIds) //Remove all blasts that are added and no longer qualify
+            {
+                if (_entityManager.EntityExists(blastEntity) &&
+                    _entityManager.TryGetComponent(blastEntity, out EmpBlastComponent? blast) &&
+                    BlastQualifies(blastEntity, currentEyeLoc, blast))
+                {
+                    var shaderInstance = _blasts[blastEntity];
+                    shaderInstance.instance.CurrentMapCoords = _transform.GetMapCoordinates(blastEntity);
+                    shaderInstance.instance.Range = blast.VisualRange;
+                }
+                else
+                {
+                    _blasts[blastEntity].shd.Dispose();
+                    _blasts.Remove(blastEntity);
+                }
+            }
+
+        }
+
+        private bool BlastQualifies(EntityUid blastEntity, MapCoordinates currentEyeLoc, EmpBlastComponent blast)
+        {
+            var transformComponent = _entityManager.GetComponent<TransformComponent>(blastEntity);
+            var transformSystem = _entityManager.System<SharedTransformSystem>();
+            return transformComponent.MapID == currentEyeLoc.MapId
+                && transformSystem.InRange(transformComponent.Coordinates, transformSystem.ToCoordinates(transformComponent.ParentUid, currentEyeLoc), PvsDist + blast.VisualRange);
+        }
+
+        private sealed record EmpShaderInstance(MapCoordinates CurrentMapCoords, float Range, TimeSpan Start, float Duration)
+        {
+            public MapCoordinates CurrentMapCoords = CurrentMapCoords;
+            public float Range = Range;
+            public TimeSpan Start = Start;
+            public float Duration = Duration;
+        };
+    }
+}
+
diff --git a/Content.Server/Emp/EmpSystem.cs b/Content.Server/Emp/EmpSystem.cs
index ff6fe45b14c..538a9521561 100644
--- a/Content.Server/Emp/EmpSystem.cs
+++ b/Content.Server/Emp/EmpSystem.cs
@@ -10,6 +10,10 @@
 using Content.Shared.Tiles; // Frontier
 using Robust.Server.GameObjects;
 using Robust.Shared.Map;
+using Content.Shared._NF.Emp.Components; // Frontier
+using Robust.Server.GameStates; // Frontier: EMP Blast PVS
+using Robust.Shared.Configuration; // Frontier: EMP Blast PVS
+using Robust.Shared; // Frontier: EMP Blast PVS
 
 namespace Content.Server.Emp;
 
@@ -17,8 +21,10 @@ public sealed class EmpSystem : SharedEmpSystem
 {
     [Dependency] private readonly EntityLookupSystem _lookup = default!;
     [Dependency] private readonly TransformSystem _transform = default!;
+    [Dependency] private readonly PvsOverrideSystem _pvs = default!; // Frontier: EMP Blast PVS
+    [Dependency] private readonly IConfigurationManager _cfg = default!; // Frontier: EMP Blast PVS
 
-    public const string EmpPulseEffectPrototype = "EffectEmpPulse";
+    public const string EmpPulseEffectPrototype = "EffectEmpBlast"; // Frontier: EffectEmpPulse
 
     public override void Initialize()
     {
@@ -54,7 +60,15 @@ public void EmpPulse(MapCoordinates coordinates, float range, float energyConsum
 
             TryEmpEffects(uid, energyConsumption, duration);
         }
-        Spawn(EmpPulseEffectPrototype, coordinates);
+
+        var empBlast = Spawn(EmpPulseEffectPrototype, coordinates); // Frontier: Added visual effect
+        EnsureComp<EmpBlastComponent>(empBlast, out var empBlastComp); // Frontier
+        empBlastComp.VisualRange = range; // Frontier
+
+        if (range > _cfg.GetCVar(CVars.NetMaxUpdateRange)) // Frontier
+            _pvs.AddGlobalOverride(empBlast); // Frontier
+
+        Dirty(empBlast, empBlastComp); // Frontier
     }
 
     /// <summary>
diff --git a/Content.Server/Holiday/HolidayPrototype.cs b/Content.Server/Holiday/HolidayPrototype.cs
index 749423402b5..c5dc7d05597 100644
--- a/Content.Server/Holiday/HolidayPrototype.cs
+++ b/Content.Server/Holiday/HolidayPrototype.cs
@@ -41,6 +41,9 @@ public sealed partial class HolidayPrototype : IPrototype
         [DataField("celebrate")]
         private IHolidayCelebrate? _celebrate = null;
 
+        [DataField("entityReplacements")] // Frontier
+        public Dictionary<EntProtoId, EntProtoId>? EntityReplacements = null; // Frontier
+
         public bool ShouldCelebrate(DateTime date)
         {
             return _shouldCelebrate.ShouldCelebrate(date, this);
diff --git a/Content.Server/Holiday/HolidaySystem.cs b/Content.Server/Holiday/HolidaySystem.cs
index 001508593da..1f8bfd72487 100644
--- a/Content.Server/Holiday/HolidaySystem.cs
+++ b/Content.Server/Holiday/HolidaySystem.cs
@@ -4,6 +4,7 @@
 using Content.Shared.CCVar;
 using Content.Shared.Holiday;
 using Robust.Shared.Configuration;
+using Robust.Shared.Map.Events;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Holiday
@@ -26,6 +27,7 @@ public override void Initialize()
             Subs.CVar(_configManager, CCVars.HolidaysEnabled, OnHolidaysEnableChange);
             SubscribeLocalEvent<GameRunLevelChangedEvent>(OnRunLevelChanged);
             SubscribeLocalEvent<HolidayVisualsComponent, ComponentInit>(OnVisualsInit);
+            SubscribeLocalEvent<BeforeEntityReadEvent>(OnBeforeRead);
         }
 
         public void RefreshCurrentHolidays()
@@ -115,6 +117,22 @@ private void OnVisualsInit(Entity<HolidayVisualsComponent> ent, ref ComponentIni
                 break;
             }
         }
+
+        // Frontier: holiday-themed entity replacement
+        private void OnBeforeRead(BeforeEntityReadEvent ev)
+        {
+            foreach (var holiday in _currentHolidays)
+            {
+                if (holiday.EntityReplacements is { } replacements)
+                {
+                    foreach (var (original, replacement) in replacements)
+                    {
+                        ev.RenamedPrototypes.TryAdd(original, replacement);
+                    }
+                }
+            }
+        }
+        // End Frontier
     }
 
     /// <summary>
diff --git a/Content.Server/_NF/Bank/BankSystem.cs b/Content.Server/_NF/Bank/BankSystem.cs
index 18c7670e181..7bcc1421225 100644
--- a/Content.Server/_NF/Bank/BankSystem.cs
+++ b/Content.Server/_NF/Bank/BankSystem.cs
@@ -208,11 +208,11 @@ public bool TryBankDeposit(ICommonSession session, PlayerPreferences prefs, Huma
     }
 
     /// <summary>
-    /// Attempts to add money to a character's bank account. This should always be used instead of attempting to modify the bankaccountcomponent directly
+    /// Retrieves a character's balance via its in-game entity, if it has one.
     /// </summary>
     /// <param name="ent">The UID that the bank account is connected to, typically the player controlled mob</param>
-    /// <param name="balance">The amount of spesos to add into the bank account</param>
-    /// <returns>true if the transaction was successful, false if it was not</returns>
+    /// <param name="balance">When successful, contains the account balance in spesos. Otherwise, set to 0.</param>
+    /// <returns>true if the account was successfully queried.</returns>
     public bool TryGetBalance(EntityUid ent, out int balance)
     {
         if (!_playerManager.TryGetSessionByEntity(ent, out var session) ||
@@ -234,6 +234,32 @@ public bool TryGetBalance(EntityUid ent, out int balance)
         return true;
     }
 
+    /// <summary>
+    /// Retrieves a character's balance via a player's session.
+    /// </summary>
+    /// <param name="session">The session of the player character to query.</param>
+    /// <param name="balance">When successful, contains the account balance in spesos. Otherwise, set to 0.</param>
+    /// <returns>true if the account was successfully queried.</returns>
+    public bool TryGetBalance(ICommonSession session, out int balance)
+    {
+        if (!_prefsManager.TryGetCachedPreferences(session.UserId, out var prefs))
+        {
+            _log.Info($"{session.UserId} has no cached prefs");
+            balance = 0;
+            return false;
+        }
+
+        if (prefs.SelectedCharacter is not HumanoidCharacterProfile profile)
+        {
+            _log.Info($"{session.UserId} has the wrong prefs type");
+            balance = 0;
+            return false;
+        }
+
+        balance = profile.BankBalance;
+        return true;
+    }
+
     /// <summary>
     /// Update the bank balance to the character's current account balance.
     /// </summary>
diff --git a/Content.Server/_NF/Construction/ConstructionSystem.Machine.Upgrades.cs b/Content.Server/_NF/Construction/ConstructionSystem.Machine.Upgrades.cs
index 08dc8a4cb40..62abc709168 100644
--- a/Content.Server/_NF/Construction/ConstructionSystem.Machine.Upgrades.cs
+++ b/Content.Server/_NF/Construction/ConstructionSystem.Machine.Upgrades.cs
@@ -109,7 +109,7 @@ public Dictionary<string, float> GetPartsRatings(List<MachinePartState> partStat
                 amount += state.Quantity();
                 sumRating += state.Part.Rating * state.Quantity();
             }
-            var rating = amount != 0 ? sumRating / amount : 0;
+            var rating = amount != 0 ? sumRating / amount : 1.0f;
             output.Add(type.ID, rating);
         }
 
diff --git a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs
index c6b88987d95..475fe794447 100644
--- a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs
+++ b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs
@@ -7,7 +7,6 @@
 using System.Threading.Tasks;
 using Content.Shared._NF.GameRule;
 using Content.Server.Procedural;
-using Content.Shared.Bank.Components;
 using Content.Server._NF.GameTicking.Events;
 using Content.Shared.Procedural;
 using Robust.Server.GameObjects;
@@ -30,9 +29,16 @@
 using Robust.Shared.Configuration;
 using Robust.Shared.Physics.Components;
 using Content.Server.Shuttles.Components;
+using Content.Shared._NF.Bank;
 using Content.Shared.Tiles;
 using Content.Server._NF.PublicTransit.Components;
 using Content.Server._NF.GameRule.Components;
+using Content.Server.Bank;
+using Robust.Shared.Player;
+using Robust.Shared.Network;
+using Content.Shared.GameTicking;
+using Robust.Shared.Enums;
+using Robust.Server.Player;
 
 namespace Content.Server._NF.GameRule;
 
@@ -44,6 +50,7 @@ public sealed class NfAdventureRuleSystem : GameRuleSystem<AdventureRuleComponen
     [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 DungeonSystem _dunGen = default!;
@@ -51,11 +58,34 @@ public sealed class NfAdventureRuleSystem : GameRuleSystem<AdventureRuleComponen
     [Dependency] private readonly StationSystem _station = default!;
     [Dependency] private readonly ShuttleSystem _shuttle = default!;
     [Dependency] private readonly PhysicsSystem _physics = default!;
+    [Dependency] private readonly BankSystem _bank = default!;
 
     private readonly HttpClient _httpClient = new();
 
+    public sealed class PlayerRoundBankInformation
+    {
+        // Initial balance, obtained on spawn
+        public int StartBalance;
+        // Ending balance, obtained on game end or detach (NOTE: multiple detaches possible), whichever happens first.
+        public int EndBalance;
+        // Entity name: used for display purposes ("The Feel of Fresh Bills earned 100,000 spesos")
+        public string Name;
+        // User ID: used to validate incoming information.
+        // If, for whatever reason, another player takes over this character, their initial balance is inaccurate.
+        public NetUserId UserId;
+
+        public PlayerRoundBankInformation(int startBalance, string name, NetUserId userId)
+        {
+            StartBalance = startBalance;
+            EndBalance = -1;
+            Name = name;
+            UserId = userId;
+        }
+    }
+
+    // A list of player bank account information stored by the controlled character's entity.
     [ViewVariables]
-    private List<(EntityUid, int)> _players = new();
+    private Dictionary<EntityUid, PlayerRoundBankInformation> _players = new();
 
     private float _distanceOffset = 1f;
     private List<Vector2> _stationCoords = new();
@@ -67,23 +97,40 @@ public override void Initialize()
     {
         base.Initialize();
         SubscribeLocalEvent<PlayerSpawnCompleteEvent>(OnPlayerSpawningEvent);
+        SubscribeLocalEvent<PlayerDetachedEvent>(OnPlayerDetachedEvent);
+        SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart);
+        _playerManager.PlayerStatusChanged += PlayerManagerOnPlayerStatusChanged;
     }
 
     protected override void AppendRoundEndText(EntityUid uid, AdventureRuleComponent component, GameRuleComponent gameRule, ref RoundEndTextAppendEvent ev)
     {
-        var profitText = Loc.GetString($"adventure-mode-profit-text");
-        var lossText = Loc.GetString($"adventure-mode-loss-text");
         ev.AddLine(Loc.GetString("adventure-list-start"));
         var allScore = new List<Tuple<string, int>>();
 
-        foreach (var player in _players)
+        foreach (var (player, playerInfo) in _players)
         {
-            if (!TryComp<BankAccountComponent>(player.Item1, out var bank) || !TryComp<MetaDataComponent>(player.Item1, out var meta))
+            var endBalance = playerInfo.EndBalance;
+            if (_bank.TryGetBalance(player, out var bankBalance))
+            {
+                endBalance = bankBalance;
+            }
+
+            // Check if endBalance is valid (non-negative)
+            if (endBalance < 0)
                 continue;
 
-            var profit = bank.Balance - player.Item2;
-            ev.AddLine($"- {meta.EntityName} {profitText} {profit} Spesos");
-            allScore.Add(new Tuple<string, int>(meta.EntityName, profit));
+            var profit = endBalance - playerInfo.StartBalance;
+            string summaryText;
+            if (profit < 0)
+            {
+                summaryText = Loc.GetString("adventure-mode-list-loss", ("amount", BankSystemExtensions.ToSpesoString(-profit)));
+            }
+            else
+            {
+                summaryText = Loc.GetString("adventure-mode-list-profit", ("amount", BankSystemExtensions.ToSpesoString(profit)));
+            }
+            ev.AddLine($"- {playerInfo.Name} {summaryText}");
+            allScore.Add(new Tuple<string, int>(playerInfo.Name, profit));
         }
 
         if (!(allScore.Count >= 1))
@@ -93,20 +140,27 @@ protected override void AppendRoundEndText(EntityUid uid, AdventureRuleComponent
         relayText += '\n';
         var highScore = allScore.OrderByDescending(h => h.Item2).ToList();
 
-        for (var i = 0; i < 10 && i < highScore.Count; i++)
+        for (var i = 0; i < 10 && highScore.Count > 0; i++)
         {
-            relayText += $"{highScore.First().Item1} {profitText} {highScore.First().Item2} Spesos";
+            if (highScore.First().Item2 < 0)
+                break;
+            var profitText = Loc.GetString("adventure-mode-top-profit", ("amount", BankSystemExtensions.ToSpesoString(highScore.First().Item2)));
+            relayText += $"{highScore.First().Item1} {profitText}";
             relayText += '\n';
-            highScore.Remove(highScore.First());
+            highScore.RemoveAt(0);
         }
+        relayText += '\n'; // Extra line separating the 
         relayText += Loc.GetString("adventure-list-low");
         relayText += '\n';
         highScore.Reverse();
-        for (var i = 0; i < 10 && i < highScore.Count; i++)
+        for (var i = 0; i < 10 && highScore.Count > 0; i++)
         {
-            relayText += $"{highScore.First().Item1} {lossText} {highScore.First().Item2} Spesos";
+            if (highScore.First().Item2 > 0)
+                break;
+            var lossText = Loc.GetString("adventure-mode-top-loss", ("amount", BankSystemExtensions.ToSpesoString(-highScore.First().Item2)));
+            relayText += $"{highScore.First().Item1} {lossText}";
             relayText += '\n';
-            highScore.Remove(highScore.First());
+            highScore.RemoveAt(0);
         }
         ReportRound(relayText);
     }
@@ -115,11 +169,52 @@ private void OnPlayerSpawningEvent(PlayerSpawnCompleteEvent ev)
     {
         if (ev.Player.AttachedEntity is { Valid: true } mobUid)
         {
-            _players.Add((mobUid, ev.Profile.BankBalance));
             EnsureComp<CargoSellBlacklistComponent>(mobUid);
+
+            // Store player info with the bank balance - we have it directly, and BankSystem won't have a cache yet.
+            if (!_players.ContainsKey(mobUid))
+                _players[mobUid] = new PlayerRoundBankInformation(ev.Profile.BankBalance, MetaData(mobUid).EntityName, ev.Player.UserId);
         }
     }
 
+    private void OnPlayerDetachedEvent(PlayerDetachedEvent ev)
+    {
+        if (ev.Entity is not { Valid: true } mobUid)
+            return;
+
+        if (_players.ContainsKey(mobUid))
+        {
+            if (_players[mobUid].UserId == ev.Player.UserId &&
+                _bank.TryGetBalance(ev.Player, out var bankBalance))
+            {
+                _players[mobUid].EndBalance = bankBalance;
+            }
+        }
+    }
+
+    private void PlayerManagerOnPlayerStatusChanged(object? _, SessionStatusEventArgs e)
+    {
+        // Treat all disconnections as being possibly final.
+        if (e.NewStatus != SessionStatus.Disconnected ||
+            e.Session.AttachedEntity == null)
+            return;
+
+        var mobUid = e.Session.AttachedEntity.Value;
+        if (_players.ContainsKey(mobUid))
+        {
+            if (_players[mobUid].UserId == e.Session.UserId &&
+                _bank.TryGetBalance(e.Session, out var bankBalance))
+            {
+                _players[mobUid].EndBalance = bankBalance;
+            }
+        }
+    }
+
+    private void OnRoundRestart(RoundRestartCleanupEvent ev)
+    {
+        _players.Clear();
+    }
+
     protected override void Started(EntityUid uid, AdventureRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
     {
         _mapId = GameTicker.DefaultMap;
@@ -439,7 +534,7 @@ private void AddStationCoordsToSet(Vector2 coords)
         _stationCoords.Add(coords);
     }
 
-    private async Task ReportRound(String message,  int color = 0x77DDE7)
+    private async Task ReportRound(String message, int color = 0x77DDE7)
     {
         Logger.InfoS("discord", message);
         String webhookUrl = _configurationManager.GetCVar(CCVars.DiscordLeaderboardWebhook);
diff --git a/Content.Shared/_NF/Construction/MachinePartSystem.cs b/Content.Shared/_NF/Construction/MachinePartSystem.cs
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/Content.Shared/_NF/Emp/Components/EmpBlastComponent.cs b/Content.Shared/_NF/Emp/Components/EmpBlastComponent.cs
new file mode 100644
index 00000000000..ea58235bd61
--- /dev/null
+++ b/Content.Shared/_NF/Emp/Components/EmpBlastComponent.cs
@@ -0,0 +1,30 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._NF.Emp.Components;
+
+/// <summary>
+///     Create circle pulse animation of emp around object.
+///     Drawn on client after creation only once per component lifetime.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class EmpBlastComponent : Component
+{
+    /// <summary>
+    ///     Timestamp when component was assigned to this entity.
+    /// </summary>
+    [AutoNetworkedField]
+    public TimeSpan StartTime;
+
+    /// <summary>
+    ///     How long will animation play in seconds.
+    ///     Can be overridden by <see cref="Robust.Shared.Spawners.TimedDespawnComponent"/>.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float VisualDuration = 1f;
+
+    /// <summary>
+    ///     The range of animation.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float VisualRange = 5f;
+}
diff --git a/Content.Shared/_NF/Emp/Systems/EmpBlastSystem.cs b/Content.Shared/_NF/Emp/Systems/EmpBlastSystem.cs
new file mode 100644
index 00000000000..e5476ab693b
--- /dev/null
+++ b/Content.Shared/_NF/Emp/Systems/EmpBlastSystem.cs
@@ -0,0 +1,27 @@
+using Content.Shared._NF.Emp.Components;
+using Robust.Shared.Spawners;
+using Robust.Shared.Timing;
+
+namespace Content.Shared._NF.Emp.Systems;
+
+public sealed class EmpBlastSystem : EntitySystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<EmpBlastComponent, ComponentStartup>(OnStartup);
+    }
+
+    private void OnStartup(EntityUid uid, EmpBlastComponent component, ComponentStartup args)
+    {
+        component.StartTime = _timing.RealTime;
+
+        // try to get despawn time or keep default duration time
+        if (TryComp<TimedDespawnComponent>(uid, out var despawn))
+        {
+            component.VisualDuration = despawn.Lifetime;
+        }
+    }
+}
diff --git a/Content.Shared/_NF/Foldable/FoldableFixtureComponent.cs b/Content.Shared/_NF/Foldable/FoldableFixtureComponent.cs
new file mode 100644
index 00000000000..a35cf433cb6
--- /dev/null
+++ b/Content.Shared/_NF/Foldable/FoldableFixtureComponent.cs
@@ -0,0 +1,10 @@
+namespace Content.Shared._NF.Foldable.Systems;
+
+[RegisterComponent]
+public sealed partial class FoldableFixtureComponent : Component
+{
+    [DataField(required: true)]
+    public List<string> FoldedFixtures;
+    [DataField(required: true)]
+    public List<string> UnfoldedFixtures;
+}
diff --git a/Content.Shared/_NF/Foldable/FoldableFixtureSystem.cs b/Content.Shared/_NF/Foldable/FoldableFixtureSystem.cs
new file mode 100644
index 00000000000..1ebbfcac260
--- /dev/null
+++ b/Content.Shared/_NF/Foldable/FoldableFixtureSystem.cs
@@ -0,0 +1,56 @@
+using Content.Shared.Foldable;
+using Robust.Shared.Physics.Systems;
+
+namespace Content.Shared._NF.Foldable.Systems;
+
+public sealed class FoldableFixtureSystem : EntitySystem
+{
+    [Dependency] private readonly FixtureSystem _fixtures = default!;
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<FoldableFixtureComponent, MapInitEvent>(OnMapInit);
+        SubscribeLocalEvent<FoldableFixtureComponent, FoldedEvent>(OnFolded);
+    }
+
+    private void OnMapInit(EntityUid uid, FoldableFixtureComponent component, MapInitEvent args)
+    {
+        if (TryComp<FoldableComponent>(uid, out var foldable))
+            SetFoldedFixtures(uid, foldable.IsFolded, component);
+    }
+
+    private void OnFolded(EntityUid uid, FoldableFixtureComponent? component, ref FoldedEvent args)
+    {
+        SetFoldedFixtures(uid, args.IsFolded, component);
+    }
+
+    // Sets all relevant fixtures for the entity to an appropriate hard/soft state.
+    private void SetFoldedFixtures(EntityUid uid, bool isFolded, FoldableFixtureComponent? component)
+    {
+        if (!Resolve(uid, ref component))
+            return;
+
+        if (isFolded)
+        {
+            SetAllFixtureHardness(uid, component.FoldedFixtures, true);
+            SetAllFixtureHardness(uid, component.UnfoldedFixtures, false);
+        }
+        else
+        {
+            SetAllFixtureHardness(uid, component.FoldedFixtures, false);
+            SetAllFixtureHardness(uid, component.UnfoldedFixtures, true);
+        }
+    }
+
+    // Sets all fixtures on an entity in a list to either be hard or soft.
+    void SetAllFixtureHardness(EntityUid uid, List<string> fixtures, bool hard)
+    {
+        foreach (var fixName in fixtures)
+        {
+            var fixture = _fixtures.GetFixtureOrNull(uid, fixName);
+            if (fixture != null)
+                _physics.SetHard(uid, fixture, hard);
+        }
+    }
+}
diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index 66afa635dad..bd13811abc5 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -4624,3 +4624,154 @@ Entries:
       message: Ice and sandstone walls no longer spawn a girder upon their destruction
   id: 5411
   time: '2024-10-16T16:15:50.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Added EMS and FSB Spirit posters to the Spirit.
+  id: 5412
+  time: '2024-10-17T11:48:53.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Apothecary now has the Medical Assember.
+  id: 5413
+  time: '2024-10-17T12:21:07.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Tweak
+      message: Updated CAD atmos for n2/o2 compliance.
+    - type: Remove
+      message: Removed cloning from CAD for Frontier compliance.
+  id: 5414
+  time: '2024-10-17T13:09:56.0000000+00:00'
+- author: ThatOneGoblin25
+  changes:
+    - type: Tweak
+      message: Eagle has received the medical assembler and slight tweaks.
+  id: 5415
+  time: '2024-10-17T14:40:32.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Add
+      message: Ammo techfab can now receive blueprints.
+  id: 5416
+  time: '2024-10-17T15:25:48.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: >-
+        Severely nerfed Goblinbane damage output and liquid transfer with each
+        hit. The mob should now become a nuisance at best. Mob will ignore
+        players (even goblins and felinids) who wear janitor clothes, how it'll
+        play out with ghost-controlled entities - who knows.
+  id: 5417
+  time: '2024-10-17T17:03:16.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Fix
+      message: >-
+        Machines that are missing components (like hyperlathes) now act as
+        though they have base components.
+    - type: Tweak
+      message: Hyper convection lathes now have 3x typical print time by default.
+    - type: Tweak
+      message: Lubrication now affects base and hyper lathe print times at 0.5x rates.
+  id: 5418
+  time: '2024-10-17T18:41:39.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: Added foldable plastic table to compliment folding chairs.
+  id: 5419
+  time: '2024-10-17T20:59:15.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: FSB Stasis now boasts a medical assembler.
+  id: 5420
+  time: '2024-10-17T21:35:46.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Remove
+      message: The salvage magnet is no longer printable from the circuit imprinter.
+  id: 5421
+  time: '2024-10-17T21:55:25.0000000+00:00'
+- author: dvir001
+  changes:
+    - type: Remove
+      message: >-
+        Removed Inquisitor from the nfsd shipyard, as there are new ships to
+        replace it.
+  id: 5422
+  time: '2024-10-17T22:46:06.0000000+00:00'
+- author: Tych0theSynth
+  changes:
+    - type: Tweak
+      message: Updated the NSF Prowler.
+  id: 5423
+  time: '2024-10-17T22:55:57.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Tweak
+      message: Updated Spectre with directional fans.
+  id: 5424
+  time: '2024-10-17T23:39:14.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: >-
+        Replaced vendomats on the Lodge' northern lobby with YouTool, EngiVend
+        and Vandomat, moved FuelVend to the northern lobby, mapped
+        LessLethalVend by BountyVend.
+  id: 5425
+  time: '2024-10-17T23:57:16.0000000+00:00'
+- author: chrome-cirrus
+  changes:
+    - type: Tweak
+      message: Updated NSF mini-shuttles to use directional fans + a few minor tweaks
+  id: 5426
+  time: '2024-10-18T12:05:18.0000000+00:00'
+- author: chrome-cirrus
+  changes: []
+  id: 5427
+  time: '2024-10-18T12:38:08.0000000+00:00'
+- author: chrome-cirrus
+  changes:
+    - type: Tweak
+      message: Modernize the Hospitaller
+  id: 5428
+  time: '2024-10-18T13:07:14.0000000+00:00'
+- author: dvir001
+  changes:
+    - type: Tweak
+      message: EMP Pulse got a new visual look.
+  id: 5429
+  time: '2024-10-18T15:18:56.0000000+00:00'
+- author: whatston3
+  changes:
+    - type: Fix
+      message: Values reported in the end of round screen are accurate again.
+  id: 5430
+  time: '2024-10-18T15:30:54.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Add
+      message: Added wall freezers.
+    - type: Add
+      message: >-
+        Added wall lockers with safety gear (fire suits/radiation suits/biohaz
+        suits/bomb suits).
+  id: 5431
+  time: '2024-10-18T16:47:22.0000000+00:00'
+- author: dvir001
+  changes:
+    - type: Add
+      message: 'You can now print some empty cardboard boxes in service techfab. '
+  id: 5432
+  time: '2024-10-18T22:47:58.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Seasonal decorations. What fun.
+  id: 5433
+  time: '2024-10-19T13:11:46.0000000+00:00'
diff --git a/Resources/Locale/en-US/_NF/adventure/adventure.ftl b/Resources/Locale/en-US/_NF/adventure/adventure.ftl
index c65acd137c1..4930e8675b3 100644
--- a/Resources/Locale/en-US/_NF/adventure/adventure.ftl
+++ b/Resources/Locale/en-US/_NF/adventure/adventure.ftl
@@ -1,9 +1,11 @@
 ## UI
-adventure-list-start = NT Galactic Bank
-adventure-mode-profit-text = made a total profit of: {" "}
-adventure-mode-loss-text = lost a total of: {" "}
-adventure-list-high = Today's Top Earners:
-adventure-list-low = Today's Biggest Spenders:
+adventure-list-start = [color=gold]NT Galactic Bank[/color]
+adventure-mode-list-profit = made a total profit of [color=#d19e5e]{$amount}[/color].
+adventure-mode-list-loss = lost a total of [color=#659cc9]{$amount}[/color].
+adventure-mode-top-profit = made a total profit of {$amount}.
+adventure-mode-top-loss = lost a total of {$amount}.
+adventure-list-high = This Shift's Top Earners:
+adventure-list-low = This Shift's Biggest Spenders:
 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!
 currency = Spesos
diff --git a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl
index 3e3aaf75ba4..bcc0ae9f745 100644
--- a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl
+++ b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl
@@ -60,7 +60,7 @@ ghost-role-information-goblinbane-name = The Goblinbane
 ghost-role-information-goblinbane-ghost-name = The Ghost of Goblinbane
 ghost-role-information-goblinbane-description = Hunt down those pesky-little-dirty-smelly goblins. And felinids. And also chaplains.
 ghost-role-information-goblinbane-rules = You are a [color=red][bold]Solo Antagonist[/bold][/color] capable of summoning minions. [color=yellow]Do note[/color], your minions will be hostile to everyone, except you.
-                                        Search and destroy goblins/felinids/chaplains.
+                                        Search and destroy goblins/felinids/chaplains. [color=yellow]Consider[/color] ignoring players dressed as janitors regardless of their species.
                                         Please note that [color=yellow]all server rules still apply.[/color]. Additionally:
                                         - [color=yellow]Reminder[/color] that Frontier Outpost (the station and 200m area around it) is a safe zone.
                                         - [color=red]DO NOT[/color] attack players on the Outpost.
diff --git a/Resources/Locale/en-US/_NF/lathe/recipes.ftl b/Resources/Locale/en-US/_NF/lathe/recipes.ftl
index 87a786e1450..bf08e3ef3b3 100644
--- a/Resources/Locale/en-US/_NF/lathe/recipes.ftl
+++ b/Resources/Locale/en-US/_NF/lathe/recipes.ftl
@@ -10,3 +10,15 @@ lathe-recipe-WeaponCaseLong-name = weapon case (empty)
 lathe-recipe-WeaponCaseHeavy-name = weapon case (heavy, empty)
 lathe-recipe-WeaponCaseShortAmmo-name = ammo case (small, empty)
 lathe-recipe-WeaponCaseShortExplosives-name = explosives case (small, empty)
+
+# Cardboard
+lathe-recipe-NFHappyHonkMimeEmpty-name  = happy honk meal (empty)
+lathe-recipe-NFHappyHonkEmpty-name = happy honk meal (empty)
+lathe-recipe-NFHappyHonkMcCargoEmpty-name  = mccargo meal (empty)
+lathe-recipe-NFHappyHonkCluwneEmpty-name  = woeful cluwne meal (empty)
+lathe-recipe-NFHappyHonkNukieEmpty-name  = robust nukie meal (empty)
+lathe-recipe-NFFoodBoxPizza-name  = pizza box (empty)
+lathe-recipe-NFFoodBoxDonutEmpty-name  = donut box (empty)
+lathe-recipe-NFFoodBoxNuggetEmpty-name = chicken nuggets (empty)
+lathe-recipe-NFFoodContainerEggEmpty-name  = egg carton (empty)
+lathe-recipe-NFBoxMREEmpty-name = M.R.E. (empty)
\ No newline at end of file
diff --git a/Resources/Locale/en-US/round-end/round-end-summary-window.ftl b/Resources/Locale/en-US/round-end/round-end-summary-window.ftl
index 58d26319b32..11f88052265 100644
--- a/Resources/Locale/en-US/round-end/round-end-summary-window.ftl
+++ b/Resources/Locale/en-US/round-end/round-end-summary-window.ftl
@@ -2,7 +2,10 @@ round-end-summary-window-title = Round End Summary
 round-end-summary-window-round-end-summary-tab-title = Round Information
 round-end-summary-window-player-manifest-tab-title = Player Manifest
 round-end-summary-window-round-id-label = Round [color=white]#{$roundId}[/color] has ended.
-round-end-summary-window-gamemode-name-label = The game mode was [color=white]{$gamemode}[/color].
+# Frontier
+round-end-summary-window-gamemode-name-label = {""}
+# round-end-summary-window-gamemode-name-label = The game mode was [color=white]{$gamemode}[/color].
+# End Frontier
 round-end-summary-window-duration-label = It lasted for [color=yellow]{$hours} hours, {$minutes} minutes, and {$seconds} seconds.
 round-end-summary-window-player-info-if-observer-text = [color=gray]{$playerOOCName}[/color] was [color=lightblue]{$playerICName}[/color], an observer.
 round-end-summary-window-player-info-if-not-observer-text = [color=gray]{$playerOOCName}[/color] was [color={$icNameColor}]{$playerICName}[/color] playing role of [color=orange]{$playerRole}[/color].
diff --git a/Resources/Maps/_NF/POI/lodge.yml b/Resources/Maps/_NF/POI/lodge.yml
index a877d7a6d5f..a30e9ff9775 100644
--- a/Resources/Maps/_NF/POI/lodge.yml
+++ b/Resources/Maps/_NF/POI/lodge.yml
@@ -4962,7 +4962,6 @@ entities:
       parent: 1
     - type: Physics
       canCollide: False
-      bodyType: Static
     - type: Fixtures
       fixtures: {}
   - uid: 1930
@@ -4973,7 +4972,6 @@ entities:
       parent: 1
     - type: Physics
       canCollide: False
-      bodyType: Static
     - type: Fixtures
       fixtures: {}
   - uid: 2134
@@ -4984,7 +4982,6 @@ entities:
       parent: 1
     - type: Physics
       canCollide: False
-      bodyType: Static
     - type: Fixtures
       fixtures: {}
   - uid: 2220
@@ -4995,7 +4992,6 @@ entities:
       parent: 1
     - type: Physics
       canCollide: False
-      bodyType: Static
     - type: Fixtures
       fixtures: {}
 - proto: BenchSofaLeft
@@ -5006,24 +5002,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 7.5,5.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 2133
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -8.5,6.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 2221
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -1.5,6.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BenchSofaMiddle
   entities:
   - uid: 369
@@ -5032,40 +5022,30 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,5.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 370
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5,5.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 1078
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 8.5,5.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 2135
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -7.5,5.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 2219
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,5.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BenchSofaRight
   entities:
   - uid: 371
@@ -5074,24 +5054,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,6.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 1077
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 9.5,6.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 2136
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -6.5,5.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BenchSteelLeft
   entities:
   - uid: 884
@@ -5099,107 +5073,79 @@ entities:
     - type: Transform
       pos: 15.5,2.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 885
     components:
     - type: Transform
       pos: -16.5,2.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 2059
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -11.5,19.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 2065
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 14.5,19.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 2120
     components:
     - type: Transform
       pos: -8.5,3.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 2124
     components:
     - type: Transform
       pos: 7.5,3.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 2523
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5,20.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BenchSteelMiddle
   entities:
-  - uid: 868
+  - uid: 886
     components:
     - type: Transform
-      pos: 16.5,2.5
+      pos: -15.5,2.5
       parent: 1
-    - type: Physics
-      bodyType: Static
-  - uid: 886
+  - uid: 1891
     components:
     - type: Transform
-      pos: -15.5,2.5
+      pos: 16.5,2.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 2067
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 13.5,19.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 2070
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -12.5,19.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 2121
     components:
     - type: Transform
       pos: -7.5,3.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 2123
     components:
     - type: Transform
       pos: 8.5,3.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 2525
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 0.5,20.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BenchSteelRight
   entities:
   - uid: 883
@@ -5207,53 +5153,39 @@ entities:
     - type: Transform
       pos: 17.5,2.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 887
     components:
     - type: Transform
       pos: -14.5,2.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 2066
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 12.5,19.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 2074
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -13.5,19.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 2119
     components:
     - type: Transform
       pos: -6.5,3.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 2122
     components:
     - type: Transform
       pos: 9.5,3.5
       parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 2524
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,20.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BodyBagFolded
   entities:
   - uid: 1495
@@ -7816,31 +7748,11 @@ entities:
     - type: Transform
       pos: 15.5,11.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        ShipyardConsole-targetId: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
   - uid: 2164
     components:
     - type: Transform
       pos: 13.5,11.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        ShipyardConsole-targetId: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
 - proto: ComputerTabletopStationRecords
   entities:
   - uid: 264
@@ -7867,8 +7779,6 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-    - type: Physics
-      canCollide: False
     - type: ItemSlots
   - uid: 2518
     components:
@@ -7886,8 +7796,6 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-    - type: Physics
-      canCollide: False
     - type: ItemSlots
   - uid: 2519
     components:
@@ -7905,8 +7813,6 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-    - type: Physics
-      canCollide: False
     - type: ItemSlots
   - uid: 2520
     components:
@@ -7924,8 +7830,6 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-    - type: Physics
-      canCollide: False
     - type: ItemSlots
   - uid: 2521
     components:
@@ -7943,8 +7847,6 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-    - type: Physics
-      canCollide: False
     - type: ItemSlots
   - uid: 2522
     components:
@@ -7962,8 +7864,6 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-    - type: Physics
-      canCollide: False
     - type: ItemSlots
 - proto: ConveyorBelt
   entities:
@@ -14303,6 +14203,13 @@ entities:
     - type: Transform
       pos: 0.5,11.5
       parent: 1
+- proto: LessLethalVendingMachinePOI
+  entities:
+  - uid: 2530
+    components:
+    - type: Transform
+      pos: 16.5,11.5
+      parent: 1
 - proto: MachineCryoSleepPod
   entities:
   - uid: 2100
@@ -14400,6 +14307,128 @@ entities:
     - type: Transform
       pos: 6.535731,10.07715
       parent: 1
+- proto: NFSignDock
+  entities:
+  - uid: 360
+    components:
+    - type: Transform
+      pos: 29.5,4.5
+      parent: 1
+  - uid: 507
+    components:
+    - type: Transform
+      pos: -28.5,4.5
+      parent: 1
+  - uid: 508
+    components:
+    - type: Transform
+      pos: -18.5,26.5
+      parent: 1
+  - uid: 509
+    components:
+    - type: Transform
+      pos: 25.5,20.5
+      parent: 1
+  - uid: 510
+    components:
+    - type: Transform
+      pos: -1.5,26.5
+      parent: 1
+  - uid: 521
+    components:
+    - type: Transform
+      pos: 2.5,26.5
+      parent: 1
+  - uid: 522
+    components:
+    - type: Transform
+      pos: -24.5,24.5
+      parent: 1
+  - uid: 523
+    components:
+    - type: Transform
+      pos: -24.5,20.5
+      parent: 1
+  - uid: 524
+    components:
+    - type: Transform
+      pos: -22.5,26.5
+      parent: 1
+  - uid: 562
+    components:
+    - type: Transform
+      pos: -28.5,-3.5
+      parent: 1
+  - uid: 576
+    components:
+    - type: Transform
+      pos: 25.5,24.5
+      parent: 1
+  - uid: 577
+    components:
+    - type: Transform
+      pos: 29.5,-3.5
+      parent: 1
+  - uid: 853
+    components:
+    - type: Transform
+      pos: 19.5,26.5
+      parent: 1
+  - uid: 855
+    components:
+    - type: Transform
+      pos: 23.5,26.5
+      parent: 1
+  - uid: 1513
+    components:
+    - type: Transform
+      pos: 33.5,4.5
+      parent: 1
+  - uid: 1514
+    components:
+    - type: Transform
+      pos: 35.5,2.5
+      parent: 1
+  - uid: 1515
+    components:
+    - type: Transform
+      pos: 35.5,-1.5
+      parent: 1
+  - uid: 1516
+    components:
+    - type: Transform
+      pos: 33.5,-3.5
+      parent: 1
+  - uid: 1517
+    components:
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 1
+  - uid: 1518
+    components:
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 1
+  - uid: 1519
+    components:
+    - type: Transform
+      pos: -32.5,-3.5
+      parent: 1
+  - uid: 1520
+    components:
+    - type: Transform
+      pos: -34.5,-1.5
+      parent: 1
+  - uid: 1521
+    components:
+    - type: Transform
+      pos: -34.5,2.5
+      parent: 1
+  - uid: 1522
+    components:
+    - type: Transform
+      pos: -32.5,4.5
+      parent: 1
 - proto: NonLethalVendingMachine
   entities:
   - uid: 1768
@@ -15708,152 +15737,30 @@ entities:
     - type: Transform
       pos: -1.5,24.5
       parent: 1
-- proto: NFSignDock
+- proto: Sink
   entities:
-  - uid: 360
+  - uid: 1001
     components:
     - type: Transform
-      pos: 29.5,4.5
+      rot: 1.5707963267948966 rad
+      pos: -17.5,17.5
       parent: 1
-  - uid: 507
+  - uid: 1852
     components:
     - type: Transform
-      pos: -28.5,4.5
+      rot: -1.5707963267948966 rad
+      pos: -13.5,17.5
       parent: 1
-  - uid: 508
+- proto: SinkWide
+  entities:
+  - uid: 848
     components:
     - type: Transform
-      pos: -18.5,26.5
+      pos: -6.5,17.5
       parent: 1
-  - uid: 509
-    components:
-    - type: Transform
-      pos: 25.5,20.5
-      parent: 1
-  - uid: 510
-    components:
-    - type: Transform
-      pos: -1.5,26.5
-      parent: 1
-  - uid: 521
-    components:
-    - type: Transform
-      pos: 2.5,26.5
-      parent: 1
-  - uid: 522
-    components:
-    - type: Transform
-      pos: -24.5,24.5
-      parent: 1
-  - uid: 523
-    components:
-    - type: Transform
-      pos: -24.5,20.5
-      parent: 1
-  - uid: 524
-    components:
-    - type: Transform
-      pos: -22.5,26.5
-      parent: 1
-  - uid: 562
-    components:
-    - type: Transform
-      pos: -28.5,-3.5
-      parent: 1
-  - uid: 576
-    components:
-    - type: Transform
-      pos: 25.5,24.5
-      parent: 1
-  - uid: 577
-    components:
-    - type: Transform
-      pos: 29.5,-3.5
-      parent: 1
-  - uid: 853
-    components:
-    - type: Transform
-      pos: 19.5,26.5
-      parent: 1
-  - uid: 855
-    components:
-    - type: Transform
-      pos: 23.5,26.5
-      parent: 1
-  - uid: 1513
-    components:
-    - type: Transform
-      pos: 33.5,4.5
-      parent: 1
-  - uid: 1514
-    components:
-    - type: Transform
-      pos: 35.5,2.5
-      parent: 1
-  - uid: 1515
-    components:
-    - type: Transform
-      pos: 35.5,-1.5
-      parent: 1
-  - uid: 1516
-    components:
-    - type: Transform
-      pos: 33.5,-3.5
-      parent: 1
-  - uid: 1517
-    components:
-    - type: Transform
-      pos: 2.5,-3.5
-      parent: 1
-  - uid: 1518
-    components:
-    - type: Transform
-      pos: -1.5,-3.5
-      parent: 1
-  - uid: 1519
-    components:
-    - type: Transform
-      pos: -32.5,-3.5
-      parent: 1
-  - uid: 1520
-    components:
-    - type: Transform
-      pos: -34.5,-1.5
-      parent: 1
-  - uid: 1521
-    components:
-    - type: Transform
-      pos: -34.5,2.5
-      parent: 1
-  - uid: 1522
-    components:
-    - type: Transform
-      pos: -32.5,4.5
-      parent: 1
-- proto: Sink
-  entities:
-  - uid: 1001
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -17.5,17.5
-      parent: 1
-  - uid: 1852
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -13.5,17.5
-      parent: 1
-- proto: SinkWide
-  entities:
-  - uid: 848
-    components:
-    - type: Transform
-      pos: -6.5,17.5
-      parent: 1
-- proto: SMESBasic
-  entities:
-  - uid: 20
+- proto: SMESBasic
+  entities:
+  - uid: 20
     components:
     - type: Transform
       pos: 1.5,13.5
@@ -16005,11 +15912,6 @@ entities:
       parent: 1
 - proto: SpawnPointLatejoin
   entities:
-  - uid: 1891
-    components:
-    - type: Transform
-      pos: -13.5,17.5
-      parent: 1
   - uid: 2084
     components:
     - type: Transform
@@ -16020,69 +15922,174 @@ entities:
     - type: Transform
       pos: -11.5,13.5
       parent: 1
-  - uid: 2086
+- proto: SpawnPointMercenary
+  entities:
+  - uid: 878
     components:
     - type: Transform
-      pos: -17.5,17.5
+      pos: 13.5,19.5
       parent: 1
-- proto: SpawnPointMercenary
-  entities:
-  - uid: 906
+  - uid: 2068
     components:
     - type: Transform
-      pos: 0.5,20.5
+      pos: 14.5,19.5
       parent: 1
-  - uid: 2056
+  - uid: 2557
     components:
     - type: Transform
-      pos: -15.5,2.5
+      pos: -8.5,10.5
       parent: 1
-  - uid: 2057
+  - uid: 2558
     components:
     - type: Transform
-      pos: 16.5,2.5
+      pos: -2.5,8.5
       parent: 1
-  - uid: 2068
+  - uid: 2559
     components:
     - type: Transform
-      pos: 9.5,3.5
+      pos: 3.5,8.5
       parent: 1
-  - uid: 2072
+  - uid: 2560
+    components:
+    - type: Transform
+      pos: -0.5,8.5
+      parent: 1
+  - uid: 2561
+    components:
+    - type: Transform
+      pos: -3.5,10.5
+      parent: 1
+  - uid: 2568
+    components:
+    - type: Transform
+      pos: 12.5,19.5
+      parent: 1
+  - uid: 2569
+    components:
+    - type: Transform
+      pos: 1.5,20.5
+      parent: 1
+  - uid: 2570
+    components:
+    - type: Transform
+      pos: 0.5,20.5
+      parent: 1
+  - uid: 2571
+    components:
+    - type: Transform
+      pos: -0.5,20.5
+      parent: 1
+  - uid: 2572
+    components:
+    - type: Transform
+      pos: -11.5,19.5
+      parent: 1
+  - uid: 2573
     components:
     - type: Transform
       pos: -12.5,19.5
       parent: 1
-  - uid: 2532
+  - uid: 2574
     components:
     - type: Transform
-      pos: -8.5,3.5
+      pos: -13.5,19.5
+      parent: 1
+  - uid: 2575
+    components:
+    - type: Transform
+      pos: -7.5,9.5
       parent: 1
 - proto: SpawnPointPilot
   entities:
-  - uid: 878
+  - uid: 868
     components:
     - type: Transform
-      pos: 13.5,19.5
+      pos: 16.5,2.5
       parent: 1
-  - uid: 2060
+  - uid: 906
     components:
     - type: Transform
       pos: -16.5,2.5
       parent: 1
+  - uid: 1055
+    components:
+    - type: Transform
+      pos: -15.5,2.5
+      parent: 1
+  - uid: 1162
+    components:
+    - type: Transform
+      pos: -7.5,3.5
+      parent: 1
+  - uid: 2056
+    components:
+    - type: Transform
+      pos: 15.5,2.5
+      parent: 1
+  - uid: 2057
+    components:
+    - type: Transform
+      pos: -14.5,2.5
+      parent: 1
+  - uid: 2060
+    components:
+    - type: Transform
+      pos: 7.5,3.5
+      parent: 1
   - uid: 2061
     components:
     - type: Transform
       pos: 17.5,2.5
       parent: 1
-  - uid: 2530
+  - uid: 2072
+    components:
+    - type: Transform
+      pos: -6.5,3.5
+      parent: 1
+  - uid: 2086
+    components:
+    - type: Transform
+      pos: 9.5,3.5
+      parent: 1
+  - uid: 2103
     components:
     - type: Transform
       pos: 8.5,3.5
       parent: 1
-  - uid: 2531
+  - uid: 2555
     components:
     - type: Transform
-      pos: -7.5,3.5
+      pos: -8.5,3.5
+      parent: 1
+  - uid: 2562
+    components:
+    - type: Transform
+      pos: -6.5,10.5
+      parent: 1
+  - uid: 2563
+    components:
+    - type: Transform
+      pos: -3.5,9.5
+      parent: 1
+  - uid: 2564
+    components:
+    - type: Transform
+      pos: -1.5,8.5
+      parent: 1
+  - uid: 2565
+    components:
+    - type: Transform
+      pos: 0.5,8.5
+      parent: 1
+  - uid: 2566
+    components:
+    - type: Transform
+      pos: 1.5,8.5
+      parent: 1
+  - uid: 2567
+    components:
+    - type: Transform
+      pos: 2.5,8.5
       parent: 1
 - proto: StairDark
   entities:
@@ -16588,11 +16595,6 @@ entities:
     - type: Transform
       pos: -10.5,4.5
       parent: 1
-  - uid: 2188
-    components:
-    - type: Transform
-      pos: -5.5,23.5
-      parent: 1
 - proto: VendingMachineBooze
   entities:
   - uid: 935
@@ -16621,32 +16623,29 @@ entities:
     - type: Transform
       pos: -11.5,17.5
       parent: 1
-- proto: VendingMachineExpeditionaryFlatpackVend
+- proto: VendingMachineEngivendPOI
   entities:
-  - uid: 1169
+  - uid: 2531
     components:
     - type: Transform
-      pos: -12.5,4.5
+      pos: -5.5,19.5
       parent: 1
-  - uid: 2103
+- proto: VendingMachineExpeditionaryFlatpackVend
+  entities:
+  - uid: 1169
     components:
     - type: Transform
-      pos: -5.5,19.5
+      pos: -12.5,4.5
       parent: 1
 - proto: VendingMachineFuelVend
   entities:
-  - uid: 2187
+  - uid: 2532
     components:
     - type: Transform
-      pos: 16.5,11.5
+      pos: 6.5,23.5
       parent: 1
 - proto: VendingMachineSalvagePOI
   entities:
-  - uid: 1162
-    components:
-    - type: Transform
-      pos: 6.5,19.5
-      parent: 1
   - uid: 2051
     components:
     - type: Transform
@@ -16659,15 +16658,24 @@ entities:
     - type: Transform
       pos: -1.5,3.5
       parent: 1
-  - uid: 1055
+  - uid: 2146
     components:
     - type: Transform
-      pos: 6.5,23.5
+      pos: 2.5,3.5
       parent: 1
-  - uid: 2146
+- proto: VendingMachineVendomatPOI
+  entities:
+  - uid: 2188
     components:
     - type: Transform
-      pos: 2.5,3.5
+      pos: 6.5,19.5
+      parent: 1
+- proto: VendingMachineYouToolPOI
+  entities:
+  - uid: 2187
+    components:
+    - type: Transform
+      pos: -5.5,23.5
       parent: 1
 - proto: WallmountTelevision
   entities:
diff --git a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml
index fb22e288160..4faea90a58d 100644
--- a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml
+++ b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml
@@ -9206,13 +9206,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -5.5,-26.5
       parent: 1
-- proto: MachineCryoSleepPod
-  entities:
-  - uid: 797
-    components:
-    - type: Transform
-      pos: 12.5,-24.5
-      parent: 1
 - proto: MaterialReclaimer
   entities:
   - uid: 1446
diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/cleric.yml b/Resources/Maps/_NF/Shuttles/Nfsd/cleric.yml
index dadc6e434f9..1bfcb75265d 100644
--- a/Resources/Maps/_NF/Shuttles/Nfsd/cleric.yml
+++ b/Resources/Maps/_NF/Shuttles/Nfsd/cleric.yml
@@ -32,7 +32,7 @@ entities:
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAWAAAAAAAWAAAAAAAWAAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -116,20 +116,17 @@ entities:
       data:
         tiles:
           0,0:
-            0: 4095
-          1,0:
-            0: 273
-          -1,0:
-            0: 3311
-            1: 784
+            0: 255
           0,-1:
-            0: 62208
+            0: 4096
             1: 3072
+          -1,0:
+            0: 140
+            1: 784
+          -1,-1:
+            0: 61440
           1,-1:
             1: 256
-            0: 4096
-          -1,-1:
-            0: 65280
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -147,7 +144,7 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.15
+          immutable: True
           moles:
           - 0
           - 0
@@ -164,7 +161,7 @@ entities:
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
-- proto: AirlockGlassShuttle
+- proto: AirlockGlassShuttleNfsdLocked
   entities:
   - uid: 43
     components:
@@ -180,7 +177,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.5,-0.5
       parent: 1
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
   - uid: 44
     components:
@@ -234,6 +231,13 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,-0.5
       parent: 1
+- proto: BoxBodyBag
+  entities:
+  - uid: 51
+    components:
+    - type: Transform
+      pos: -0.8229167,0.52664566
+      parent: 1
 - proto: CableApcExtension
   entities:
   - uid: 82
@@ -445,13 +449,6 @@ entities:
     - type: Transform
       pos: 3.5,1.5
       parent: 1
-- proto: CrateMedicalSupplies
-  entities:
-  - uid: 51
-    components:
-    - type: Transform
-      pos: -1.5,0.5
-      parent: 1
 - proto: DefibrillatorCabinetFilled
   entities:
   - uid: 49
@@ -465,7 +462,7 @@ entities:
   - uid: 56
     components:
     - type: Transform
-      pos: 1.4651704,1.6325955
+      pos: -0.49972308,1.5314707
       parent: 1
 - proto: GeneratorWallmountAPU
   entities:
@@ -543,13 +540,6 @@ entities:
     - type: Transform
       pos: -0.5,2.5
       parent: 1
-- proto: LockerParamedicFilledHardsuit
-  entities:
-  - uid: 52
-    components:
-    - type: Transform
-      pos: -0.5,1.5
-      parent: 1
 - proto: MedicalBed
   entities:
   - uid: 45
@@ -562,12 +552,19 @@ entities:
     - type: Transform
       pos: 0.5,-0.5
       parent: 1
-- proto: MedkitCombatFilled
+- proto: MedkitFilled
+  entities:
+  - uid: 52
+    components:
+    - type: Transform
+      pos: 1.531527,1.5206747
+      parent: 1
+- proto: Morgue
   entities:
   - uid: 57
     components:
     - type: Transform
-      pos: 1.5068371,1.5180122
+      pos: -1.5,0.5
       parent: 1
 - proto: PlastitaniumWindow
   entities:
@@ -664,6 +661,20 @@ entities:
     - type: Transform
       pos: -2.5,-0.5
       parent: 1
+- proto: SignNfsd
+  entities:
+  - uid: 111
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,0.5
+      parent: 1
+  - uid: 112
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,2.5
+      parent: 1
 - proto: SmallGyroscopeNfsd
   entities:
   - uid: 29
@@ -672,6 +683,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: -2.5,2.5
       parent: 1
+- proto: SpawnPointLatejoin
+  entities:
+  - uid: 50
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,0.5
+      parent: 1
 - proto: SubstationWallBasic
   entities:
   - uid: 70
@@ -721,13 +740,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 3.5,-1.5
       parent: 1
-- proto: VendingMachineWallMedical
-  entities:
-  - uid: 50
-    components:
-    - type: Transform
-      pos: -1.5,1.5
-      parent: 1
 - proto: WallPlastitanium
   entities:
   - uid: 2
diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml b/Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml
index adbf57a660b..7d08d8aa038 100644
--- a/Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml
+++ b/Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml
@@ -28,7 +28,7 @@ entities:
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
@@ -112,19 +112,17 @@ entities:
       data:
         tiles:
           0,0:
-            0: 30583
-          0,1:
-            0: 1
-            1: 6
+            0: 819
           0,-1:
-            0: 30583
+            0: 12592
           -1,0:
-            0: 52428
+            0: 34952
+          0,1:
+            1: 6
           -1,1:
-            0: 12
+            0: 8
           -1,-1:
             1: 17476
-            0: 34952
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -142,7 +140,7 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.15
+          immutable: True
           moles:
           - 0
           - 0
@@ -159,7 +157,7 @@ entities:
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
-- proto: AirlockGlassShuttle
+- proto: AirlockGlassShuttleNfsdLocked
   entities:
   - uid: 28
     components:
@@ -181,7 +179,7 @@ entities:
     - type: Transform
       pos: 0.5,3.5
       parent: 1
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
   - uid: 29
     components:
@@ -434,6 +432,21 @@ entities:
     - type: Transform
       pos: 1.5,2.5
       parent: 1
+- proto: ExtinguisherCabinet
+  entities:
+  - uid: 104
+    components:
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 1
+- proto: FirelockGlass
+  entities:
+  - uid: 105
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-1.5
+      parent: 1
 - proto: GeneratorWallmountAPU
   entities:
   - uid: 48
@@ -600,6 +613,20 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,3.5
       parent: 1
+- proto: SignNfsd
+  entities:
+  - uid: 102
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,4.5
+      parent: 1
+  - uid: 103
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-3.5
+      parent: 1
 - proto: SmallGyroscopeNfsd
   entities:
   - uid: 32
@@ -607,6 +634,14 @@ entities:
     - type: Transform
       pos: -1.5,-1.5
       parent: 1
+- proto: SpawnPointLatejoin
+  entities:
+  - uid: 106
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,0.5
+      parent: 1
 - proto: Stool
   entities:
   - uid: 46
diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/hospitaller.yml b/Resources/Maps/_NF/Shuttles/Nfsd/hospitaller.yml
index 16502755d2e..d991dda3e0e 100644
--- a/Resources/Maps/_NF/Shuttles/Nfsd/hospitaller.yml
+++ b/Resources/Maps/_NF/Shuttles/Nfsd/hospitaller.yml
@@ -6,6 +6,7 @@ tilemap:
   30: FloorDark
   57: FloorHull
   65: FloorMetalDiamond
+  1: FloorSteel
   107: FloorTechMaint
   111: FloorWhite
   124: Lattice
@@ -24,19 +25,19 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: bwAAAAAAbwAAAAAAbwAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAADfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAACfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: bwAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAbwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAbwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAbwAAAAAAbwAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAbwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAbwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAbwAAAAAAbwAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -59,43 +60,69 @@ entities:
         version: 2
         nodes:
         - node:
-            color: '#49392696'
-            id: CheckerNWSE
+            color: '#4B653E96'
+            id: BrickTileWhiteCornerNe
+          decals:
+            52: 1,3
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteCornerNe
+          decals:
+            41: 2,-1
+        - node:
+            color: '#4B653E96'
+            id: BrickTileWhiteCornerNw
+          decals:
+            49: 0,3
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteCornerNw
           decals:
-            4: -1,4
-            5: 0,4
-            6: 1,4
-            7: 1,3
-            8: 0,3
-            9: -1,3
-            10: -1,2
-            11: 0,2
-            12: 1,2
+            42: -2,-1
         - node:
             color: '#4B653E96'
-            id: CheckerNWSE
+            id: BrickTileWhiteCornerSe
+          decals:
+            50: 1,2
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteCornerSe
+          decals:
+            40: 2,-2
+        - node:
+            color: '#4B653E96'
+            id: BrickTileWhiteCornerSw
+          decals:
+            51: 0,2
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteCornerSw
+          decals:
+            39: -2,-2
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteLineN
+          decals:
+            46: 1,-1
+            47: -1,-1
+            48: 0,-1
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteLineS
+          decals:
+            43: -1,-2
+            44: 0,-2
+            45: 1,-2
+        - node:
+            color: '#4D9BE6FF'
+            id: DeliveryGreyscale
+          decals:
+            34: 0,-5
+        - node:
+            color: '#B33831FF'
+            id: DeliveryGreyscale
           decals:
-            13: -2,-2
-            14: -2,-1
-            15: -2,0
-            16: -1,0
-            17: -1,-1
-            18: -1,-2
-            19: -1,-3
-            20: -1,-4
-            21: 0,-4
-            22: 0,-3
-            23: 0,-2
-            24: 0,-1
-            25: 0,0
-            26: 1,0
-            27: 1,-1
-            28: 1,-2
-            29: 1,-3
-            30: 1,-4
-            31: 2,-2
-            32: 2,-1
-            33: 2,0
+            35: 1,-5
         - node:
             color: '#FFFFFFFF'
             id: WarnLineN
@@ -113,29 +140,29 @@ entities:
       data:
         tiles:
           0,0:
-            0: 30719
-            1: 34816
-          0,1:
-            0: 55
-            1: 72
+            0: 13079
+            1: 34944
           0,-1:
-            0: 65527
-            1: 8
-          0,-2:
-            0: 12288
-            1: 49152
+            0: 32563
+            1: 136
           -1,0:
-            0: 52462
-            1: 8704
+            0: 34828
+            1: 8736
+          0,1:
+            0: 3
+            1: 64
           -1,1:
-            0: 140
-            1: 66
-          -1,-1:
-            1: 2
-            0: 61164
+            0: 8
+            1: 64
+          0,-2:
+            0: 13312
+            1: 34816
           -1,-2:
-            1: 24576
-            0: 32768
+            0: 33792
+            1: 8704
+          -1,-1:
+            0: 52872
+            1: 34
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -153,7 +180,7 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.15
+          immutable: True
           moles:
           - 0
           - 0
@@ -172,71 +199,52 @@ entities:
     - type: RadiationGridResistance
     - type: BecomesStation
       id: Hospitaller
-- proto: AirCanister
+- proto: AirlockGlassShuttleNfsd
   entities:
-  - uid: 2
+  - uid: 4
     components:
     - type: Transform
-      anchored: True
-      pos: 1.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-1.5
       parent: 1
-    - type: Physics
-      bodyType: Static
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: AirlockGlassShuttle
-  entities:
-  - uid: 3
+  - uid: 8
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -2.5,-1.5
       parent: 1
-  - uid: 4
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-1.5
-      parent: 1
-- proto: AirlockNfsdLocked
+- proto: AirlockNfsdGlassLocked
   entities:
   - uid: 5
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 0.5,1.5
       parent: 1
 - proto: APCBasic
   entities:
-  - uid: 6
+  - uid: 41
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,2.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,2.5
       parent: 1
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
-  - uid: 7
+  - uid: 3
     components:
     - type: Transform
-      pos: -2.5,-1.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-1.5
       parent: 1
-  - uid: 8
+  - uid: 7
     components:
     - type: Transform
-      pos: 3.5,-1.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-1.5
       parent: 1
 - proto: AtmosFixBlockerMarker
   entities:
-  - uid: 9
-    components:
-    - type: Transform
-      pos: 3.5,4.5
-      parent: 1
-  - uid: 10
-    components:
-    - type: Transform
-      pos: -2.5,4.5
-      parent: 1
   - uid: 11
     components:
     - type: Transform
@@ -255,12 +263,12 @@ entities:
   - uid: 14
     components:
     - type: Transform
-      pos: -1.5,-4.5
+      pos: -1.5,-5.5
       parent: 1
   - uid: 15
     components:
     - type: Transform
-      pos: 2.5,-4.5
+      pos: -2.5,-5.5
       parent: 1
   - uid: 16
     components:
@@ -297,25 +305,32 @@ entities:
     - type: Transform
       pos: -2.5,-4.5
       parent: 1
-- proto: BedsheetNfsdBrigmedic
-  entities:
-  - uid: 23
+  - uid: 174
     components:
     - type: Transform
-      pos: 0.5,-1.5
+      pos: 2.5,-5.5
       parent: 1
-- proto: CableApcExtension
+  - uid: 175
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 1
+- proto: BedsheetNfsdBrigmedic
   entities:
-  - uid: 24
+  - uid: 176
     components:
     - type: Transform
-      pos: -1.5,2.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,0.5
       parent: 1
-  - uid: 25
+  - uid: 177
     components:
     - type: Transform
-      pos: -0.5,2.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-2.5
       parent: 1
+- proto: CableApcExtension
+  entities:
   - uid: 26
     components:
     - type: Transform
@@ -361,11 +376,6 @@ entities:
     - type: Transform
       pos: 1.5,-0.5
       parent: 1
-  - uid: 35
-    components:
-    - type: Transform
-      pos: 1.5,2.5
-      parent: 1
   - uid: 36
     components:
     - type: Transform
@@ -381,27 +391,47 @@ entities:
     - type: Transform
       pos: 1.5,-3.5
       parent: 1
-- proto: CableHV
-  entities:
   - uid: 39
     components:
     - type: Transform
-      pos: 2.5,1.5
+      pos: 2.5,2.5
       parent: 1
-  - uid: 40
+  - uid: 46
     components:
     - type: Transform
-      pos: 1.5,1.5
+      pos: -0.5,2.5
       parent: 1
-  - uid: 41
+  - uid: 47
     components:
     - type: Transform
-      pos: 0.5,1.5
+      pos: 1.5,2.5
+      parent: 1
+  - uid: 169
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 1
+  - uid: 170
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 1
+  - uid: 171
+    components:
+    - type: Transform
+      pos: 1.5,-4.5
+      parent: 1
+  - uid: 172
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
       parent: 1
+- proto: CableHV
+  entities:
   - uid: 42
     components:
     - type: Transform
-      pos: 2.5,2.5
+      pos: 1.5,1.5
       parent: 1
   - uid: 43
     components:
@@ -413,32 +443,32 @@ entities:
     - type: Transform
       pos: -0.5,1.5
       parent: 1
-- proto: CableMV
-  entities:
   - uid: 45
     components:
     - type: Transform
-      pos: 2.5,2.5
+      pos: 0.5,1.5
       parent: 1
-  - uid: 46
+  - uid: 54
     components:
     - type: Transform
-      pos: 1.5,2.5
+      pos: -2.5,1.5
       parent: 1
-  - uid: 47
+  - uid: 80
     components:
     - type: Transform
-      pos: 0.5,2.5
+      pos: 2.5,1.5
       parent: 1
-  - uid: 48
+- proto: CableMV
+  entities:
+  - uid: 6
     components:
     - type: Transform
-      pos: -0.5,2.5
+      pos: 2.5,1.5
       parent: 1
-  - uid: 49
+  - uid: 24
     components:
     - type: Transform
-      pos: -1.5,2.5
+      pos: 2.5,2.5
       parent: 1
 - proto: ChairPilotSeat
   entities:
@@ -448,30 +478,34 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,3.5
       parent: 1
-  - uid: 51
+  - uid: 53
     components:
     - type: Transform
-      pos: -0.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-3.5
       parent: 1
-  - uid: 52
+- proto: ClosetWallO2N2FilledRandom
+  entities:
+  - uid: 56
     components:
     - type: Transform
-      pos: 1.5,0.5
+      rot: 3.141592653589793 rad
+      pos: -1.5,-2.5
       parent: 1
 - proto: ClothingBackpackDuffelSurgeryFilled
   entities:
-  - uid: 53
+  - uid: 9
     components:
     - type: Transform
-      pos: 0.5574491,-3.3398647
+      pos: -0.54252744,-2.4372983
       parent: 1
 - proto: ComputerTabletopCrewMonitoring
   entities:
-  - uid: 54
+  - uid: 40
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -0.5,2.5
+      pos: -0.5,3.5
       parent: 1
 - proto: ComputerTabletopShuttle
   entities:
@@ -482,11 +516,11 @@ entities:
       parent: 1
 - proto: ComputerTabletopStationRecords
   entities:
-  - uid: 56
+  - uid: 83
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -0.5,3.5
+      pos: -0.5,2.5
       parent: 1
 - proto: DefibrillatorCabinetFilled
   entities:
@@ -510,11 +544,11 @@ entities:
       parent: 1
 - proto: ExtinguisherCabinetFilled
   entities:
-  - uid: 143
+  - uid: 70
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-3.5
       parent: 1
 - proto: FaxMachineShip
   entities:
@@ -523,166 +557,176 @@ entities:
     - type: Transform
       pos: -0.5,4.5
       parent: 1
-- proto: GasPassiveVent
+- proto: FirelockGlass
   entities:
-  - uid: 62
+  - uid: 51
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -2.5,4.5
+      pos: 0.5,1.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 63
+- proto: GasMixerOn
+  entities:
+  - uid: 99
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,4.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,-3.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: GasPipeStraight
+    - type: GasMixer
+      inletTwoConcentration: 0.79
+      inletOneConcentration: 0.21
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPassiveVent
   entities:
-  - uid: 64
+  - uid: 77
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-0.5
+      rot: 1.5707963267948966 rad
+      pos: -2.5,3.5
       parent: 1
-  - uid: 65
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasPipeBend
+  entities:
+  - uid: 62
     components:
     - type: Transform
-      pos: 0.5,1.5
+      pos: 0.5,2.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 66
+  - uid: 82
     components:
     - type: Transform
-      pos: 0.5,2.5
+      pos: 1.5,-3.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 67
+- proto: GasPipeStraight
+  entities:
+  - uid: 71
     components:
     - type: Transform
-      pos: 1.5,-1.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,1.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 68
+  - uid: 73
     components:
     - type: Transform
-      pos: 1.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,3.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 69
+  - uid: 74
     components:
     - type: Transform
-      pos: 1.5,1.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,2.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 70
+  - uid: 120
     components:
     - type: Transform
-      pos: 1.5,2.5
+      pos: 0.5,1.5
       parent: 1
-  - uid: 71
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 124
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,4.5
+      pos: 0.5,-0.5
       parent: 1
-  - uid: 72
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 167
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,4.5
+      pos: 0.5,-1.5
       parent: 1
-  - uid: 73
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 168
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,4.5
-      parent: 1
-  - uid: 74
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,4.5
-      parent: 1
-  - uid: 75
-    components:
-    - type: Transform
-      pos: 1.5,3.5
+      pos: 0.5,-2.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPipeTJunction
   entities:
-  - uid: 76
+  - uid: 63
     components:
     - type: Transform
-      pos: 1.5,4.5
+      rot: -1.5707963267948966 rad
+      pos: -0.5,3.5
       parent: 1
-  - uid: 77
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 72
     components:
     - type: Transform
-      pos: 0.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,0.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasPort
   entities:
-  - uid: 78
+  - uid: 10
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,3.5
+      rot: 3.141592653589793 rad
+      pos: 1.5,-4.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-- proto: GasVentPump
-  entities:
-  - uid: 79
+  - uid: 100
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 0.5,0.5
+      pos: 0.5,-4.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 80
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasVentPump
+  entities:
+  - uid: 64
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -0.5,3.5
+      pos: -0.5,2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 106
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,0.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasVentScrubber
   entities:
-  - uid: 81
+  - uid: 35
     components:
     - type: Transform
-      pos: 1.5,2.5
+      pos: -0.5,4.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 82
+  - uid: 78
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 1.5,-2.5
+      pos: -0.5,0.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GeneratorWallmountAPU
@@ -692,10 +736,10 @@ entities:
     - type: Transform
       pos: -0.5,1.5
       parent: 1
-  - uid: 83
+  - uid: 79
     components:
     - type: Transform
-      pos: 2.5,1.5
+      pos: -2.5,1.5
       parent: 1
   - uid: 84
     components:
@@ -711,11 +755,6 @@ entities:
       parent: 1
 - proto: Grille
   entities:
-  - uid: 86
-    components:
-    - type: Transform
-      pos: -2.5,0.5
-      parent: 1
   - uid: 87
     components:
     - type: Transform
@@ -734,22 +773,18 @@ entities:
   - uid: 90
     components:
     - type: Transform
-      pos: 0.5,-4.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-5.5
       parent: 1
   - uid: 91
     components:
     - type: Transform
       pos: 2.5,3.5
       parent: 1
-  - uid: 92
-    components:
-    - type: Transform
-      pos: -0.5,5.5
-      parent: 1
   - uid: 93
     components:
     - type: Transform
-      pos: 0.5,5.5
+      pos: -0.5,5.5
       parent: 1
   - uid: 94
     components:
@@ -761,6 +796,28 @@ entities:
     - type: Transform
       pos: -1.5,3.5
       parent: 1
+  - uid: 109
+    components:
+    - type: Transform
+      pos: -2.5,0.5
+      parent: 1
+  - uid: 113
+    components:
+    - type: Transform
+      pos: 0.5,5.5
+      parent: 1
+  - uid: 115
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-5.5
+      parent: 1
+  - uid: 162
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-5.5
+      parent: 1
 - proto: GrilleDiagonal
   entities:
   - uid: 96
@@ -774,27 +831,60 @@ entities:
     - type: Transform
       pos: -1.5,5.5
       parent: 1
-- proto: LockerNfsdBrigmedic
+- proto: LockerNfsdEvidence
   entities:
-  - uid: 98
+  - uid: 48
     components:
     - type: Transform
-      pos: 1.5,2.5
+      pos: 1.5,3.5
+      parent: 1
+- proto: LockerWallEVAColorNfsdFilled
+  entities:
+  - uid: 49
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,1.5
       parent: 1
 - proto: MedicalBed
   entities:
-  - uid: 99
+  - uid: 23
     components:
     - type: Transform
-      pos: 0.5,-1.5
+      pos: 1.5,0.5
       parent: 1
-- proto: MedkitAdvancedFilled
+  - uid: 52
+    components:
+    - type: Transform
+      pos: 1.5,-2.5
+      parent: 1
+- proto: MedkitFilled
   entities:
-  - uid: 100
+  - uid: 76
     components:
     - type: Transform
-      pos: 1.5215306,-3.481596
+      pos: -0.5030305,-3.2284198
       parent: 1
+- proto: NitrogenCanister
+  entities:
+  - uid: 69
+    components:
+    - type: Transform
+      anchored: True
+      pos: 1.5,-4.5
+      parent: 1
+    - type: Physics
+      bodyType: Static
+- proto: OxygenCanister
+  entities:
+  - uid: 81
+    components:
+    - type: Transform
+      anchored: True
+      pos: 0.5,-4.5
+      parent: 1
+    - type: Physics
+      bodyType: Static
 - proto: Paper
   entities:
   - uid: 101
@@ -807,47 +897,64 @@ entities:
     - type: Transform
       pos: -0.35719717,4.51526
       parent: 1
-- proto: PoweredlightColoredRed
+- proto: PowerCellRecharger
   entities:
-  - uid: 103
+  - uid: 158
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-3.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-4.5
       parent: 1
-  - uid: 104
+- proto: Poweredlight
+  entities:
+  - uid: 2
     components:
     - type: Transform
-      pos: -1.5,0.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-0.5
+      parent: 1
+  - uid: 66
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-0.5
       parent: 1
   - uid: 105
     components:
     - type: Transform
-      pos: 2.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,2.5
       parent: 1
-  - uid: 106
+- proto: PoweredlightColoredRed
+  entities:
+  - uid: 123
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -0.5,4.5
+      pos: -0.5,-3.5
       parent: 1
 - proto: ShuttleWindow
   entities:
-  - uid: 107
+  - uid: 86
     components:
     - type: Transform
-      pos: 3.5,0.5
+      pos: -2.5,0.5
       parent: 1
-  - uid: 108
+  - uid: 92
     components:
     - type: Transform
-      pos: -1.5,3.5
+      pos: -0.5,5.5
       parent: 1
-  - uid: 109
+  - uid: 107
     components:
     - type: Transform
       pos: -1.5,4.5
       parent: 1
+  - uid: 108
+    components:
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 1
   - uid: 110
     components:
     - type: Transform
@@ -856,32 +963,40 @@ entities:
   - uid: 111
     components:
     - type: Transform
-      pos: -0.5,5.5
+      pos: 1.5,5.5
       parent: 1
   - uid: 112
     components:
     - type: Transform
       pos: 0.5,5.5
       parent: 1
-  - uid: 113
+  - uid: 114
     components:
     - type: Transform
-      pos: 1.5,5.5
+      pos: 2.5,3.5
       parent: 1
-  - uid: 114
+  - uid: 116
     components:
     - type: Transform
-      pos: 2.5,3.5
+      pos: 3.5,0.5
       parent: 1
-  - uid: 115
+  - uid: 161
     components:
     - type: Transform
-      pos: 0.5,-4.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-5.5
       parent: 1
-  - uid: 116
+  - uid: 163
     components:
     - type: Transform
-      pos: -2.5,0.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-5.5
+      parent: 1
+  - uid: 164
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-5.5
       parent: 1
 - proto: ShuttleWindowDiagonal
   entities:
@@ -896,49 +1011,69 @@ entities:
     - type: Transform
       pos: -1.5,5.5
       parent: 1
+- proto: SignNfsd
+  entities:
+  - uid: 178
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 179
+    components:
+    - type: Transform
+      pos: -2.5,-2.5
+      parent: 1
 - proto: SmallGyroscopeNfsd
   entities:
-  - uid: 119
+  - uid: 98
     components:
     - type: Transform
       pos: 1.5,4.5
       parent: 1
-- proto: StasisBed
+- proto: SpawnPointLatejoin
   entities:
-  - uid: 120
+  - uid: 25
     components:
     - type: Transform
-      pos: 0.5,-2.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,-1.5
       parent: 1
-- proto: SubstationWallBasic
-  entities:
-  - uid: 121
+  - uid: 173
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,2.5
+      pos: 0.5,3.5
       parent: 1
-- proto: TableReinforced
+- proto: StasisBed
   entities:
-  - uid: 122
+  - uid: 67
     components:
     - type: Transform
-      pos: -0.5,-3.5
+      pos: -0.5,0.5
       parent: 1
-  - uid: 123
+- proto: SubstationWallBasic
+  entities:
+  - uid: 119
     components:
     - type: Transform
-      pos: 1.5,-3.5
+      pos: 2.5,1.5
       parent: 1
-  - uid: 124
+- proto: TableReinforced
+  entities:
+  - uid: 103
     components:
     - type: Transform
-      pos: 0.5,-3.5
+      pos: -0.5,2.5
       parent: 1
-  - uid: 125
+  - uid: 104
     components:
     - type: Transform
-      pos: -0.5,2.5
+      pos: -0.5,3.5
+      parent: 1
+  - uid: 122
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
       parent: 1
   - uid: 126
     components:
@@ -946,24 +1081,36 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,4.5
       parent: 1
-  - uid: 127
+  - uid: 128
+    components:
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 1
+  - uid: 165
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -0.5,3.5
+      pos: -0.5,-2.5
       parent: 1
-  - uid: 128
+  - uid: 166
     components:
     - type: Transform
-      pos: -0.5,4.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-4.5
       parent: 1
 - proto: ThrusterNfsd
   entities:
-  - uid: 129
+  - uid: 65
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -2.5,-4.5
+      pos: -2.5,-5.5
+      parent: 1
+  - uid: 68
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-5.5
       parent: 1
   - uid: 130
     components:
@@ -978,20 +1125,14 @@ entities:
   - uid: 132
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: -1.5707963267948966 rad
       pos: 3.5,-4.5
       parent: 1
-  - uid: 133
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-3.5
-      parent: 1
   - uid: 134
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-3.5
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-4.5
       parent: 1
 - proto: VendingMachineMedical
   entities:
@@ -1062,16 +1203,6 @@ entities:
     - type: Transform
       pos: 3.5,-0.5
       parent: 1
-  - uid: 149
-    components:
-    - type: Transform
-      pos: -0.5,-4.5
-      parent: 1
-  - uid: 150
-    components:
-    - type: Transform
-      pos: 1.5,-4.5
-      parent: 1
   - uid: 151
     components:
     - type: Transform
@@ -1087,6 +1218,18 @@ entities:
     - type: Transform
       pos: 2.5,-3.5
       parent: 1
+  - uid: 155
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-4.5
+      parent: 1
+  - uid: 157
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-4.5
+      parent: 1
   - uid: 160
     components:
     - type: Transform
@@ -1094,43 +1237,54 @@ entities:
       parent: 1
 - proto: WallShuttleDiagonal
   entities:
-  - uid: 154
+  - uid: 129
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,2.5
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-3.5
       parent: 1
-  - uid: 155
+  - uid: 133
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-4.5
+      rot: 3.141592653589793 rad
+      pos: 3.5,-3.5
       parent: 1
-  - uid: 156
+  - uid: 149
     components:
     - type: Transform
-      pos: -2.5,2.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-5.5
       parent: 1
-  - uid: 157
+  - uid: 150
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 2.5,-4.5
+      pos: 2.5,-5.5
       parent: 1
-- proto: WallWeaponCapacitorRecharger
-  entities:
-  - uid: 158
+  - uid: 154
     components:
     - type: Transform
-      pos: 1.5,1.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,2.5
+      parent: 1
+  - uid: 156
+    components:
+    - type: Transform
+      pos: -2.5,2.5
       parent: 1
 - proto: WarpPointShip
   entities:
   - uid: 159
     components:
     - type: Transform
-      pos: 0.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-1.5
+      parent: 1
+- proto: Wrench
+  entities:
+  - uid: 75
+    components:
+    - type: Transform
+      pos: -0.54011965,-3.8666306
       parent: 1
-    - type: WarpPoint
-      location: Hospitaller
 ...
diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/inquisitor.yml b/Resources/Maps/_NF/Shuttles/Nfsd/inquisitor.yml
deleted file mode 100644
index a481672bafd..00000000000
--- a/Resources/Maps/_NF/Shuttles/Nfsd/inquisitor.yml
+++ /dev/null
@@ -1,3286 +0,0 @@
-meta:
-  format: 6
-  postmapinit: false
-tilemap:
-  0: Space
-  30: FloorDark
-  33: FloorDarkHerringbone
-  34: FloorDarkMini
-  46: FloorGlass
-  108: FloorTechMaint2
-  124: Lattice
-  125: Plating
-entities:
-- proto: ""
-  entities:
-  - uid: 1
-    components:
-    - type: MetaData
-      name: Inquisitor
-    - type: Transform
-      pos: 1.6817646,-5.3364935
-      parent: invalid
-    - type: MapGrid
-      chunks:
-        0,0:
-          ind: 0,0
-          tiles: HgAAAAADHgAAAAADHgAAAAABHgAAAAADHgAAAAAAHgAAAAABHgAAAAAAfQAAAAAAIQAAAAADIQAAAAAAIQAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACfQAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAIgAAAAADfQAAAAAAfAAAAAAAfQAAAAAAbAAAAAAAfQAAAAAAfAAAAAAAAAAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAIgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIgAAAAACIgAAAAAAfQAAAAAALgAAAAABfQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIgAAAAAAIgAAAAABfQAAAAAAAAAAAAAALgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAADfQAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAALgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        0,-1:
-          ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAADfQAAAAAAfQAAAAAALgAAAAADAAAAAAAAAAAAAAAALgAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIgAAAAAAIgAAAAADfQAAAAAAAAAAAAAALgAAAAABfQAAAAAAHgAAAAADHgAAAAABHgAAAAABHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIgAAAAABIgAAAAADfQAAAAAALgAAAAACfQAAAAAAHgAAAAACHgAAAAACHgAAAAAAHgAAAAABHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAIgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHgAAAAACHgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAIgAAAAAAfQAAAAAAfAAAAAAAfQAAAAAAHgAAAAACfQAAAAAAfAAAAAAAAAAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADfQAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAHgAAAAADHgAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAADHgAAAAADHgAAAAACHgAAAAABHgAAAAADHgAAAAACfQAAAAAAIQAAAAACIQAAAAADIQAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAAAHgAAAAADHgAAAAACHgAAAAADHgAAAAABHgAAAAACbAAAAAAAIQAAAAABIQAAAAAAIQAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-        -1,-1:
-          ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAADHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAHgAAAAABHgAAAAACfQAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAADfQAAAAAAfAAAAAAAfQAAAAAA
-          version: 6
-        -1,0:
-          ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAHgAAAAACHgAAAAABfQAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAADHgAAAAADHgAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-          version: 6
-    - type: Broadphase
-    - type: Physics
-      bodyStatus: InAir
-      angularDamping: 0.05
-      linearDamping: 0.05
-      fixedRotation: False
-      bodyType: Dynamic
-    - type: Fixtures
-      fixtures: {}
-    - type: OccluderTree
-    - type: SpreaderGrid
-      updateAccumulator: 0.58426464
-    - type: Shuttle
-    - type: GridPathfinding
-    - type: Gravity
-      gravityShakeSound: !type:SoundPathSpecifier
-        path: /Audio/Effects/alert.ogg
-    - type: DecalGrid
-      chunkCollection:
-        version: 2
-        nodes:
-        - node:
-            color: '#FFFFFFFF'
-            id: Caution
-          decals:
-            15: 2,0
-        - node:
-            angle: 3.141592653589793 rad
-            color: '#FFFFFFFF'
-            id: Caution
-          decals:
-            14: 2,-2
-        - node:
-            color: '#FFFFFFFF'
-            id: CautionGreyscale
-          decals:
-            16: 6,1
-        - node:
-            angle: 3.141592653589793 rad
-            color: '#FFFFFFFF'
-            id: CautionGreyscale
-          decals:
-            17: 6,-3
-        - node:
-            angle: -3.141592653589793 rad
-            color: '#FFFFFFFF'
-            id: Dirt
-          decals:
-            3: 1,-7
-            4: 2,-7
-        - node:
-            angle: -1.5707963267948966 rad
-            color: '#FFFFFFFF'
-            id: Dirt
-          decals:
-            2: 2,-6
-        - node:
-            color: '#FFFFFFFF'
-            id: Dirt
-          decals:
-            1: 2,-5
-            5: 2,2
-            10: 1,-6
-            13: 2,4
-        - node:
-            angle: 1.5707963267948966 rad
-            color: '#FFFFFFFF'
-            id: Dirt
-          decals:
-            0: 2,-4
-            6: 2,3
-        - node:
-            angle: 4.71238898038469 rad
-            color: '#FFFFFFFF'
-            id: Dirt
-          decals:
-            7: 2,5
-            8: 1,5
-        - node:
-            angle: 6.283185307179586 rad
-            color: '#FFFFFFFF'
-            id: Dirt
-          decals:
-            9: 1,4
-        - node:
-            cleanable: True
-            color: '#FFFFFFFF'
-            id: DirtHeavy
-          decals:
-            20: -1,1
-            21: 0,-1
-            22: 1,0
-            23: 2,-1
-            24: 4,-1
-            25: 5,-1
-            26: 5,0
-            27: 6,1
-            28: 6,3
-            29: 7,4
-            30: 8,4
-            31: 9,4
-            32: 9,-1
-            33: 8,-2
-            34: 9,-6
-            35: 8,-6
-            36: 7,-6
-            37: 6,-5
-            38: 6,-4
-            39: 6,-3
-            40: 5,-1
-            41: 2,-3
-            42: 2,-5
-            43: 0,-2
-            44: 0,-3
-            45: -1,-3
-            46: -3,-3
-            47: -4,-3
-            48: -4,-2
-            49: -4,-1
-            50: -4,0
-            51: -4,1
-            52: -3,1
-            53: -3,0
-            54: -3,-2
-            55: -1,-2
-            56: -1,0
-            57: 0,1
-            58: 0,0
-            59: 0,-1
-            60: 3,-1
-            61: 4,0
-            62: 0,-1
-            63: 2,-1
-            64: 3,-1
-            65: 5,-1
-            66: 1,-1
-            67: 1,-1
-            68: 2,0
-            69: 5,0
-            70: 6,1
-            71: 6,1
-            72: 6,3
-            73: 6,3
-            74: 6,4
-            75: 8,4
-            76: 9,4
-            77: 9,4
-            78: 6,2
-            79: 6,-4
-            80: 6,-1
-            81: 7,-1
-            82: 8,-1
-            83: 8,-1
-            84: 6,-1
-            85: 6,-1
-            86: 5,-2
-            87: 6,-2
-        - node:
-            angle: 1.5707963267948966 rad
-            color: '#FFFFFFFF'
-            id: LoadingAreaGreyscale
-          decals:
-            18: -4,-2
-            19: -4,0
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineW
-          decals:
-            11: 2,0
-        - node:
-            angle: 3.141592653589793 rad
-            color: '#FFFFFFFF'
-            id: WarnLineW
-          decals:
-            12: 2,-2
-    - type: GridAtmosphere
-      version: 2
-      data:
-        tiles:
-          0,0:
-            0: 61439
-            1: 4096
-          0,-1:
-            0: 65535
-          -1,-1:
-            0: 49151
-            1: 16384
-          -1,0:
-            0: 4095
-          0,1:
-            0: 1791
-            1: 2304
-          1,0:
-            0: 61183
-            1: 256
-          1,1:
-            0: 2254
-            1: 1056
-          2,0:
-            0: 28799
-            1: 33152
-          2,1:
-            0: 2047
-            1: 2048
-          0,-2:
-            1: 4105
-            0: 61430
-          1,-2:
-            1: 36
-            0: 61128
-          1,-1:
-            1: 1
-            0: 65534
-          2,-2:
-            0: 32759
-            1: 32776
-          2,-1:
-            1: 129
-            0: 65392
-          -2,-1:
-            1: 8
-            0: 34944
-          -2,0:
-            0: 136
-            1: 2048
-        uniqueMixes:
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        chunkSize: 4
-    - type: GasTileOverlay
-    - type: BecomesStation
-      id: Inquisitor
-    - type: RadiationGridResistance
-    - type: GravityShake
-      shakeTimes: 10
-- proto: AirAlarm
-  entities:
-  - uid: 2
-    components:
-    - type: Transform
-      pos: 3.5,1.5
-      parent: 1
-    - type: DeviceNetwork
-      address: AIR-07EE-EDC5
-      transmitFrequency: 1621
-      receiveFrequency: 1621
-    - type: DeviceList
-      devices:
-      - 163
-      - 162
-      - 158
-      - 156
-      - 164
-      - 154
-      - 160
-      - 234
-      - 227
-    - type: ContainerContainer
-      containers:
-        board: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 3
-  - uid: 11
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,3.5
-      parent: 1
-    - type: DeviceList
-      devices:
-      - 229
-      - 225
-  - uid: 13
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-4.5
-      parent: 1
-    - type: DeviceList
-      devices:
-      - 231
-      - 226
-  - uid: 18
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-4.5
-      parent: 1
-    - type: DeviceList
-      devices:
-      - 224
-      - 230
-  - uid: 24
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,3.5
-      parent: 1
-    - type: DeviceList
-      devices:
-      - 232
-      - 228
-  - uid: 105
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-1.5
-      parent: 1
-    - type: DeviceList
-      devices:
-      - 223
-      - 233
-- proto: AirAlarmElectronics
-  entities:
-  - uid: 3
-    components:
-    - type: Transform
-      parent: 2
-    - type: Physics
-      canCollide: False
-- proto: AirCanister
-  entities:
-  - uid: 25
-    components:
-    - type: Transform
-      anchored: True
-      pos: 10.5,4.5
-      parent: 1
-    - type: Physics
-      bodyType: Static
-- proto: AirlockGlassShuttle
-  entities:
-  - uid: 15
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,0.5
-      parent: 1
-  - uid: 16
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-1.5
-      parent: 1
-- proto: AirlockNfsdGlassLocked
-  entities:
-  - uid: 17
-    components:
-    - type: Transform
-      pos: 2.5,1.5
-      parent: 1
-  - uid: 19
-    components:
-    - type: Transform
-      pos: 7.5,-0.5
-      parent: 1
-  - uid: 20
-    components:
-    - type: Transform
-      pos: -1.5,-2.5
-      parent: 1
-  - uid: 21
-    components:
-    - type: Transform
-      pos: -1.5,1.5
-      parent: 1
-  - uid: 22
-    components:
-    - type: Transform
-      pos: 2.5,-2.5
-      parent: 1
-  - uid: 23
-    components:
-    - type: Transform
-      pos: 6.5,-3.5
-      parent: 1
-- proto: AirlockNfsdLocked
-  entities:
-  - uid: 10
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,2.5
-      parent: 1
-- proto: APCBasic
-  entities:
-  - uid: 30
-    components:
-    - type: Transform
-      pos: 9.5,6.5
-      parent: 1
-    - type: Battery
-      startingCharge: 0
-    - type: Apc
-      hasAccess: True
-      lastChargeState: Charging
-  - uid: 31
-    components:
-    - type: Transform
-      pos: 8.5,1.5
-      parent: 1
-- proto: AtmosDeviceFanTiny
-  entities:
-  - uid: 32
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-1.5
-      parent: 1
-  - uid: 33
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,0.5
-      parent: 1
-- proto: AtmosFixBlockerMarker
-  entities:
-  - uid: 4
-    components:
-    - type: Transform
-      pos: 11.5,3.5
-      parent: 1
-  - uid: 5
-    components:
-    - type: Transform
-      pos: 11.5,-7.5
-      parent: 1
-  - uid: 6
-    components:
-    - type: Transform
-      pos: 11.5,1.5
-      parent: 1
-  - uid: 7
-    components:
-    - type: Transform
-      pos: 11.5,-4.5
-      parent: 1
-  - uid: 8
-    components:
-    - type: Transform
-      pos: 11.5,-2.5
-      parent: 1
-  - uid: 12
-    components:
-    - type: Transform
-      pos: 3.5,-7.5
-      parent: 1
-  - uid: 14
-    components:
-    - type: Transform
-      pos: 5.5,-6.5
-      parent: 1
-  - uid: 26
-    components:
-    - type: Transform
-      pos: 0.5,6.5
-      parent: 1
-  - uid: 27
-    components:
-    - type: Transform
-      pos: 6.5,6.5
-      parent: 1
-  - uid: 28
-    components:
-    - type: Transform
-      pos: 11.5,6.5
-      parent: 1
-  - uid: 101
-    components:
-    - type: Transform
-      pos: 3.5,6.5
-      parent: 1
-  - uid: 107
-    components:
-    - type: Transform
-      pos: 5.5,5.5
-      parent: 1
-  - uid: 108
-    components:
-    - type: Transform
-      pos: 6.5,-7.5
-      parent: 1
-  - uid: 359
-    components:
-    - type: Transform
-      pos: 0.5,-7.5
-      parent: 1
-  - uid: 382
-    components:
-    - type: Transform
-      pos: 10.5,-3.5
-      parent: 1
-  - uid: 388
-    components:
-    - type: Transform
-      pos: 10.5,2.5
-      parent: 1
-  - uid: 393
-    components:
-    - type: Transform
-      pos: 4.5,4.5
-      parent: 1
-  - uid: 400
-    components:
-    - type: Transform
-      pos: 4.5,-5.5
-      parent: 1
-  - uid: 434
-    components:
-    - type: Transform
-      pos: -4.5,2.5
-      parent: 1
-  - uid: 435
-    components:
-    - type: Transform
-      pos: -4.5,-3.5
-      parent: 1
-  - uid: 436
-    components:
-    - type: Transform
-      pos: -1.5,-0.5
-      parent: 1
-  - uid: 437
-    components:
-    - type: Transform
-      pos: 4.5,2.5
-      parent: 1
-  - uid: 438
-    components:
-    - type: Transform
-      pos: 4.5,-3.5
-      parent: 1
-  - uid: 439
-    components:
-    - type: Transform
-      pos: 0.5,-4.5
-      parent: 1
-  - uid: 440
-    components:
-    - type: Transform
-      pos: 0.5,3.5
-      parent: 1
-  - uid: 441
-    components:
-    - type: Transform
-      pos: 8.5,-3.5
-      parent: 1
-  - uid: 442
-    components:
-    - type: Transform
-      pos: 8.5,2.5
-      parent: 1
-- proto: BarSign
-  entities:
-  - uid: 34
-    components:
-    - type: MetaData
-      desc: Anteriormente ubicado en Spessmerica.
-      name: Zocalo
-    - type: Transform
-      pos: 9.5,-4.5
-      parent: 1
-    - type: BarSign
-      current: Zocalo
-- proto: Bed
-  entities:
-  - uid: 35
-    components:
-    - type: Transform
-      pos: 2.5,5.5
-      parent: 1
-  - uid: 36
-    components:
-    - type: Transform
-      pos: 2.5,-6.5
-      parent: 1
-- proto: BedsheetBlack
-  entities:
-  - uid: 37
-    components:
-    - type: Transform
-      pos: 2.5,-6.5
-      parent: 1
-  - uid: 38
-    components:
-    - type: Transform
-      pos: 2.5,5.5
-      parent: 1
-- proto: CableApcExtension
-  entities:
-  - uid: 39
-    components:
-    - type: Transform
-      pos: 2.5,-3.5
-      parent: 1
-  - uid: 40
-    components:
-    - type: Transform
-      pos: 8.5,1.5
-      parent: 1
-  - uid: 41
-    components:
-    - type: Transform
-      pos: 8.5,0.5
-      parent: 1
-  - uid: 42
-    components:
-    - type: Transform
-      pos: 9.5,-0.5
-      parent: 1
-  - uid: 43
-    components:
-    - type: Transform
-      pos: 5.5,-0.5
-      parent: 1
-  - uid: 44
-    components:
-    - type: Transform
-      pos: -2.5,1.5
-      parent: 1
-  - uid: 45
-    components:
-    - type: Transform
-      pos: -2.5,1.5
-      parent: 1
-  - uid: 46
-    components:
-    - type: Transform
-      pos: -1.5,1.5
-      parent: 1
-    - type: Forensics
-      residues: []
-      dnas: []
-      fibers:
-      - black insulative fibers
-      fingerprints: []
-  - uid: 47
-    components:
-    - type: Transform
-      pos: 1.5,0.5
-      parent: 1
-  - uid: 48
-    components:
-    - type: Transform
-      pos: 0.5,1.5
-      parent: 1
-  - uid: 49
-    components:
-    - type: Transform
-      pos: -0.5,1.5
-      parent: 1
-  - uid: 50
-    components:
-    - type: Transform
-      pos: 0.5,0.5
-      parent: 1
-  - uid: 51
-    components:
-    - type: Transform
-      pos: 2.5,-5.5
-      parent: 1
-  - uid: 52
-    components:
-    - type: Transform
-      pos: 9.5,6.5
-      parent: 1
-  - uid: 53
-    components:
-    - type: Transform
-      pos: 9.5,5.5
-      parent: 1
-  - uid: 54
-    components:
-    - type: Transform
-      pos: 9.5,4.5
-      parent: 1
-  - uid: 55
-    components:
-    - type: Transform
-      pos: 8.5,4.5
-      parent: 1
-  - uid: 56
-    components:
-    - type: Transform
-      pos: 7.5,4.5
-      parent: 1
-  - uid: 57
-    components:
-    - type: Transform
-      pos: 6.5,-2.5
-      parent: 1
-  - uid: 58
-    components:
-    - type: Transform
-      pos: 4.5,1.5
-      parent: 1
-  - uid: 59
-    components:
-    - type: Transform
-      pos: 4.5,0.5
-      parent: 1
-  - uid: 60
-    components:
-    - type: Transform
-      pos: 3.5,-0.5
-      parent: 1
-  - uid: 61
-    components:
-    - type: Transform
-      pos: 2.5,-0.5
-      parent: 1
-  - uid: 62
-    components:
-    - type: Transform
-      pos: 0.5,-1.5
-      parent: 1
-  - uid: 63
-    components:
-    - type: Transform
-      pos: 1.5,-1.5
-      parent: 1
-  - uid: 64
-    components:
-    - type: Transform
-      pos: -0.5,-2.5
-      parent: 1
-  - uid: 65
-    components:
-    - type: Transform
-      pos: 0.5,-2.5
-      parent: 1
-  - uid: 66
-    components:
-    - type: Transform
-      pos: -1.5,-2.5
-      parent: 1
-  - uid: 67
-    components:
-    - type: Transform
-      pos: -2.5,-2.5
-      parent: 1
-  - uid: 68
-    components:
-    - type: Transform
-      pos: -1.5,-2.5
-      parent: 1
-  - uid: 69
-    components:
-    - type: Transform
-      pos: -2.5,-2.5
-      parent: 1
-  - uid: 70
-    components:
-    - type: Transform
-      pos: 4.5,-0.5
-      parent: 1
-  - uid: 71
-    components:
-    - type: Transform
-      pos: 7.5,-0.5
-      parent: 1
-  - uid: 72
-    components:
-    - type: Transform
-      pos: 6.5,-0.5
-      parent: 1
-  - uid: 73
-    components:
-    - type: Transform
-      pos: 6.5,-3.5
-      parent: 1
-  - uid: 74
-    components:
-    - type: Transform
-      pos: 8.5,-0.5
-      parent: 1
-  - uid: 75
-    components:
-    - type: Transform
-      pos: 6.5,-4.5
-      parent: 1
-  - uid: 76
-    components:
-    - type: Transform
-      pos: 7.5,-5.5
-      parent: 1
-  - uid: 77
-    components:
-    - type: Transform
-      pos: 8.5,-5.5
-      parent: 1
-  - uid: 78
-    components:
-    - type: Transform
-      pos: 9.5,-5.5
-      parent: 1
-  - uid: 79
-    components:
-    - type: Transform
-      pos: 10.5,-5.5
-      parent: 1
-  - uid: 80
-    components:
-    - type: Transform
-      pos: 2.5,-1.5
-      parent: 1
-  - uid: 81
-    components:
-    - type: Transform
-      pos: 2.5,-2.5
-      parent: 1
-  - uid: 82
-    components:
-    - type: Transform
-      pos: 6.5,-5.5
-      parent: 1
-  - uid: 83
-    components:
-    - type: Transform
-      pos: 2.5,-4.5
-      parent: 1
-  - uid: 84
-    components:
-    - type: Transform
-      pos: 2.5,-6.5
-      parent: 1
-  - uid: 85
-    components:
-    - type: Transform
-      pos: 2.5,0.5
-      parent: 1
-  - uid: 86
-    components:
-    - type: Transform
-      pos: 2.5,1.5
-      parent: 1
-  - uid: 87
-    components:
-    - type: Transform
-      pos: 2.5,2.5
-      parent: 1
-  - uid: 88
-    components:
-    - type: Transform
-      pos: 2.5,3.5
-      parent: 1
-  - uid: 89
-    components:
-    - type: Transform
-      pos: 2.5,3.5
-      parent: 1
-  - uid: 90
-    components:
-    - type: Transform
-      pos: 2.5,4.5
-      parent: 1
-  - uid: 91
-    components:
-    - type: Transform
-      pos: 2.5,5.5
-      parent: 1
-  - uid: 92
-    components:
-    - type: Transform
-      pos: 6.5,-1.5
-      parent: 1
-- proto: CableApcStack1
-  entities:
-  - uid: 94
-    components:
-    - type: Transform
-      parent: 93
-    - type: Stack
-      count: 5
-    - type: Item
-      size: 5
-    - type: Physics
-      canCollide: False
-- proto: CableHV
-  entities:
-  - uid: 98
-    components:
-    - type: Transform
-      pos: 8.5,5.5
-      parent: 1
-  - uid: 103
-    components:
-    - type: Transform
-      pos: 7.5,5.5
-      parent: 1
-  - uid: 106
-    components:
-    - type: Transform
-      pos: 9.5,5.5
-      parent: 1
-- proto: CableMV
-  entities:
-  - uid: 112
-    components:
-    - type: Transform
-      pos: 7.5,3.5
-      parent: 1
-  - uid: 113
-    components:
-    - type: Transform
-      pos: 7.5,1.5
-      parent: 1
-  - uid: 114
-    components:
-    - type: Transform
-      pos: 8.5,1.5
-      parent: 1
-  - uid: 115
-    components:
-    - type: Transform
-      pos: 7.5,2.5
-      parent: 1
-  - uid: 117
-    components:
-    - type: Transform
-      pos: 9.5,4.5
-      parent: 1
-  - uid: 118
-    components:
-    - type: Transform
-      pos: 9.5,5.5
-      parent: 1
-  - uid: 119
-    components:
-    - type: Transform
-      pos: 9.5,6.5
-      parent: 1
-  - uid: 120
-    components:
-    - type: Transform
-      pos: 9.5,4.5
-      parent: 1
-  - uid: 122
-    components:
-    - type: Transform
-      pos: 9.5,4.5
-      parent: 1
-  - uid: 123
-    components:
-    - type: Transform
-      pos: 8.5,4.5
-      parent: 1
-  - uid: 124
-    components:
-    - type: Transform
-      pos: 7.5,4.5
-      parent: 1
-- proto: CapacitorStockPart
-  entities:
-  - uid: 95
-    components:
-    - type: Transform
-      parent: 93
-    - type: Physics
-      canCollide: False
-  - uid: 96
-    components:
-    - type: Transform
-      parent: 93
-    - type: Physics
-      canCollide: False
-- proto: Catwalk
-  entities:
-  - uid: 125
-    components:
-    - type: Transform
-      pos: 7.5,5.5
-      parent: 1
-  - uid: 126
-    components:
-    - type: Transform
-      pos: 9.5,5.5
-      parent: 1
-  - uid: 127
-    components:
-    - type: Transform
-      pos: 10.5,5.5
-      parent: 1
-  - uid: 128
-    components:
-    - type: Transform
-      pos: 8.5,5.5
-      parent: 1
-  - uid: 129
-    components:
-    - type: Transform
-      pos: 10.5,4.5
-      parent: 1
-- proto: CellRechargerCircuitboard
-  entities:
-  - uid: 97
-    components:
-    - type: Transform
-      parent: 93
-    - type: Physics
-      canCollide: False
-- proto: ChairOfficeDark
-  entities:
-  - uid: 130
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 9.5,-0.5
-      parent: 1
-  - uid: 131
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 9.5,-5.5
-      parent: 1
-- proto: ClosetWall
-  entities:
-  - uid: 132
-    components:
-    - type: Transform
-      pos: 6.5,5.5
-      parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14957
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 133
-          - 134
-- proto: ComputerPowerMonitoring
-  entities:
-  - uid: 29
-    components:
-    - type: Transform
-      pos: 8.5,5.5
-      parent: 1
-- proto: ComputerTabletopCrewMonitoring
-  entities:
-  - uid: 138
-    components:
-    - type: Transform
-      pos: 9.5,0.5
-      parent: 1
-- proto: ComputerTabletopCriminalRecords
-  entities:
-  - uid: 137
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,-5.5
-      parent: 1
-- proto: ComputerTabletopShuttle
-  entities:
-  - uid: 136
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,-0.5
-      parent: 1
-- proto: ComputerTabletopStationRecords
-  entities:
-  - uid: 139
-    components:
-    - type: Transform
-      pos: 8.5,0.5
-      parent: 1
-- proto: DoorElectronics
-  entities:
-  - uid: 141
-    components:
-    - type: Transform
-      parent: 140
-    - type: Physics
-      canCollide: False
-  - uid: 143
-    components:
-    - type: Transform
-      parent: 142
-    - type: Physics
-      canCollide: False
-  - uid: 145
-    components:
-    - type: Transform
-      parent: 144
-    - type: Physics
-      canCollide: False
-- proto: EmergencyLight
-  entities:
-  - uid: 146
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,0.5
-      parent: 1
-  - uid: 147
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-6.5
-      parent: 1
-    - type: PointLight
-      enabled: True
-    - type: Battery
-      startingCharge: 10198.422
-    - type: ActiveEmergencyLight
-  - uid: 148
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 9.5,-6.5
-      parent: 1
-    - type: PointLight
-      enabled: True
-    - type: Battery
-      startingCharge: 5770.106
-    - type: ActiveEmergencyLight
-  - uid: 149
-    components:
-    - type: Transform
-      pos: 2.5,5.5
-      parent: 1
-    - type: PointLight
-      enabled: True
-    - type: Battery
-      startingCharge: 10316.518
-    - type: ActiveEmergencyLight
-  - uid: 150
-    components:
-    - type: Transform
-      pos: 9.5,5.5
-      parent: 1
-  - uid: 151
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 9.5,-1.5
-      parent: 1
-    - type: PointLight
-      enabled: True
-    - type: Battery
-      startingCharge: 5948.6265
-    - type: ActiveEmergencyLight
-  - uid: 152
-    components:
-    - type: Transform
-      pos: -3.5,1.5
-      parent: 1
-- proto: FaxMachineShip
-  entities:
-  - uid: 153
-    components:
-    - type: Transform
-      pos: 10.5,0.5
-      parent: 1
-- proto: FirelockElectronics
-  entities:
-  - uid: 155
-    components:
-    - type: Transform
-      parent: 154
-    - type: Physics
-      canCollide: False
-  - uid: 157
-    components:
-    - type: Transform
-      parent: 156
-    - type: Physics
-      canCollide: False
-  - uid: 159
-    components:
-    - type: Transform
-      parent: 158
-    - type: Physics
-      canCollide: False
-  - uid: 161
-    components:
-    - type: Transform
-      parent: 160
-    - type: Physics
-      canCollide: False
-- proto: FirelockGlass
-  entities:
-  - uid: 154
-    components:
-    - type: Transform
-      pos: 7.5,-0.5
-      parent: 1
-    - type: ContainerContainer
-      containers:
-        board: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 155
-    - type: DeviceNetwork
-      address: 2A2F-32C5
-      receiveFrequency: 1621
-  - uid: 156
-    components:
-    - type: Transform
-      pos: 2.5,-2.5
-      parent: 1
-    - type: ContainerContainer
-      containers:
-        board: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 157
-    - type: DeviceNetwork
-      address: 69E1-ED5D
-      receiveFrequency: 1621
-  - uid: 158
-    components:
-    - type: Transform
-      pos: 2.5,1.5
-      parent: 1
-    - type: ContainerContainer
-      containers:
-        board: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 159
-    - type: DeviceNetwork
-      address: 4EBA-47B3
-      receiveFrequency: 1621
-  - uid: 160
-    components:
-    - type: Transform
-      pos: 6.5,-3.5
-      parent: 1
-    - type: ContainerContainer
-      containers:
-        board: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 161
-    - type: DeviceNetwork
-      address: 6D3F-5E6B
-      receiveFrequency: 1621
-  - uid: 162
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-2.5
-      parent: 1
-  - uid: 163
-    components:
-    - type: Transform
-      pos: -1.5,1.5
-      parent: 1
-  - uid: 164
-    components:
-    - type: Transform
-      pos: 6.5,2.5
-      parent: 1
-- proto: GasPassiveVent
-  entities:
-  - uid: 165
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,2.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-- proto: GasPipeBend
-  entities:
-  - uid: 166
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 167
-    components:
-    - type: Transform
-      pos: 3.5,5.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 168
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-6.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 169
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,2.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 170
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,0.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 171
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,0.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 172
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,3.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-- proto: GasPipeFourway
-  entities:
-  - uid: 173
-    components:
-    - type: Transform
-      pos: 7.5,-0.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 174
-    components:
-    - type: Transform
-      pos: 3.5,-0.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-- proto: GasPipeStraight
-  entities:
-  - uid: 102
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 9.5,4.5
-      parent: 1
-  - uid: 175
-    components:
-    - type: Transform
-      pos: 7.5,-3.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 176
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-1.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 177
-    components:
-    - type: Transform
-      pos: 7.5,3.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 178
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-0.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 179
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,-3.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 180
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,0.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 181
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-1.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 182
-    components:
-    - type: Transform
-      pos: 7.5,-2.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 183
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-0.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 184
-    components:
-    - type: Transform
-      pos: 7.5,2.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 185
-    components:
-    - type: Transform
-      pos: 7.5,-1.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 186
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,-2.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 187
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-1.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 188
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,1.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 189
-    components:
-    - type: Transform
-      pos: 3.5,2.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 190
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,1.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 191
-    components:
-    - type: Transform
-      pos: 3.5,-4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 192
-    components:
-    - type: Transform
-      pos: 7.5,-5.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 193
-    components:
-    - type: Transform
-      pos: 3.5,-5.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 194
-    components:
-    - type: Transform
-      pos: 7.5,-4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 195
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 196
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,2.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 197
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,3.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 198
-    components:
-    - type: Transform
-      pos: 3.5,1.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 199
-    components:
-    - type: Transform
-      pos: 3.5,-1.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 200
-    components:
-    - type: Transform
-      pos: 3.5,3.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 201
-    components:
-    - type: Transform
-      pos: 3.5,4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 202
-    components:
-    - type: Transform
-      pos: 3.5,0.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 203
-    components:
-    - type: Transform
-      pos: 6.5,2.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 204
-    components:
-    - type: Transform
-      pos: 7.5,1.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 205
-    components:
-    - type: Transform
-      pos: 7.5,0.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 206
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-3.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 207
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-2.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 208
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,-0.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 209
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-0.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 210
-    components:
-    - type: Transform
-      pos: 1.5,-0.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 211
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,5.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 212
-    components:
-    - type: Transform
-      pos: 3.5,-2.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 213
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-6.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 214
-    components:
-    - type: Transform
-      pos: 3.5,-3.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-- proto: GasPipeTJunction
-  entities:
-  - uid: 215
-    components:
-    - type: Transform
-      pos: 2.5,-1.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 216
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 217
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,3.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 218
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,0.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 219
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-1.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 220
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-1.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-- proto: GasPort
-  entities:
-  - uid: 9
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,4.5
-      parent: 1
-- proto: GasPressurePump
-  entities:
-  - uid: 222
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-- proto: GasVentPump
-  entities:
-  - uid: 223
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,-0.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 105
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 224
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 7.5,-6.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 18
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 225
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,5.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 11
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 226
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-6.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 13
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 227
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,-0.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 228
-    components:
-    - type: Transform
-      pos: 7.5,5.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 24
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-- proto: GasVentScrubber
-  entities:
-  - uid: 229
-    components:
-    - type: Transform
-      pos: 2.5,4.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 11
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 230
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,-4.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 18
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 231
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-5.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 13
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 232
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,4.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 24
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 233
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,0.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 105
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 234
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-1.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-- proto: GravityGeneratorMini
-  entities:
-  - uid: 100
-    components:
-    - type: Transform
-      pos: 10.5,5.5
-      parent: 1
-- proto: Grille
-  entities:
-  - uid: 236
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,1.5
-      parent: 1
-  - uid: 237
-    components:
-    - type: Transform
-      pos: -0.5,-3.5
-      parent: 1
-  - uid: 238
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-2.5
-      parent: 1
-  - uid: 239
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-1.5
-      parent: 1
-  - uid: 240
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-0.5
-      parent: 1
-  - uid: 241
-    components:
-    - type: Transform
-      pos: -1.5,0.5
-      parent: 1
-  - uid: 242
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-0.5
-      parent: 1
-  - uid: 243
-    components:
-    - type: Transform
-      pos: -0.5,2.5
-      parent: 1
-  - uid: 244
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-0.5
-      parent: 1
-  - uid: 245
-    components:
-    - type: Transform
-      pos: 11.5,-6.5
-      parent: 1
-  - uid: 246
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-6.5
-      parent: 1
-  - uid: 247
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-3.5
-      parent: 1
-  - uid: 248
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,5.5
-      parent: 1
-  - uid: 249
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,0.5
-      parent: 1
-  - uid: 250
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-5.5
-      parent: 1
-  - uid: 251
-    components:
-    - type: Transform
-      pos: 11.5,-5.5
-      parent: 1
-  - uid: 252
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,-0.5
-      parent: 1
-  - uid: 253
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,5.5
-      parent: 1
-  - uid: 254
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,2.5
-      parent: 1
-  - uid: 255
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,4.5
-      parent: 1
-  - uid: 256
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-6.5
-      parent: 1
-  - uid: 257
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,-1.5
-      parent: 1
-- proto: GyroscopeNfsd
-  entities:
-  - uid: 258
-    components:
-    - type: Transform
-      pos: -1.5,-0.5
-      parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
-- proto: LockerNfsdSilverDetectiveFilled
-  entities:
-  - uid: 259
-    components:
-    - type: Transform
-      pos: 8.5,-6.5
-      parent: 1
-- proto: LockerNfsdEvidence
-  entities:
-  - uid: 260
-    components:
-    - type: Transform
-      pos: 3.5,-1.5
-      parent: 1
-  - uid: 261
-    components:
-    - type: Transform
-      pos: 3.5,0.5
-      parent: 1
-- proto: LockerNfsdSilver
-  entities:
-  - uid: 262
-    components:
-    - type: Transform
-      pos: 9.5,-1.5
-      parent: 1
-- proto: PortableGeneratorPacmanShuttle
-  entities:
-  - uid: 99
-    components:
-    - type: Transform
-      pos: 7.5,5.5
-      parent: 1
-    - type: FuelGenerator
-      on: False
-    - type: Physics
-      bodyType: Static
-- proto: PosterContrabandBorgFancy
-  entities:
-  - uid: 263
-    components:
-    - type: Transform
-      pos: -1.5,-3.5
-      parent: 1
-- proto: PosterContrabandDonutCorp
-  entities:
-  - uid: 264
-    components:
-    - type: Transform
-      pos: 3.5,-3.5
-      parent: 1
-- proto: PosterContrabandNuclearDeviceInformational
-  entities:
-  - uid: 265
-    components:
-    - type: Transform
-      pos: 1.5,-7.5
-      parent: 1
-- proto: PosterContrabandWehWatches
-  entities:
-  - uid: 266
-    components:
-    - type: Transform
-      pos: 1.5,6.5
-      parent: 1
-- proto: PosterLegit12Gauge
-  entities:
-  - uid: 267
-    components:
-    - type: Transform
-      pos: -1.5,2.5
-      parent: 1
-- proto: PosterLegitCarbonDioxide
-  entities:
-  - uid: 268
-    components:
-    - type: Transform
-      pos: 10.5,1.5
-      parent: 1
-- proto: PosterLegitEnlist
-  entities:
-  - uid: 269
-    components:
-    - type: Transform
-      pos: 8.5,3.5
-      parent: 1
-- proto: PosterLegitFruitBowl
-  entities:
-  - uid: 270
-    components:
-    - type: Transform
-      pos: 7.5,-7.5
-      parent: 1
-- proto: PosterLegitGetYourLEGS
-  entities:
-  - uid: 271
-    components:
-    - type: Transform
-      pos: 3.5,2.5
-      parent: 1
-- proto: PosterLegitLoveIan
-  entities:
-  - uid: 272
-    components:
-    - type: Transform
-      pos: 6.5,-6.5
-      parent: 1
-- proto: PosterLegitPeriodicTable
-  entities:
-  - uid: 273
-    components:
-    - type: Transform
-      pos: 10.5,-2.5
-      parent: 1
-- proto: PowerCellRecharger
-  entities:
-  - uid: 93
-    components:
-    - type: Transform
-      pos: 9.5,-6.5
-      parent: 1
-    - type: ContainerContainer
-      containers:
-        charger_slot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 97
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 95
-          - 96
-          - 94
-    - type: ApcPowerReceiver
-      powerLoad: 0
-- proto: Poweredlight
-  entities:
-  - uid: 274
-    components:
-    - type: Transform
-      pos: 9.5,0.5
-      parent: 1
-  - uid: 275
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-1.5
-      parent: 1
-  - uid: 276
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,4.5
-      parent: 1
-  - uid: 277
-    components:
-    - type: Transform
-      pos: 1.5,0.5
-      parent: 1
-  - uid: 278
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-2.5
-      parent: 1
-- proto: PoweredlightColoredRed
-  entities:
-  - uid: 279
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-5.5
-      parent: 1
-- proto: PoweredSmallLight
-  entities:
-  - uid: 280
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,3.5
-      parent: 1
-  - uid: 281
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-4.5
-      parent: 1
-- proto: Railing
-  entities:
-  - uid: 366
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.5,2.5
-      parent: 1
-  - uid: 371
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.5,-3.5
-      parent: 1
-  - uid: 375
-    components:
-    - type: Transform
-      pos: 4.5,-5.5
-      parent: 1
-  - uid: 379
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,4.5
-      parent: 1
-- proto: SheetPlasma
-  entities:
-  - uid: 133
-    components:
-    - type: Transform
-      parent: 132
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 134
-    components:
-    - type: Transform
-      parent: 132
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ShuttersNormalOpen
-  entities:
-  - uid: 140
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,-1.5
-      parent: 1
-    - type: ContainerContainer
-      containers:
-        board: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 141
-    - type: DeviceNetwork
-      address: 4967-8FDB
-      receiveFrequency: 1280
-    - type: DeviceLinkSink
-      links:
-      - 304
-  - uid: 142
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,0.5
-      parent: 1
-    - type: ContainerContainer
-      containers:
-        board: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 143
-    - type: DeviceNetwork
-      address: 7927-5FE5
-      receiveFrequency: 1280
-    - type: DeviceLinkSink
-      links:
-      - 304
-  - uid: 144
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,-0.5
-      parent: 1
-    - type: ContainerContainer
-      containers:
-        board: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 145
-    - type: DeviceNetwork
-      address: 2F67-D620
-      receiveFrequency: 1280
-    - type: DeviceLinkSink
-      links:
-      - 304
-- proto: ShuttleWindow
-  entities:
-  - uid: 282
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,1.5
-      parent: 1
-  - uid: 283
-    components:
-    - type: Transform
-      pos: -2.5,-0.5
-      parent: 1
-  - uid: 284
-    components:
-    - type: Transform
-      pos: -0.5,-3.5
-      parent: 1
-  - uid: 285
-    components:
-    - type: Transform
-      pos: -0.5,2.5
-      parent: 1
-  - uid: 286
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-0.5
-      parent: 1
-  - uid: 287
-    components:
-    - type: Transform
-      pos: -1.5,0.5
-      parent: 1
-  - uid: 288
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-2.5
-      parent: 1
-  - uid: 289
-    components:
-    - type: Transform
-      pos: -2.5,-3.5
-      parent: 1
-  - uid: 290
-    components:
-    - type: Transform
-      pos: -0.5,-0.5
-      parent: 1
-  - uid: 291
-    components:
-    - type: Transform
-      pos: -1.5,-1.5
-      parent: 1
-  - uid: 292
-    components:
-    - type: Transform
-      pos: 11.5,-6.5
-      parent: 1
-  - uid: 293
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,0.5
-      parent: 1
-  - uid: 294
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,-0.5
-      parent: 1
-  - uid: 295
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,-1.5
-      parent: 1
-  - uid: 296
-    components:
-    - type: Transform
-      pos: 11.5,-5.5
-      parent: 1
-  - uid: 297
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-5.5
-      parent: 1
-  - uid: 298
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-6.5
-      parent: 1
-  - uid: 299
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-6.5
-      parent: 1
-  - uid: 300
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,5.5
-      parent: 1
-  - uid: 301
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,5.5
-      parent: 1
-  - uid: 302
-    components:
-    - type: Transform
-      pos: -2.5,2.5
-      parent: 1
-  - uid: 303
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,4.5
-      parent: 1
-- proto: SignalButton
-  entities:
-  - uid: 304
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,0.5
-      parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        142:
-        - Pressed: Toggle
-        144:
-        - Pressed: Toggle
-        140:
-        - Pressed: Toggle
-- proto: SignBridge
-  entities:
-  - uid: 306
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 7.5,0.5
-      parent: 1
-- proto: SignConspiracyBoard
-  entities:
-  - uid: 307
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 8.5,-7.5
-      parent: 1
-- proto: SignDirectionalBrig
-  entities:
-  - uid: 308
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,1.5
-      parent: 1
-  - uid: 309
-    components:
-    - type: Transform
-      pos: 1.5,-2.5
-      parent: 1
-- proto: SignEngineering
-  entities:
-  - uid: 310
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,2.5
-      parent: 1
-  - uid: 311
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 7.5,2.5
-      parent: 1
-- proto: SignFlammableMed
-  entities:
-  - uid: 312
-    components:
-    - type: Transform
-      pos: 7.5,6.5
-      parent: 1
-- proto: SignGravity
-  entities:
-  - uid: 313
-    components:
-    - type: Transform
-      pos: 11.5,5.5
-      parent: 1
-- proto: SignSec
-  entities:
-  - uid: 314
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 7.5,-3.5
-      parent: 1
-  - uid: 315
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,-3.5
-      parent: 1
-- proto: SpawnPointLatejoin
-  entities:
-  - uid: 317
-    components:
-    - type: Transform
-      pos: 2.5,-0.5
-      parent: 1
-- proto: SubstationBasic
-  entities:
-  - uid: 104
-    components:
-    - type: Transform
-      pos: 9.5,5.5
-      parent: 1
-- proto: SuitStorageDeputy
-  entities:
-  - uid: 319
-    components:
-    - type: Transform
-      pos: 7.5,-6.5
-      parent: 1
-  - uid: 320
-    components:
-    - type: Transform
-      pos: 8.5,-1.5
-      parent: 1
-- proto: SuitStorageWallmountEVAPrisoner
-  entities:
-  - uid: 321
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,2.5
-      parent: 1
-    - type: Physics
-      canCollide: False
-  - uid: 322
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-3.5
-      parent: 1
-    - type: Physics
-      canCollide: False
-- proto: TableWood
-  entities:
-  - uid: 323
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,0.5
-      parent: 1
-  - uid: 324
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,-0.5
-      parent: 1
-  - uid: 325
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,-1.5
-      parent: 1
-  - uid: 326
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,-6.5
-      parent: 1
-  - uid: 327
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,-5.5
-      parent: 1
-  - uid: 328
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 9.5,0.5
-      parent: 1
-  - uid: 329
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 8.5,0.5
-      parent: 1
-  - uid: 330
-    components:
-    - type: Transform
-      pos: 9.5,-6.5
-      parent: 1
-- proto: ThrusterNfsd
-  entities:
-  - uid: 331
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,-3.5
-      parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
-  - uid: 332
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,2.5
-      parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
-  - uid: 333
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,3.5
-      parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
-  - uid: 334
-    components:
-    - type: Transform
-      pos: 4.5,2.5
-      parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
-  - uid: 335
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-4.5
-      parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
-  - uid: 336
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-3.5
-      parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
-- proto: WallShuttle
-  entities:
-  - uid: 338
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-3.5
-      parent: 1
-  - uid: 339
-    components:
-    - type: Transform
-      pos: 3.5,-4.5
-      parent: 1
-  - uid: 340
-    components:
-    - type: Transform
-      pos: 7.5,0.5
-      parent: 1
-  - uid: 341
-    components:
-    - type: Transform
-      pos: 3.5,3.5
-      parent: 1
-  - uid: 342
-    components:
-    - type: Transform
-      pos: 7.5,-1.5
-      parent: 1
-  - uid: 343
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,2.5
-      parent: 1
-  - uid: 344
-    components:
-    - type: Transform
-      pos: 5.5,-5.5
-      parent: 1
-  - uid: 346
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-7.5
-      parent: 1
-  - uid: 347
-    components:
-    - type: Transform
-      pos: 4.5,1.5
-      parent: 1
-  - uid: 348
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,2.5
-      parent: 1
-  - uid: 349
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,3.5
-      parent: 1
-  - uid: 350
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,2.5
-      parent: 1
-  - uid: 351
-    components:
-    - type: Transform
-      pos: 7.5,1.5
-      parent: 1
-  - uid: 352
-    components:
-    - type: Transform
-      pos: 8.5,1.5
-      parent: 1
-  - uid: 353
-    components:
-    - type: Transform
-      pos: 9.5,1.5
-      parent: 1
-  - uid: 354
-    components:
-    - type: Transform
-      pos: 10.5,1.5
-      parent: 1
-  - uid: 356
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.5,-2.5
-      parent: 1
-  - uid: 357
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 9.5,-2.5
-      parent: 1
-  - uid: 358
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,-2.5
-      parent: 1
-  - uid: 360
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-2.5
-      parent: 1
-  - uid: 361
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-3.5
-      parent: 1
-  - uid: 362
-    components:
-    - type: Transform
-      pos: 5.5,-4.5
-      parent: 1
-  - uid: 363
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 9.5,-4.5
-      parent: 1
-  - uid: 364
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,-4.5
-      parent: 1
-  - uid: 365
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,-4.5
-      parent: 1
-  - uid: 367
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,6.5
-      parent: 1
-  - uid: 368
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,6.5
-      parent: 1
-  - uid: 369
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 9.5,6.5
-      parent: 1
-  - uid: 370
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,6.5
-      parent: 1
-  - uid: 372
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-3.5
-      parent: 1
-  - uid: 373
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-2.5
-      parent: 1
-  - uid: 374
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-7.5
-      parent: 1
-  - uid: 376
-    components:
-    - type: Transform
-      pos: 8.5,3.5
-      parent: 1
-  - uid: 377
-    components:
-    - type: Transform
-      pos: 9.5,3.5
-      parent: 1
-  - uid: 378
-    components:
-    - type: Transform
-      pos: 10.5,3.5
-      parent: 1
-  - uid: 380
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 9.5,-7.5
-      parent: 1
-  - uid: 381
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,-7.5
-      parent: 1
-  - uid: 383
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,5.5
-      parent: 1
-  - uid: 384
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,4.5
-      parent: 1
-  - uid: 385
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,5.5
-      parent: 1
-  - uid: 386
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,-7.5
-      parent: 1
-  - uid: 387
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-7.5
-      parent: 1
-  - uid: 389
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-6.5
-      parent: 1
-  - uid: 390
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,2.5
-      parent: 1
-  - uid: 391
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,2.5
-      parent: 1
-  - uid: 392
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-3.5
-      parent: 1
-  - uid: 394
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,1.5
-      parent: 1
-  - uid: 395
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,2.5
-      parent: 1
-  - uid: 396
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-4.5
-      parent: 1
-  - uid: 397
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-2.5
-      parent: 1
-  - uid: 398
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-3.5
-      parent: 1
-  - uid: 399
-    components:
-    - type: Transform
-      pos: 1.5,-2.5
-      parent: 1
-  - uid: 401
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-5.5
-      parent: 1
-  - uid: 402
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,1.5
-      parent: 1
-  - uid: 403
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-3.5
-      parent: 1
-  - uid: 404
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-3.5
-      parent: 1
-  - uid: 405
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,6.5
-      parent: 1
-  - uid: 406
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,6.5
-      parent: 1
-  - uid: 408
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,4.5
-      parent: 1
-  - uid: 409
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,3.5
-      parent: 1
-  - uid: 410
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,2.5
-      parent: 1
-  - uid: 412
-    components:
-    - type: Transform
-      pos: 5.5,4.5
-      parent: 1
-- proto: WallShuttleDiagonal
-  entities:
-  - uid: 109
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-7.5
-      parent: 1
-  - uid: 110
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-7.5
-      parent: 1
-  - uid: 111
-    components:
-    - type: Transform
-      pos: 6.5,6.5
-      parent: 1
-  - uid: 116
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 5.5,-6.5
-      parent: 1
-  - uid: 121
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,6.5
-      parent: 1
-  - uid: 135
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 11.5,-2.5
-      parent: 1
-  - uid: 221
-    components:
-    - type: Transform
-      pos: 0.5,6.5
-      parent: 1
-  - uid: 235
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 6.5,-7.5
-      parent: 1
-  - uid: 305
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 11.5,-7.5
-      parent: 1
-  - uid: 316
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,1.5
-      parent: 1
-  - uid: 318
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,6.5
-      parent: 1
-  - uid: 337
-    components:
-    - type: Transform
-      pos: 5.5,5.5
-      parent: 1
-  - uid: 345
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,-4.5
-      parent: 1
-  - uid: 355
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 11.5,3.5
-      parent: 1
-  - uid: 414
-    components:
-    - type: Transform
-      pos: -4.5,2.5
-      parent: 1
-  - uid: 415
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,-3.5
-      parent: 1
-  - uid: 416
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-1.5
-      parent: 1
-  - uid: 417
-    components:
-    - type: Transform
-      pos: -2.5,0.5
-      parent: 1
-  - uid: 418
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,1.5
-      parent: 1
-  - uid: 419
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-3.5
-      parent: 1
-  - uid: 420
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-2.5
-      parent: 1
-  - uid: 421
-    components:
-    - type: Transform
-      pos: 7.5,3.5
-      parent: 1
-  - uid: 422
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 423
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-5.5
-      parent: 1
-  - uid: 424
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,0.5
-      parent: 1
-  - uid: 425
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,-4.5
-      parent: 1
-  - uid: 426
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,4.5
-      parent: 1
-- proto: WardrobePrisonFilled
-  entities:
-  - uid: 427
-    components:
-    - type: Transform
-      pos: 4.5,-1.5
-      parent: 1
-  - uid: 428
-    components:
-    - type: Transform
-      pos: 4.5,0.5
-      parent: 1
-- proto: WarpPointShip
-  entities:
-  - uid: 429
-    components:
-    - type: Transform
-      pos: 4.5,-0.5
-      parent: 1
-- proto: WeaponCapacitorRecharger
-  entities:
-  - uid: 430
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.5,-6.5
-      parent: 1
-  - uid: 431
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 10.5,-1.5
-      parent: 1
-- proto: WindoorSecureSecurityLocked
-  entities:
-  - uid: 432
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,3.5
-      parent: 1
-  - uid: 433
-    components:
-    - type: Transform
-      pos: 2.5,-4.5
-      parent: 1
-...
diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/interceptor.yml b/Resources/Maps/_NF/Shuttles/Nfsd/interceptor.yml
index 4b833a586da..d4d70be3993 100644
--- a/Resources/Maps/_NF/Shuttles/Nfsd/interceptor.yml
+++ b/Resources/Maps/_NF/Shuttles/Nfsd/interceptor.yml
@@ -23,7 +23,7 @@ entities:
       chunks:
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAHgAAAAADHgAAAAABHgAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAIwAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAACHgAAAAAAHgAAAAADfQAAAAAAeQAAAAABeQAAAAAAeQAAAAACeQAAAAABeQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAACHgAAAAACHgAAAAAAeQAAAAABeQAAAAABeQAAAAACeQAAAAADeQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAACHgAAAAABHgAAAAACHgAAAAAAfQAAAAAAeQAAAAADeQAAAAABeQAAAAAAeQAAAAAAeQAAAAAB
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAAHgAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAHgAAAAADHgAAAAABHgAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAIwAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAACHgAAAAAAHgAAAAADfQAAAAAAeQAAAAABeQAAAAAAeQAAAAACeQAAAAABeQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAACHgAAAAACHgAAAAAAeQAAAAABeQAAAAABeQAAAAACeQAAAAADeQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAACHgAAAAABHgAAAAACHgAAAAAAfQAAAAAAeQAAAAADeQAAAAABeQAAAAAAeQAAAAAAeQAAAAAB
           version: 6
         0,-1:
           ind: 0,-1
@@ -185,44 +185,35 @@ entities:
       version: 2
       data:
         tiles:
-          -1,-1:
-            0: 65535
-          0,-1:
-            0: 30579
-          -3,-2:
-            0: 54272
           -3,-1:
-            1: 1
-            0: 65534
-          -2,-2:
-            0: 29696
-            1: 32768
+            0: 1
+            1: 61128
+          -3,-2:
+            0: 8192
           -2,-1:
-            0: 65535
+            1: 49075
+          -2,-2:
+            0: 32768
+          -1,-1:
+            1: 65524
           -1,-2:
-            0: 61184
-            1: 4096
+            1: 17408
+          -1,0:
+            1: 61162
           0,-2:
-            0: 14080
-          -3,0:
-            0: 207
+            1: 4352
+          0,-1:
+            1: 4369
           -2,0:
-            0: 31
-            1: 128
-          -1,0:
-            0: 65535
-          -1,1:
-            0: 239
+            0: 128
           0,0:
-            0: 30579
-          0,1:
-            0: 19
+            1: 4368
         uniqueMixes:
         - volume: 2500
-          temperature: 293.15
+          immutable: True
           moles:
-          - 21.824879
-          - 82.10312
+          - 0
+          - 0
           - 0
           - 0
           - 0
@@ -236,8 +227,8 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 0
-          - 0
+          - 21.824879
+          - 82.10312
           - 0
           - 0
           - 0
@@ -254,27 +245,25 @@ entities:
     - type: BecomesStation
       id: Interceptor
     - type: SpreaderGrid
-- proto: AirCanister
+- proto: ActionToggleLight
   entities:
-  - uid: 106
+  - uid: 131
     components:
     - type: Transform
-      anchored: True
-      pos: -8.5,-0.5
-      parent: 1
-    - type: Physics
-      bodyType: Static
-- proto: AirlockGlassShuttle
+      parent: 120
+    - type: InstantAction
+      container: 120
+- proto: AirlockGlassShuttleNfsdLocked
   entities:
-  - uid: 6
+  - uid: 7
     components:
     - type: Transform
-      pos: 0.5,-5.5
+      pos: -1.5,-5.5
       parent: 1
-  - uid: 7
+  - uid: 17
     components:
     - type: Transform
-      pos: -1.5,-5.5
+      pos: 0.5,-5.5
       parent: 1
 - proto: AirlockNfsdGlassLocked
   entities:
@@ -308,17 +297,17 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -5.5,-0.5
       parent: 1
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
   - uid: 10
     components:
     - type: Transform
-      pos: -1.5,-5.5
+      pos: 0.5,-5.5
       parent: 1
   - uid: 11
     components:
     - type: Transform
-      pos: 0.5,-5.5
+      pos: -1.5,-5.5
       parent: 1
 - proto: AtmosFixBlockerMarker
   entities:
@@ -327,11 +316,6 @@ entities:
     - type: Transform
       pos: -4.5,1.5
       parent: 1
-  - uid: 23
-    components:
-    - type: Transform
-      pos: -3.5,-4.5
-      parent: 1
   - uid: 117
     components:
     - type: Transform
@@ -378,14 +362,7 @@ entities:
   - uid: 16
     components:
     - type: Transform
-      pos: -3.376185,-1.4098043
-      parent: 1
-- proto: BoxForensicPad
-  entities:
-  - uid: 17
-    components:
-    - type: Transform
-      pos: -3.6799874,-1.4031521
+      pos: -3.62612,-1.2769039
       parent: 1
 - proto: CableApcExtension
   entities:
@@ -563,11 +540,6 @@ entities:
     - type: Transform
       pos: -4.5,-0.5
       parent: 1
-  - uid: 260
-    components:
-    - type: Transform
-      pos: -5.5,-0.5
-      parent: 1
   - uid: 261
     components:
     - type: Transform
@@ -652,11 +624,6 @@ entities:
       parent: 1
 - proto: ChairOfficeDark
   entities:
-  - uid: 73
-    components:
-    - type: Transform
-      pos: -8.5,-2.5
-      parent: 1
   - uid: 75
     components:
     - type: Transform
@@ -669,28 +636,26 @@ entities:
       rot: 3.141592653589793 rad
       pos: -7.5,-1.5
       parent: 1
-- proto: ComputerIFF
+- proto: ComputerTabletopIFF
   entities:
-  - uid: 78
+  - uid: 82
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-2.5
+      pos: -8.5,-0.5
       parent: 1
-- proto: ComputerShuttle
+- proto: ComputerTabletopShuttle
   entities:
-  - uid: 220
+  - uid: 73
     components:
     - type: Transform
       pos: -7.5,-0.5
       parent: 1
-- proto: ComputerStationRecords
+- proto: ComputerTabletopStationRecords
   entities:
-  - uid: 131
+  - uid: 164
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -8.5,-3.5
+      pos: -6.5,-0.5
       parent: 1
 - proto: DefibrillatorCabinetFilled
   entities:
@@ -702,10 +667,32 @@ entities:
       parent: 1
 - proto: FaxMachineShip
   entities:
-  - uid: 26
+  - uid: 6
     components:
     - type: Transform
-      pos: -6.5,-3.5
+      pos: -9.5,-0.5
+      parent: 1
+- proto: FirelockEdge
+  entities:
+  - uid: 269
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -2.5,-0.5
+      parent: 1
+- proto: FirelockGlass
+  entities:
+  - uid: 260
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -5.5,-1.5
+      parent: 1
+  - uid: 268
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,0.5
       parent: 1
 - proto: Fireplace
   entities:
@@ -714,20 +701,25 @@ entities:
     - type: Transform
       pos: 0.5,3.5
       parent: 1
-- proto: ForensicScanner
+- proto: GasMixerOnFlipped
   entities:
-  - uid: 84
+  - uid: 167
     components:
     - type: Transform
-      pos: -3.0549874,-1.2281519
+      pos: -7.5,-2.5
       parent: 1
+    - type: GasMixer
+      inletTwoConcentration: 0.79
+      inletOneConcentration: 0.21
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPassiveVent
   entities:
-  - uid: 129
+  - uid: 163
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -3.5,-4.5
+      pos: -4.5,-4.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -757,11 +749,11 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 178
+  - uid: 220
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -8.5,-1.5
+      rot: 1.5707963267948966 rad
+      pos: -8.5,-2.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -791,13 +783,6 @@ entities:
       color: '#0055CCFF'
 - proto: GasPipeFourway
   entities:
-  - uid: 163
-    components:
-    - type: Transform
-      pos: -3.5,-2.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 234
     components:
     - type: Transform
@@ -822,19 +807,18 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 162
+  - uid: 129
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-2.5
+      pos: -4.5,-3.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 164
+  - uid: 162
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -4.5,-2.5
+      pos: -5.5,-2.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -854,13 +838,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 167
-    components:
-    - type: Transform
-      pos: -3.5,-3.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 168
     components:
     - type: Transform
@@ -926,6 +903,29 @@ entities:
       color: '#0055CCFF'
 - proto: GasPipeTJunction
   entities:
+  - uid: 23
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -3.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 67
+    components:
+    - type: Transform
+      pos: -4.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 84
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 170
     components:
     - type: Transform
@@ -934,20 +934,21 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 177
+- proto: GasPort
+  entities:
+  - uid: 21
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -7.5,-1.5
+      pos: -8.5,-3.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-- proto: GasPort
-  entities:
-  - uid: 120
+  - uid: 78
     components:
     - type: Transform
-      pos: -8.5,-0.5
+      rot: 3.141592653589793 rad
+      pos: -7.5,-3.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -999,12 +1000,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 67
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-1.5
-      parent: 1
   - uid: 125
     components:
     - type: Transform
@@ -1150,34 +1145,56 @@ entities:
       parent: 1
 - proto: GyroscopeNfsd
   entities:
-  - uid: 21
+  - uid: 26
     components:
     - type: Transform
-      pos: -9.5,-0.5
+      rot: 3.141592653589793 rad
+      pos: -9.5,-2.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
-- proto: LampGold
+- proto: LampInterrogator
   entities:
-  - uid: 119
+  - uid: 120
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.4816613,-1.1827465
+      pos: -3.0243516,-1.0670333
+      parent: 1
+    - type: HandheldLight
+      toggleActionEntity: 131
+    - type: ContainerContainer
+      containers:
+        cell_slot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+        actions: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 131
+    - type: Physics
+      canCollide: True
+    - type: ActionsContainer
+- proto: LockerNfsdEvidence
+  entities:
+  - uid: 77
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
       parent: 1
 - proto: LockerNfsdSilverDetectiveFilled
   entities:
-  - uid: 76
+  - uid: 178
     components:
     - type: Transform
-      pos: -6.5,-0.5
+      pos: -6.5,-3.5
       parent: 1
-- proto: LockerNfsdEvidence
+- proto: LockerWallMaterialsFuelPlasmaFilled
   entities:
-  - uid: 77
+  - uid: 266
     components:
     - type: Transform
-      pos: 0.5,-0.5
+      rot: 3.141592653589793 rad
+      pos: -10.5,-2.5
       parent: 1
 - proto: Matchbox
   entities:
@@ -1186,52 +1203,58 @@ entities:
     - type: Transform
       pos: -2.4866343,-1.9206845
       parent: 1
-- proto: PaperBin10
+- proto: NitrogenCanister
   entities:
-  - uid: 74
+  - uid: 177
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -7.5,-3.5
+      anchored: True
+      pos: -8.5,-3.5
       parent: 1
-- proto: Pen
+    - type: Physics
+      bodyType: Static
+- proto: OxygenCanister
   entities:
-  - uid: 122
+  - uid: 182
     components:
     - type: Transform
-      pos: -3.1632028,-1.4523776
+      anchored: True
+      pos: -7.5,-3.5
       parent: 1
-- proto: PinpointerUniversal
+    - type: Physics
+      bodyType: Static
+- proto: Paper
   entities:
-  - uid: 123
+  - uid: 74
     components:
     - type: Transform
-      pos: -8.56982,-2.4906285
+      pos: -9.234102,-0.380448
       parent: 1
-- proto: PortableGeneratorPacmanShuttle
+  - uid: 76
+    components:
+    - type: Transform
+      pos: -9.202852,-0.30748048
+      parent: 1
+- proto: Pen
   entities:
-  - uid: 124
+  - uid: 122
     components:
     - type: Transform
-      pos: -10.5,-1.5
+      pos: -3.5115366,-1.527078
       parent: 1
-    - type: FuelGenerator
-      on: False
-    - type: Physics
-      bodyType: Static
-- proto: PosterLegit12Gauge
+- proto: PinpointerUniversal
   entities:
-  - uid: 265
+  - uid: 123
     components:
     - type: Transform
-      pos: 1.5,1.5
+      pos: -2.4514349,-1.5361089
       parent: 1
-- proto: PosterLegitDickGumshue
+- proto: PortableGeneratorPacmanShuttle
   entities:
-  - uid: 266
+  - uid: 124
     components:
     - type: Transform
-      pos: 1.5,-4.5
+      pos: -10.5,-1.5
       parent: 1
 - proto: PosterLegitObey
   entities:
@@ -1300,6 +1323,20 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-2.5
       parent: 1
+- proto: RandomPosterAny
+  entities:
+  - uid: 116
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,1.5
+      parent: 1
+  - uid: 225
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-4.5
+      parent: 1
 - proto: ReinforcedWindow
   entities:
   - uid: 135
@@ -1408,15 +1445,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -4.5,-3.5
       parent: 1
-- proto: SheetPlasma
-  entities:
-  - uid: 225
-    components:
-    - type: Transform
-      pos: -10.5,-1.5
-      parent: 1
-    - type: Stack
-      count: 15
 - proto: ShuttersNormalOpen
   entities:
   - uid: 104
@@ -1424,159 +1452,105 @@ entities:
     - type: Transform
       pos: -1.5,0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 251
   - uid: 145
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -7.5,-4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 252
   - uid: 148
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -6.5,-4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 252
   - uid: 241
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -8.5,-4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 252
   - uid: 242
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -11.5,-1.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 252
   - uid: 243
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -11.5,-0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 252
   - uid: 244
     components:
     - type: Transform
       pos: -8.5,0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 252
   - uid: 245
     components:
     - type: Transform
       pos: -7.5,0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 252
   - uid: 246
     components:
     - type: Transform
       pos: -6.5,0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 252
   - uid: 247
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 259
   - uid: 248
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -4.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 259
   - uid: 249
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 251
   - uid: 250
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 251
   - uid: 253
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,-0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 259
   - uid: 254
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,-1.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 259
   - uid: 255
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,-2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 259
   - uid: 256
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 259
   - uid: 257
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 259
 - proto: ShuttersWindowOpen
   entities:
   - uid: 151
@@ -1584,9 +1558,6 @@ entities:
     - type: Transform
       pos: -2.5,0.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 251
 - proto: SignalButtonDirectional
   entities:
   - uid: 251
@@ -1662,7 +1633,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: -3.5,0.5
       parent: 1
-- proto: SignSec
+- proto: SignNfsd
   entities:
   - uid: 89
     components:
@@ -1677,13 +1648,11 @@ entities:
   - uid: 172
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: -2.5,-5.5
       parent: 1
   - uid: 173
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: 1.5,-5.5
       parent: 1
 - proto: SmokingPipeFilledTobacco
@@ -1693,6 +1662,14 @@ entities:
     - type: Transform
       pos: -2.586734,-2.0767865
       parent: 1
+- proto: SpawnPointLatejoin
+  entities:
+  - uid: 265
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-1.5
+      parent: 1
 - proto: SubstationWallBasic
   entities:
   - uid: 179
@@ -1714,20 +1691,27 @@ entities:
     - type: Transform
       pos: -4.5,0.5
       parent: 1
-    - type: Physics
-      canCollide: False
 - proto: TableReinforced
   entities:
-  - uid: 82
+  - uid: 106
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,-3.5
+      pos: -9.5,-0.5
       parent: 1
-  - uid: 182
+  - uid: 119
     components:
     - type: Transform
-      pos: -7.5,-3.5
+      pos: -8.5,-0.5
+      parent: 1
+  - uid: 270
+    components:
+    - type: Transform
+      pos: -7.5,-0.5
+      parent: 1
+  - uid: 271
+    components:
+    - type: Transform
+      pos: -6.5,-0.5
       parent: 1
 - proto: TableWood
   entities:
@@ -1757,31 +1741,23 @@ entities:
       rot: 3.141592653589793 rad
       pos: -10.5,-4.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 187
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -4.5,-4.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 188
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -11.5,-3.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 189
     components:
     - type: Transform
       pos: -4.5,1.5
       parent: 1
-    - type: Thruster
-      originalPowerLoad: 1500
 - proto: TintedWindow
   entities:
   - uid: 191
@@ -1982,11 +1958,11 @@ entities:
       parent: 1
 - proto: WallWeaponCapacitorRecharger
   entities:
-  - uid: 116
+  - uid: 272
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -5.5,-2.5
+      pos: -5.5,-3.5
       parent: 1
 - proto: WardrobePrisonFilled
   entities:
diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml b/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml
index 010aa61d5ae..de1a67fbcd8 100644
--- a/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml
+++ b/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml
@@ -4,10 +4,14 @@ meta:
 tilemap:
   0: Space
   30: FloorDark
+  2: FloorDarkMono
   56: FloorGym
   57: FloorHull
+  3: FloorHullReinforced
+  1: FloorMetalDiamond
   80: FloorRockVault
   107: FloorTechMaint
+  4: FloorTechMaint2
   124: Lattice
   125: Plating
 entities:
@@ -24,19 +28,19 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: UAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAHgAAAAAAHgAAAAADHgAAAAADawAAAAAAHgAAAAADHgAAAAABUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAADHgAAAAAAHgAAAAACHgAAAAACHgAAAAAAHgAAAAABHgAAAAABHgAAAAAAHgAAAAABUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAAAHgAAAAACUAAAAAAAawAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAADHgAAAAABUAAAAAAAUAAAAAAAUAAAAAAAOQAAAAAAOQAAAAAAUAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAADHgAAAAACUAAAAAAAUAAAAAAAawAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAHgAAAAADHgAAAAACUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAAAHgAAAAACHgAAAAAAHgAAAAABUAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAACHgAAAAAAHgAAAAACUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAABHgAAAAADUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAawAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAABHgAAAAABHgAAAAADBAAAAAAABAAAAAAABAAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAAAHgAAAAACHgAAAAAAHgAAAAABHgAAAAACHgAAAAACHgAAAAABBAAAAAAABAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAAAHgAAAAABfQAAAAAAAgAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAAAHgAAAAAAfQAAAAAAAQAAAAAAUAAAAAAAAwAAAAAAAwAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAACHgAAAAAAfQAAAAAAAQAAAAAAAQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAADHgAAAAABHgAAAAAAHgAAAAACfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAABHgAAAAABHgAAAAADfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAABHgAAAAACfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAHgAAAAACHgAAAAAAHgAAAAADHgAAAAACawAAAAAAHgAAAAACHgAAAAADUAAAAAAAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAHgAAAAADHgAAAAAAHgAAAAAAHgAAAAADHgAAAAABHgAAAAACHgAAAAABHgAAAAADHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAawAAAAAAUAAAAAAAHgAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAUAAAAAAAOQAAAAAAOQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAHgAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAawAAAAAAUAAAAAAAUAAAAAAAHgAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAHgAAAAABHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAUAAAAAAAHgAAAAAAHgAAAAACHgAAAAADHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAHgAAAAADHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAADHgAAAAADHgAAAAACHgAAAAACAgAAAAAAHgAAAAAAHgAAAAABfQAAAAAAAgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAABHgAAAAABHgAAAAACHgAAAAADfQAAAAAAHgAAAAABHgAAAAABHgAAAAACHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAgAAAAAAUAAAAAAAHgAAAAACHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAAwAAAAAAAwAAAAAAfQAAAAAAAQAAAAAAUAAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAQAAAAAAAQAAAAAAUAAAAAAAHgAAAAADHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAABHgAAAAACHgAAAAADHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAUAAAAAAAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAUAAAAAAAUAAAAAAAHgAAAAADUAAAAAAAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAHgAAAAAAHgAAAAABHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAawAAAAAAUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAUAAAAAAAHgAAAAACHgAAAAADUAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAUAAAAAAAHgAAAAACHgAAAAABUAAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAUAAAAAAAHgAAAAADHgAAAAACUAAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAawAAAAAAUAAAAAAAHgAAAAAC
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAADHgAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAgAAAAACfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAAgAAAAACHgAAAAADHgAAAAABfQAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfQAAAAAAHgAAAAADHgAAAAABfQAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfQAAAAAAHgAAAAACHgAAAAAAfQAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAUAAAAAAAAgAAAAAAfQAAAAAAHgAAAAAD
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAawAAAAAAUAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAADUAAAAAAAUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAawAAAAAAUAAAAAAAHgAAAAACUAAAAAAAUAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAADUAAAAAAAHgAAAAAAHgAAAAACUAAAAAAAUAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAHgAAAAABUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAAAOAAAAAABOAAAAAAAUAAAAAAAHgAAAAABUAAAAAAAHgAAAAAAHgAAAAAAHgAAAAACHgAAAAAAHgAAAAABUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAADOAAAAAACOAAAAAACUAAAAAAAHgAAAAABUAAAAAAAHgAAAAABHgAAAAAAHgAAAAACHgAAAAADHgAAAAAAUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAADHgAAAAABUAAAAAAAHgAAAAABawAAAAAAHgAAAAABHgAAAAAAHgAAAAADHgAAAAABHgAAAAADUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAADHgAAAAABUAAAAAAAHgAAAAABUAAAAAAAUAAAAAAAHgAAAAADUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAgAAAAACfQAAAAAAHgAAAAABfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAABfQAAAAAAHgAAAAADHgAAAAACfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAABOAAAAAABOAAAAAACfQAAAAAAHgAAAAACfQAAAAAAHgAAAAADHgAAAAAAHgAAAAACHgAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOAAAAAAAOAAAAAABOAAAAAADfQAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAHgAAAAACHgAAAAACHgAAAAAAHgAAAAABfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAABHgAAAAADfQAAAAAAHgAAAAADAgAAAAABHgAAAAADHgAAAAACHgAAAAACHgAAAAABHgAAAAACfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAABHgAAAAAAfQAAAAAAHgAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -59,21 +63,37 @@ entities:
         version: 2
         nodes:
         - node:
-            color: '#4B653EF2'
-            id: Box
+            color: '#F1B223FF'
+            id: Bot
           decals:
-            13: 0,3
-            14: 0,2
+            127: -2,2
         - node:
-            color: '#4B653EFF'
-            id: Box
+            color: '#FFFFFFFF'
+            id: Bot
+          decals:
+            128: -8,-4
+            129: -6,-3
+        - node:
+            color: '#AF9369FF'
+            id: BotGreyscale
+          decals:
+            135: 2,2
+        - node:
+            color: '#FFFFFFFF'
+            id: BotGreyscale
+          decals:
+            125: 0,2
+            126: 0,3
+        - node:
+            color: '#0096FFFF'
+            id: BoxGreyscale
           decals:
-            15: -2,4
-            16: -2,3
-            17: -2,2
-            18: 2,4
-            19: 2,3
-            20: 2,2
+            132: -7,-2
+        - node:
+            color: '#FF0000FF'
+            id: BoxGreyscale
+          decals:
+            133: -6,-2
         - node:
             color: '#FFFFFFFF'
             id: BrickTileDarkLineN
@@ -219,13 +239,13 @@ entities:
             106: 2,-2
             107: 2,-1
         - node:
-            color: '#FF9F0033'
+            color: '#4B653ECC'
             id: CheckerNESW
           decals:
-            0: 8,1
-            1: 8,0
-            2: 9,0
-            3: 9,1
+            143: -2,3
+            144: -2,4
+            145: 2,4
+            146: 2,3
         - node:
             color: '#49392699'
             id: CheckerNWSE
@@ -252,6 +272,14 @@ entities:
             101: 0,-1
             108: 2,-2
             109: 2,-1
+        - node:
+            color: '#493926CC'
+            id: CheckerNWSE
+          decals:
+            139: -2,3
+            140: -2,4
+            141: 2,4
+            142: 2,3
         - node:
             color: '#FFFFFFFF'
             id: Delivery
@@ -275,6 +303,9 @@ entities:
             87: 0,4
             88: 4,1
             89: -4,1
+            150: -3,-6
+            151: -3,-2
+            152: -1,-1
         - node:
             color: '#493926CC'
             id: WarnLineGreyscaleS
@@ -282,11 +313,26 @@ entities:
             38: 0,6
             90: -1,-6
             91: 1,-6
+            153: -1,1
+            154: -3,0
+            155: -3,-4
+        - node:
+            color: '#493926CC'
+            id: WarnLineGreyscaleW
+          decals:
+            156: -4,0
         - node:
             color: '#EFB34166'
             id: WarnLineGreyscaleW
           decals:
             92: -4,-4
+        - node:
+            color: '#FFFFFFFF'
+            id: WarnLineN
+          decals:
+            147: -1,-8
+            148: 1,-8
+            149: 0,-8
     - type: GridAtmosphere
       version: 2
       data:
@@ -303,59 +349,69 @@ entities:
             0: 61197
           0,2:
             0: 7
+            1: 128
           -1,2:
             0: 12
+            1: 33
           1,0:
             0: 4479
-            1: 49152
+            2: 49152
           1,1:
             0: 259
-            1: 140
-            2: 1024
+            1: 9216
+            2: 140
+          1,2:
+            1: 1
           1,-1:
             0: 8157
           2,0:
             0: 51
-            2: 8192
+            1: 9224
           2,1:
-            1: 1
+            2: 1
           -3,0:
+            1: 33794
             0: 136
-            2: 32768
           -2,0:
             0: 127
-            1: 24576
+            2: 24576
           -2,1:
-            1: 39
+            2: 39
             0: 8
-            2: 1024
+            1: 33792
           -1,-1:
             0: 43963
+          -3,-2:
+            1: 2113
           -3,-1:
             0: 3822
-          -3,-2:
-            2: 2112
+            1: 4096
           -2,-2:
-            2: 832
+            1: 832
           -2,-1:
             0: 1919
           -1,-2:
+            1: 1
             0: 11912
           -1,-3:
-            2: 8192
+            1: 8192
             0: 32768
           0,-2:
             0: 2979
           0,-3:
             0: 8192
-            2: 32768
+            1: 32768
           1,-2:
+            1: 2113
             0: 4352
-            2: 2112
           2,-2:
-            2: 832
+            1: 832
           2,-1:
             0: 1911
+          3,-1:
+            1: 4096
+          3,-2:
+            1: 1
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -373,7 +429,7 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.15
+          immutable: True
           moles:
           - 0
           - 0
@@ -388,7 +444,7 @@ entities:
           - 0
           - 0
         - volume: 2500
-          immutable: True
+          temperature: 293.15
           moles:
           - 0
           - 0
@@ -407,92 +463,94 @@ entities:
     - type: RadiationGridResistance
     - type: BecomesStation
       id: Prowler
-- proto: AirlockEngineering
+- proto: AirlockExternalGlassNfsdLocked
   entities:
-  - uid: 2
+  - uid: 5
     components:
     - type: Transform
-      pos: -4.5,-3.5
+      pos: 1.5,-6.5
       parent: 1
-- proto: AirlockGlassShuttle
-  entities:
-  - uid: 3
+  - uid: 9
     components:
     - type: Transform
-      pos: -0.5,-8.5
+      pos: -4.5,4.5
       parent: 1
-  - uid: 4
+  - uid: 12
     components:
     - type: Transform
-      pos: 1.5,-8.5
+      pos: -0.5,-6.5
       parent: 1
-- proto: AirlockNfsdGlassLocked
-  entities:
-  - uid: 5
+  - uid: 13
     components:
     - type: Transform
-      pos: 1.5,-6.5
+      pos: 5.5,4.5
       parent: 1
-  - uid: 6
+- proto: AirlockGlassShuttleNfsdLocked
+  entities:
+  - uid: 170
     components:
     - type: Transform
-      pos: -0.5,-6.5
+      pos: 1.5,-8.5
       parent: 1
-- proto: AirlockNfsdLocked
-  entities:
-  - uid: 7
+  - uid: 171
     components:
     - type: Transform
-      pos: -2.5,-0.5
+      pos: -0.5,-8.5
       parent: 1
-  - uid: 8
+- proto: AirlockMaintSecLocked
+  entities:
+  - uid: 14
     components:
     - type: Transform
-      pos: 5.5,4.5
+      pos: -4.5,-3.5
       parent: 1
-  - uid: 9
+- proto: AirlockNfsdGlassLocked
+  entities:
+  - uid: 7
     components:
     - type: Transform
-      pos: -4.5,4.5
+      pos: -0.5,0.5
       parent: 1
-  - uid: 10
+  - uid: 15
     components:
     - type: Transform
-      pos: -3.5,2.5
+      pos: -2.5,-0.5
       parent: 1
-  - uid: 11
+- proto: AirlockNfsdLocked
+  entities:
+  - uid: 2
     components:
     - type: Transform
       pos: 0.5,5.5
       parent: 1
-  - uid: 12
+  - uid: 6
     components:
     - type: Transform
-      pos: 4.5,2.5
+      pos: -2.5,-4.5
       parent: 1
-  - uid: 13
+  - uid: 8
     components:
     - type: Transform
-      pos: -2.5,-4.5
+      pos: -3.5,2.5
       parent: 1
-  - uid: 14
+  - uid: 10
     components:
     - type: Transform
       pos: -4.5,0.5
       parent: 1
-  - uid: 15
+  - uid: 11
     components:
     - type: Transform
-      pos: 5.5,-1.5
+      pos: 4.5,2.5
       parent: 1
   - uid: 16
     components:
     - type: Transform
-      pos: -0.5,0.5
+      pos: 5.5,-1.5
       parent: 1
 - proto: AmeController
   entities:
-  - uid: 17
+  - uid: 344
     components:
     - type: Transform
       pos: -7.5,-2.5
@@ -501,36 +559,16 @@ entities:
       injecting: True
     - type: ContainerContainer
       containers:
-        AmeFuel: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: 18
         fuelSlot: !type:ContainerSlot
           showEnts: False
           occludes: True
-          ent: 57
+          ent: 17
 - proto: AmeJar
   entities:
-  - uid: 18
-    components:
-    - type: Transform
-      parent: 17
-    - type: Physics
-      canCollide: False
-  - uid: 19
-    components:
-    - type: Transform
-      pos: -6.8893666,-2.805623
-      parent: 1
-  - uid: 20
-    components:
-    - type: Transform
-      pos: -6.8893666,-2.352498
-      parent: 1
-  - uid: 57
+  - uid: 17
     components:
     - type: Transform
-      parent: 17
+      parent: 344
     - type: Physics
       canCollide: False
 - proto: AmeShielding
@@ -590,41 +628,54 @@ entities:
     - type: Transform
       pos: 6.5,-0.5
       parent: 1
-  - uid: 31
+  - uid: 32
     components:
     - type: Transform
-      pos: -6.5,-0.5
+      rot: 3.141592653589793 rad
+      pos: 3.5,5.5
       parent: 1
-  - uid: 32
+  - uid: 70
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 3.5,5.5
+      pos: -5.5,-4.5
       parent: 1
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
-  - uid: 33
+  - uid: 34
     components:
     - type: Transform
-      pos: -4.5,4.5
+      pos: -0.5,-8.5
       parent: 1
-  - uid: 34
+  - uid: 36
     components:
     - type: Transform
       pos: 1.5,-8.5
       parent: 1
-  - uid: 35
+  - uid: 605
     components:
     - type: Transform
-      pos: 5.5,4.5
+      rot: -1.5707963267948966 rad
+      pos: -4.5,4.5
       parent: 1
-  - uid: 36
+  - uid: 606
     components:
     - type: Transform
-      pos: -0.5,-8.5
+      rot: 1.5707963267948966 rad
+      pos: 5.5,4.5
       parent: 1
 - proto: AtmosFixBlockerMarker
   entities:
+  - uid: 33
+    components:
+    - type: Transform
+      pos: 10.5,2.5
+      parent: 1
+  - uid: 35
+    components:
+    - type: Transform
+      pos: 5.5,7.5
+      parent: 1
   - uid: 37
     components:
     - type: Transform
@@ -705,6 +756,36 @@ entities:
     - type: Transform
       pos: 3.5,-8.5
       parent: 1
+  - uid: 98
+    components:
+    - type: Transform
+      pos: 12.5,-0.5
+      parent: 1
+  - uid: 214
+    components:
+    - type: Transform
+      pos: -10.5,0.5
+      parent: 1
+  - uid: 227
+    components:
+    - type: Transform
+      pos: -9.5,2.5
+      parent: 1
+  - uid: 230
+    components:
+    - type: Transform
+      pos: -11.5,-7.5
+      parent: 1
+  - uid: 231
+    components:
+    - type: Transform
+      pos: -11.5,-0.5
+      parent: 1
+  - uid: 298
+    components:
+    - type: Transform
+      pos: 11.5,0.5
+      parent: 1
   - uid: 409
     components:
     - type: Transform
@@ -715,6 +796,21 @@ entities:
     - type: Transform
       pos: -6.5,5.5
       parent: 1
+  - uid: 450
+    components:
+    - type: Transform
+      pos: -3.5,-7.5
+      parent: 1
+  - uid: 572
+    components:
+    - type: Transform
+      pos: 4.5,-7.5
+      parent: 1
+  - uid: 604
+    components:
+    - type: Transform
+      pos: 12.5,-7.5
+      parent: 1
   - uid: 623
     components:
     - type: Transform
@@ -765,6 +861,31 @@ entities:
     - type: Transform
       pos: 7.5,3.5
       parent: 1
+  - uid: 637
+    components:
+    - type: Transform
+      pos: 4.5,8.5
+      parent: 1
+  - uid: 638
+    components:
+    - type: Transform
+      pos: 3.5,9.5
+      parent: 1
+  - uid: 639
+    components:
+    - type: Transform
+      pos: -2.5,9.5
+      parent: 1
+  - uid: 640
+    components:
+    - type: Transform
+      pos: -3.5,8.5
+      parent: 1
+  - uid: 641
+    components:
+    - type: Transform
+      pos: -4.5,7.5
+      parent: 1
 - proto: Bed
   entities:
   - uid: 53
@@ -825,114 +946,50 @@ entities:
       bodyType: Static
 - proto: BlastDoorOpen
   entities:
-  - uid: 61
+  - uid: 165
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-7.5
+      pos: -3.5,7.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 398
-  - uid: 62
+  - uid: 226
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-7.5
+      pos: 0.5,9.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 398
-  - uid: 63
+  - uid: 241
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
       pos: -0.5,9.5
       parent: 1
-    - type: DeviceLinkSink
-      invokeCounter: 1
-      links:
-      - 399
-  - uid: 64
+  - uid: 289
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,7.5
+      pos: 1.5,9.5
       parent: 1
-    - type: DeviceLinkSink
-      invokeCounter: 1
-      links:
-      - 399
-  - uid: 65
+  - uid: 415
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,8.5
+      pos: 4.5,7.5
       parent: 1
-    - type: DeviceLinkSink
-      invokeCounter: 1
-      links:
-      - 399
-  - uid: 66
+- proto: ButtonFrameCautionSecurity
+  entities:
+  - uid: 62
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-7.5
+      rot: 3.141592653589793 rad
+      pos: 2.5,5.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 398
-  - uid: 67
+- proto: CableApcExtension
+  entities:
+  - uid: 71
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,9.5
+      pos: 0.5,6.5
       parent: 1
-    - type: DeviceLinkSink
-      invokeCounter: 1
-      links:
-      - 399
-  - uid: 68
+  - uid: 72
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,9.5
-      parent: 1
-    - type: DeviceLinkSink
-      invokeCounter: 1
-      links:
-      - 399
-  - uid: 69
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,8.5
-      parent: 1
-    - type: DeviceLinkSink
-      invokeCounter: 1
-      links:
-      - 399
-  - uid: 70
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,7.5
-      parent: 1
-    - type: DeviceLinkSink
-      invokeCounter: 1
-      links:
-      - 399
-- proto: CableApcExtension
-  entities:
-  - uid: 71
-    components:
-    - type: Transform
-      pos: 0.5,6.5
-      parent: 1
-  - uid: 72
-    components:
-    - type: Transform
-      pos: -0.5,6.5
+      pos: -0.5,6.5
       parent: 1
   - uid: 73
     components:
@@ -974,11 +1031,6 @@ entities:
     - type: Transform
       pos: -3.5,-3.5
       parent: 1
-  - uid: 81
-    components:
-    - type: Transform
-      pos: -6.5,-2.5
-      parent: 1
   - uid: 82
     components:
     - type: Transform
@@ -1059,11 +1111,6 @@ entities:
     - type: Transform
       pos: -1.5,3.5
       parent: 1
-  - uid: 98
-    components:
-    - type: Transform
-      pos: -6.5,-0.5
-      parent: 1
   - uid: 99
     components:
     - type: Transform
@@ -1134,11 +1181,6 @@ entities:
     - type: Transform
       pos: 0.5,-5.5
       parent: 1
-  - uid: 113
-    components:
-    - type: Transform
-      pos: -0.5,-6.5
-      parent: 1
   - uid: 114
     components:
     - type: Transform
@@ -1164,11 +1206,6 @@ entities:
     - type: Transform
       pos: -2.5,0.5
       parent: 1
-  - uid: 119
-    components:
-    - type: Transform
-      pos: 1.5,-6.5
-      parent: 1
   - uid: 120
     components:
     - type: Transform
@@ -1179,11 +1216,6 @@ entities:
     - type: Transform
       pos: -7.5,1.5
       parent: 1
-  - uid: 122
-    components:
-    - type: Transform
-      pos: -6.5,-1.5
-      parent: 1
   - uid: 123
     components:
     - type: Transform
@@ -1274,32 +1306,37 @@ entities:
     - type: Transform
       pos: -0.5,-1.5
       parent: 1
+  - uid: 308
+    components:
+    - type: Transform
+      pos: -5.5,-4.5
+      parent: 1
 - proto: CableHV
   entities:
-  - uid: 141
+  - uid: 31
     components:
     - type: Transform
-      pos: -7.5,-1.5
+      pos: -5.5,-0.5
       parent: 1
-  - uid: 142
+  - uid: 81
     components:
     - type: Transform
-      pos: -6.5,-2.5
+      pos: -5.5,-3.5
       parent: 1
-  - uid: 143
+  - uid: 141
     components:
     - type: Transform
-      pos: -6.5,-1.5
+      pos: -7.5,-1.5
       parent: 1
-  - uid: 144
+  - uid: 143
     components:
     - type: Transform
-      pos: -7.5,-2.5
+      pos: -6.5,-1.5
       parent: 1
   - uid: 145
     components:
     - type: Transform
-      pos: -5.5,-2.5
+      pos: -3.5,-3.5
       parent: 1
   - uid: 146
     components:
@@ -1309,12 +1346,12 @@ entities:
   - uid: 147
     components:
     - type: Transform
-      pos: -3.5,-2.5
+      pos: -4.5,-3.5
       parent: 1
   - uid: 148
     components:
     - type: Transform
-      pos: -4.5,-2.5
+      pos: -5.5,-2.5
       parent: 1
   - uid: 149
     components:
@@ -1396,43 +1433,38 @@ entities:
     - type: Transform
       pos: -3.5,6.5
       parent: 1
-  - uid: 165
-    components:
-    - type: Transform
-      pos: 1.5,1.5
-      parent: 1
-  - uid: 166
+  - uid: 178
     components:
     - type: Transform
-      pos: 2.5,1.5
+      pos: -2.5,-3.5
       parent: 1
-  - uid: 167
+  - uid: 182
     components:
     - type: Transform
-      pos: 3.5,1.5
+      pos: -7.5,-2.5
       parent: 1
-  - uid: 168
+  - uid: 505
     components:
     - type: Transform
-      pos: 4.5,1.5
+      pos: -5.5,-1.5
       parent: 1
-  - uid: 169
+- proto: CableMV
+  entities:
+  - uid: 119
     components:
     - type: Transform
-      pos: 5.5,1.5
+      pos: -5.5,-1.5
       parent: 1
-  - uid: 170
+  - uid: 142
     components:
     - type: Transform
-      pos: 6.5,1.5
+      pos: -5.5,-0.5
       parent: 1
-  - uid: 171
+  - uid: 144
     components:
     - type: Transform
-      pos: 7.5,1.5
+      pos: -2.5,-3.5
       parent: 1
-- proto: CableMV
-  entities:
   - uid: 172
     components:
     - type: Transform
@@ -1448,11 +1480,6 @@ entities:
     - type: Transform
       pos: 1.5,1.5
       parent: 1
-  - uid: 175
-    components:
-    - type: Transform
-      pos: -3.5,-2.5
-      parent: 1
   - uid: 176
     components:
     - type: Transform
@@ -1461,17 +1488,7 @@ entities:
   - uid: 177
     components:
     - type: Transform
-      pos: -6.5,-0.5
-      parent: 1
-  - uid: 178
-    components:
-    - type: Transform
-      pos: -6.5,-2.5
-      parent: 1
-  - uid: 179
-    components:
-    - type: Transform
-      pos: -6.5,-1.5
+      pos: -5.5,-3.5
       parent: 1
   - uid: 180
     components:
@@ -1483,25 +1500,15 @@ entities:
     - type: Transform
       pos: -2.5,-0.5
       parent: 1
-  - uid: 182
-    components:
-    - type: Transform
-      pos: -4.5,-2.5
-      parent: 1
   - uid: 183
     components:
     - type: Transform
-      pos: -5.5,-2.5
+      pos: 7.5,1.5
       parent: 1
   - uid: 184
     components:
     - type: Transform
-      pos: 5.5,0.5
-      parent: 1
-  - uid: 185
-    components:
-    - type: Transform
-      pos: 4.5,0.5
+      pos: 6.5,1.5
       parent: 1
   - uid: 186
     components:
@@ -1588,13 +1595,38 @@ entities:
     - type: Transform
       pos: -2.5,0.5
       parent: 1
+  - uid: 203
+    components:
+    - type: Transform
+      pos: -5.5,-2.5
+      parent: 1
+  - uid: 209
+    components:
+    - type: Transform
+      pos: 5.5,1.5
+      parent: 1
+  - uid: 335
+    components:
+    - type: Transform
+      pos: -4.5,-3.5
+      parent: 1
+  - uid: 399
+    components:
+    - type: Transform
+      pos: -5.5,-4.5
+      parent: 1
+  - uid: 483
+    components:
+    - type: Transform
+      pos: -3.5,-3.5
+      parent: 1
 - proto: CableTerminal
   entities:
-  - uid: 203
+  - uid: 122
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-1.5
+      rot: 3.141592653589793 rad
+      pos: -7.5,-2.5
       parent: 1
 - proto: CarpetGreen
   entities:
@@ -1618,6 +1650,68 @@ entities:
     - type: Transform
       pos: -8.5,0.5
       parent: 1
+- proto: Catwalk
+  entities:
+  - uid: 61
+    components:
+    - type: Transform
+      pos: 7.5,5.5
+      parent: 1
+  - uid: 423
+    components:
+    - type: Transform
+      pos: -7.5,4.5
+      parent: 1
+  - uid: 424
+    components:
+    - type: Transform
+      pos: -6.5,5.5
+      parent: 1
+  - uid: 427
+    components:
+    - type: Transform
+      pos: 8.5,4.5
+      parent: 1
+  - uid: 642
+    components:
+    - type: Transform
+      pos: 6.5,4.5
+      parent: 1
+  - uid: 643
+    components:
+    - type: Transform
+      pos: 7.5,4.5
+      parent: 1
+  - uid: 644
+    components:
+    - type: Transform
+      pos: 7.5,3.5
+      parent: 1
+  - uid: 645
+    components:
+    - type: Transform
+      pos: 6.5,3.5
+      parent: 1
+  - uid: 646
+    components:
+    - type: Transform
+      pos: -5.5,4.5
+      parent: 1
+  - uid: 647
+    components:
+    - type: Transform
+      pos: -6.5,4.5
+      parent: 1
+  - uid: 648
+    components:
+    - type: Transform
+      pos: -6.5,3.5
+      parent: 1
+  - uid: 649
+    components:
+    - type: Transform
+      pos: -5.5,3.5
+      parent: 1
 - proto: ChairFolding
   entities:
   - uid: 208
@@ -1626,11 +1720,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -6.5,1.5
       parent: 1
-  - uid: 209
+  - uid: 254
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,-1.5
+      pos: 2.4896135,-1.3288689
       parent: 1
 - proto: ChairPilotSeat
   entities:
@@ -1658,26 +1752,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.5,7.5
       parent: 1
-- proto: ClothingHeadHatNfsdBeretGreen
-  entities:
-  - uid: 214
-    components:
-    - type: Transform
-      pos: 0.68947345,2.7193756
-      parent: 1
-- proto: ClothingHeadHelmetNfsd
-  entities:
-  - uid: 215
+  - uid: 411
     components:
     - type: Transform
-      pos: 6.291652,-3.3226833
+      rot: 3.141592653589793 rad
+      pos: 0.5,7.5
       parent: 1
 - proto: ComputerAdvancedRadar
   entities:
-  - uid: 217
+  - uid: 244
     components:
     - type: Transform
-      pos: 0.5,8.5
+      pos: 3.5,7.5
       parent: 1
 - proto: ComputerCriminalRecords
   entities:
@@ -1688,10 +1774,10 @@ entities:
       parent: 1
 - proto: ComputerIFF
   entities:
-  - uid: 218
+  - uid: 243
     components:
     - type: Transform
-      pos: 3.5,7.5
+      pos: 0.5,8.5
       parent: 1
 - proto: ComputerMedicalRecords
   entities:
@@ -1752,17 +1838,11 @@ entities:
     - type: Transform
       pos: 0.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 447
   - uid: 225
     components:
     - type: Transform
       pos: 2.5,-3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 447
 - proto: DefibrillatorCabinetFilled
   entities:
   - uid: 619
@@ -1771,14 +1851,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,-2.5
       parent: 1
-- proto: ExtinguisherCabinetFilled
-  entities:
-  - uid: 227
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-4.5
-      parent: 1
 - proto: FaxMachineShip
   entities:
   - uid: 228
@@ -1795,31 +1867,23 @@ entities:
       pos: -6.5,-2.5
       parent: 1
     - type: GasMixer
-      inletTwoConcentration: 0.20999998
-      inletOneConcentration: 0.79
+      inletTwoConcentration: 0.78
+      inletOneConcentration: 0.22
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasPassiveVent
   entities:
-  - uid: 230
+  - uid: 653
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -2.5,-8.5
+      pos: 8.5,-5.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 231
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-8.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-- proto: GasPipeBend
-  entities:
-  - uid: 232
+- proto: GasPipeBend
+  entities:
+  - uid: 232
     components:
     - type: Transform
       pos: -0.5,-3.5
@@ -1842,14 +1906,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 235
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,3.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 236
     components:
     - type: Transform
@@ -1872,64 +1928,63 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 239
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 240
+  - uid: 242
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 1.5,6.5
+      pos: 7.5,0.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 241
+  - uid: 296
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,6.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,-5.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 242
+  - uid: 510
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 7.5,0.5
+      rot: 3.141592653589793 rad
+      pos: 1.5,-2.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 243
+  - uid: 650
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-2.5
+      pos: 8.5,-2.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GasPipeFourway
   entities:
-  - uid: 244
+  - uid: 312
     components:
     - type: Transform
-      pos: -0.5,1.5
+      pos: -2.5,-1.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 312
+      color: '#990000FF'
+  - uid: 325
     components:
     - type: Transform
-      pos: -2.5,-1.5
+      pos: 7.5,-2.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GasPipeStraight
   entities:
+  - uid: 113
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,-3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 245
     components:
     - type: Transform
@@ -1946,13 +2001,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 247
-    components:
-    - type: Transform
-      pos: 2.5,1.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 248
     components:
     - type: Transform
@@ -1963,18 +2011,10 @@ entities:
   - uid: 249
     components:
     - type: Transform
-      pos: -0.5,2.5
+      pos: 0.5,2.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 250
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,5.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 251
     components:
     - type: Transform
@@ -1997,43 +2037,10 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 254
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,1.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 255
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 256
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-7.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 257
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-6.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 258
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-7.5
+      pos: 1.5,5.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -2139,13 +2146,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 272
-    components:
-    - type: Transform
-      pos: -0.5,3.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 273
     components:
     - type: Transform
@@ -2219,13 +2219,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 283
-    components:
-    - type: Transform
-      pos: 3.5,-6.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 284
     components:
     - type: Transform
@@ -2260,62 +2253,92 @@ entities:
   - uid: 288
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,2.5
+      pos: 1.5,3.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 289
+  - uid: 290
     components:
     - type: Transform
-      pos: 2.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-2.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 290
+  - uid: 293
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-2.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,-2.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 291
+  - uid: 294
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 3.5,-5.5
+      pos: -2.5,-4.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 293
+  - uid: 302
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-2.5
+      pos: 1.5,2.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 294
+  - uid: 322
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -2.5,-4.5
+      pos: 1.5,1.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 295
+  - uid: 347
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-4.5
+      pos: 0.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 348
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 349
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-2.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 296
+  - uid: 451
     components:
     - type: Transform
-      pos: 3.5,-3.5
+      pos: 1.5,6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 526
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 610
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,0.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -2343,39 +2366,46 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 636
+  - uid: 651
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-1.5
+      pos: 8.5,-3.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-- proto: GasPipeTJunction
-  entities:
-  - uid: 297
+  - uid: 652
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-2.5
+      pos: 8.5,-4.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 298
+- proto: GasPipeTJunction
+  entities:
+  - uid: 217
     components:
     - type: Transform
-      pos: 3.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-0.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 299
+  - uid: 255
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,-0.5
+      pos: 0.5,4.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#0055CCFF'
+  - uid: 297
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 300
     components:
     - type: Transform
@@ -2391,14 +2421,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 302
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,3.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 303
     components:
     - type: Transform
@@ -2414,13 +2436,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 305
-    components:
-    - type: Transform
-      pos: -0.5,4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 306
     components:
     - type: Transform
@@ -2436,43 +2451,42 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 308
+  - uid: 326
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-5.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-1.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 309
+  - uid: 350
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-1.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,4.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-- proto: GasPort
-  entities:
-  - uid: 310
+  - uid: 465
     components:
     - type: Transform
-      pos: -5.5,-1.5
+      pos: -0.5,1.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 311
+- proto: GasPort
+  entities:
+  - uid: 310
     components:
     - type: Transform
-      pos: -6.5,-1.5
+      pos: -5.5,-1.5
       parent: 1
-- proto: GasPressurePumpOn
-  entities:
-  - uid: 408
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 311
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -5.5,-3.5
+      pos: -6.5,-1.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -2551,14 +2565,6 @@ entities:
       color: '#0055CCFF'
 - proto: GasVentScrubber
   entities:
-  - uid: 322
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-0.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 323
     components:
     - type: Transform
@@ -2575,20 +2581,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 325
-    components:
-    - type: Transform
-      pos: 2.5,4.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 326
-    components:
-    - type: Transform
-      pos: 2.5,7.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 327
     components:
     - type: Transform
@@ -2621,20 +2613,38 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 352
+    components:
+    - type: Transform
+      pos: 1.5,7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 484
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 492
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,4.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GravityGeneratorMini
   entities:
-  - uid: 331
+  - uid: 175
     components:
     - type: Transform
       pos: -7.5,-3.5
       parent: 1
 - proto: Grille
   entities:
-  - uid: 332
-    components:
-    - type: Transform
-      pos: -3.5,8.5
-      parent: 1
   - uid: 333
     components:
     - type: Transform
@@ -2645,11 +2655,6 @@ entities:
     - type: Transform
       pos: 0.5,9.5
       parent: 1
-  - uid: 335
-    components:
-    - type: Transform
-      pos: 4.5,8.5
-      parent: 1
   - uid: 336
     components:
     - type: Transform
@@ -2671,9 +2676,22 @@ entities:
       rot: 3.141592653589793 rad
       pos: 7.5,1.5
       parent: 1
+- proto: GrilleDiagonal
+  entities:
+  - uid: 57
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,8.5
+      parent: 1
+  - uid: 331
+    components:
+    - type: Transform
+      pos: -3.5,8.5
+      parent: 1
 - proto: GyroscopeNfsd
   entities:
-  - uid: 340
+  - uid: 257
     components:
     - type: Transform
       pos: -5.5,-2.5
@@ -2697,12 +2715,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -8.5,1.5
       parent: 1
-- proto: LockerNfsdBailiff
+- proto: LockerNfsdCopper
   entities:
-  - uid: 345
+  - uid: 367
     components:
     - type: Transform
-      pos: 7.5,-3.5
+      pos: 10.5,-3.5
       parent: 1
 - proto: LockerNfsdEvidence
   entities:
@@ -2711,60 +2729,83 @@ entities:
     - type: Transform
       pos: 6.5,1.5
       parent: 1
-  - uid: 347
+- proto: LockerNfsdSergeant
+  entities:
+  - uid: 240
     components:
     - type: Transform
-      pos: 8.5,-1.5
+      pos: 7.5,-3.5
       parent: 1
 - proto: LockerNfsdSilver
   entities:
-  - uid: 348
+  - uid: 366
     components:
     - type: Transform
-      pos: 10.5,-3.5
+      pos: 8.5,-3.5
       parent: 1
-  - uid: 349
+  - uid: 368
     components:
     - type: Transform
-      pos: 8.5,-3.5
+      pos: 9.5,-3.5
       parent: 1
-  - uid: 350
+- proto: LockerWallEVAColorNfsdFilled
+  entities:
+  - uid: 408
     components:
     - type: Transform
-      pos: 9.5,-3.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,3.5
       parent: 1
-- proto: Mirror
+  - uid: 609
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,4.5
+      parent: 1
+  - uid: 618
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,3.5
+      parent: 1
+  - uid: 636
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,4.5
+      parent: 1
+- proto: LockerWallMaterialsFuelAmeJarFilled
   entities:
-  - uid: 351
+  - uid: 362
     components:
     - type: Transform
-      pos: 3.5,-4.5
+      rot: 3.141592653589793 rad
+      pos: -6.5,-4.5
       parent: 1
-- proto: NfsdWhistle
+- proto: Mirror
   entities:
-  - uid: 352
+  - uid: 351
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.39259845,2.5318756
+      pos: 3.5,-4.5
       parent: 1
 - proto: NitrogenCanister
   entities:
-  - uid: 353
+  - uid: 370
     components:
     - type: Transform
       anchored: True
-      pos: -6.5,-1.5
+      pos: -5.5,-1.5
       parent: 1
     - type: Physics
       bodyType: Static
 - proto: OxygenCanister
   entities:
-  - uid: 354
+  - uid: 371
     components:
     - type: Transform
       anchored: True
-      pos: -5.5,-1.5
+      pos: -6.5,-1.5
       parent: 1
     - type: Physics
       bodyType: Static
@@ -2782,11 +2823,6 @@ entities:
     - type: Transform
       pos: 0.5,9.5
       parent: 1
-  - uid: 357
-    components:
-    - type: Transform
-      pos: -3.5,8.5
-      parent: 1
   - uid: 358
     components:
     - type: Transform
@@ -2807,81 +2843,41 @@ entities:
     - type: Transform
       pos: -3.5,7.5
       parent: 1
-  - uid: 362
+- proto: PlastitaniumWindowDiagonal
+  entities:
+  - uid: 68
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 4.5,8.5
       parent: 1
-- proto: PowerCellRecharger
-  entities:
-  - uid: 363
+  - uid: 353
     components:
     - type: Transform
-      pos: 0.5,7.5
+      pos: -3.5,8.5
       parent: 1
 - proto: Poweredlight
   entities:
-  - uid: 364
-    components:
-    - type: Transform
-      pos: 8.5,-1.5
-      parent: 1
-  - uid: 365
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,-1.5
-      parent: 1
-  - uid: 366
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,-3.5
-      parent: 1
-  - uid: 367
+  - uid: 167
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,-2.5
+      pos: -1.5,4.5
       parent: 1
-  - uid: 368
+  - uid: 364
     components:
     - type: Transform
-      pos: -6.5,1.5
+      pos: 8.5,-1.5
       parent: 1
   - uid: 369
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 4.5,-3.5
+      pos: 1.5,-0.5
       parent: 1
-  - uid: 370
+  - uid: 615
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
       pos: 2.5,4.5
       parent: 1
-  - uid: 371
-    components:
-    - type: Transform
-      pos: 1.5,-5.5
-      parent: 1
-  - uid: 372
-    components:
-    - type: Transform
-      pos: -0.5,-5.5
-      parent: 1
-  - uid: 373
-    components:
-    - type: Transform
-      pos: 5.5,1.5
-      parent: 1
-  - uid: 374
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -3.5,1.5
-      parent: 1
 - proto: PoweredlightColoredRed
   entities:
   - uid: 375
@@ -2910,6 +2906,18 @@ entities:
       parent: 1
 - proto: PoweredSmallLight
   entities:
+  - uid: 372
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -5.5,-2.5
+      parent: 1
+  - uid: 374
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-2.5
+      parent: 1
   - uid: 379
     components:
     - type: Transform
@@ -2928,24 +2936,49 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -3.5,4.5
       parent: 1
-- proto: Rack
-  entities:
   - uid: 382
     components:
     - type: Transform
-      pos: 0.5,2.5
+      pos: -6.5,1.5
       parent: 1
   - uid: 383
     components:
     - type: Transform
-      pos: 0.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-2.5
       parent: 1
+  - uid: 388
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-7.5
+      parent: 1
+  - uid: 389
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-5.5
+      parent: 1
+  - uid: 398
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,0.5
+      parent: 1
+  - uid: 400
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,1.5
+      parent: 1
+- proto: Rack
+  entities:
   - uid: 384
     components:
     - type: Transform
       pos: -0.5,-3.5
       parent: 1
-  - uid: 385
+  - uid: 613
     components:
     - type: Transform
       pos: 6.5,-3.5
@@ -2962,18 +2995,6 @@ entities:
     - type: Transform
       pos: 0.5,-3.5
       parent: 1
-  - uid: 388
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -7.5,0.5
-      parent: 1
-  - uid: 389
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -7.5,1.5
-      parent: 1
 - proto: RailingCorner
   entities:
   - uid: 390
@@ -3019,6 +3040,23 @@ entities:
     - type: Transform
       pos: -5.5,1.5
       parent: 1
+- proto: RandomPosterLegit
+  entities:
+  - uid: 168
+    components:
+    - type: Transform
+      pos: 8.5,2.5
+      parent: 1
+  - uid: 169
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 1
+  - uid: 185
+    components:
+    - type: Transform
+      pos: 3.5,-1.5
+      parent: 1
 - proto: ReinforcedPlasmaWindow
   entities:
   - uid: 397
@@ -3026,67 +3064,57 @@ entities:
     - type: Transform
       pos: 7.5,1.5
       parent: 1
-- proto: SignalButton
+- proto: ShelfMetal
   entities:
-  - uid: 398
+  - uid: 239
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-4.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-1.5
       parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        66:
-        - Pressed: Toggle
-        61:
-        - Pressed: Toggle
-        62:
-        - Pressed: Toggle
-  - uid: 399
+  - uid: 357
     components:
     - type: Transform
-      pos: 0.5,7.5
+      pos: 1.5,5.5
       parent: 1
-    - type: SignalSwitch
-      state: True
-    - type: DeviceLinkSource
-      linkedPorts:
-        64:
-        - Pressed: Toggle
-        69:
-        - Pressed: Toggle
-        63:
-        - Pressed: Toggle
-        67:
-        - Pressed: Toggle
-        68:
-        - Pressed: Toggle
-        65:
-        - Pressed: Toggle
-        70:
-        - Pressed: Toggle
-- proto: SignArmory
-  entities:
-  - uid: 400
+  - uid: 373
     components:
     - type: Transform
-      pos: 5.5,-2.5
+      pos: -7.5,2.5
+      parent: 1
+  - uid: 428
+    components:
+    - type: Transform
+      pos: -0.5,5.5
       parent: 1
-- proto: SignConspiracyBoard
+- proto: ShelfRMetal
   entities:
   - uid: 401
     components:
     - type: Transform
-      pos: 1.5,5.5
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-2.5
       parent: 1
-- proto: SignDirectionalBridge
+- proto: SignalButtonDirectional
   entities:
-  - uid: 226
+  - uid: 66
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -0.5,5.5
+      pos: 2.5,5.5
       parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        415:
+        - Pressed: Toggle
+        289:
+        - Pressed: Toggle
+        226:
+        - Pressed: Toggle
+        241:
+        - Pressed: Toggle
+        165:
+        - Pressed: Toggle
 - proto: SignDirectionalDorms
   entities:
   - uid: 617
@@ -3095,6 +3123,14 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -4.5,1.5
       parent: 1
+- proto: SignDirectionalEng
+  entities:
+  - uid: 443
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -4.5,-2.5
+      parent: 1
 - proto: SignEVA
   entities:
   - uid: 402
@@ -3107,6 +3143,25 @@ entities:
     - type: Transform
       pos: 3.5,2.5
       parent: 1
+- proto: SignNfsd
+  entities:
+  - uid: 19
+    components:
+    - type: Transform
+      pos: -3.5,-0.5
+      parent: 1
+  - uid: 455
+    components:
+    - type: Transform
+      pos: 0.5,-6.5
+      parent: 1
+- proto: SignNfsdArmoury
+  entities:
+  - uid: 616
+    components:
+    - type: Transform
+      pos: 5.5,-2.5
+      parent: 1
 - proto: SignPlaque
   entities:
   - uid: 404
@@ -3114,19 +3169,29 @@ entities:
     - type: Transform
       pos: -1.5,5.5
       parent: 1
-- proto: SignSec
+- proto: SignSecurearea
   entities:
-  - uid: 618
+  - uid: 462
     components:
     - type: Transform
-      pos: 0.5,-6.5
+      pos: 0.5,-8.5
       parent: 1
-- proto: SignSecurearea
+- proto: SignSpace
   entities:
-  - uid: 405
+  - uid: 3
     components:
     - type: Transform
-      pos: 0.5,-8.5
+      pos: 5.5,3.5
+      parent: 1
+  - uid: 4
+    components:
+    - type: Transform
+      pos: -4.5,3.5
+      parent: 1
+  - uid: 20
+    components:
+    - type: Transform
+      pos: -1.5,-7.5
       parent: 1
 - proto: SinkWide
   entities:
@@ -3150,36 +3215,65 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,1.5
       parent: 1
-- proto: SubstationWallBasic
+- proto: SteelBench
   entities:
-  - uid: 411
+  - uid: 215
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,4.5
       parent: 1
-- proto: SuitStorageDeputy
-  entities:
-  - uid: 413
+  - uid: 309
     components:
     - type: Transform
-      pos: -1.5,2.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,4.5
       parent: 1
-  - uid: 414
+  - uid: 365
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.5,3.5
       parent: 1
-  - uid: 415
+  - uid: 552
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 2.5,3.5
       parent: 1
-  - uid: 450
+- proto: SubstationWallBasic
+  entities:
+  - uid: 345
+    components:
+    - type: Transform
+      pos: -5.5,-0.5
+      parent: 1
+- proto: SuitStorageCadet
+  entities:
+  - uid: 414
     components:
     - type: Transform
       pos: 2.5,2.5
       parent: 1
+- proto: SuitStorageDeputy
+  entities:
+  - uid: 235
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
+  - uid: 405
+    components:
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 1
+- proto: SuitStorageSergeant
+  entities:
+  - uid: 218
+    components:
+    - type: Transform
+      pos: -1.5,2.5
+      parent: 1
 - proto: SuitStorageWallmountEVAPrisoner
   entities:
   - uid: 416
@@ -3188,8 +3282,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,-0.5
       parent: 1
-    - type: Physics
-      canCollide: False
 - proto: SurveillanceCameraRouterSecurity
   entities:
   - uid: 417
@@ -3254,17 +3346,24 @@ entities:
       - SurveillanceCameraSecurity
       nameSet: True
       id: Port Airlock
+- proto: Table
+  entities:
+  - uid: 523
+    components:
+    - type: Transform
+      pos: -5.5,1.5
+      parent: 1
 - proto: TableReinforced
   entities:
-  - uid: 423
+  - uid: 247
     components:
     - type: Transform
       pos: 1.5,-0.5
       parent: 1
-  - uid: 424
+  - uid: 299
     components:
     - type: Transform
-      pos: 0.5,7.5
+      pos: 2.5,-0.5
       parent: 1
   - uid: 425
     components:
@@ -3276,15 +3375,12 @@ entities:
     - type: Transform
       pos: 2.5,7.5
       parent: 1
-  - uid: 427
-    components:
-    - type: Transform
-      pos: -5.5,1.5
-      parent: 1
-  - uid: 428
+- proto: TableReinforcedGlass
+  entities:
+  - uid: 250
     components:
     - type: Transform
-      pos: 2.5,-0.5
+      pos: 8.5,-1.5
       parent: 1
 - proto: ThrusterNfsd
   entities:
@@ -3370,7 +3466,7 @@ entities:
       parent: 1
 - proto: ToiletEmpty
   entities:
-  - uid: 443
+  - uid: 413
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -3413,29 +3509,91 @@ entities:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-- proto: VendingMachineNfsdDrobe
+- proto: WallmountTelevision
   entities:
-  - uid: 448
+  - uid: 528
     components:
     - type: Transform
-      pos: 2.5,4.5
+      rot: 3.141592653589793 rad
+      pos: 1.5,-4.5
       parent: 1
-- proto: VendingMachineNfsdTech
+- proto: WallPlastitanium
   entities:
-  - uid: 449
+  - uid: 18
     components:
     - type: Transform
-      pos: -1.5,4.5
+      pos: -4.5,-2.5
       parent: 1
-- proto: WallmountTelevision
-  entities:
-  - uid: 451
+  - uid: 64
     components:
     - type: Transform
-      pos: 1.5,-4.5
+      pos: -1.5,9.5
+      parent: 1
+  - uid: 65
+    components:
+    - type: Transform
+      pos: 3.5,8.5
+      parent: 1
+  - uid: 67
+    components:
+    - type: Transform
+      pos: -2.5,8.5
+      parent: 1
+  - uid: 69
+    components:
+    - type: Transform
+      pos: 2.5,9.5
+      parent: 1
+  - uid: 179
+    components:
+    - type: Transform
+      pos: -4.5,-1.5
+      parent: 1
+  - uid: 272
+    components:
+    - type: Transform
+      pos: 1.5,5.5
+      parent: 1
+  - uid: 291
+    components:
+    - type: Transform
+      pos: 3.5,-7.5
+      parent: 1
+  - uid: 295
+    components:
+    - type: Transform
+      pos: -2.5,-7.5
+      parent: 1
+  - uid: 305
+    components:
+    - type: Transform
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 340
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 1
+  - uid: 363
+    components:
+    - type: Transform
+      pos: 4.5,5.5
+      parent: 1
+  - uid: 385
+    components:
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 1
+  - uid: 448
+    components:
+    - type: Transform
+      pos: -4.5,-4.5
+      parent: 1
+  - uid: 449
+    components:
+    - type: Transform
+      pos: -5.5,-4.5
       parent: 1
-- proto: WallPlastitanium
-  entities:
   - uid: 452
     components:
     - type: Transform
@@ -3451,11 +3609,6 @@ entities:
     - type: Transform
       pos: 5.5,-5.5
       parent: 1
-  - uid: 455
-    components:
-    - type: Transform
-      pos: -5.5,-4.5
-      parent: 1
   - uid: 456
     components:
     - type: Transform
@@ -3474,7 +3627,7 @@ entities:
   - uid: 459
     components:
     - type: Transform
-      pos: -5.5,-5.5
+      pos: -4.5,-5.5
       parent: 1
   - uid: 460
     components:
@@ -3486,11 +3639,6 @@ entities:
     - type: Transform
       pos: 7.5,-4.5
       parent: 1
-  - uid: 462
-    components:
-    - type: Transform
-      pos: -2.5,-6.5
-      parent: 1
   - uid: 463
     components:
     - type: Transform
@@ -3501,11 +3649,6 @@ entities:
     - type: Transform
       pos: 2.5,-5.5
       parent: 1
-  - uid: 465
-    components:
-    - type: Transform
-      pos: 3.5,-7.5
-      parent: 1
   - uid: 466
     components:
     - type: Transform
@@ -3516,16 +3659,6 @@ entities:
     - type: Transform
       pos: 4.5,-6.5
       parent: 1
-  - uid: 468
-    components:
-    - type: Transform
-      pos: -3.5,-5.5
-      parent: 1
-  - uid: 469
-    components:
-    - type: Transform
-      pos: 11.5,0.5
-      parent: 1
   - uid: 470
     components:
     - type: Transform
@@ -3539,7 +3672,7 @@ entities:
   - uid: 472
     components:
     - type: Transform
-      pos: 10.5,0.5
+      pos: -6.5,-0.5
       parent: 1
   - uid: 473
     components:
@@ -3586,21 +3719,10 @@ entities:
     - type: Transform
       pos: -11.5,-3.5
       parent: 1
-  - uid: 482
-    components:
-    - type: Transform
-      pos: 5.5,-6.5
-      parent: 1
-  - uid: 483
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,8.5
-      parent: 1
-  - uid: 484
+  - uid: 482
     components:
     - type: Transform
-      pos: 11.5,-2.5
+      pos: 5.5,-6.5
       parent: 1
   - uid: 485
     components:
@@ -3625,7 +3747,7 @@ entities:
   - uid: 489
     components:
     - type: Transform
-      pos: -11.5,-7.5
+      pos: -4.5,-0.5
       parent: 1
   - uid: 490
     components:
@@ -3637,11 +3759,6 @@ entities:
     - type: Transform
       pos: 3.5,-0.5
       parent: 1
-  - uid: 492
-    components:
-    - type: Transform
-      pos: -4.5,-0.5
-      parent: 1
   - uid: 493
     components:
     - type: Transform
@@ -3670,7 +3787,7 @@ entities:
   - uid: 498
     components:
     - type: Transform
-      pos: -4.5,-2.5
+      pos: -3.5,-6.5
       parent: 1
   - uid: 499
     components:
@@ -3680,7 +3797,7 @@ entities:
   - uid: 500
     components:
     - type: Transform
-      pos: -4.5,-1.5
+      pos: -3.5,-5.5
       parent: 1
   - uid: 501
     components:
@@ -3696,22 +3813,17 @@ entities:
   - uid: 503
     components:
     - type: Transform
-      pos: -4.5,7.5
+      pos: 2.5,0.5
       parent: 1
   - uid: 504
     components:
     - type: Transform
       pos: -4.5,3.5
       parent: 1
-  - uid: 505
-    components:
-    - type: Transform
-      pos: -4.5,-6.5
-      parent: 1
   - uid: 506
     components:
     - type: Transform
-      pos: -4.5,-4.5
+      pos: -4.5,-6.5
       parent: 1
   - uid: 507
     components:
@@ -3721,28 +3833,18 @@ entities:
   - uid: 508
     components:
     - type: Transform
-      pos: 12.5,-0.5
+      pos: -2.5,-6.5
       parent: 1
   - uid: 509
     components:
     - type: Transform
       pos: -11.5,-2.5
       parent: 1
-  - uid: 510
-    components:
-    - type: Transform
-      pos: -6.5,-0.5
-      parent: 1
   - uid: 511
     components:
     - type: Transform
       pos: -7.5,-0.5
       parent: 1
-  - uid: 512
-    components:
-    - type: Transform
-      pos: -3.5,-6.5
-      parent: 1
   - uid: 513
     components:
     - type: Transform
@@ -3791,12 +3893,7 @@ entities:
   - uid: 522
     components:
     - type: Transform
-      pos: 3.5,-2.5
-      parent: 1
-  - uid: 523
-    components:
-    - type: Transform
-      pos: 2.5,0.5
+      pos: 10.5,1.5
       parent: 1
   - uid: 524
     components:
@@ -3808,22 +3905,11 @@ entities:
     - type: Transform
       pos: 2.5,5.5
       parent: 1
-  - uid: 526
-    components:
-    - type: Transform
-      pos: 11.5,-3.5
-      parent: 1
   - uid: 527
     components:
     - type: Transform
       pos: 11.5,-4.5
       parent: 1
-  - uid: 528
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,8.5
-      parent: 1
   - uid: 529
     components:
     - type: Transform
@@ -3843,7 +3929,7 @@ entities:
   - uid: 532
     components:
     - type: Transform
-      pos: 5.5,7.5
+      pos: 11.5,-2.5
       parent: 1
   - uid: 533
     components:
@@ -3860,11 +3946,6 @@ entities:
     - type: Transform
       pos: 8.5,3.5
       parent: 1
-  - uid: 536
-    components:
-    - type: Transform
-      pos: -1.5,9.5
-      parent: 1
   - uid: 537
     components:
     - type: Transform
@@ -3875,11 +3956,6 @@ entities:
     - type: Transform
       pos: 12.5,-2.5
       parent: 1
-  - uid: 539
-    components:
-    - type: Transform
-      pos: 10.5,1.5
-      parent: 1
   - uid: 540
     components:
     - type: Transform
@@ -3893,33 +3969,13 @@ entities:
   - uid: 542
     components:
     - type: Transform
-      pos: 10.5,2.5
-      parent: 1
-  - uid: 543
-    components:
-    - type: Transform
-      pos: -2.5,9.5
+      pos: 10.5,0.5
       parent: 1
   - uid: 544
     components:
     - type: Transform
       pos: 5.5,-2.5
       parent: 1
-  - uid: 545
-    components:
-    - type: Transform
-      pos: 3.5,9.5
-      parent: 1
-  - uid: 546
-    components:
-    - type: Transform
-      pos: 2.5,9.5
-      parent: 1
-  - uid: 547
-    components:
-    - type: Transform
-      pos: 4.5,5.5
-      parent: 1
   - uid: 548
     components:
     - type: Transform
@@ -3940,11 +3996,6 @@ entities:
     - type: Transform
       pos: 1.5,-4.5
       parent: 1
-  - uid: 552
-    components:
-    - type: Transform
-      pos: 1.5,5.5
-      parent: 1
   - uid: 553
     components:
     - type: Transform
@@ -3955,11 +4006,6 @@ entities:
     - type: Transform
       pos: -9.5,0.5
       parent: 1
-  - uid: 555
-    components:
-    - type: Transform
-      pos: -9.5,2.5
-      parent: 1
   - uid: 556
     components:
     - type: Transform
@@ -3993,18 +4039,13 @@ entities:
   - uid: 562
     components:
     - type: Transform
-      pos: -10.5,0.5
+      pos: -5.5,-5.5
       parent: 1
   - uid: 563
     components:
     - type: Transform
       pos: 12.5,-6.5
       parent: 1
-  - uid: 564
-    components:
-    - type: Transform
-      pos: 12.5,-7.5
-      parent: 1
   - uid: 565
     components:
     - type: Transform
@@ -4028,7 +4069,7 @@ entities:
   - uid: 569
     components:
     - type: Transform
-      pos: 11.5,-1.5
+      pos: 11.5,-3.5
       parent: 1
   - uid: 570
     components:
@@ -4040,16 +4081,6 @@ entities:
     - type: Transform
       pos: -7.5,2.5
       parent: 1
-  - uid: 572
-    components:
-    - type: Transform
-      pos: -11.5,-0.5
-      parent: 1
-  - uid: 573
-    components:
-    - type: Transform
-      pos: -4.5,-5.5
-      parent: 1
   - uid: 574
     components:
     - type: Transform
@@ -4082,16 +4113,6 @@ entities:
     - type: Transform
       pos: -10.5,-6.5
       parent: 1
-  - uid: 580
-    components:
-    - type: Transform
-      pos: -3.5,-7.5
-      parent: 1
-  - uid: 581
-    components:
-    - type: Transform
-      pos: -2.5,-7.5
-      parent: 1
   - uid: 582
     components:
     - type: Transform
@@ -4102,11 +4123,6 @@ entities:
     - type: Transform
       pos: -3.5,-0.5
       parent: 1
-  - uid: 584
-    components:
-    - type: Transform
-      pos: 4.5,-7.5
-      parent: 1
   - uid: 585
     components:
     - type: Transform
@@ -4147,11 +4163,6 @@ entities:
     - type: Transform
       pos: 3.5,5.5
       parent: 1
-  - uid: 593
-    components:
-    - type: Transform
-      pos: 3.5,4.5
-      parent: 1
   - uid: 594
     components:
     - type: Transform
@@ -4200,27 +4211,116 @@ entities:
   - uid: 603
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,0.5
+      pos: 11.5,-1.5
       parent: 1
-- proto: WallWeaponCapacitorRecharger
+- proto: WallPlastitaniumDiagonal
   entities:
-  - uid: 604
+  - uid: 258
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 2.5,0.5
+      pos: 3.5,-8.5
       parent: 1
-  - uid: 605
+  - uid: 283
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-8.5
+      parent: 1
+  - uid: 332
+    components:
+    - type: Transform
+      pos: -2.5,9.5
+      parent: 1
+  - uid: 354
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,9.5
+      parent: 1
+  - uid: 468
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,0.5
+      parent: 1
+  - uid: 469
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,-7.5
+      parent: 1
+  - uid: 512
+    components:
+    - type: Transform
+      pos: -4.5,7.5
+      parent: 1
+  - uid: 536
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,7.5
+      parent: 1
+  - uid: 539
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-0.5
+      parent: 1
+  - uid: 543
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 10.5,2.5
+      parent: 1
+  - uid: 545
+    components:
+    - type: Transform
+      pos: -11.5,-0.5
+      parent: 1
+  - uid: 546
+    components:
+    - type: Transform
+      pos: -10.5,0.5
+      parent: 1
+  - uid: 547
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 0.5,0.5
+      pos: 4.5,-7.5
       parent: 1
-  - uid: 606
+  - uid: 555
+    components:
+    - type: Transform
+      pos: -9.5,2.5
+      parent: 1
+  - uid: 564
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -11.5,-7.5
+      parent: 1
+  - uid: 573
     components:
     - type: Transform
       rot: 3.141592653589793 rad
+      pos: 12.5,-7.5
+      parent: 1
+- proto: WallWeaponCapacitorRechargerOmnidirectional
+  entities:
+  - uid: 580
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 1
+  - uid: 581
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 1
+  - uid: 584
+    components:
+    - type: Transform
       pos: 1.5,0.5
       parent: 1
 - proto: WardrobePrisonFilled
@@ -4248,15 +4348,15 @@ entities:
       parent: 1
 - proto: WeaponGrapplingGun
   entities:
-  - uid: 609
+  - uid: 63
     components:
     - type: Transform
-      pos: 0.5159931,3.674327
+      pos: 6.4297323,-3.414895
       parent: 1
-  - uid: 610
+  - uid: 166
     components:
     - type: Transform
-      pos: 0.6566181,3.439952
+      pos: 6.6953573,-3.539895
       parent: 1
 - proto: StructureGunRackNfsd
   entities:
@@ -4270,12 +4370,12 @@ entities:
     - type: Transform
       pos: 10.5,-1.5
       parent: 1
-- proto: StructurePistolRackWallmountedNfsd
+- proto: StructurePistolRackNfsd
   entities:
-  - uid: 613
+  - uid: 593
     components:
     - type: Transform
-      pos: 11.5,-2.5
+      pos: 8.5,-1.5
       parent: 1
 - proto: WindoorSecureBrigLocked
   entities:
@@ -4285,16 +4385,4 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,0.5
       parent: 1
-- proto: Zipties
-  entities:
-  - uid: 615
-    components:
-    - type: Transform
-      pos: 6.619777,-3.3851833
-      parent: 1
-  - uid: 616
-    components:
-    - type: Transform
-      pos: 6.776027,-3.3851833
-      parent: 1
-...
+...
\ No newline at end of file
diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml b/Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml
index db735edb977..d5193795948 100644
--- a/Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml
+++ b/Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml
@@ -87,19 +87,21 @@ entities:
       data:
         tiles:
           0,0:
-            0: 1911
-            1: 28672
-          0,1:
-            1: 7
-          0,-1:
-            0: 30583
+            0: 34
+            1: 4096
+            2: 24576
           -1,0:
-            1: 52428
+            2: 52428
+          0,1:
+            1: 1
+            2: 6
           -1,1:
-            1: 12
+            2: 12
+          0,-1:
+            0: 8994
           -1,-1:
-            1: 12
-            0: 52416
+            2: 12
+            0: 34816
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -131,17 +133,32 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          immutable: True
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
-- proto: AirlockExternalGlassLocked
+- proto: AirlockExternalGlassNfsdLocked
   entities:
   - uid: 19
     components:
     - type: Transform
       pos: -0.5,-0.5
       parent: 1
-- proto: AirlockGlassShuttle
+- proto: AirlockGlassShuttleNfsdLocked
   entities:
   - uid: 23
     components:
@@ -164,11 +181,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,-0.5
       parent: 1
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
   - uid: 24
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: -0.5,-0.5
       parent: 1
   - uid: 25
@@ -527,6 +545,13 @@ entities:
     - type: Transform
       pos: 1.5,1.5
       parent: 1
+- proto: ExtinguisherCabinetFilled
+  entities:
+  - uid: 124
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 1
 - proto: GeneratorWallmountAPU
   entities:
   - uid: 62
@@ -697,7 +722,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,3.5
       parent: 1
-- proto: ShuttleGunFriendship
+- proto: ShuttleGunFriendshipNfsd
   entities:
   - uid: 54
     components:
@@ -725,9 +750,18 @@ entities:
       entities:
       - 67
       - 68
-    - type: DeviceLinkSink
-      links:
-      - 121
+- proto: SignNfsd
+  entities:
+  - uid: 125
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
+  - uid: 126
+    components:
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 1
 - proto: SmallGyroscopeNfsd
   entities:
   - uid: 50
@@ -736,6 +770,13 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,4.5
       parent: 1
+- proto: SpawnPointLatejoin
+  entities:
+  - uid: 127
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 1
 - proto: SubstationWallBasic
   entities:
   - uid: 64
diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/templar.yml b/Resources/Maps/_NF/Shuttles/Nfsd/templar.yml
index e7d1d35e4db..f5204d7fe40 100644
--- a/Resources/Maps/_NF/Shuttles/Nfsd/templar.yml
+++ b/Resources/Maps/_NF/Shuttles/Nfsd/templar.yml
@@ -7,9 +7,11 @@ tilemap:
   46: FloorGlass
   57: FloorHull
   65: FloorMetalDiamond
+  1: FloorSteel
   99: FloorSteelDirty
   107: FloorTechMaint
   124: Lattice
+  2: Plating
 entities:
 - proto: ""
   entities:
@@ -24,19 +26,19 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: QQAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAHgAAAAACOQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAOQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAADOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAACOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: HgAAAAAAHgAAAAAAHgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAHgAAAAACOQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAOQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAACLgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAawAAAAAAHgAAAAABOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAACfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAHgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAHgAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAawAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOQAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOQAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOQAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAABYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAADYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAHgAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAADAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAawAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAAAHgAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -59,88 +61,107 @@ entities:
         version: 2
         nodes:
         - node:
-            color: '#49392696'
-            id: CheckerNWSE
+            color: '#4B653E96'
+            id: BrickTileSteelCornerNe
           decals:
-            6: -1,4
-            7: 0,4
-            8: 1,4
-            9: 1,3
-            10: 0,3
-            11: -1,3
-            12: -1,2
-            13: 0,2
-            14: 1,2
-            15: 0,-3
-            16: 1,-3
-            17: 1,-4
-            18: 0,-4
+            24: 0,0
+            37: 1,3
+        - node:
+            color: '#4B653E96'
+            id: BrickTileSteelCornerNw
+          decals:
+            21: -2,0
+            38: 0,3
+        - node:
+            color: '#4B653E96'
+            id: BrickTileSteelCornerSe
+          decals:
+            22: 0,-1
+            40: 1,2
+        - node:
+            color: '#4B653E96'
+            id: BrickTileSteelCornerSw
+          decals:
+            23: -2,-1
+            39: 0,2
+        - node:
+            color: '#4B653E96'
+            id: BrickTileSteelLineN
+          decals:
+            25: -1,0
+        - node:
+            color: '#4B653E96'
+            id: BrickTileSteelLineS
+          decals:
+            26: -1,-1
+        - node:
+            color: '#4D9BE6FF'
+            id: DeliveryGreyscale
+          decals:
+            19: 1,0
+        - node:
+            color: '#B33831FF'
+            id: DeliveryGreyscale
+          decals:
+            20: 2,0
         - node:
-            angle: -1.5707963267948966 rad
             color: '#FFFFFFFF'
-            id: StandClear
+            id: DirtHeavy
           decals:
-            2: -2,0
+            44: 2,0
         - node:
-            angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
-            id: StandClear
+            id: DirtHeavyMonotile
           decals:
-            3: 2,0
+            42: 0,-4
+            43: -2,0
+            48: -2,-2
         - node:
             color: '#FFFFFFFF'
-            id: WarnLineE
+            id: DirtLight
           decals:
-            1: 2,0
-            5: 2,-1
+            45: 1,0
+            46: -1,-2
+            47: 2,-2
         - node:
             color: '#FFFFFFFF'
-            id: WarnLineS
+            id: DirtMedium
+          decals:
+            41: -1,-3
+        - node:
+            color: '#FF9821FF'
+            id: HalfTileOverlayGreyscale
           decals:
-            0: -2,0
-            4: -2,-1
+            33: -1,-3
+            35: 1,-3
+            36: 0,-3
     - type: GridAtmosphere
       version: 2
       data:
         tiles:
           0,0:
-            0: 15
-            1: 32240
-            2: 512
-          0,1:
-            1: 119
+            0: 13079
+            1: 34944
           0,-1:
-            1: 2031
-            3: 16
-            0: 63488
-          0,-2:
-            1: 28672
+            0: 32563
+            1: 32904
           -1,0:
-            0: 14
-            1: 52960
+            0: 34828
+            1: 8736
+          0,1:
+            0: 3
+            2: 64
           -1,1:
-            1: 204
+            0: 8
+            2: 64
           -1,-1:
-            1: 3310
-            0: 57856
-          -1,-2:
+            0: 52872
+            1: 8226
+          0,-2:
             1: 49152
+          -1,-2:
+            1: 24576
         uniqueMixes:
-        - volume: 2500
-          temperature: 293.15
-          moles:
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -157,10 +178,10 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.14996
+          immutable: True
           moles:
-          - 20.078888
-          - 75.53487
+          - 0
+          - 0
           - 0
           - 0
           - 0
@@ -172,10 +193,10 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.1499
+          temperature: 293.15
           moles:
-          - 20.078888
-          - 75.53487
+          - 0
+          - 0
           - 0
           - 0
           - 0
@@ -191,825 +212,1031 @@ entities:
     - type: RadiationGridResistance
     - type: BecomesStation
       id: Hospitaller
-- proto: AirlockGlassShuttle
+- proto: AirlockGlassShuttleNfsd
   entities:
-  - uid: 2
+  - uid: 45
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -2.5,-1.5
       parent: 1
-  - uid: 3
+  - uid: 48
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 3.5,-1.5
       parent: 1
-- proto: AirlockNfsd
+- proto: AirlockNfsdGlassLocked
   entities:
-  - uid: 4
-    components:
-    - type: Transform
-      pos: 1.5,-1.5
-      parent: 1
   - uid: 5
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 0.5,1.5
       parent: 1
 - proto: APCBasic
   entities:
-  - uid: 6
+  - uid: 37
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,2.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,2.5
       parent: 1
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
-  - uid: 7
+  - uid: 2
     components:
     - type: Transform
-      pos: 0.5,1.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-1.5
       parent: 1
-  - uid: 8
+  - uid: 3
     components:
     - type: Transform
-      pos: 1.5,-1.5
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-1.5
       parent: 1
-- proto: Bed
+- proto: AtmosFixBlockerMarker
   entities:
-  - uid: 9
+  - uid: 7
     components:
     - type: Transform
-      pos: -0.5,-2.5
+      pos: -2.5,3.5
       parent: 1
-- proto: BedsheetOrange
-  entities:
-  - uid: 10
+  - uid: 96
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-2.5
+      pos: -2.5,2.5
       parent: 1
-- proto: CableApcExtension
-  entities:
-  - uid: 11
+  - uid: 161
     components:
     - type: Transform
-      pos: -1.5,2.5
+      pos: 3.5,3.5
       parent: 1
-  - uid: 12
+  - uid: 162
     components:
     - type: Transform
-      pos: -0.5,2.5
+      pos: 3.5,2.5
       parent: 1
-  - uid: 13
+  - uid: 163
     components:
     - type: Transform
-      pos: 0.5,2.5
+      pos: 3.5,-3.5
       parent: 1
-  - uid: 14
+  - uid: 164
     components:
     - type: Transform
-      pos: 0.5,1.5
+      pos: 3.5,-4.5
       parent: 1
-  - uid: 15
+  - uid: 165
     components:
     - type: Transform
-      pos: 0.5,0.5
+      pos: 2.5,-4.5
       parent: 1
-  - uid: 16
+  - uid: 166
     components:
     - type: Transform
-      pos: 0.5,-0.5
+      pos: -2.5,-4.5
       parent: 1
-  - uid: 17
+  - uid: 167
     components:
     - type: Transform
-      pos: 0.5,-1.5
+      pos: -1.5,-4.5
       parent: 1
-  - uid: 18
+  - uid: 168
     components:
     - type: Transform
-      pos: 0.5,-2.5
+      pos: -2.5,-3.5
       parent: 1
-  - uid: 19
+  - uid: 169
     components:
     - type: Transform
-      pos: 0.5,-3.5
+      pos: 2.5,5.5
       parent: 1
-  - uid: 20
+  - uid: 170
     components:
     - type: Transform
-      pos: 0.5,3.5
+      pos: -1.5,5.5
       parent: 1
-  - uid: 21
+- proto: Bed
+  entities:
+  - uid: 66
     components:
     - type: Transform
-      pos: 0.5,4.5
+      pos: 1.5,-3.5
       parent: 1
-  - uid: 22
+- proto: BedsheetOrange
+  entities:
+  - uid: 58
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-3.5
+      parent: 1
+- proto: CableApcExtension
+  entities:
+  - uid: 27
     components:
     - type: Transform
       pos: -0.5,-0.5
       parent: 1
-  - uid: 23
+  - uid: 138
     components:
     - type: Transform
-      pos: -1.5,-0.5
+      pos: 2.5,2.5
       parent: 1
-  - uid: 24
+  - uid: 139
     components:
     - type: Transform
-      pos: 1.5,-0.5
+      pos: 1.5,2.5
       parent: 1
-  - uid: 25
+  - uid: 140
     components:
     - type: Transform
-      pos: 2.5,-0.5
+      pos: 0.5,2.5
       parent: 1
-  - uid: 26
+  - uid: 141
     components:
     - type: Transform
-      pos: 1.5,-3.5
+      pos: 0.5,3.5
       parent: 1
-  - uid: 27
+  - uid: 142
     components:
     - type: Transform
-      pos: 2.5,-3.5
+      pos: 0.5,1.5
       parent: 1
-  - uid: 28
+  - uid: 143
     components:
     - type: Transform
-      pos: -0.5,-3.5
+      pos: 0.5,0.5
       parent: 1
-  - uid: 29
+  - uid: 144
     components:
     - type: Transform
-      pos: -1.5,-3.5
+      pos: 0.5,-0.5
       parent: 1
-- proto: CableHV
-  entities:
-  - uid: 30
+  - uid: 145
     components:
     - type: Transform
-      pos: 2.5,1.5
+      pos: 0.5,-1.5
       parent: 1
-  - uid: 31
+  - uid: 146
     components:
     - type: Transform
-      pos: 1.5,1.5
+      pos: 0.5,-2.5
       parent: 1
-  - uid: 32
+  - uid: 147
     components:
     - type: Transform
-      pos: 0.5,1.5
+      pos: -0.5,-2.5
       parent: 1
-  - uid: 33
+  - uid: 148
     components:
     - type: Transform
-      pos: 2.5,2.5
+      pos: 1.5,-2.5
       parent: 1
-  - uid: 34
+  - uid: 149
     components:
     - type: Transform
-      pos: -1.5,1.5
+      pos: 1.5,-3.5
       parent: 1
-  - uid: 35
+  - uid: 150
+    components:
+    - type: Transform
+      pos: -0.5,-3.5
+      parent: 1
+  - uid: 151
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 1
+- proto: CableHV
+  entities:
+  - uid: 12
     components:
     - type: Transform
       pos: -0.5,1.5
       parent: 1
-  - uid: 145
+  - uid: 41
     components:
     - type: Transform
-      pos: 0.5,0.5
+      pos: -1.5,1.5
       parent: 1
-  - uid: 146
+  - uid: 42
     components:
     - type: Transform
-      pos: 0.5,-0.5
+      pos: -1.5,2.5
       parent: 1
-  - uid: 147
+  - uid: 154
     components:
     - type: Transform
-      pos: 0.5,-1.5
+      pos: 0.5,1.5
       parent: 1
-- proto: CableMV
-  entities:
-  - uid: 36
+  - uid: 155
     components:
     - type: Transform
-      pos: 2.5,2.5
+      pos: 1.5,1.5
       parent: 1
-  - uid: 37
+  - uid: 156
     components:
     - type: Transform
-      pos: 1.5,2.5
+      pos: 2.5,1.5
       parent: 1
-  - uid: 38
+- proto: CableMV
+  entities:
+  - uid: 6
     components:
     - type: Transform
       pos: 0.5,2.5
       parent: 1
-  - uid: 39
+  - uid: 57
     components:
     - type: Transform
       pos: -0.5,2.5
       parent: 1
-  - uid: 40
+  - uid: 102
     components:
     - type: Transform
       pos: -1.5,2.5
       parent: 1
-- proto: Catwalk
-  entities:
-  - uid: 41
+  - uid: 136
     components:
     - type: Transform
-      pos: 3.5,0.5
+      pos: 1.5,2.5
       parent: 1
-  - uid: 42
+  - uid: 137
     components:
     - type: Transform
-      pos: -2.5,-1.5
+      pos: 2.5,2.5
       parent: 1
-  - uid: 43
+- proto: Catwalk
+  entities:
+  - uid: 16
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,0.5
+      pos: -1.5,-1.5
       parent: 1
-  - uid: 44
+  - uid: 17
     components:
     - type: Transform
-      pos: -2.5,-0.5
+      pos: -0.5,-1.5
       parent: 1
-  - uid: 45
+  - uid: 18
     components:
     - type: Transform
-      pos: 3.5,-1.5
+      pos: 0.5,-1.5
       parent: 1
-  - uid: 46
+  - uid: 53
     components:
     - type: Transform
-      pos: 3.5,-0.5
+      pos: 1.5,-1.5
+      parent: 1
+  - uid: 126
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
       parent: 1
 - proto: ChairPilotSeat
   entities:
-  - uid: 47
+  - uid: 13
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 1.5,3.5
+      pos: 0.5,3.5
       parent: 1
-  - uid: 48
+  - uid: 84
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-3.5
-      parent: 1
-  - uid: 49
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,3.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,0.5
       parent: 1
-- proto: ClothingMaskBreath
+- proto: ClosetWallOrangeFilled
   entities:
-  - uid: 51
+  - uid: 60
     components:
     - type: Transform
-      parent: 50
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 52
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-2.5
+      parent: 1
+- proto: ComputerTabletopIFF
+  entities:
+  - uid: 34
     components:
     - type: Transform
-      parent: 50
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingOuterHardsuitEVAPrisoner
+      rot: 1.5707963267948966 rad
+      pos: -0.5,2.5
+      parent: 1
+- proto: ComputerTabletopShuttle
   entities:
-  - uid: 53
+  - uid: 35
     components:
     - type: Transform
-      parent: 50
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 54
+      pos: 0.5,4.5
+      parent: 1
+- proto: ComputerTabletopStationRecords
+  entities:
+  - uid: 71
     components:
     - type: Transform
-      parent: 50
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingShoesColorOrange
+      rot: 1.5707963267948966 rad
+      pos: -0.5,3.5
+      parent: 1
+- proto: CurtainsOrangeOpen
   entities:
-  - uid: 55
+  - uid: 52
     components:
     - type: Transform
-      parent: 50
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 56
+      pos: -0.5,-3.5
+      parent: 1
+- proto: DefibrillatorCabinetFilled
+  entities:
+  - uid: 94
     components:
     - type: Transform
-      parent: 50
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingUniformJumpskirtPrisoner
+      rot: 3.141592653589793 rad
+      pos: 2.5,-2.5
+      parent: 1
+- proto: ExtinguisherCabinetFilled
   entities:
-  - uid: 57
+  - uid: 50
     components:
     - type: Transform
-      parent: 50
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 58
+      rot: 3.141592653589793 rad
+      pos: -0.5,1.5
+      parent: 1
+- proto: FaxMachineShip
+  entities:
+  - uid: 20
     components:
     - type: Transform
-      parent: 50
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ClothingUniformJumpsuitPrisoner
+      pos: -0.5,4.5
+      parent: 1
+- proto: FirelockEdge
   entities:
-  - uid: 59
+  - uid: 160
     components:
     - type: Transform
-      parent: 50
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 60
+      pos: 0.5,-1.5
+      parent: 1
+- proto: FirelockGlass
+  entities:
+  - uid: 159
     components:
     - type: Transform
-      parent: 50
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: ComputerIFF
+      rot: 1.5707963267948966 rad
+      pos: 0.5,1.5
+      parent: 1
+- proto: FloorDrain
   entities:
   - uid: 63
     components:
     - type: Transform
-      pos: -0.5,4.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,-3.5
       parent: 1
-- proto: ComputerShuttle
+    - type: Fixtures
+      fixtures: {}
+- proto: GasMixerOn
   entities:
-  - uid: 64
+  - uid: 62
     components:
     - type: Transform
-      pos: 1.5,4.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-0.5
       parent: 1
-- proto: ComputerStationRecords
+    - type: GasMixer
+      inletTwoConcentration: 0.20999998
+      inletOneConcentration: 0.79
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPassiveVent
   entities:
-  - uid: 65
+  - uid: 38
     components:
     - type: Transform
-      pos: 0.5,4.5
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-3.5
       parent: 1
-- proto: EmergencyNitrogenTankFilled
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasPipeBend
   entities:
-  - uid: 61
+  - uid: 9
     components:
     - type: Transform
-      parent: 50
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: EmergencyOxygenTankFilled
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 36
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPipeFourway
   entities:
-  - uid: 62
+  - uid: 171
     components:
     - type: Transform
-      parent: 50
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-- proto: FaxMachineShip
+      pos: 0.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPipeStraight
   entities:
-  - uid: 66
+  - uid: 30
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 31
+    components:
+    - type: Transform
+      pos: 0.5,2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 33
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 44
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 47
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: -0.5,2.5
       parent: 1
-- proto: GasPassiveVent
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 55
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 65
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 68
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 70
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 81
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 82
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 97
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasPipeTJunction
   entities:
+  - uid: 46
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 67
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GasPort
+  entities:
+  - uid: 19
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 133
+    components:
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasVentPump
+  entities:
+  - uid: 49
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 64
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 158
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -1.5,-0.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 68
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasVentScrubber
+  entities:
+  - uid: 21
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,-0.5
+      pos: 1.5,-3.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: GasPipeFourway
-  entities:
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 61
+    components:
+    - type: Transform
+      pos: -0.5,3.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 69
     components:
     - type: Transform
-      pos: 1.5,-0.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,0.5
       parent: 1
-- proto: GasPipeStraight
+    - type: AtmosPipeColor
+      color: '#990000FF'
+- proto: GeneratorWallmountAPU
   entities:
-  - uid: 70
+  - uid: 40
     components:
     - type: Transform
-      pos: 1.5,-1.5
+      pos: -1.5,1.5
       parent: 1
-  - uid: 71
+  - uid: 72
     components:
     - type: Transform
-      pos: 1.5,0.5
+      pos: 2.5,1.5
       parent: 1
-  - uid: 72
+- proto: GravityGeneratorMini
+  entities:
+  - uid: 10
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 1
+- proto: Grille
+  entities:
+  - uid: 26
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 0.5,-0.5
+      pos: -2.5,0.5
       parent: 1
-  - uid: 73
+  - uid: 51
     components:
     - type: Transform
-      pos: 1.5,1.5
+      rot: -1.5707963267948966 rad
+      pos: -0.5,5.5
       parent: 1
-  - uid: 74
+  - uid: 59
     components:
     - type: Transform
-      pos: -0.5,-1.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,0.5
       parent: 1
-- proto: GasPipeTJunction
-  entities:
   - uid: 75
     components:
     - type: Transform
-      pos: -0.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: 0.5,5.5
       parent: 1
-- proto: GasVentScrubber
-  entities:
   - uid: 76
     components:
     - type: Transform
-      pos: 1.5,2.5
+      rot: 3.141592653589793 rad
+      pos: -1.5,3.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 77
+  - uid: 83
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 1.5,-2.5
+      pos: 2.5,4.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-  - uid: 78
+  - uid: 87
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,5.5
+      parent: 1
+  - uid: 112
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -0.5,-2.5
+      pos: -1.5,4.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
-- proto: GeneratorWallmountAPU
+  - uid: 116
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,3.5
+      parent: 1
+- proto: GrilleDiagonal
   entities:
-  - uid: 79
+  - uid: 109
     components:
     - type: Transform
-      pos: 2.5,1.5
+      pos: -1.5,5.5
       parent: 1
-  - uid: 80
+  - uid: 110
     components:
     - type: Transform
-      pos: -1.5,1.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,5.5
       parent: 1
-  - uid: 144
+- proto: LockerNfsdCopper
+  entities:
+  - uid: 119
     components:
     - type: Transform
-      pos: 0.5,-1.5
+      pos: 1.5,3.5
       parent: 1
-- proto: GravityGeneratorMini
+- proto: LockerNfsdEvidence
   entities:
-  - uid: 81
+  - uid: 93
     components:
     - type: Transform
-      pos: -0.5,3.5
+      pos: 2.5,-0.5
       parent: 1
-- proto: Grille
+- proto: NitrogenCanister
   entities:
-  - uid: 82
+  - uid: 54
     components:
     - type: Transform
-      pos: 2.5,3.5
+      anchored: True
+      pos: 2.5,0.5
       parent: 1
-  - uid: 83
+    - type: Physics
+      bodyType: Static
+- proto: OxygenCanister
+  entities:
+  - uid: 56
     components:
     - type: Transform
-      pos: -0.5,5.5
+      anchored: True
+      pos: 1.5,0.5
       parent: 1
-  - uid: 84
+    - type: Physics
+      bodyType: Static
+- proto: Paper
+  entities:
+  - uid: 99
+    components:
+    - type: Transform
+      pos: -0.3125,4.6643505
+      parent: 1
+  - uid: 101
     components:
     - type: Transform
+      pos: -0.34375,4.4975677
+      parent: 1
+- proto: PlastitaniumWindow
+  entities:
+  - uid: 74
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 0.5,5.5
       parent: 1
+  - uid: 77
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,3.5
+      parent: 1
+  - uid: 80
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,0.5
+      parent: 1
   - uid: 85
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,5.5
       parent: 1
   - uid: 86
     components:
     - type: Transform
-      pos: 2.5,-2.5
+      rot: 3.141592653589793 rad
+      pos: -1.5,4.5
       parent: 1
-  - uid: 87
+  - uid: 88
     components:
     - type: Transform
-      pos: -1.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: 3.5,0.5
+      parent: 1
+  - uid: 89
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,5.5
+      parent: 1
+  - uid: 111
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,4.5
+      parent: 1
+  - uid: 115
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,3.5
       parent: 1
-  - uid: 88
+- proto: PlastitaniumWindowDiagonal
+  entities:
+  - uid: 105
     components:
     - type: Transform
-      pos: -1.5,3.5
+      pos: -1.5,5.5
       parent: 1
-- proto: GyroscopeNfsd
-  entities:
-  - uid: 89
+  - uid: 108
     components:
     - type: Transform
-      pos: 1.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: 2.5,5.5
       parent: 1
-- proto: IntercomMedical
+- proto: PoweredlightColoredRed
   entities:
-  - uid: 90
+  - uid: 28
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,4.5
+      pos: 2.5,-0.5
       parent: 1
-  - uid: 91
+  - uid: 29
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-3.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-0.5
       parent: 1
-- proto: LockerNfsdEvidence
+- proto: PoweredSmallLight
   entities:
-  - uid: 50
+  - uid: 4
     components:
     - type: Transform
-      pos: 0.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-2.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14914
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 62
-          - 61
-          - 59
-          - 60
-          - 57
-          - 53
-          - 51
-          - 52
-          - 55
-          - 54
-          - 58
-          - 56
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-- proto: LockerNfsdSilver
-  entities:
-  - uid: 92
+  - uid: 95
     components:
     - type: Transform
-      pos: 1.5,2.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,2.5
       parent: 1
-- proto: PlastitaniumWindow
+- proto: SignNfsd
   entities:
-  - uid: 93
+  - uid: 173
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,5.5
+      pos: -2.5,1.5
       parent: 1
-  - uid: 94
+  - uid: 174
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,5.5
+      pos: 3.5,1.5
       parent: 1
-  - uid: 95
+  - uid: 175
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,5.5
+      pos: 0.5,-4.5
       parent: 1
-  - uid: 96
+- proto: SinkStemlessWater
+  entities:
+  - uid: 92
     components:
     - type: Transform
-      pos: -1.5,3.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,-3.5
       parent: 1
-  - uid: 97
+- proto: SmallGyroscopeNfsd
+  entities:
+  - uid: 157
     components:
     - type: Transform
-      pos: 2.5,3.5
+      rot: 3.141592653589793 rad
+      pos: 1.5,4.5
       parent: 1
-  - uid: 98
+- proto: SpawnPointLatejoin
+  entities:
+  - uid: 153
     components:
     - type: Transform
-      pos: -1.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: 0.5,3.5
       parent: 1
-  - uid: 99
+- proto: SubstationWallBasic
+  entities:
+  - uid: 125
     components:
     - type: Transform
-      pos: 2.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,2.5
       parent: 1
-- proto: PoweredlightColoredRed
+- proto: SuitStorageWallmountCadet
   entities:
-  - uid: 100
+  - uid: 152
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 0.5,-3.5
+      pos: 1.5,1.5
       parent: 1
-  - uid: 101
+- proto: TableReinforced
+  entities:
+  - uid: 14
     components:
     - type: Transform
-      pos: -1.5,0.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,4.5
       parent: 1
-  - uid: 102
+  - uid: 15
     components:
     - type: Transform
-      pos: 2.5,0.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,3.5
       parent: 1
-  - uid: 103
+  - uid: 22
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -0.5,4.5
+      pos: -0.5,2.5
       parent: 1
-- proto: ShuttersWindowOpen
-  entities:
-  - uid: 104
+  - uid: 32
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 3.5,0.5
+      pos: 0.5,4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 108
-  - uid: 105
+- proto: ThrusterNfsd
+  entities:
+  - uid: 8
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,-0.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,-4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 108
-  - uid: 106
+  - uid: 24
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -2.5,0.5
+      pos: -2.5,3.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 108
-  - uid: 107
+  - uid: 25
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,-0.5
+      rot: 3.141592653589793 rad
+      pos: 3.5,-4.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 108
-- proto: SignalButton
-  entities:
-  - uid: 108
+  - uid: 100
     components:
     - type: Transform
-      pos: -0.5,1.5
+      pos: 3.5,3.5
       parent: 1
-    - type: DeviceLinkSource
-      linkedPorts:
-        106:
-        - Pressed: Toggle
-        105:
-        - Pressed: Toggle
-        104:
-        - Pressed: Toggle
-        107:
-        - Pressed: Toggle
-- proto: SubstationWallBasic
-  entities:
-  - uid: 109
+  - uid: 103
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,2.5
+      pos: 3.5,-3.5
       parent: 1
-- proto: TableReinforced
+  - uid: 104
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-3.5
+      parent: 1
+- proto: ToiletEmpty
   entities:
-  - uid: 110
+  - uid: 23
     components:
     - type: Transform
-      pos: -0.5,2.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-3.5
       parent: 1
-- proto: ThrusterNfsd
+- proto: ToolboxMechanicalFilled
   entities:
-  - uid: 111
+  - uid: 73
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-2.5
+      pos: -0.5289452,0.5080383
       parent: 1
-  - uid: 112
+- proto: WallPlastitanium
+  entities:
+  - uid: 78
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-3.5
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-2.5
       parent: 1
-  - uid: 113
+  - uid: 79
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-3.5
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-2.5
       parent: 1
-  - uid: 114
+  - uid: 90
     components:
     - type: Transform
-      pos: 3.5,2.5
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-2.5
       parent: 1
-  - uid: 115
+  - uid: 91
     components:
     - type: Transform
-      pos: -2.5,2.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-2.5
       parent: 1
-  - uid: 116
+  - uid: 113
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: -2.5,-2.5
+      pos: 3.5,-0.5
       parent: 1
-- proto: WallPlastitanium
-  entities:
-  - uid: 117
+  - uid: 114
     components:
     - type: Transform
-      pos: -0.5,-1.5
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-0.5
       parent: 1
-  - uid: 118
+  - uid: 117
     components:
     - type: Transform
-      pos: 0.5,-1.5
+      pos: 3.5,1.5
       parent: 1
-  - uid: 119
+  - uid: 118
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,4.5
+      pos: -2.5,1.5
       parent: 1
   - uid: 120
     components:
@@ -1041,18 +1268,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -1.5,1.5
       parent: 1
-  - uid: 125
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,4.5
-      parent: 1
-  - uid: 126
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-1.5
-      parent: 1
   - uid: 127
     components:
     - type: Transform
@@ -1086,14 +1301,19 @@ entities:
     - type: Transform
       pos: 0.5,-4.5
       parent: 1
-  - uid: 133
+- proto: WallPlastitaniumDiagonal
+  entities:
+  - uid: 106
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 2.5,-1.5
+      pos: 3.5,2.5
+      parent: 1
+  - uid: 107
+    components:
+    - type: Transform
+      pos: -2.5,2.5
       parent: 1
-- proto: WallPlastitaniumDiagonal
-  entities:
   - uid: 134
     components:
     - type: Transform
@@ -1106,58 +1326,34 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,-4.5
       parent: 1
-  - uid: 136
-    components:
-    - type: Transform
-      pos: -1.5,5.5
-      parent: 1
-  - uid: 137
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,5.5
-      parent: 1
-  - uid: 138
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,1.5
-      parent: 1
-  - uid: 139
-    components:
-    - type: Transform
-      pos: -2.5,1.5
-      parent: 1
-- proto: WallWeaponCapacitorRecharger
-  entities:
-  - uid: 140
-    components:
-    - type: Transform
-      pos: 1.5,1.5
-      parent: 1
 - proto: WarpPointShip
   entities:
-  - uid: 141
+  - uid: 98
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: 0.5,0.5
       parent: 1
-    - type: WarpPoint
-      location: Hospitaller
 - proto: WindoorSecureSecurityLocked
   entities:
-  - uid: 142
+  - uid: 39
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-3.5
+      rot: 3.141592653589793 rad
+      pos: 0.5,-2.5
       parent: 1
 - proto: WindowReinforcedDirectional
   entities:
-  - uid: 143
+  - uid: 11
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 0.5,-2.5
+      rot: 3.141592653589793 rad
+      pos: -0.5,-2.5
+      parent: 1
+  - uid: 43
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,-2.5
       parent: 1
 ...
diff --git a/Resources/Maps/_NF/Shuttles/Sr/watchdog.yml b/Resources/Maps/_NF/Shuttles/Sr/watchdog.yml
index cec4e63a330..f5d638cb100 100644
--- a/Resources/Maps/_NF/Shuttles/Sr/watchdog.yml
+++ b/Resources/Maps/_NF/Shuttles/Sr/watchdog.yml
@@ -294,13 +294,13 @@ entities:
         tiles:
           0,0:
             0: 13079
-            1: 34944
+            1: 34816
           0,-1:
             0: 32563
-            1: 136
+            1: 8
           -1,0:
             0: 34828
-            1: 8736
+            1: 8704
           0,1:
             0: 3
             1: 64
@@ -309,7 +309,7 @@ entities:
             1: 64
           -1,-1:
             0: 52872
-            1: 34
+            1: 2
           0,-2:
             1: 49152
           -1,-2:
@@ -644,19 +644,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,-0.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        bank-ATM-cashSlot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-    - type: Physics
-      canCollide: False
-    - type: ItemSlots
 - proto: CurtainsOrangeOpen
   entities:
   - uid: 146
@@ -688,6 +675,20 @@ entities:
     - type: Transform
       pos: -0.5,4.5
       parent: 1
+- proto: FirelockEdge
+  entities:
+  - uid: 162
+    components:
+    - type: Transform
+      pos: 0.5,-1.5
+      parent: 1
+- proto: FirelockGlass
+  entities:
+  - uid: 161
+    components:
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 1
 - proto: FloorDrain
   entities:
   - uid: 103
@@ -992,19 +993,19 @@ entities:
     - type: Transform
       pos: -1.5,5.5
       parent: 1
-- proto: NFLockerSecurityFilled
+- proto: LockerWallMaterialsFuelPlasmaFilled
   entities:
-  - uid: 114
+  - uid: 105
     components:
     - type: Transform
-      pos: 1.5,3.5
+      pos: -1.5,1.5
       parent: 1
-- proto: LockerWallMaterialsFuelPlasmaFilled
+- proto: NFLockerSecurityFilled
   entities:
-  - uid: 105
+  - uid: 114
     components:
     - type: Transform
-      pos: -1.5,1.5
+      pos: 1.5,3.5
       parent: 1
 - proto: NitrogenCanister
   entities:
@@ -1045,12 +1046,8 @@ entities:
     - type: Transform
       pos: -1.5,0.5
       parent: 1
-    - type: FuelGenerator
-      on: False
     - type: MaterialStorageMagnetPickup
       magnetEnabled: True
-    - type: Physics
-      bodyType: Static
 - proto: PoweredSmallLight
   entities:
   - uid: 73
diff --git a/Resources/Maps/_NF/Shuttles/apothecary.yml b/Resources/Maps/_NF/Shuttles/apothecary.yml
index ac689136627..31779efd92e 100644
--- a/Resources/Maps/_NF/Shuttles/apothecary.yml
+++ b/Resources/Maps/_NF/Shuttles/apothecary.yml
@@ -997,6 +997,13 @@ entities:
     - type: Transform
       pos: -4.5,3.5
       parent: 1
+- proto: BannerMedical
+  entities:
+  - uid: 292
+    components:
+    - type: Transform
+      pos: 0.5,-3.5
+      parent: 1
 - proto: BedsheetMedical
   entities:
   - uid: 137
@@ -1046,12 +1053,27 @@ entities:
       rot: 6.283185307179586 rad
       pos: -1.6655741,6.2222466
       parent: 1
+- proto: ButtonFrameCaution
+  entities:
+  - uid: 412
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.25,7.5
+      parent: 1
+- proto: ButtonFrameCautionSecurity
+  entities:
+  - uid: 411
+    components:
+    - type: Transform
+      pos: 0.25,7.5
+      parent: 1
 - proto: ButtonFrameExit
   entities:
   - uid: 276
     components:
     - type: Transform
-      pos: 0.5,7.5
+      pos: 0.75,7.5
       parent: 1
 - proto: ButtonFrameGrey
   entities:
@@ -1064,7 +1086,7 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -1.5,7.5
+      pos: -1.75,7.5
       parent: 1
 - proto: CableApcExtension
   entities:
@@ -1408,6 +1430,7 @@ entities:
       pos: -1.5,6.5
       parent: 1
     - type: ItemPlacer
+      lastPlaceable: False
       placedEntities:
       - 221
     - type: PlaceableSurface
@@ -1434,13 +1457,6 @@ entities:
     - type: Transform
       pos: -3.5210888,-2.1972485
       parent: 1
-- proto: ClothingOuterCoatLabChem
-  entities:
-  - uid: 245
-    components:
-    - type: Transform
-      pos: -1.4726316,2.2593617
-      parent: 1
 - proto: ComputerTabletopCrewMonitoring
   entities:
   - uid: 375
@@ -1481,8 +1497,6 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-    - type: Physics
-      canCollide: False
     - type: ItemSlots
 - proto: CrateChemistryD
   entities:
@@ -1554,11 +1568,6 @@ entities:
       parent: 1
 - proto: EmergencyRollerBed
   entities:
-  - uid: 292
-    components:
-    - type: Transform
-      pos: 0.62088865,-3.4683585
-      parent: 1
   - uid: 315
     components:
     - type: Transform
@@ -2247,7 +2256,8 @@ entities:
   - uid: 167
     components:
     - type: Transform
-      pos: -1.6666503,2.7190852
+      rot: 3.141592653589793 rad
+      pos: -1.6407223,5.6968827
       parent: 1
 - proto: HospitalCurtainsOpen
   entities:
@@ -2286,31 +2296,13 @@ entities:
     - type: Transform
       pos: 4.5,5.5
       parent: 1
-- proto: LockerWallChemistryFilled
+- proto: LockerWallColorChemistryFilled
   entities:
-  - uid: 364
+  - uid: 229
     components:
     - type: Transform
       pos: -2.5,7.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14917
-        moles:
-        - 1.734816
-        - 6.5262127
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -2321,14 +2313,24 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-- proto: LockerWallEVAColorMedicalFilled
+- proto: LockerWallColorMedicalDoctorFilled
   entities:
-  - uid: 357
+  - uid: 245
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-3.5
+      rot: 3.141592653589793 rad
+      pos: -2.5,2.5
       parent: 1
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
 - proto: LockerWallEVAColorParamedicFilled
   entities:
   - uid: 141
@@ -2341,21 +2343,21 @@ entities:
     - type: Transform
       pos: 5.5,0.5
       parent: 1
-- proto: LockerWallMaterialsFuelUraniumFilled
+- proto: LockerWallMaterialsBasicFilled
   entities:
-  - uid: 160
+  - uid: 319
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -1.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-2.5
       parent: 1
-- proto: LockerWallMedicalDoctorFilled
+- proto: LockerWallMaterialsFuelUraniumFilled
   entities:
-  - uid: 309
+  - uid: 160
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,2.5
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-2.5
       parent: 1
 - proto: LuxuryPen
   entities:
@@ -2378,6 +2380,27 @@ entities:
     - type: Transform
       pos: -3.5,4.5
       parent: 1
+- proto: MedicalAssembler
+  entities:
+  - uid: 309
+    components:
+    - type: Transform
+      pos: 3.5,3.5
+      parent: 1
+    - type: ContainerContainer
+      containers:
+        machine_board: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        machine_parts: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        microwave_entity_container: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
 - proto: MedicalBed
   entities:
   - uid: 178
@@ -2397,6 +2420,20 @@ entities:
     - type: Transform
       pos: 2.5,2.5
       parent: 1
+    - type: ContainerContainer
+      containers:
+        machine_board: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        machine_parts: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        blueprint: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
 - proto: NFPosterContrabandFsbApothecary
   entities:
   - uid: 289
@@ -2411,6 +2448,32 @@ entities:
     - type: Transform
       pos: 3.5,1.5
       parent: 1
+- proto: NFSignDock
+  entities:
+  - uid: 237
+    components:
+    - type: Transform
+      pos: 2.5,-4.5
+      parent: 1
+  - uid: 248
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 1
+- proto: NFSignEms2
+  entities:
+  - uid: 357
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 4.5,7.5
+      parent: 1
+  - uid: 372
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 0.5,-4.5
+      parent: 1
 - proto: NitrogenCanister
   entities:
   - uid: 225
@@ -2461,10 +2524,7 @@ entities:
       pos: -2.5,-2.5
       parent: 1
     - type: FuelGenerator
-      targetPower: 16000
-      on: False     
-    - type: Physics
-      bodyType: Static
+      targetPower: 17000
 - proto: PosterLegitSMHardhats
   entities:
   - uid: 249
@@ -2492,8 +2552,7 @@ entities:
   - uid: 317
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,3.5
+      pos: -1.5,2.5
       parent: 1
 - proto: Poweredlight
   entities:
@@ -2786,7 +2845,7 @@ entities:
   - uid: 296
     components:
     - type: Transform
-      pos: 0.5,7.5
+      pos: 0.75,7.5
       parent: 1
     - type: DeviceLinkSource
       linkedPorts:
@@ -2817,11 +2876,26 @@ entities:
         - Pressed: Toggle
         333:
         - Pressed: Toggle
+  - uid: 364
+    components:
+    - type: Transform
+      pos: 0.25,7.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        2:
+        - Pressed: DoorBolt
+        61:
+        - Pressed: DoorBolt
+        55:
+        - Pressed: DoorBolt
+        65:
+        - Pressed: DoorBolt
   - uid: 365
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -1.5,7.5
+      pos: -1.75,7.5
       parent: 1
     - type: DeviceLinkSource
       linkedPorts:
@@ -2839,6 +2913,36 @@ entities:
         - Pressed: Toggle
         408:
         - Pressed: Toggle
+  - uid: 413
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.25,7.5
+      parent: 1
+    - type: SignalSwitch
+      state: True
+    - type: DeviceLinkSource
+      linkedPorts:
+        293:
+        - Pressed: Toggle
+        339:
+        - Pressed: Toggle
+        336:
+        - Pressed: Toggle
+        158:
+        - Pressed: Toggle
+        202:
+        - Pressed: Toggle
+        270:
+        - Pressed: Toggle
+        213:
+        - Pressed: Toggle
+        358:
+        - Pressed: Toggle
+        355:
+        - Pressed: Toggle
+        277:
+        - Pressed: Toggle
 - proto: SignEVA
   entities:
   - uid: 337
@@ -2853,31 +2957,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 6.5,-2.5
       parent: 1
-- proto: SignMedical
-  entities:
-  - uid: 319
-    components:
-    - type: Transform
-      pos: 4.5,7.5
-      parent: 1
-  - uid: 372
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-4.5
-      parent: 1
-- proto: NFSignDock
-  entities:
-  - uid: 237
-    components:
-    - type: Transform
-      pos: 2.5,-4.5
-      parent: 1
-  - uid: 248
-    components:
-    - type: Transform
-      pos: -1.5,-4.5
-      parent: 1
 - proto: SignSpace
   entities:
   - uid: 149
@@ -2924,6 +3003,8 @@ entities:
       parent: 1
     - type: ApcPowerReceiver
       powerLoad: 1
+    - type: DeviceLinkSink
+      invokeCounter: 1
   - uid: 339
     components:
     - type: Transform
@@ -2963,14 +3044,6 @@ entities:
     - type: Transform
       pos: -2.5,0.5
       parent: 1
-- proto: TableCounterMetal
-  entities:
-  - uid: 134
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,3.5
-      parent: 1
 - proto: TableReinforced
   entities:
   - uid: 14
@@ -3002,16 +3075,16 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,4.5
       parent: 1
-  - uid: 217
+  - uid: 134
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,9.5
+      pos: -1.5,2.5
       parent: 1
-  - uid: 229
+  - uid: 217
     components:
     - type: Transform
-      pos: -1.5,2.5
+      rot: -1.5707963267948966 rad
+      pos: -0.5,9.5
       parent: 1
   - uid: 302
     components:
diff --git a/Resources/Maps/_NF/Shuttles/caduceus.yml b/Resources/Maps/_NF/Shuttles/caduceus.yml
index 2a3a6e31050..1afe233663d 100644
--- a/Resources/Maps/_NF/Shuttles/caduceus.yml
+++ b/Resources/Maps/_NF/Shuttles/caduceus.yml
@@ -527,6 +527,16 @@ entities:
             188: -8,4
             189: 1,-17
             190: -1,-17
+        - node:
+            color: '#3C44AAFF'
+            id: DeliveryGreyscale
+          decals:
+            280: 12,-13
+        - node:
+            color: '#B02E26FF'
+            id: DeliveryGreyscale
+          decals:
+            281: 11,-13
         - node:
             zIndex: 100
             color: '#5895B9FF'
@@ -700,161 +710,158 @@ entities:
       version: 2
       data:
         tiles:
+          0,-4:
+            0: 48954
+          -1,-4:
+            0: 57339
           0,-3:
-            0: 65535
+            0: 43698
+          -1,-3:
+            0: 56824
           0,-2:
-            0: 65535
+            0: 65470
+          -1,-2:
+            0: 49080
           0,-1:
-            0: 65523
-            1: 12
+            0: 65327
+          -1,-1:
+            0: 65419
           0,0:
-            0: 65535
-          0,1:
-            0: 65535
-          0,2:
-            0: 65531
-            1: 4
-          0,-4:
-            0: 32767
-            1: 32768
+            0: 12287
+          0,-5:
+            0: 41472
           1,-4:
-            0: 61439
-            1: 4096
+            0: 57295
           1,-3:
-            0: 65407
-            2: 128
+            0: 65520
           1,-2:
-            0: 65535
+            0: 13087
+            1: 32768
           1,-1:
-            0: 13175
-            3: 1024
+            0: 4355
+            1: 1088
+          1,-5:
+            0: 61440
+            1: 128
+          1,0:
+            0: 273
+            1: 1024
           2,-4:
-            0: 65535
-          2,-3:
-            0: 5119
+            0: 48063
           2,-2:
-            0: 17
+            1: 16
+          2,-3:
+            1: 704
           3,-4:
             0: 65535
           3,-3:
-            0: 249
-            1: 6
-            3: 3584
+            1: 16
+            0: 14
+          3,-5:
+            0: 63688
+            1: 52
+          4,-4:
+            0: 4437
+          4,-3:
+            0: 1
+            1: 36
+          -1,0:
+            0: 36863
+          0,1:
+            0: 12287
+          -1,1:
+            0: 36863
+          0,2:
+            0: 1911
+          -1,2:
+            0: 7645
           0,3:
-            0: 140
-          1,0:
-            0: 63283
+            1: 12
           1,1:
-            0: 65535
+            0: 12159
           1,2:
-            0: 65535
+            0: 65527
           1,3:
-            0: 4095
-          2,0:
-            0: 13088
+            1: 3600
+            0: 14
           2,1:
-            0: 13107
-          2,2:
-            0: 4371
+            0: 771
           2,3:
-            0: 273
-          0,-5:
-            0: 65280
-          1,-5:
-            0: 49092
-            1: 16384
+            1: 272
+          2,0:
+            1: 288
+          2,2:
+            1: 2
+          -1,-5:
+            0: 47104
           2,-5:
-            0: 65280
-          3,-5:
-            0: 57340
-            1: 8192
+            1: 3840
           3,-6:
-            0: 32768
+            1: 32768
+          4,-6:
+            0: 4096
+            1: 258
+          4,-5:
+            0: 4211
           -3,0:
-            0: 34944
-          -3,1:
-            0: 34952
-          -3,2:
-            0: 8
+            1: 128
           -2,0:
-            0: 64908
+            1: 1284
+          -3,1:
+            0: 2056
           -2,1:
-            0: 65535
+            0: 36815
+          -3,2:
+            1: 8
           -2,2:
-            0: 65535
+            0: 61164
           -2,3:
-            0: 4095
-          -1,0:
-            0: 65535
-          -1,1:
-            0: 65023
-            1: 512
-          -1,2:
-            0: 65519
-            1: 16
+            1: 2832
+            0: 14
           -1,3:
-            0: 279
+            1: 22
           -4,-4:
             0: 65535
+          -4,-5:
+            0: 62067
+            1: 132
           -4,-3:
-            0: 255
-            3: 3840
+            0: 15
+          -5,-3:
+            1: 132
           -3,-4:
-            0: 65535
+            0: 57341
           -3,-3:
-            0: 2303
+            1: 2160
+          -3,-5:
+            0: 4096
+            1: 3600
           -2,-4:
-            0: 65535
+            0: 61438
           -2,-3:
-            0: 64991
-            1: 544
+            0: 61152
           -2,-2:
-            0: 60095
-            1: 1088
+            1: 8208
+            0: 36032
+          -2,-5:
+            0: 57344
+            1: 288
           -2,-1:
-            0: 35020
-            3: 1024
-          -1,-4:
-            0: 49151
-            1: 16384
-          -1,-3:
-            0: 65535
-          -1,-2:
-            0: 65535
-          -1,-1:
-            0: 65279
-            4: 256
+            1: 1088
+            0: 8
           -4,-6:
-            0: 12544
-          -4,-5:
-            0: 65527
-          -3,-5:
-            0: 65296
-          -2,-5:
-            0: 65380
-          -1,-5:
-            0: 65280
+            1: 8448
+            0: 4096
+          -5,-5:
+            0: 200
           -5,-4:
-            0: 52428
-          -5,-3:
-            0: 140
+            1: 68
           -5,-7:
-            0: 16384
+            1: 16384
           -5,-6:
-            0: 52428
-          -5,-5:
-            0: 52428
-          4,-4:
-            0: 30583
-          4,-3:
-            0: 55
-            3: 256
-          4,-6:
-            0: 30566
-          4,-5:
-            0: 30583
+            1: 8
           4,-7:
-            0: 16384
+            1: 16384
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -872,37 +879,7 @@ entities:
           - 0
           - 0
         - volume: 2500
-          temperature: 293.14996
-          moles:
-          - 20.078888
-          - 75.53487
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.1499
-          moles:
-          - 18.472576
-          - 69.49208
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-        - volume: 2500
-          temperature: 293.15
+          immutable: True
           moles:
           - 0
           - 0
@@ -916,21 +893,6 @@ entities:
           - 0
           - 0
           - 0
-        - volume: 2500
-          temperature: 293.14996
-          moles:
-          - 21.824879
-          - 82.10312
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
-          - 0
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -1072,22 +1034,6 @@ entities:
       - 856
 - proto: AirCanister
   entities:
-  - uid: 895
-    components:
-    - type: Transform
-      anchored: True
-      pos: 12.5,-12.5
-      parent: 1
-    - type: Physics
-      bodyType: Static
-  - uid: 896
-    components:
-    - type: Transform
-      anchored: True
-      pos: 11.5,-12.5
-      parent: 1
-    - type: Physics
-      bodyType: Static
   - uid: 1428
     components:
     - type: Transform
@@ -1537,10 +1483,10 @@ entities:
       parent: 1
 - proto: BiomassReclaimer
   entities:
-  - uid: 722
+  - uid: 802
     components:
     - type: Transform
-      pos: -6.5,-15.5
+      pos: -8.5,-12.5
       parent: 1
 - proto: BorgCharger
   entities:
@@ -1549,24 +1495,6 @@ entities:
     - type: Transform
       pos: 13.5,-16.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
 - proto: BorgModuleDefibrillator
   entities:
   - uid: 1425
@@ -1597,10 +1525,10 @@ entities:
       parent: 1
 - proto: BoxBodyBag
   entities:
-  - uid: 1150
+  - uid: 764
     components:
     - type: Transform
-      pos: -6.7670183,-16.647583
+      pos: -8.991088,-12.998157
       parent: 1
 - proto: BoxFolderBase
   entities:
@@ -3709,6 +3637,12 @@ entities:
       parent: 1
 - proto: Chair
   entities:
+  - uid: 698
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-8.5
+      parent: 1
   - uid: 739
     components:
     - type: Transform
@@ -3750,11 +3684,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,-9.5
       parent: 1
-  - uid: 1464
-    components:
-    - type: Transform
-      pos: 0.5,6.5
-      parent: 1
 - proto: ChairOfficeDark
   entities:
   - uid: 1142
@@ -3816,61 +3745,18 @@ entities:
     - type: Transform
       pos: 3.5,-8.5
       parent: 1
-- proto: CloningPod
-  entities:
-  - uid: 720
-    components:
-    - type: Transform
-      pos: -4.5,-16.5
-      parent: 1
 - proto: ClosetL3VirologyFilled
   entities:
-  - uid: 609
+  - uid: 103
     components:
     - type: Transform
-      pos: 3.5,-12.5
+      pos: 4.5,-12.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-  - uid: 610
+  - uid: 536
     components:
     - type: Transform
-      pos: 4.5,-12.5
+      pos: 3.5,-12.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
 - proto: ClosetSteelBase
   entities:
   - uid: 752
@@ -3878,24 +3764,6 @@ entities:
     - type: Transform
       pos: -6.5,-10.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
 - proto: ClosetToolFilled
   entities:
   - uid: 636
@@ -3903,78 +3771,33 @@ entities:
     - type: Transform
       pos: 13.5,-11.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
 - proto: ClosetWallEmergencyFilledRandom
   entities:
-  - uid: 3
-    components:
-    - type: Transform
-      pos: -2.5,7.5
-      parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
   - uid: 1278
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 5.5,-1.5
       parent: 1
-  - uid: 1279
+- proto: ClosetWallO2N2FilledRandom
+  entities:
+  - uid: 3
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -1.5,-2.5
+      pos: 7.5,-17.5
       parent: 1
-  - uid: 1281
+  - uid: 34
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -1.5,-7.5
       parent: 1
-  - uid: 1282
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-17.5
-      parent: 1
-  - uid: 1283
+  - uid: 781
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 7.5,-17.5
+      pos: -4.5,3.5
       parent: 1
 - proto: ClothingBackpackDuffelSurgeryFilled
   entities:
@@ -3983,56 +3806,67 @@ entities:
     - type: Transform
       pos: -3.5074787,-8.435668
       parent: 1
+    - type: GroupExamine
+      group:
+      - hoverMessage: ""
+        contextText: verb-examine-group-other
+        icon: /Textures/Interface/examine-star.png
+        components:
+        - Armor
+        - ClothingSpeedModifier
+        entries:
+        - message: >-
+            It provides the following protection:
+
+            - [color=orange]Explosion[/color] damage [color=white]to contents[/color] reduced by [color=lightblue]10%[/color].
+          priority: 0
+          component: Armor
+        title: null
   - uid: 751
     components:
     - type: Transform
       pos: -6.582903,-8.3960905
       parent: 1
+    - type: GroupExamine
+      group:
+      - hoverMessage: ""
+        contextText: verb-examine-group-other
+        icon: /Textures/Interface/examine-star.png
+        components:
+        - Armor
+        - ClothingSpeedModifier
+        entries:
+        - message: >-
+            It provides the following protection:
+
+            - [color=orange]Explosion[/color] damage [color=white]to contents[/color] reduced by [color=lightblue]10%[/color].
+          priority: 0
+          component: Armor
+        title: null
 - proto: ClothingBeltMedical
   entities:
-  - uid: 1127
+  - uid: 537
     components:
     - type: Transform
-      pos: 5.5486674,-3.2977939
+      pos: 5.4280796,-5.50636
       parent: 1
-  - uid: 1128
+  - uid: 1127
     components:
     - type: Transform
-      pos: 5.5486674,-3.2977939
+      pos: 5.573913,-5.131099
       parent: 1
 - proto: ClothingEyesHudMedical
   entities:
-  - uid: 1124
-    components:
-    - type: Transform
-      pos: 5.245085,-3.6671867
-      parent: 1
-  - uid: 1125
+  - uid: 609
     components:
     - type: Transform
-      pos: 5.245085,-3.6671867
+      pos: 5.5843296,-3.348611
       parent: 1
-  - uid: 1126
+  - uid: 1124
     components:
     - type: Transform
-      pos: 5.245085,-3.6671867
+      pos: 5.4264383,-3.7134476
       parent: 1
-- proto: ClothingHeadHatBeretBrigmedic
-  entities:
-  - uid: 693
-    components:
-    - type: Transform
-      parent: 632
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
-  - uid: 698
-    components:
-    - type: Transform
-      parent: 633
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ClothingNeckStethoscope
   entities:
   - uid: 1394
@@ -4045,21 +3879,6 @@ entities:
     - type: Transform
       pos: 2.5316,-1.4875672
       parent: 1
-- proto: ClothingOuterHardsuitVoidParamed
-  entities:
-  - uid: 1148
-    components:
-    - type: Transform
-      pos: 5.384019,-5.6894855
-      parent: 1
-- proto: ComputerCloningConsole
-  entities:
-  - uid: 721
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -3.5,-16.5
-      parent: 1
 - proto: ComputerCrewMonitoring
   entities:
   - uid: 725
@@ -4121,8 +3940,6 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-    - type: Physics
-      canCollide: False
     - type: ItemSlots
 - proto: CrateFreezer
   entities:
@@ -4138,24 +3955,6 @@ entities:
     - type: Transform
       pos: -3.5,9.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
 - proto: CrateMedicalSurgery
   entities:
   - uid: 749
@@ -4163,31 +3962,6 @@ entities:
     - type: Transform
       pos: -6.5,-9.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-- proto: CrateVendingMachineRestockChemVendFilled
-  entities:
-  - uid: 267
-    components:
-    - type: Transform
-      pos: 7.5,-8.5
-      parent: 1
 - proto: CryoPod
   entities:
   - uid: 690
@@ -4222,25 +3996,55 @@ entities:
     - type: Transform
       pos: -3.1544197,-1.3643616
       parent: 1
-- proto: CyborgEndoskeleton
+- proto: CurtainsBlueOpen
   entities:
-  - uid: 1446
+  - uid: 267
     components:
     - type: Transform
-      pos: 12.507489,-16.392925
+      rot: 3.141592653589793 rad
+      pos: 2.5,-0.5
       parent: 1
-- proto: DefibrillatorCabinetFilled
-  entities:
-  - uid: 1324
+  - uid: 622
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 3.5,-2.5
+      pos: 2.5,0.5
       parent: 1
-  - uid: 1325
+  - uid: 1118
     components:
     - type: Transform
-      pos: 3.5,3.5
+      rot: 3.141592653589793 rad
+      pos: 2.5,1.5
+      parent: 1
+  - uid: 1119
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 1
+  - uid: 1120
+    components:
+    - type: Transform
+      pos: 2.5,-1.5
+      parent: 1
+- proto: CyborgEndoskeleton
+  entities:
+  - uid: 1446
+    components:
+    - type: Transform
+      pos: 12.507489,-16.392925
+      parent: 1
+- proto: DefibrillatorCabinetFilled
+  entities:
+  - uid: 1324
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-2.5
+      parent: 1
+  - uid: 1325
+    components:
+    - type: Transform
+      pos: 3.5,3.5
       parent: 1
   - uid: 1408
     components:
@@ -4385,11 +4189,11 @@ entities:
       parent: 1
 - proto: ExtinguisherCabinetFilled
   entities:
-  - uid: 1192
+  - uid: 895
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,7.5
+      rot: 3.141592653589793 rad
+      pos: 5.5,3.5
       parent: 1
   - uid: 1193
     components:
@@ -4562,10 +4366,10 @@ entities:
       parent: 1
     - type: Fixtures
       fixtures: {}
-  - uid: 1434
+  - uid: 766
     components:
     - type: Transform
-      pos: -5.5,-15.5
+      pos: -8.5,-12.5
       parent: 1
     - type: Fixtures
       fixtures: {}
@@ -4585,6 +4389,19 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#FF0000FF'
+- proto: GasMixerOn
+  entities:
+  - uid: 702
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-14.5
+      parent: 1
+    - type: GasMixer
+      inletTwoConcentration: 0.79
+      inletOneConcentration: 0.21
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPassiveVent
   entities:
   - uid: 778
@@ -4605,6 +4422,14 @@ entities:
       color: '#FF0000FF'
 - proto: GasPipeBend
   entities:
+  - uid: 40
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,-14.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 765
     components:
     - type: Transform
@@ -4628,18 +4453,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0000FFFF'
-  - uid: 802
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 11.5,-13.5
-      parent: 1
-  - uid: 804
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 12.5,-14.5
-      parent: 1
   - uid: 880
     components:
     - type: Transform
@@ -4771,6 +4584,20 @@ entities:
       color: '#FF0000FF'
 - proto: GasPipeStraight
   entities:
+  - uid: 720
+    components:
+    - type: Transform
+      pos: 12.5,-13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 721
+    components:
+    - type: Transform
+      pos: 11.5,-13.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 773
     components:
     - type: Transform
@@ -5746,12 +5573,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0000FFFF'
-  - uid: 803
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 12.5,-13.5
-      parent: 1
   - uid: 813
     components:
     - type: Transform
@@ -5918,16 +5739,20 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,-10.5
       parent: 1
-  - uid: 764
+  - uid: 716
     components:
     - type: Transform
-      pos: 11.5,-12.5
+      pos: 12.5,-12.5
       parent: 1
-  - uid: 766
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 719
     components:
     - type: Transform
-      pos: 12.5,-12.5
+      pos: 11.5,-12.5
       parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPressurePump
   entities:
   - uid: 774
@@ -5942,18 +5767,6 @@ entities:
       color: '#0000FFFF'
     - type: Label
       currentLabel: Distro to Cryo
-  - uid: 894
-    components:
-    - type: MetaData
-      name: gas pump (Port to Distro)
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,-14.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0000FFFF'
-    - type: Label
-      currentLabel: Port to Distro
 - proto: GasThermoMachineFreezer
   entities:
   - uid: 692
@@ -6205,10 +6018,10 @@ entities:
       color: '#FF0000FF'
 - proto: GravityGeneratorMini
   entities:
-  - uid: 1418
+  - uid: 699
     components:
     - type: Transform
-      pos: 5.5,12.5
+      pos: -13.5,-14.5
       parent: 1
 - proto: Grille
   entities:
@@ -6432,18 +6245,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,3.5
       parent: 1
-  - uid: 1248
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,3.5
-      parent: 1
-  - uid: 1249
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,3.5
-      parent: 1
   - uid: 1250
     components:
     - type: Transform
@@ -6654,23 +6455,6 @@ entities:
     - type: Transform
       pos: 16.493662,-12.606645
       parent: 1
-- proto: HospitalCurtainsOpen
-  entities:
-  - uid: 699
-    components:
-    - type: Transform
-      pos: 2.5,-0.5
-      parent: 1
-  - uid: 700
-    components:
-    - type: Transform
-      pos: 2.5,0.5
-      parent: 1
-  - uid: 701
-    components:
-    - type: Transform
-      pos: 2.5,1.5
-      parent: 1
 - proto: hydroponicsTrayAnchored
   entities:
   - uid: 796
@@ -6693,41 +6477,56 @@ entities:
       parent: 1
 - proto: IntercomMedical
   entities:
-  - uid: 1183
+  - uid: 700
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-10.5
+      rot: 3.141592653589793 rad
+      pos: -1.5,-2.5
       parent: 1
-  - uid: 1184
+    - type: Physics
+      canCollide: False
+    - type: Fixtures
+      fixtures: {}
+  - uid: 701
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -1.5,-15.5
+      pos: 8.5,-16.5
       parent: 1
-  - uid: 1185
+    - type: Physics
+      canCollide: False
+    - type: Fixtures
+      fixtures: {}
+  - uid: 1184
     components:
     - type: Transform
-      pos: 8.5,-11.5
+      rot: 3.141592653589793 rad
+      pos: -1.5,-15.5
       parent: 1
+    - type: Physics
+      canCollide: False
+    - type: Fixtures
+      fixtures: {}
   - uid: 1186
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 8.5,-9.5
       parent: 1
-  - uid: 1187
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 6.5,-4.5
-      parent: 1
+    - type: Physics
+      canCollide: False
+    - type: Fixtures
+      fixtures: {}
   - uid: 1191
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -2.5,10.5
       parent: 1
+    - type: Physics
+      canCollide: False
+    - type: Fixtures
+      fixtures: {}
 - proto: KitchenKnife
   entities:
   - uid: 1132
@@ -6735,13 +6534,6 @@ entities:
     - type: Transform
       pos: 4.274497,9.370374
       parent: 1
-- proto: KitchenMicrowave
-  entities:
-  - uid: 453
-    components:
-    - type: Transform
-      pos: 4.5,10.5
-      parent: 1
 - proto: KitchenReagentGrinder
   entities:
   - uid: 621
@@ -6788,10 +6580,10 @@ entities:
       parent: 1
 - proto: LockerChemistryFilled
   entities:
-  - uid: 622
+  - uid: 35
     components:
     - type: Transform
-      pos: 7.5,-9.5
+      pos: 7.5,-8.5
       parent: 1
 - proto: LockerChiefMedicalOfficerFilled
   entities:
@@ -6800,144 +6592,25 @@ entities:
     - type: Transform
       pos: -5.5,-5.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-- proto: LockerEngineerFilledHardsuit
-  entities:
-  - uid: 635
-    components:
-    - type: Transform
-      pos: 14.5,-11.5
-      parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
 - proto: LockerMedicalFilled
   entities:
-  - uid: 632
+  - uid: 610
     components:
     - type: Transform
       pos: 2.5,-3.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 693
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-  - uid: 633
+  - uid: 624
     components:
     - type: Transform
       pos: 3.5,-3.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.1496
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 698
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
 - proto: LockerParamedicFilled
   entities:
   - uid: 634
     components:
     - type: Transform
-      pos: -1.5,-12.5
-      parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+      pos: -3.5,-16.5
+      parent: 1
 - proto: LockerPilotFilled
   entities:
   - uid: 614
@@ -6953,14 +6626,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -11.5,-17.5
       parent: 1
-- proto: LockerWallMedical
-  entities:
-  - uid: 781
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-11.5
-      parent: 1
 - proto: MachineCentrifuge
   entities:
   - uid: 625
@@ -6975,13 +6640,27 @@ entities:
     - type: Transform
       pos: 6.5,-7.5
       parent: 1
-- proto: MaterialBiomass
+- proto: MedicalAssembler
   entities:
-  - uid: 1151
+  - uid: 453
     components:
     - type: Transform
-      pos: -5.5790863,-16.449692
+      pos: 5.5,-10.5
       parent: 1
+    - type: ContainerContainer
+      containers:
+        machine_board: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        machine_parts: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        microwave_entity_container: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
 - proto: MedicalBed
   entities:
   - uid: 694
@@ -7004,13 +6683,6 @@ entities:
     - type: Transform
       pos: 4.5,1.5
       parent: 1
-- proto: MedicalScanner
-  entities:
-  - uid: 719
-    components:
-    - type: Transform
-      pos: -2.5,-16.5
-      parent: 1
 - proto: MedicalTechFab
   entities:
   - uid: 1209
@@ -7032,45 +6704,12 @@ entities:
           showEnts: False
           occludes: True
           ents: []
-- proto: MedkitAdvancedFilled
-  entities:
-  - uid: 1118
-    components:
-    - type: Transform
-      pos: 4.223197,-3.7086353
-      parent: 1
 - proto: MedkitFilled
   entities:
-  - uid: 103
-    components:
-    - type: Transform
-      pos: 2.901178,2.298713
-      parent: 1
-- proto: MedkitOxygenFilled
-  entities:
-  - uid: 1121
-    components:
-    - type: Transform
-      pos: 4.856761,-3.7350206
-      parent: 1
-  - uid: 1130
-    components:
-    - type: Transform
-      pos: 2.3732085,2.298713
-      parent: 1
-- proto: MedkitRadiationFilled
-  entities:
-  - uid: 1119
-    components:
-    - type: Transform
-      pos: 4.4475837,-3.4052055
-      parent: 1
-- proto: MedkitToxinFilled
-  entities:
-  - uid: 1120
+  - uid: 633
     components:
     - type: Transform
-      pos: 4.962354,-3.418398
+      pos: 2.5670705,2.4268012
       parent: 1
 - proto: Morgue
   entities:
@@ -7079,11 +6718,6 @@ entities:
     - type: Transform
       pos: -9.5,-12.5
       parent: 1
-  - uid: 716
-    components:
-    - type: Transform
-      pos: -8.5,-12.5
-      parent: 1
   - uid: 717
     components:
     - type: Transform
@@ -7096,13 +6730,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -9.5,-15.5
       parent: 1
-- proto: NetworkConfigurator
-  entities:
-  - uid: 702
-    components:
-    - type: Transform
-      pos: -6.048698,-16.522701
-      parent: 1
 - proto: NFSignDock
   entities:
   - uid: 1362
@@ -7135,6 +6762,16 @@ entities:
     - type: Transform
       pos: -5.5,-19.5
       parent: 1
+- proto: NitrogenCanister
+  entities:
+  - uid: 722
+    components:
+    - type: Transform
+      anchored: True
+      pos: 11.5,-12.5
+      parent: 1
+    - type: Physics
+      bodyType: Static
 - proto: NitrousOxideCanister
   entities:
   - uid: 1375
@@ -7154,6 +6791,16 @@ entities:
     - type: Transform
       pos: -4.5,-8.5
       parent: 1
+- proto: OxygenCanister
+  entities:
+  - uid: 527
+    components:
+    - type: Transform
+      anchored: True
+      pos: 12.5,-12.5
+      parent: 1
+    - type: Physics
+      bodyType: Static
 - proto: PaperBin10
   entities:
   - uid: 736
@@ -7173,14 +6820,6 @@ entities:
     - type: Transform
       pos: 4.5,-16.5
       parent: 1
-- proto: PosterContrabandBorgFancyv2
-  entities:
-  - uid: 1275
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -10.5,-12.5
-      parent: 1
 - proto: PosterLegitAnatomyPoster
   entities:
   - uid: 753
@@ -7567,16 +7206,6 @@ entities:
     - type: Transform
       pos: 6.5,3.5
       parent: 1
-  - uid: 34
-    components:
-    - type: Transform
-      pos: 2.5,3.5
-      parent: 1
-  - uid: 35
-    components:
-    - type: Transform
-      pos: -1.5,3.5
-      parent: 1
   - uid: 36
     components:
     - type: Transform
@@ -8125,24 +7754,23 @@ entities:
     - type: Transform
       pos: -5.5,-6.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+- proto: SuitStorageParamedic
+  entities:
+  - uid: 528
+    components:
+    - type: Transform
+      pos: -4.5,-16.5
+      parent: 1
+  - uid: 803
+    components:
+    - type: Transform
+      pos: -2.5,-16.5
+      parent: 1
+  - uid: 882
+    components:
+    - type: Transform
+      pos: -6.5,-16.5
+      parent: 1
 - proto: TableGlass
   entities:
   - uid: 131
@@ -8186,18 +7814,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 7.5,9.5
       parent: 1
-  - uid: 527
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,-16.5
-      parent: 1
-  - uid: 528
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -5.5,-16.5
-      parent: 1
   - uid: 529
     components:
     - type: Transform
@@ -8240,18 +7856,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,-3.5
       parent: 1
-  - uid: 536
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 5.5,-5.5
-      parent: 1
-  - uid: 537
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-3.5
-      parent: 1
   - uid: 538
     components:
     - type: Transform
@@ -8316,6 +7920,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 5.5,-16.5
       parent: 1
+  - uid: 693
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-5.5
+      parent: 1
   - uid: 1403
     components:
     - type: Transform
@@ -8374,11 +7984,6 @@ entities:
     - type: Transform
       pos: 4.5,-10.5
       parent: 1
-  - uid: 624
-    components:
-    - type: Transform
-      pos: 5.5,-10.5
-      parent: 1
   - uid: 731
     components:
     - type: Transform
@@ -8545,14 +8150,14 @@ entities:
   - uid: 1405
     components:
     - type: Transform
-      pos: 15.716684,-11.280165
+      pos: 15.634625,-11.263636
       parent: 1
 - proto: ToolboxMechanicalFilled
   entities:
   - uid: 1406
     components:
     - type: Transform
-      pos: 15.281109,-11.596787
+      pos: 15.488791,-11.472113
       parent: 1
 - proto: TorsoBorgMedical
   entities:
@@ -8582,24 +8187,26 @@ entities:
     - type: Transform
       pos: 4.5,8.5
       parent: 1
-- proto: VendingMachineMedical
+- proto: VendingMachineEngivend
   entities:
-  - uid: 703
+  - uid: 632
     components:
     - type: Transform
-      pos: 0.5,2.5
+      pos: 14.5,-11.5
       parent: 1
-  - uid: 1419
+- proto: VendingMachineMedical
+  entities:
+  - uid: 703
     components:
     - type: Transform
-      pos: -6.5,-12.5
+      pos: 0.5,2.5
       parent: 1
 - proto: VendingMachineMediDrobe
   entities:
-  - uid: 1167
+  - uid: 635
     components:
     - type: Transform
-      pos: -1.5,-8.5
+      pos: 4.5,-3.5
       parent: 1
 - proto: VendingMachineSeeds
   entities:
@@ -8608,19 +8215,12 @@ entities:
     - type: Transform
       pos: -6.5,9.5
       parent: 1
-- proto: VendingMachineWallMedical
+- proto: VendingMachineTankDispenserEVA
   entities:
-  - uid: 219
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 5.5,3.5
-      parent: 1
-  - uid: 266
+  - uid: 804
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -4.5,3.5
+      pos: -5.5,-16.5
       parent: 1
 - proto: WallShuttle
   entities:
@@ -9347,6 +8947,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,-15.5
       parent: 1
+  - uid: 219
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,3.5
+      parent: 1
   - uid: 225
     components:
     - type: Transform
@@ -9425,6 +9031,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 8.5,12.5
       parent: 1
+  - uid: 266
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,3.5
+      parent: 1
   - uid: 268
     components:
     - type: Transform
@@ -9883,29 +9495,11 @@ entities:
       parent: 1
 - proto: WardrobeVirologyFilled
   entities:
-  - uid: 1168
+  - uid: 894
     components:
     - type: Transform
       pos: 6.5,-16.5
       parent: 1
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
 - proto: WarpPointShip
   entities:
   - uid: 1277
@@ -9930,7 +9524,7 @@ entities:
       parent: 1
 - proto: WindowFrostedDirectional
   entities:
-  - uid: 1390
+  - uid: 896
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -9942,15 +9536,4 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,-1.5
       parent: 1
-  - uid: 1392
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,2.5
-      parent: 1
-  - uid: 1393
-    components:
-    - type: Transform
-      pos: 2.5,-1.5
-      parent: 1
 ...
diff --git a/Resources/Maps/_NF/Shuttles/camper.yml b/Resources/Maps/_NF/Shuttles/camper.yml
index 92589e3ca38..8c2a04a808a 100644
--- a/Resources/Maps/_NF/Shuttles/camper.yml
+++ b/Resources/Maps/_NF/Shuttles/camper.yml
@@ -19,17 +19,16 @@ entities:
     - type: MetaData
       name: Camper
     - type: Transform
-      pos: -9.170037,-0.1471653
       parent: invalid
     - type: MapGrid
       chunks:
         0,0:
           ind: 0,0
-          tiles: ggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: ggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAgAAAAAAAgAAAAAAYQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAYQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAABAAAAAAABAAAAAAAYQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAAgAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAgAAAAAAAgAAAAAAYQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAYQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAABAAAAAAABAAAAAAAYQAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAAgAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
@@ -116,6 +115,7 @@ entities:
             id: Delivery
           decals:
             16: -1,2
+            27: 0,2
         - node:
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
@@ -233,19 +233,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,-5.5
       parent: 1
-- proto: AirCanister
-  entities:
-  - uid: 3
-    components:
-    - type: Transform
-      anchored: True
-      pos: -0.5,2.5
-      parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: AirlockExternal
   entities:
-  - uid: 4
+  - uid: 3
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -253,7 +243,7 @@ entities:
       parent: 1
 - proto: AirlockGlassShuttle
   entities:
-  - uid: 5
+  - uid: 4
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -261,7 +251,7 @@ entities:
       parent: 1
 - proto: AirSensor
   entities:
-  - uid: 6
+  - uid: 5
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -269,85 +259,86 @@ entities:
       parent: 1
 - proto: APCBasic
   entities:
-  - uid: 7
+  - uid: 6
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -2.5,1.5
       parent: 1
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
-  - uid: 8
+  - uid: 7
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 1.5,-1.5
       parent: 1
 - proto: AtmosFixBlockerMarker
   entities:
-  - uid: 9
+  - uid: 8
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5,4.5
       parent: 1
-  - uid: 10
+  - uid: 9
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,-6.5
       parent: 1
-  - uid: 11
+  - uid: 10
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,-5.5
       parent: 1
-  - uid: 12
+  - uid: 11
     components:
     - type: Transform
       pos: 0.5,-5.5
       parent: 1
-  - uid: 13
+  - uid: 12
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,6.5
       parent: 1
-  - uid: 14
+  - uid: 13
     components:
     - type: Transform
       pos: 0.5,-6.5
       parent: 1
-  - uid: 15
+  - uid: 14
     components:
     - type: Transform
       pos: 0.5,6.5
       parent: 1
-  - uid: 16
+  - uid: 15
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5,-6.5
       parent: 1
-  - uid: 17
+  - uid: 16
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -4.5,-3.5
       parent: 1
-  - uid: 18
+  - uid: 17
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,-6.5
       parent: 1
-  - uid: 19
+  - uid: 18
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5,-3.5
       parent: 1
-  - uid: 20
+  - uid: 19
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -355,14 +346,14 @@ entities:
       parent: 1
 - proto: Bed
   entities:
-  - uid: 21
+  - uid: 20
     components:
     - type: Transform
       pos: -1.5,-4.5
       parent: 1
 - proto: BedsheetBlue
   entities:
-  - uid: 22
+  - uid: 21
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -370,162 +361,167 @@ entities:
       parent: 1
 - proto: BoxPaper
   entities:
-  - uid: 23
+  - uid: 22
     components:
     - type: Transform
       pos: -1.4186039,5.4487333
       parent: 1
 - proto: Bucket
   entities:
-  - uid: 24
+  - uid: 23
     components:
     - type: Transform
       pos: -3.1369505,2.8069963
       parent: 1
 - proto: CableApcExtension
   entities:
-  - uid: 25
+  - uid: 24
     components:
     - type: Transform
       pos: -1.5,-0.5
       parent: 1
-  - uid: 26
+  - uid: 25
     components:
     - type: Transform
       pos: -1.5,4.5
       parent: 1
-  - uid: 27
+  - uid: 26
     components:
     - type: Transform
       pos: -1.5,3.5
       parent: 1
-  - uid: 28
+  - uid: 27
     components:
     - type: Transform
       pos: -1.5,2.5
       parent: 1
-  - uid: 29
+  - uid: 28
     components:
     - type: Transform
       pos: -1.5,-0.5
       parent: 1
-  - uid: 30
+  - uid: 29
     components:
     - type: Transform
       pos: -1.5,0.5
       parent: 1
-  - uid: 31
+  - uid: 30
     components:
     - type: Transform
       pos: -1.5,1.5
       parent: 1
-  - uid: 32
+  - uid: 31
     components:
     - type: Transform
       pos: -1.5,-2.5
       parent: 1
-  - uid: 33
+  - uid: 32
     components:
     - type: Transform
       pos: -1.5,-3.5
       parent: 1
-  - uid: 34
+  - uid: 33
     components:
     - type: Transform
       pos: -1.5,-1.5
       parent: 1
-  - uid: 35
+  - uid: 34
     components:
     - type: Transform
       pos: -2.5,1.5
       parent: 1
-  - uid: 36
+  - uid: 35
     components:
     - type: Transform
       pos: -1.5,-4.5
       parent: 1
-  - uid: 37
+  - uid: 36
     components:
     - type: Transform
       pos: -1.5,5.5
       parent: 1
 - proto: CableHV
   entities:
-  - uid: 38
+  - uid: 37
     components:
     - type: Transform
       pos: 0.5,-0.5
       parent: 1
-  - uid: 39
+  - uid: 38
     components:
     - type: Transform
       pos: 0.5,0.5
       parent: 1
+  - uid: 191
+    components:
+    - type: Transform
+      pos: -0.5,0.5
+      parent: 1
 - proto: CableMV
   entities:
-  - uid: 40
+  - uid: 39
     components:
     - type: Transform
       pos: -0.5,1.5
       parent: 1
-  - uid: 41
+  - uid: 40
     components:
     - type: Transform
       pos: 0.5,-0.5
       parent: 1
-  - uid: 42
+  - uid: 41
     components:
     - type: Transform
       pos: 0.5,0.5
       parent: 1
-  - uid: 43
+  - uid: 42
     components:
     - type: Transform
       pos: -0.5,0.5
       parent: 1
-  - uid: 44
+  - uid: 43
     components:
     - type: Transform
       pos: -2.5,1.5
       parent: 1
-  - uid: 45
+  - uid: 44
     components:
     - type: Transform
       pos: -1.5,1.5
       parent: 1
 - proto: CarpetBlue
   entities:
-  - uid: 46
+  - uid: 45
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -2.5,-3.5
       parent: 1
-  - uid: 47
+  - uid: 46
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -2.5,-4.5
       parent: 1
-  - uid: 48
+  - uid: 47
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -1.5,-4.5
       parent: 1
-  - uid: 49
+  - uid: 48
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -1.5,-3.5
       parent: 1
-  - uid: 50
+  - uid: 49
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -0.5,-4.5
       parent: 1
-  - uid: 51
+  - uid: 50
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -533,35 +529,24 @@ entities:
       parent: 1
 - proto: Catwalk
   entities:
-  - uid: 52
-    components:
-    - type: Transform
-      pos: 0.5,2.5
-      parent: 1
-  - uid: 53
+  - uid: 51
     components:
     - type: Transform
       pos: -0.5,0.5
       parent: 1
-  - uid: 54
+  - uid: 52
     components:
     - type: Transform
       pos: 0.5,0.5
       parent: 1
-  - uid: 55
+  - uid: 53
     components:
     - type: Transform
       pos: 0.5,1.5
       parent: 1
-  - uid: 56
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,1.5
-      parent: 1
 - proto: ChairFolding
   entities:
-  - uid: 57
+  - uid: 54
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -569,50 +554,42 @@ entities:
       parent: 1
 - proto: ChairPilotSeat
   entities:
-  - uid: 58
+  - uid: 55
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5,4.5
       parent: 1
-  - uid: 59
+  - uid: 56
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,4.5
       parent: 1
-- proto: ClosetWallMaintenanceFilledRandom
-  entities:
-  - uid: 60
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-0.5
-      parent: 1
 - proto: ComfyChair
   entities:
-  - uid: 61
+  - uid: 57
     components:
     - type: Transform
       pos: -2.5,-3.5
       parent: 1
 - proto: ComputerTabletopShuttle
   entities:
-  - uid: 62
+  - uid: 58
     components:
     - type: Transform
       pos: -2.5,5.5
       parent: 1
 - proto: ComputerTabletopStationRecords
   entities:
-  - uid: 63
+  - uid: 59
     components:
     - type: Transform
       pos: -0.5,5.5
       parent: 1
 - proto: ComputerTelevision
   entities:
-  - uid: 64
+  - uid: 60
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -620,14 +597,14 @@ entities:
       parent: 1
 - proto: CrateFreezer
   entities:
-  - uid: 65
+  - uid: 61
     components:
     - type: Transform
       pos: -3.5,0.5
       parent: 1
 - proto: CurtainsBlackOpen
   entities:
-  - uid: 66
+  - uid: 62
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -635,7 +612,7 @@ entities:
       parent: 1
 - proto: CurtainsBlueOpen
   entities:
-  - uid: 67
+  - uid: 63
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -643,7 +620,7 @@ entities:
       parent: 1
 - proto: CurtainsWhiteOpen
   entities:
-  - uid: 68
+  - uid: 64
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -651,7 +628,7 @@ entities:
       parent: 1
 - proto: DefibrillatorCabinetFilled
   entities:
-  - uid: 69
+  - uid: 65
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -659,27 +636,27 @@ entities:
       parent: 1
 - proto: DresserFilled
   entities:
-  - uid: 70
+  - uid: 66
     components:
     - type: Transform
       pos: -0.5,-4.5
       parent: 1
 - proto: DrinkBeerBottleFull
   entities:
-  - uid: 71
+  - uid: 67
     components:
     - type: Transform
       pos: -1.9612398,5.593486
       parent: 1
 - proto: DrinkGlass
   entities:
-  - uid: 72
+  - uid: 68
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.8106375,-0.12930775
       parent: 1
-  - uid: 73
+  - uid: 69
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -687,7 +664,7 @@ entities:
       parent: 1
 - proto: EmergencyLight
   entities:
-  - uid: 74
+  - uid: 70
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -695,7 +672,7 @@ entities:
       parent: 1
 - proto: ExtinguisherCabinetFilled
   entities:
-  - uid: 75
+  - uid: 71
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -703,14 +680,27 @@ entities:
       parent: 1
 - proto: FaxMachineShip
   entities:
-  - uid: 76
+  - uid: 72
     components:
     - type: Transform
       pos: -1.5,5.5
       parent: 1
+- proto: GasMixerOn
+  entities:
+  - uid: 73
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,1.5
+      parent: 1
+    - type: GasMixer
+      inletTwoConcentration: 0.79
+      inletOneConcentration: 0.21
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPassiveVent
   entities:
-  - uid: 77
+  - uid: 74
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -720,7 +710,15 @@ entities:
       color: '#CC1111FF'
 - proto: GasPipeBend
   entities:
-  - uid: 78
+  - uid: 75
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 76
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -728,7 +726,7 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#CC1111FF'
-  - uid: 79
+  - uid: 77
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -736,22 +734,14 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#CC1111FF'
-  - uid: 80
+  - uid: 78
     components:
     - type: Transform
       pos: -1.5,-1.5
       parent: 1
     - type: AtmosPipeColor
       color: '#CC1111FF'
-  - uid: 81
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,1.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 82
+  - uid: 79
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -761,14 +751,14 @@ entities:
       color: '#0055CCFF'
 - proto: GasPipeStraight
   entities:
-  - uid: 83
+  - uid: 80
     components:
     - type: Transform
       pos: -1.5,-2.5
       parent: 1
     - type: AtmosPipeColor
       color: '#CC1111FF'
-  - uid: 84
+  - uid: 81
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -776,7 +766,7 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#CC1111FF'
-  - uid: 85
+  - uid: 82
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -784,28 +774,33 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#CC1111FF'
+  - uid: 83
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasPort
   entities:
-  - uid: 86
+  - uid: 84
     components:
     - type: Transform
-      pos: -0.5,2.5
+      pos: 0.5,2.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-- proto: GasPressurePumpOn
-  entities:
-  - uid: 87
+  - uid: 85
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,2.5
+      pos: -0.5,2.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasValve
   entities:
-  - uid: 88
+  - uid: 86
     components:
     - type: Transform
       pos: -2.5,-0.5
@@ -814,7 +809,7 @@ entities:
       color: '#CC1111FF'
 - proto: GasVentPump
   entities:
-  - uid: 89
+  - uid: 87
     components:
     - type: Transform
       pos: -1.5,3.5
@@ -823,7 +818,7 @@ entities:
       color: '#0055CCFF'
 - proto: GasVentScrubber
   entities:
-  - uid: 90
+  - uid: 88
     components:
     - type: Transform
       pos: -2.5,0.5
@@ -832,86 +827,86 @@ entities:
       color: '#CC1111FF'
 - proto: GravityGeneratorMini
   entities:
-  - uid: 91
+  - uid: 89
     components:
     - type: Transform
-      pos: 0.5,2.5
+      pos: 0.5,0.5
       parent: 1
 - proto: Grille
   entities:
-  - uid: 92
+  - uid: 90
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.5,1.5
       parent: 1
-  - uid: 93
+  - uid: 91
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -4.5,-0.5
       parent: 1
-  - uid: 94
+  - uid: 92
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -3.5,-3.5
       parent: 1
-  - uid: 95
+  - uid: 93
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,4.5
       parent: 1
-  - uid: 96
+  - uid: 94
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,-4.5
       parent: 1
-  - uid: 97
+  - uid: 95
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 0.5,-3.5
       parent: 1
-  - uid: 98
+  - uid: 96
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 0.5,4.5
       parent: 1
-  - uid: 99
+  - uid: 97
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,5.5
       parent: 1
-  - uid: 100
+  - uid: 98
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -0.5,6.5
       parent: 1
-  - uid: 101
+  - uid: 99
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -1.5,6.5
       parent: 1
-  - uid: 102
+  - uid: 100
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -2.5,6.5
       parent: 1
-  - uid: 103
+  - uid: 101
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 0.5,5.5
       parent: 1
-  - uid: 104
+  - uid: 102
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -919,14 +914,22 @@ entities:
       parent: 1
 - proto: KitchenKnife
   entities:
-  - uid: 105
+  - uid: 103
     components:
     - type: Transform
       pos: -3.4543009,-0.5313598
       parent: 1
+- proto: LockerWallMaterialsFuelPlasmaFilled
+  entities:
+  - uid: 104
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-0.5
+      parent: 1
 - proto: LockerWoodenGeneric
   entities:
-  - uid: 106
+  - uid: 105
     components:
     - type: Transform
       pos: -0.5,-3.5
@@ -949,27 +952,43 @@ entities:
         - 0
         - 0
         - 0
-- proto: Plunger
+- proto: NitrogenCanister
+  entities:
+  - uid: 106
+    components:
+    - type: Transform
+      anchored: True
+      pos: -0.5,2.5
+      parent: 1
+    - type: Physics
+      bodyType: Static
+- proto: OxygenCanister
   entities:
   - uid: 107
+    components:
+    - type: Transform
+      anchored: True
+      pos: 0.5,2.5
+      parent: 1
+    - type: Physics
+      bodyType: Static
+- proto: Plunger
+  entities:
+  - uid: 108
     components:
     - type: Transform
       pos: -3.9147282,2.3184562
       parent: 1
 - proto: PortableGeneratorPacmanShuttle
   entities:
-  - uid: 108
+  - uid: 109
     components:
     - type: Transform
-      pos: 0.5,0.5
+      pos: -0.5,0.5
       parent: 1
-    - type: FuelGenerator
-      on: False
-    - type: Physics
-      bodyType: Static
 - proto: PosterContrabandEAT
   entities:
-  - uid: 109
+  - uid: 110
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -977,14 +996,14 @@ entities:
       parent: 1
 - proto: PosterContrabandTools
   entities:
-  - uid: 110
+  - uid: 111
     components:
     - type: Transform
       pos: 0.5,3.5
       parent: 1
 - proto: PosterLegitEatMeat
   entities:
-  - uid: 111
+  - uid: 112
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -992,7 +1011,7 @@ entities:
       parent: 1
 - proto: PosterLegitNoERP
   entities:
-  - uid: 112
+  - uid: 113
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -1000,13 +1019,13 @@ entities:
       parent: 1
 - proto: PoweredLightPostSmallRed
   entities:
-  - uid: 113
+  - uid: 114
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,-6.5
       parent: 1
-  - uid: 114
+  - uid: 115
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -1014,40 +1033,32 @@ entities:
       parent: 1
 - proto: PoweredSmallLight
   entities:
-  - uid: 115
+  - uid: 116
     components:
     - type: Transform
       pos: -0.5,-3.5
       parent: 1
-  - uid: 116
+  - uid: 117
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5,4.5
       parent: 1
-  - uid: 117
+  - uid: 118
     components:
     - type: Transform
       pos: -3.5,0.5
       parent: 1
-  - uid: 118
+  - uid: 119
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,2.5
       parent: 1
-  - uid: 119
-    components:
-    - type: Transform
-      pos: 0.5,-1.5
-      parent: 1
-- proto: Rack
-  entities:
   - uid: 120
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,0.5
+      pos: 0.5,-1.5
       parent: 1
 - proto: RandomPosterAny
   entities:
@@ -1068,96 +1079,81 @@ entities:
     - type: Transform
       pos: -3.562829,-0.3866073
       parent: 1
-- proto: SheetPlasma
-  entities:
-  - uid: 124
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.4961233,0.41857672
-      parent: 1
-- proto: ShipyardCamperInfo
-  entities:
-  - uid: 125
-    components:
-    - type: Transform
-      pos: 0.43701267,0.44958544
-      parent: 1
 - proto: ShuttleWindow
   entities:
-  - uid: 126
+  - uid: 124
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.5,1.5
       parent: 1
-  - uid: 127
+  - uid: 125
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -4.5,-0.5
       parent: 1
-  - uid: 128
+  - uid: 126
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -3.5,-3.5
       parent: 1
-  - uid: 129
+  - uid: 127
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,4.5
       parent: 1
-  - uid: 130
+  - uid: 128
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 0.5,5.5
       parent: 1
-  - uid: 131
+  - uid: 129
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 0.5,-3.5
       parent: 1
-  - uid: 132
+  - uid: 130
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 0.5,4.5
       parent: 1
-  - uid: 133
+  - uid: 131
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 0.5,-4.5
       parent: 1
-  - uid: 134
+  - uid: 132
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,-4.5
       parent: 1
-  - uid: 135
+  - uid: 133
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -2.5,6.5
       parent: 1
-  - uid: 136
+  - uid: 134
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -1.5,6.5
       parent: 1
-  - uid: 137
+  - uid: 135
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -0.5,6.5
       parent: 1
-  - uid: 138
+  - uid: 136
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -1165,15 +1161,15 @@ entities:
       parent: 1
 - proto: SignFire
   entities:
-  - uid: 139
+  - uid: 137
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
+      rot: 3.141592653589793 rad
       pos: 1.5,0.5
       parent: 1
 - proto: SignNosmoking
   entities:
-  - uid: 140
+  - uid: 138
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -1181,7 +1177,7 @@ entities:
       parent: 1
 - proto: SignSpace
   entities:
-  - uid: 141
+  - uid: 139
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -1189,64 +1185,64 @@ entities:
       parent: 1
 - proto: Sink
   entities:
-  - uid: 142
+  - uid: 140
     components:
     - type: Transform
       pos: -2.5,0.5
       parent: 1
 - proto: SmallGyroscope
   entities:
-  - uid: 143
+  - uid: 141
     components:
     - type: Transform
       pos: 0.5,1.5
       parent: 1
 - proto: SmallThruster
   entities:
-  - uid: 144
+  - uid: 142
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,-3.5
       parent: 1
-  - uid: 145
+  - uid: 143
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,-6.5
       parent: 1
-  - uid: 146
+  - uid: 144
     components:
     - type: Transform
       pos: -4.5,4.5
       parent: 1
-  - uid: 147
+  - uid: 145
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -4.5,-3.5
       parent: 1
-  - uid: 148
+  - uid: 146
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5,-6.5
       parent: 1
-  - uid: 149
+  - uid: 147
     components:
     - type: Transform
       pos: 1.5,4.5
       parent: 1
 - proto: Soap
   entities:
-  - uid: 150
+  - uid: 148
     components:
     - type: Transform
       pos: -3.5809164,2.197432
       parent: 1
 - proto: SpawnPointLatejoin
   entities:
-  - uid: 151
+  - uid: 149
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -1254,7 +1250,7 @@ entities:
       parent: 1
 - proto: SubstationWallBasic
   entities:
-  - uid: 152
+  - uid: 150
     components:
     - type: Transform
       rot: 3.141592653589793 rad
@@ -1262,23 +1258,21 @@ entities:
       parent: 1
 - proto: SuitStorageWallmountBasic
   entities:
-  - uid: 153
+  - uid: 151
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -0.5,3.5
       parent: 1
-    - type: Physics
-      canCollide: False
 - proto: TableCounterMetal
   entities:
-  - uid: 154
+  - uid: 152
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -3.5,-1.5
       parent: 1
-  - uid: 155
+  - uid: 153
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -1286,18 +1280,18 @@ entities:
       parent: 1
 - proto: TableReinforced
   entities:
-  - uid: 156
+  - uid: 154
     components:
     - type: Transform
       pos: -2.5,5.5
       parent: 1
-  - uid: 157
+  - uid: 155
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -0.5,5.5
       parent: 1
-  - uid: 158
+  - uid: 156
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -1305,7 +1299,7 @@ entities:
       parent: 1
 - proto: ToiletEmpty
   entities:
-  - uid: 159
+  - uid: 157
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -1313,131 +1307,131 @@ entities:
       parent: 1
 - proto: TrashBag
   entities:
-  - uid: 160
+  - uid: 158
     components:
     - type: Transform
       pos: -2.4956446,0.6085676
       parent: 1
 - proto: WallShuttle
   entities:
-  - uid: 161
+  - uid: 159
     components:
     - type: Transform
       pos: 1.5,0.5
       parent: 1
-  - uid: 162
+  - uid: 160
     components:
     - type: Transform
       pos: -4.5,1.5
       parent: 1
-  - uid: 163
+  - uid: 161
     components:
     - type: Transform
       pos: -4.5,3.5
       parent: 1
-  - uid: 164
+  - uid: 162
     components:
     - type: Transform
       pos: 1.5,2.5
       parent: 1
-  - uid: 165
+  - uid: 163
     components:
     - type: Transform
       pos: -4.5,-1.5
       parent: 1
-  - uid: 166
+  - uid: 164
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,3.5
       parent: 1
-  - uid: 167
+  - uid: 165
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 0.5,3.5
       parent: 1
-  - uid: 168
+  - uid: 166
     components:
     - type: Transform
       pos: -4.5,-2.5
       parent: 1
-  - uid: 169
+  - uid: 167
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 0.5,-2.5
       parent: 1
-  - uid: 170
+  - uid: 168
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -0.5,-5.5
       parent: 1
-  - uid: 171
+  - uid: 169
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -1.5,-5.5
       parent: 1
-  - uid: 172
+  - uid: 170
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -2.5,-5.5
       parent: 1
-  - uid: 173
+  - uid: 171
     components:
     - type: Transform
       pos: -4.5,2.5
       parent: 1
-  - uid: 174
+  - uid: 172
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -3.5,-2.5
       parent: 1
-  - uid: 175
+  - uid: 173
     components:
     - type: Transform
       pos: 1.5,-2.5
       parent: 1
-  - uid: 176
+  - uid: 174
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -3.5,3.5
       parent: 1
-  - uid: 177
+  - uid: 175
     components:
     - type: Transform
       pos: -4.5,0.5
       parent: 1
-  - uid: 178
+  - uid: 176
     components:
     - type: Transform
       pos: 1.5,-0.5
       parent: 1
 - proto: WallShuttleDiagonal
   entities:
-  - uid: 179
+  - uid: 177
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,-5.5
       parent: 1
-  - uid: 180
+  - uid: 178
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 0.5,-5.5
       parent: 1
-  - uid: 181
+  - uid: 179
     components:
     - type: Transform
       pos: -3.5,6.5
       parent: 1
-  - uid: 182
+  - uid: 180
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
@@ -1445,65 +1439,65 @@ entities:
       parent: 1
 - proto: WallShuttleInterior
   entities:
-  - uid: 183
+  - uid: 181
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,-0.5
       parent: 1
-  - uid: 184
+  - uid: 182
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 0.5,-0.5
       parent: 1
-  - uid: 185
+  - uid: 183
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -3.5,1.5
       parent: 1
-  - uid: 186
+  - uid: 184
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -2.5,1.5
       parent: 1
-  - uid: 187
+  - uid: 185
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,-2.5
       parent: 1
-  - uid: 188
+  - uid: 186
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -2.5,3.5
       parent: 1
-  - uid: 189
+  - uid: 187
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -0.5,3.5
       parent: 1
-  - uid: 190
+  - uid: 188
     components:
     - type: Transform
       pos: -2.5,-2.5
       parent: 1
 - proto: WarpPointShip
   entities:
-  - uid: 191
+  - uid: 189
     components:
     - type: Transform
       pos: -1.5,0.5
       parent: 1
 - proto: Wrench
   entities:
-  - uid: 192
+  - uid: 190
     components:
     - type: Transform
-      pos: -0.5,0.5
+      pos: -0.5,1.5
       parent: 1
 ...
diff --git a/Resources/Maps/_NF/Shuttles/crescent.yml b/Resources/Maps/_NF/Shuttles/crescent.yml
index 96bd6b9f386..13f7f6169ce 100644
--- a/Resources/Maps/_NF/Shuttles/crescent.yml
+++ b/Resources/Maps/_NF/Shuttles/crescent.yml
@@ -16773,23 +16773,6 @@ entities:
     - type: Transform
       pos: -17.5,10.5
       parent: 1
-- proto: MachineCryoSleepPod
-  entities:
-  - uid: 2246
-    components:
-    - type: Transform
-      pos: -23.5,33.5
-      parent: 1
-  - uid: 2247
-    components:
-    - type: Transform
-      pos: -23.5,32.5
-      parent: 1
-  - uid: 2248
-    components:
-    - type: Transform
-      pos: -23.5,31.5
-      parent: 1
 - proto: MachineElectrolysisUnit
   entities:
   - uid: 3691
diff --git a/Resources/Maps/_NF/Shuttles/eagle.yml b/Resources/Maps/_NF/Shuttles/eagle.yml
index a6984021bb6..2f117dd7426 100644
--- a/Resources/Maps/_NF/Shuttles/eagle.yml
+++ b/Resources/Maps/_NF/Shuttles/eagle.yml
@@ -28,7 +28,7 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: WgAAAAADWgAAAAADcgAAAAABbQAAAAADbQAAAAACbQAAAAACcgAAAAABbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAADbQAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAABegAAAAAAbQAAAAACbQAAAAABbQAAAAAAegAAAAAAbQAAAAABbQAAAAABbQAAAAABbQAAAAACegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAADegAAAAAAegAAAAAAegAAAAAAcgAAAAADegAAAAAAegAAAAAAbQAAAAACbQAAAAACegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAegAAAAAAbQAAAAACbQAAAAADbQAAAAAAbQAAAAAAegAAAAAAbQAAAAACbQAAAAABegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABegAAAAAAbQAAAAABbQAAAAAAbQAAAAAAbQAAAAACegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABegAAAAAAbQAAAAAAbQAAAAADbQAAAAADbQAAAAADegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAABHgAAAAACHgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAADHgAAAAABegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAACHgAAAAADegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: WgAAAAADWgAAAAADbQAAAAAAbQAAAAADbQAAAAACbQAAAAACbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAADbQAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAABegAAAAAAbQAAAAACbQAAAAABbQAAAAAAegAAAAAAbQAAAAABbQAAAAABbQAAAAABbQAAAAACegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAegAAAAAAegAAAAAAegAAAAAAbQAAAAAAegAAAAAAegAAAAAAbQAAAAACbQAAAAACegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAegAAAAAAbQAAAAACbQAAAAADbQAAAAAAbQAAAAAAegAAAAAAbQAAAAACbQAAAAABegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABegAAAAAAbQAAAAABbQAAAAAAbQAAAAAAbQAAAAACegAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABegAAAAAAbQAAAAAAbQAAAAADbQAAAAADbQAAAAADegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAABHgAAAAACHgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAADHgAAAAABegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAACHgAAAAADegAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
@@ -40,7 +40,7 @@ entities:
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAADIwAAAAAAWgAAAAACWgAAAAABWgAAAAABWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAHgAAAAACHgAAAAADHgAAAAACHgAAAAABHgAAAAACegAAAAAAWgAAAAACWgAAAAAAWgAAAAADWgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAegAAAAAAIwAAAAABegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAHgAAAAACHgAAAAAAHgAAAAACHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAAAHgAAAAABHgAAAAACHgAAAAABHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAHgAAAAACHgAAAAABHgAAAAADHgAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAACHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAHgAAAAABHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAHgAAAAADHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAADHgAAAAAAWgAAAAACWgAAAAABWgAAAAABWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAHgAAAAACHgAAAAADHgAAAAACHgAAAAABHgAAAAACegAAAAAAWgAAAAACWgAAAAAAWgAAAAADWgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAegAAAAAAHgAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAAgAAAAAAAgAAAAAAegAAAAAAHgAAAAACHgAAAAAAHgAAAAACHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAAAHgAAAAABHgAAAAACHgAAAAABHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAHgAAAAACHgAAAAABHgAAAAADHgAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAACHgAAAAAAHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAHgAAAAABHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAegAAAAAAHgAAAAADHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
     - type: Broadphase
     - type: Physics
@@ -68,30 +68,27 @@ entities:
           decals:
             249: 0,9
         - node:
-            color: '#FFFFFFFF'
-            id: BrickTileSteelInnerNe
-          decals:
-            237: -3,1
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileSteelInnerNw
-          decals:
-            236: -1,1
-        - node:
-            color: '#FFFFFFFF'
-            id: BrickTileSteelLineN
+            color: '#52B4E996'
+            id: BrickTileWhiteBox
           decals:
-            235: -2,1
+            293: 12,-3
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteCornerNe
           decals:
-            160: 12,-2
+            275: 10,1
+            276: 8,3
+            290: 12,-2
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteCornerNe
           decals:
             180: -6,1
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteCornerNw
+          decals:
+            270: 7,3
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteCornerNw
@@ -101,65 +98,72 @@ entities:
             color: '#EFB34196'
             id: BrickTileWhiteCornerSe
           decals:
-            179: -6,-1
-            183: -7,-2
-            184: -8,-3
+            339: -8,-3
+            341: -6,-1
+            418: -7,-2
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteCornerSw
           decals:
-            9: 10,-4
-            10: 11,-5
+            282: 7,-2
+            296: 10,-4
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteCornerSw
           decals:
-            186: -9,-3
+            342: -9,-3
         - node:
             color: '#52B4E996'
-            id: BrickTileWhiteInnerNe
+            id: BrickTileWhiteEndE
+          decals:
+            273: 11,0
+        - node:
+            color: '#52B4E996'
+            id: BrickTileWhiteEndS
           decals:
-            16: 11,-5
-            171: 10,-2
+            283: 8,-3
         - node:
             color: '#52B4E996'
-            id: BrickTileWhiteInnerNw
+            id: BrickTileWhiteInnerNe
           decals:
-            17: 13,-5
+            274: 10,0
+            281: 8,1
+            299: 10,-2
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteInnerSe
           decals:
-            163: 11,-3
+            289: 8,0
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteInnerSe
           decals:
-            185: -8,-2
-            194: -7,-1
+            344: -7,-1
+            402: -8,-2
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteInnerSw
           decals:
-            12: 11,-4
-            13: 10,-3
-            18: 13,-5
+            284: 8,-2
+            301: 11,-4
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteInnerSw
           decals:
-            188: -9,-2
+            345: -9,-2
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineE
           decals:
-            11: 11,-4
+            279: 8,2
+            286: 8,-1
+            295: 11,-4
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineN
           decals:
-            14: 12,-5
-            161: 11,-2
+            280: 9,1
+            298: 11,-2
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineN
@@ -169,7 +173,8 @@ entities:
             color: '#52B4E996'
             id: BrickTileWhiteLineS
           decals:
-            15: 12,-5
+            287: 10,0
+            288: 9,0
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineS
@@ -179,8 +184,14 @@ entities:
             color: '#52B4E996'
             id: BrickTileWhiteLineW
           decals:
-            19: 13,-4
-            20: 13,-6
+            277: 7,2
+            278: 7,1
+            285: 7,-1
+            300: 11,-5
+            303: 13,-5
+            304: 13,-4
+            305: 13,-6
+            306: 10,-3
         - node:
             color: '#EFB34196'
             id: BrickTileWhiteLineW
@@ -241,9 +252,11 @@ entities:
             id: DeliveryGreyscale
           decals:
             176: -11,-5
-            199: -7,-2
             247: -3,7
             248: 3,7
+            324: 12,-2
+            417: -6,-1
+            436: -7,-2
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -252,37 +265,32 @@ entities:
             203: -11,-2
             204: -11,-4
             205: -11,-3
-            206: -7,-2
-            207: -8,-2
-            208: -8,-3
-            209: -9,-3
+            326: -12,-4
+            374: 13,-4
+            375: 13,-5
+            376: 13,-6
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
-            66: -4,3
-            67: 0,3
             72: -1,7
             73: -2,8
             81: 3,1
             82: 5,-1
-            83: 11,0
-            84: 10,1
-            85: 10,0
             91: 4,4
             92: 3,4
             109: -4,0
             119: -6,0
-            120: -3,3
-            128: 13,-6
-            129: 13,-4
-            130: 12,-5
             149: 1,7
-            210: -9,-2
-            238: 8,-3
-            239: 7,-2
-            240: 8,-2
+            346: -9,-2
+            351: -7,0
+            355: -7,1
+            404: -8,-2
+            408: -8,-1
+            415: 5,5
+            416: 3,5
+            419: -7,-2
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
@@ -291,10 +299,11 @@ entities:
           decals:
             155: 1,-1
             211: -10,-2
-            212: -9,-1
-            221: -8,0
-            222: -8,-2
-            223: -7,-2
+            347: -9,-2
+            367: -9,1
+            368: -8,0
+            382: 8,3
+            409: -9,-2
         - node:
             cleanable: True
             angle: 3.141592653589793 rad
@@ -302,10 +311,10 @@ entities:
             id: DirtHeavy
           decals:
             146: -4,1
-            147: -4,5
             148: -2,8
-            219: -9,0
-            220: -8,-1
+            366: -10,1
+            383: 7,3
+            420: -7,-2
         - node:
             cleanable: True
             angle: 4.71238898038469 rad
@@ -315,6 +324,7 @@ entities:
             144: -1,-2
             145: -3,-1
             154: 0,-1
+            369: -8,-1
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -329,16 +339,15 @@ entities:
             95: 2,4
             107: -3,-1
             108: -4,-1
-            115: -1,1
             116: 0,1
             117: 0,0
             118: 1,1
-            125: 10,-4
-            126: 11,-5
-            127: 13,-5
-            214: -8,-1
-            241: 7,-1
-            242: 8,-3
+            352: -7,0
+            354: -8,1
+            359: -7,-1
+            371: 9,0
+            407: -8,-2
+            411: 3,5
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
@@ -347,6 +356,19 @@ entities:
           decals:
             156: -2,-1
             213: -10,-1
+            381: 8,1
+            394: 11,-2
+            395: 11,-3
+            396: 11,-4
+            397: 11,-5
+            398: 12,-5
+            399: 12,-2
+            410: 4,5
+            412: 2,5
+            432: -1,-1
+            433: -1,0
+            434: 0,-2
+            435: 0,-3
         - node:
             cleanable: True
             angle: 3.141592653589793 rad
@@ -355,9 +377,28 @@ entities:
           decals:
             157: -1,-1
             158: 1,0
-            159: -2,1
-            243: 8,-1
-            244: 7,-1
+            353: -8,0
+            406: -8,-2
+            413: 2,5
+            414: 2,4
+            421: -7,-2
+            424: -2,1
+        - node:
+            cleanable: True
+            angle: 4.71238898038469 rad
+            color: '#FFFFFFFF'
+            id: DirtHeavyMonotile
+          decals:
+            429: -2,0
+            430: -1,0
+            431: 0,-1
+        - node:
+            cleanable: True
+            angle: 6.283185307179586 rad
+            color: '#FFFFFFFF'
+            id: DirtHeavyMonotile
+          decals:
+            425: -2,1
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -366,33 +407,49 @@ entities:
             70: -3,4
             78: 3,-1
             79: 4,1
-            86: 7,1
             101: -1,-3
             102: -1,-5
             103: 0,-5
             104: -1,-2
             105: -2,-2
             106: -1,-1
-            112: -2,1
             113: -2,0
             114: -3,0
-            124: 11,-4
-            215: -6,-1
-            216: -7,-1
+            356: -9,-1
+            372: 7,1
+            373: 8,-1
+        - node:
+            cleanable: True
+            angle: 1.5707963267948966 rad
+            color: '#FFFFFFFF'
+            id: DirtLight
+          decals:
+            385: 7,2
+            386: 8,2
+            387: 7,0
         - node:
             cleanable: True
             angle: 3.141592653589793 rad
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
-            245: 8,0
+            384: 8,2
+            422: -1,1
         - node:
             cleanable: True
             angle: 4.71238898038469 rad
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
-            246: 9,0
+            428: -1,1
+        - node:
+            cleanable: True
+            angle: 6.283185307179586 rad
+            color: '#FFFFFFFF'
+            id: DirtLight
+          decals:
+            426: -1,1
+            427: -2,1
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -404,7 +461,6 @@ entities:
             75: 1,8
             76: 4,-1
             77: 3,0
-            87: 8,1
             88: 5,0
             89: 4,3
             90: 3,3
@@ -414,19 +470,17 @@ entities:
             99: 1,-5
             100: -1,-4
             110: -4,1
-            111: -3,1
             121: 0,4
             122: 1,7
             123: 0,7
-            131: 13,-6
-            132: 13,-4
-            133: 13,-5
-            134: 11,-5
             135: -2,-7
             136: 2,-7
             142: 1,-8
-            217: -7,0
-            218: -8,0
+            349: -8,-1
+            350: -9,0
+            377: 7,-1
+            380: 10,0
+            391: 10,-4
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
@@ -437,6 +491,8 @@ entities:
             138: -1,-7
             141: 1,-6
             152: 0,-2
+            392: 10,-3
+            393: 10,-2
         - node:
             cleanable: True
             angle: 3.141592653589793 rad
@@ -445,6 +501,17 @@ entities:
           decals:
             139: -1,-8
             140: -1,-6
+            360: -7,-1
+            361: -8,-1
+            362: -9,-1
+            363: -9,1
+            364: -10,1
+            365: -6,1
+            378: 8,0
+            388: 10,1
+            389: 9,1
+            390: 11,0
+            423: -3,1
         - node:
             cleanable: True
             angle: 4.71238898038469 rad
@@ -453,41 +520,22 @@ entities:
           decals:
             143: 0,-4
             153: 1,-2
-        - node:
-            color: '#52B4E996'
-            id: FullTileOverlayGreyscale
-          decals:
-            51: 11,0
-            162: 12,-3
-            167: 8,-3
+            379: 9,0
         - node:
             color: '#334E6DC8'
             id: HalfTileOverlayGreyscale
           decals:
-            60: -2,1
-        - node:
-            color: '#52B4E996'
-            id: HalfTileOverlayGreyscale
-          decals:
-            228: 9,1
+            310: -2,1
         - node:
             color: '#52B4E996'
             id: HalfTileOverlayGreyscale180
           decals:
             4: 4,-1
-            230: 9,0
         - node:
             color: '#EDB14293'
             id: HalfTileOverlayGreyscale180
           decals:
             40: -3,-1
-        - node:
-            color: '#52B4E996'
-            id: HalfTileOverlayGreyscale270
-          decals:
-            8: 7,1
-            169: 7,-1
-            224: 7,2
         - node:
             color: '#EDB14293'
             id: HalfTileOverlayGreyscale270
@@ -505,24 +553,16 @@ entities:
             27: 1,1
             150: 1,-2
             151: 1,-1
-            227: 8,2
-            232: 8,-1
         - node:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale
           decals:
-            58: -1,1
+            313: -1,1
         - node:
             color: '#52B4E996'
             id: QuarterTileOverlayGreyscale180
           decals:
             48: 0,-5
-            231: 8,0
-        - node:
-            color: '#52B4E996'
-            id: QuarterTileOverlayGreyscale270
-          decals:
-            170: 8,-2
         - node:
             color: '#EDB14293'
             id: QuarterTileOverlayGreyscale270
@@ -538,12 +578,7 @@ entities:
             color: '#334E6DC8'
             id: QuarterTileOverlayGreyscale90
           decals:
-            59: -3,1
-        - node:
-            color: '#52B4E996'
-            id: QuarterTileOverlayGreyscale90
-          decals:
-            229: 8,1
+            312: -3,1
         - node:
             color: '#FFFFFFFF'
             id: StandClear
@@ -555,19 +590,16 @@ entities:
             id: ThreeQuarterTileOverlayGreyscale
           decals:
             0: 3,1
-            225: 7,3
         - node:
             color: '#52B4E996'
             id: ThreeQuarterTileOverlayGreyscale180
           decals:
             1: 5,-1
-            49: 10,0
         - node:
             color: '#52B4E996'
             id: ThreeQuarterTileOverlayGreyscale270
           decals:
             2: 3,-1
-            168: 7,-2
         - node:
             color: '#EDB14293'
             id: ThreeQuarterTileOverlayGreyscale270
@@ -579,8 +611,6 @@ entities:
             id: ThreeQuarterTileOverlayGreyscale90
           decals:
             3: 5,1
-            50: 10,1
-            226: 8,3
         - node:
             color: '#FFFFFFFF'
             id: WarnBox
@@ -602,7 +632,8 @@ entities:
           decals:
             7: 5,0
             28: 1,0
-            166: 8,-2
+            256: 8,-2
+            257: 11,-5
         - node:
             color: '#EFB34196'
             id: WarnLineGreyscaleE
@@ -630,8 +661,8 @@ entities:
             id: WarnLineGreyscaleS
           decals:
             53: 0,7
-            62: 0,3
-            233: -4,3
+            307: -4,3
+            308: 0,3
         - node:
             color: '#EFB34196'
             id: WarnLineGreyscaleS
@@ -643,8 +674,8 @@ entities:
             id: WarnLineGreyscaleW
           decals:
             6: 3,0
-            164: 7,0
-            165: 10,-2
+            253: 10,-2
+            255: 7,0
         - node:
             color: '#EDB14293'
             id: WarnLineGreyscaleW
@@ -662,6 +693,12 @@ entities:
           decals:
             197: -7,1
             198: -8,1
+        - node:
+            cleanable: True
+            color: '#FFFFFFFF'
+            id: body
+          decals:
+            325: -4,4
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -814,20 +851,18 @@ entities:
       parent: 1
     - type: DeviceList
       devices:
-      - 516
+      - 207
+      - 48
+      - 574
+      - 571
+      - 365
+      - 403
+      - 573
       - 428
       - 435
-      - 667
       - 3
       - 432
-      - 207
-      - 253
-      - 4
       - 451
-      - 571
-      - 573
-      - 574
-      - 48
   - uid: 196
     components:
     - type: Transform
@@ -849,8 +884,8 @@ entities:
       - 666
       - 530
       - 673
-      - 246
-      - 544
+      - 312
+      - 253
   - uid: 266
     components:
     - type: Transform
@@ -961,14 +996,6 @@ entities:
       parent: 1
 - proto: AirSensor
   entities:
-  - uid: 4
-    components:
-    - type: Transform
-      pos: 8.5,-1.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 6
   - uid: 64
     components:
     - type: Transform
@@ -989,9 +1016,6 @@ entities:
     - type: Transform
       pos: 2.5,4.5
       parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 6
   - uid: 532
     components:
     - type: Transform
@@ -1000,14 +1024,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 266
-  - uid: 667
-    components:
-    - type: Transform
-      pos: 7.5,3.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 6
   - uid: 668
     components:
     - type: Transform
@@ -1029,48 +1045,45 @@ entities:
       parent: 1
 - proto: APCBasic
   entities:
-  - uid: 47
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-1.5
-      parent: 1
   - uid: 257
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -2.5,8.5
       parent: 1
-  - uid: 449
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -5.5,-1.5
-      parent: 1
   - uid: 592
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 9.5,-0.5
       parent: 1
-- proto: AtmosDeviceFanTiny
-  entities:
-  - uid: 472
+  - uid: 695
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,-7.5
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-1.5
       parent: 1
-  - uid: 482
+  - uid: 703
     components:
     - type: Transform
       rot: 3.141592653589793 rad
+      pos: -5.5,-1.5
+      parent: 1
+- proto: AtmosDeviceFanDirectional
+  entities:
+  - uid: 77
+    components:
+    - type: Transform
       pos: -0.5,-7.5
       parent: 1
-  - uid: 588
+  - uid: 138
+    components:
+    - type: Transform
+      pos: 1.5,-7.5
+      parent: 1
+  - uid: 698
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: -11.5,-5.5
       parent: 1
 - proto: AtmosFixBlockerMarker
@@ -1242,13 +1255,6 @@ entities:
     - type: Transform
       pos: -3.5,-0.5
       parent: 1
-- proto: BannerMedical
-  entities:
-  - uid: 11
-    components:
-    - type: Transform
-      pos: 1.5,1.5
-      parent: 1
 - proto: BedsheetMedical
   entities:
   - uid: 80
@@ -1274,8 +1280,6 @@ entities:
     - type: Transform
       pos: -0.5,5.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BenchSofaCorpMiddle
   entities:
   - uid: 583
@@ -1283,8 +1287,6 @@ entities:
     - type: Transform
       pos: -1.5,5.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BenchSofaCorpRight
   entities:
   - uid: 484
@@ -1292,8 +1294,6 @@ entities:
     - type: Transform
       pos: -2.5,5.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BlockGameArcade
   entities:
   - uid: 460
@@ -1318,18 +1318,16 @@ entities:
       parent: 1
 - proto: ButtonFrameCaution
   entities:
-  - uid: 184
+  - uid: 152
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,6.5
+      pos: -5.5,2.5
       parent: 1
-- proto: ButtonFrameCautionSecurity
-  entities:
-  - uid: 138
+  - uid: 184
     components:
     - type: Transform
-      pos: -5.5,2.5
+      rot: 3.141592653589793 rad
+      pos: 2.5,6.5
       parent: 1
 - proto: CableApcExtension
   entities:
@@ -1969,7 +1967,7 @@ entities:
     - type: Transform
       pos: -5.5,0.5
       parent: 1
-  - uid: 524
+  - uid: 497
     components:
     - type: Transform
       pos: -5.5,-1.5
@@ -2036,12 +2034,19 @@ entities:
       parent: 1
 - proto: Chair
   entities:
-  - uid: 640
+  - uid: 178
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 5.5,-0.5
       parent: 1
+- proto: ChairOfficeDark
+  entities:
+  - uid: 522
+    components:
+    - type: Transform
+      pos: 4.5,4.5
+      parent: 1
 - proto: ChairOfficeLight
   entities:
   - uid: 396
@@ -2085,28 +2090,47 @@ entities:
     - type: Transform
       pos: 4.5,5.5
       parent: 1
+- proto: ClosetFireFilled
+  entities:
+  - uid: 696
+    components:
+    - type: Transform
+      pos: -1.5,-6.5
+      parent: 1
+- proto: ClosetO2N2FilledRandom
+  entities:
+  - uid: 697
+    components:
+    - type: Transform
+      pos: 2.5,-6.5
+      parent: 1
 - proto: ClosetRadiationSuitFilled
   entities:
-  - uid: 178
+  - uid: 653
     components:
     - type: Transform
-      pos: -8.5,1.5
+      pos: -9.5,1.5
       parent: 1
-- proto: ClosetWallEmergencyFilledRandom
+- proto: ClothingBackpackDuffelSurgeryFilled
   entities:
-  - uid: 689
+  - uid: 706
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-3.5
+      pos: 8.5,-2.5
       parent: 1
-- proto: ClosetWallFireFilledRandom
+- proto: Cobweb1
   entities:
-  - uid: 690
+  - uid: 144
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-2.5
+      pos: -12.5,-3.5
+      parent: 1
+- proto: Cobweb2
+  entities:
+  - uid: 704
+    components:
+    - type: Transform
+      pos: 13.5,-3.5
       parent: 1
 - proto: ComfyChair
   entities:
@@ -2116,6 +2140,14 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -4.5,4.5
       parent: 1
+- proto: ComputerTabletopBodyScanner
+  entities:
+  - uid: 459
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 7.5,-1.5
+      parent: 1
 - proto: ComputerTabletopCrewMonitoring
   entities:
   - uid: 394
@@ -2154,10 +2186,10 @@ entities:
       parent: 1
 - proto: ComputerWallmountWithdrawBankATM
   entities:
-  - uid: 145
+  - uid: 447
     components:
     - type: Transform
-      pos: -1.5,2.5
+      pos: 1.5,2.5
       parent: 1
     - type: ContainerContainer
       containers:
@@ -2169,8 +2201,6 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-    - type: Physics
-      canCollide: False
     - type: ItemSlots
 - proto: DefibrillatorCabinetFilled
   entities:
@@ -2201,12 +2231,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,8.5
       parent: 1
-  - uid: 84
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,-3.5
-      parent: 1
   - uid: 215
     components:
     - type: Transform
@@ -2228,6 +2252,11 @@ entities:
     - type: Transform
       pos: -1.5,5.5
       parent: 1
+  - uid: 513
+    components:
+    - type: Transform
+      pos: 12.5,-1.5
+      parent: 1
   - uid: 515
     components:
     - type: Transform
@@ -2253,11 +2282,25 @@ entities:
       parent: 1
 - proto: EngineeringTechFab
   entities:
-  - uid: 364
+  - uid: 231
     components:
     - type: Transform
-      pos: -6.5,-1.5
+      pos: -5.5,-0.5
       parent: 1
+    - type: ContainerContainer
+      containers:
+        machine_board: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        machine_parts: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        blueprint: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
 - proto: ExtinguisherCabinetFilled
   entities:
   - uid: 334
@@ -2306,8 +2349,18 @@ entities:
       - 573
       - 574
       - 48
+      - 207
 - proto: Firelock
   entities:
+  - uid: 207
+    components:
+    - type: Transform
+      pos: 12.5,-4.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 6
+      - 576
   - uid: 530
     components:
     - type: Transform
@@ -2472,40 +2525,33 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 286
+  - uid: 274
     components:
     - type: Transform
-      pos: 9.5,1.5
+      rot: -1.5707963267948966 rad
+      pos: -7.5,-1.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 298
+      color: '#0055CCFF'
+  - uid: 279
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 10.5,-1.5
+      pos: 10.5,-3.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 371
+  - uid: 286
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 8.5,-2.5
+      pos: 9.5,1.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 373
+      color: '#990000FF'
+  - uid: 375
     components:
     - type: Transform
-      pos: 11.5,-1.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 375
-    components:
-    - type: Transform
-      pos: 8.5,0.5
+      pos: 8.5,0.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -2528,10 +2574,10 @@ entities:
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -6.5,-1.5
+      pos: -7.5,0.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
   - uid: 422
     components:
     - type: Transform
@@ -2680,6 +2726,14 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 246
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 248
     components:
     - type: Transform
@@ -2703,6 +2757,13 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 252
+    components:
+    - type: Transform
+      pos: 10.5,-2.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 254
     components:
     - type: Transform
@@ -2717,26 +2778,26 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 270
+  - uid: 269
     components:
     - type: Transform
-      pos: 0.5,2.5
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-1.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 271
+  - uid: 270
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-0.5
+      pos: 0.5,2.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 279
+  - uid: 271
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 9.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-0.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
@@ -2751,11 +2812,11 @@ entities:
   - uid: 350
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-1.5
+      rot: -1.5707963267948966 rad
+      pos: -9.5,1.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
+      color: '#990000FF'
   - uid: 369
     components:
     - type: Transform
@@ -2764,6 +2825,21 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 382
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 384
+    components:
+    - type: Transform
+      pos: 10.5,-1.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 397
     components:
     - type: Transform
@@ -2787,13 +2863,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 403
-    components:
-    - type: Transform
-      pos: 11.5,-2.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 413
     components:
     - type: Transform
@@ -2864,14 +2933,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 459
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -6.5,1.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 465
     components:
     - type: Transform
@@ -2991,6 +3052,14 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 186
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -7.5,-0.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 190
     components:
     - type: Transform
@@ -2999,48 +3068,47 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 229
+  - uid: 233
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,-0.5
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-3.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#0055CCFF'
-  - uid: 252
+      color: '#990000FF'
+  - uid: 298
     components:
     - type: Transform
-      pos: -7.5,1.5
+      pos: -6.5,1.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 269
+  - uid: 314
     components:
     - type: Transform
-      pos: -8.5,1.5
+      pos: -7.5,1.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 312
+  - uid: 364
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
+      rot: 3.141592653589793 rad
       pos: 8.5,-1.5
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 314
+  - uid: 370
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,-3.5
+      pos: 7.5,1.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 370
+  - uid: 371
     components:
     - type: Transform
-      pos: 7.5,1.5
+      pos: -8.5,0.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -3083,14 +3151,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 653
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -8.5,0.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#990000FF'
 - proto: GasPort
   entities:
   - uid: 122
@@ -3137,11 +3197,11 @@ entities:
       color: '#0055CCFF'
 - proto: GasPressurePumpOnMax
   entities:
-  - uid: 144
+  - uid: 689
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -9.5,1.5
+      pos: -8.5,1.5
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -3168,32 +3228,32 @@ entities:
       - 196
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 246
+  - uid: 251
     components:
     - type: Transform
-      pos: -6.5,0.5
+      rot: 1.5707963267948966 rad
+      pos: -0.5,3.5
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 223
+      - 266
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 251
+  - uid: 253
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -0.5,3.5
+      pos: -7.5,0.5
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 266
+      - 223
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 253
+  - uid: 403
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 10.5,-2.5
+      pos: 11.5,-1.5
       parent: 1
     - type: DeviceNetwork
       deviceLists:
@@ -3232,11 +3292,21 @@ entities:
       - 266
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 207
+  - uid: 312
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 10.5,-3.5
+      rot: 3.141592653589793 rad
+      pos: -6.5,0.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 223
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 365
+    components:
+    - type: Transform
+      pos: 11.5,-2.5
       parent: 1
     - type: DeviceNetwork
       deviceLists:
@@ -3298,17 +3368,6 @@ entities:
       - 266
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 544
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -7.5,0.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 223
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 666
     components:
     - type: Transform
@@ -3431,6 +3490,11 @@ entities:
     - type: Transform
       pos: -2.5,10.5
       parent: 1
+  - uid: 373
+    components:
+    - type: Transform
+      pos: 2.5,-2.5
+      parent: 1
   - uid: 381
     components:
     - type: Transform
@@ -3443,6 +3507,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,-7.5
       parent: 1
+  - uid: 449
+    components:
+    - type: Transform
+      pos: 11.5,-5.5
+      parent: 1
   - uid: 462
     components:
     - type: Transform
@@ -3459,12 +3528,6 @@ entities:
     - type: Transform
       pos: 3.5,9.5
       parent: 1
-  - uid: 509
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,1.5
-      parent: 1
   - uid: 510
     components:
     - type: Transform
@@ -3556,6 +3619,12 @@ entities:
     - type: Transform
       pos: 7.5,2.5
       parent: 1
+  - uid: 699
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 8.5,-2.5
+      parent: 1
 - proto: IntercomMedical
   entities:
   - uid: 743
@@ -3563,6 +3632,10 @@ entities:
     - type: Transform
       pos: 11.5,-0.5
       parent: 1
+    - type: Physics
+      canCollide: False
+    - type: Fixtures
+      fixtures: {}
 - proto: KitchenReagentGrinder
   entities:
   - uid: 421
@@ -3584,49 +3657,64 @@ entities:
     - type: Transform
       pos: 2.5,4.5
       parent: 1
-- proto: LockerEngineerFilledHardsuit
+- proto: LockerWallColorMedicalFilled
   entities:
-  - uid: 186
+  - uid: 472
     components:
     - type: Transform
-      pos: -5.5,-0.5
+      rot: 3.141592653589793 rad
+      pos: 10.5,-0.5
       parent: 1
-- proto: LockerMedicalFilled
+- proto: LockerWallMaterialsFuelUraniumFilled2
   entities:
-  - uid: 445
+  - uid: 73
     components:
     - type: Transform
-      pos: 10.5,-2.5
+      rot: -1.5707963267948966 rad
+      pos: -4.5,1.5
       parent: 1
-- proto: LockerParamedicFilledHardsuit
+- proto: MachineCentrifuge
   entities:
-  - uid: 447
+  - uid: 537
     components:
     - type: Transform
-      pos: 10.5,-3.5
+      pos: 5.5,3.5
       parent: 1
-- proto: LockerWallMedicalFilled
+- proto: MachineElectrolysisUnit
   entities:
-  - uid: 448
+  - uid: 203
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 9.5,-2.5
+      pos: 5.5,4.5
       parent: 1
-- proto: MachineCentrifuge
+- proto: MachineFlatpacker
   entities:
-  - uid: 537
+  - uid: 562
     components:
     - type: Transform
-      pos: 5.5,3.5
+      pos: -6.5,-1.5
       parent: 1
-- proto: MachineElectrolysisUnit
+- proto: MedicalAssembler
   entities:
-  - uid: 203
+  - uid: 509
     components:
     - type: Transform
-      pos: 5.5,4.5
+      pos: 3.5,1.5
       parent: 1
+    - type: ContainerContainer
+      containers:
+        machine_board: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        machine_parts: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        microwave_entity_container: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
 - proto: MedicalBed
   entities:
   - uid: 135
@@ -3651,12 +3739,26 @@ entities:
     - type: Transform
       pos: 12.5,-1.5
       parent: 1
+    - type: ContainerContainer
+      containers:
+        machine_board: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        machine_parts: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        blueprint: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
 - proto: MedkitFilled
   entities:
-  - uid: 595
+  - uid: 145
     components:
     - type: Transform
-      pos: 7.5,-1.5
+      pos: 10.50416,-2.3501134
       parent: 1
 - proto: Morgue
   entities:
@@ -3671,6 +3773,34 @@ entities:
       rot: 3.141592653589793 rad
       pos: 13.5,-5.5
       parent: 1
+- proto: NFSignDock
+  entities:
+  - uid: 632
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-7.5
+      parent: 1
+  - uid: 640
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-7.5
+      parent: 1
+- proto: NFSignEms1
+  entities:
+  - uid: 4
+    components:
+    - type: Transform
+      pos: 9.5,2.5
+      parent: 1
+- proto: NFSignEms2
+  entities:
+  - uid: 14
+    components:
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 1
 - proto: NitrogenCanister
   entities:
   - uid: 235
@@ -3681,6 +3811,13 @@ entities:
       parent: 1
     - type: Physics
       bodyType: Static
+- proto: OperatingTable
+  entities:
+  - uid: 595
+    components:
+    - type: Transform
+      pos: 8.5,-2.5
+      parent: 1
 - proto: OxygenCanister
   entities:
   - uid: 214
@@ -3698,19 +3835,11 @@ entities:
     - type: Transform
       pos: -6.5,3.5
       parent: 1
-    - type: FuelGenerator
-      on: False
-    - type: Physics
-      bodyType: Static
   - uid: 637
     components:
     - type: Transform
       pos: -7.5,3.5
       parent: 1
-    - type: FuelGenerator
-      on: False
-    - type: Physics
-      bodyType: Static
 - proto: PortableScrubber
   entities:
   - uid: 572
@@ -3718,6 +3847,13 @@ entities:
     - type: Transform
       pos: -9.5,0.5
       parent: 1
+- proto: PosterContrabandAtmosiaDeclarationIndependence
+  entities:
+  - uid: 717
+    components:
+    - type: Transform
+      pos: -13.5,-3.5
+      parent: 1
 - proto: PosterLegitHelpOthers
   entities:
   - uid: 713
@@ -3739,6 +3875,13 @@ entities:
     - type: Transform
       pos: 3.5,6.5
       parent: 1
+- proto: PosterLegitPeriodicTable
+  entities:
+  - uid: 700
+    components:
+    - type: Transform
+      pos: 6.5,4.5
+      parent: 1
 - proto: PosterLegitSafetyEyeProtection
   entities:
   - uid: 351
@@ -3748,11 +3891,10 @@ entities:
       parent: 1
 - proto: PosterLegitSafetyMothEpi
   entities:
-  - uid: 490
+  - uid: 227
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,-2.5
+      pos: 6.5,-1.5
       parent: 1
 - proto: PosterLegitSafetyMothMeth
   entities:
@@ -3763,10 +3905,10 @@ entities:
       parent: 1
 - proto: PosterLegitSafetyMothPiping
   entities:
-  - uid: 737
+  - uid: 544
     components:
     - type: Transform
-      pos: -13.5,-3.5
+      pos: -11.5,-2.5
       parent: 1
 - proto: PosterLegitSMEpi
   entities:
@@ -3789,18 +3931,17 @@ entities:
       parent: 1
 - proto: PosterLegitSMHardhats
   entities:
-  - uid: 676
+  - uid: 685
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -11.5,-0.5
+      pos: -12.5,-1.5
       parent: 1
 - proto: PosterLegitSMPills
   entities:
-  - uid: 77
+  - uid: 708
     components:
     - type: Transform
-      pos: 1.5,2.5
+      pos: 2.5,2.5
       parent: 1
 - proto: PosterLegitSMPoisoning
   entities:
@@ -3841,24 +3982,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 1.5,7.5
       parent: 1
-  - uid: 181
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-0.5
-      parent: 1
   - uid: 211
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 5.5,4.5
       parent: 1
-  - uid: 227
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -4.5,4.5
-      parent: 1
   - uid: 402
     components:
     - type: Transform
@@ -3871,12 +4000,29 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 7.5,1.5
       parent: 1
+  - uid: 445
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-1.5
+      parent: 1
+  - uid: 524
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,1.5
+      parent: 1
   - uid: 652
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -5.5,1.5
       parent: 1
+  - uid: 710
+    components:
+    - type: Transform
+      pos: -2.5,5.5
+      parent: 1
   - uid: 740
     components:
     - type: Transform
@@ -3901,8 +4047,6 @@ entities:
       on: False
     - type: DeviceLinkSink
       invokeCounter: 1
-      links:
-      - 635
 - proto: PoweredlightSodium
   entities:
   - uid: 440
@@ -3912,6 +4056,12 @@ entities:
       parent: 1
 - proto: PoweredSmallLight
   entities:
+  - uid: 229
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,-3.5
+      parent: 1
   - uid: 444
     components:
     - type: Transform
@@ -3925,14 +4075,6 @@ entities:
       parent: 1
     - type: PoweredLight
       on: False
-    - type: DeviceLinkSink
-      links:
-      - 409
-  - uid: 513
-    components:
-    - type: Transform
-      pos: 12.5,-1.5
-      parent: 1
   - uid: 542
     components:
     - type: Transform
@@ -4012,29 +4154,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: -2.5,6.5
       parent: 1
-- proto: RandomPosterLegit
-  entities:
-  - uid: 319
+  - uid: 715
     components:
     - type: Transform
-      pos: 5.5,-1.5
+      pos: -5.5,4.5
       parent: 1
-- proto: SheetUranium
+- proto: RandomPosterLegit
   entities:
-  - uid: 233
-    components:
-    - type: Transform
-      pos: -7.5,3.5
-      parent: 1
-    - type: Stack
-      count: 15
-  - uid: 365
+  - uid: 319
     components:
     - type: Transform
-      pos: -6.5,3.5
+      pos: 5.5,-1.5
       parent: 1
-    - type: Stack
-      count: 15
 - proto: ShuttersRadiation
   entities:
   - uid: 518
@@ -4042,17 +4173,11 @@ entities:
     - type: Transform
       pos: -6.5,2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 409
   - uid: 541
     components:
     - type: Transform
       pos: -7.5,2.5
       parent: 1
-    - type: DeviceLinkSink
-      links:
-      - 409
 - proto: ShuttleWindow
   entities:
   - uid: 38
@@ -4240,15 +4365,20 @@ entities:
     - type: Transform
       pos: 1.5,11.5
       parent: 1
-  - uid: 648
+  - uid: 669
     components:
     - type: Transform
-      pos: -4.5,1.5
+      pos: 1.5,5.5
       parent: 1
-  - uid: 669
+  - uid: 676
     components:
     - type: Transform
-      pos: 1.5,5.5
+      pos: 2.5,-2.5
+      parent: 1
+  - uid: 684
+    components:
+    - type: Transform
+      pos: 11.5,-5.5
       parent: 1
 - proto: SignalButton
   entities:
@@ -4284,13 +4414,6 @@ entities:
     - type: Transform
       pos: -9.5,-2.5
       parent: 1
-- proto: SignAtmosMinsky
-  entities:
-  - uid: 497
-    components:
-    - type: Transform
-      pos: -10.5,-5.5
-      parent: 1
 - proto: SignChem
   entities:
   - uid: 380
@@ -4299,38 +4422,44 @@ entities:
       rot: 3.141592653589793 rad
       pos: 3.5,2.5
       parent: 1
-- proto: SignEngineering
+- proto: SignConference
   entities:
-  - uid: 632
+  - uid: 709
     components:
     - type: Transform
-      pos: -4.5,-0.5
+      pos: -4.5,2.5
       parent: 1
-- proto: SignMedical
+- proto: SignEngine
   entities:
-  - uid: 73
+  - uid: 482
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,-0.5
+      pos: -11.5,-0.5
       parent: 1
-  - uid: 382
+- proto: SignEngineering
+  entities:
+  - uid: 588
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-7.5
+      pos: -4.5,-0.5
       parent: 1
-  - uid: 384
+- proto: SignEVA
+  entities:
+  - uid: 47
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 3.5,-7.5
+      rot: 1.5707963267948966 rad
+      pos: -10.5,-5.5
       parent: 1
-  - uid: 438
+- proto: SignExamroom
+  entities:
+  - uid: 648
     components:
     - type: Transform
       pos: 6.5,1.5
       parent: 1
+- proto: SignMedical
+  entities:
   - uid: 596
     components:
     - type: Transform
@@ -4366,6 +4495,13 @@ entities:
     - type: Transform
       pos: 12.5,-3.5
       parent: 1
+- proto: SignNosmoking
+  entities:
+  - uid: 486
+    components:
+    - type: Transform
+      pos: -5.5,3.5
+      parent: 1
 - proto: SignRadiationMed
   entities:
   - uid: 499
@@ -4373,18 +4509,26 @@ entities:
     - type: Transform
       pos: -7.5,4.5
       parent: 1
-  - uid: 675
+- proto: SignSecureMed
+  entities:
+  - uid: 712
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -6.5,4.5
+      pos: -12.5,-5.5
+      parent: 1
+- proto: SignSurgery
+  entities:
+  - uid: 705
+    components:
+    - type: Transform
+      pos: 7.5,-2.5
       parent: 1
 - proto: SinkWide
   entities:
-  - uid: 603
+  - uid: 181
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: 1.5707963267948966 rad
       pos: 11.5,-4.5
       parent: 1
 - proto: SMESBasic
@@ -4417,6 +4561,11 @@ entities:
       parent: 1
 - proto: TableReinforced
   entities:
+  - uid: 84
+    components:
+    - type: Transform
+      pos: -8.5,-2.5
+      parent: 1
   - uid: 191
     components:
     - type: Transform
@@ -4442,24 +4591,25 @@ entities:
     - type: Transform
       pos: 2.5,9.5
       parent: 1
-  - uid: 231
+  - uid: 679
     components:
     - type: Transform
-      pos: -7.5,-2.5
+      rot: 3.141592653589793 rad
+      pos: 2.5,8.5
       parent: 1
-  - uid: 562
+  - uid: 716
     components:
     - type: Transform
-      pos: -8.5,-2.5
+      pos: -7.5,-2.5
       parent: 1
-  - uid: 679
+- proto: TableReinforcedGlass
+  entities:
+  - uid: 11
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,8.5
+      rot: -1.5707963267948966 rad
+      pos: 10.5,-2.5
       parent: 1
-- proto: TableReinforcedGlass
-  entities:
   - uid: 439
     components:
     - type: Transform
@@ -4470,25 +4620,25 @@ entities:
     - type: Transform
       pos: 5.5,4.5
       parent: 1
-  - uid: 486
+  - uid: 498
     components:
     - type: Transform
-      pos: 7.5,-0.5
+      pos: 5.5,3.5
       parent: 1
-  - uid: 498
+  - uid: 531
     components:
     - type: Transform
-      pos: 5.5,3.5
+      pos: 2.5,3.5
       parent: 1
-  - uid: 522
+  - uid: 675
     components:
     - type: Transform
-      pos: 7.5,-1.5
+      pos: 7.5,-0.5
       parent: 1
-  - uid: 531
+  - uid: 702
     components:
     - type: Transform
-      pos: 2.5,3.5
+      pos: 7.5,-1.5
       parent: 1
 - proto: TableWood
   entities:
@@ -4600,6 +4750,13 @@ entities:
     - type: Transform
       pos: 11.5,0.5
       parent: 1
+- proto: VendingMachineMediDrobe
+  entities:
+  - uid: 448
+    components:
+    - type: Transform
+      pos: 10.5,-3.5
+      parent: 1
 - proto: WallShuttle
   entities:
   - uid: 2
@@ -4612,11 +4769,6 @@ entities:
     - type: Transform
       pos: 3.5,-1.5
       parent: 1
-  - uid: 14
-    components:
-    - type: Transform
-      pos: 2.5,-2.5
-      parent: 1
   - uid: 17
     components:
     - type: Transform
@@ -4837,11 +4989,6 @@ entities:
     - type: Transform
       pos: 10.5,-4.5
       parent: 1
-  - uid: 152
-    components:
-    - type: Transform
-      pos: 11.5,-5.5
-      parent: 1
   - uid: 153
     components:
     - type: Transform
@@ -5189,6 +5336,11 @@ entities:
     - type: Transform
       pos: 9.5,-0.5
       parent: 1
+  - uid: 438
+    components:
+    - type: Transform
+      pos: -4.5,1.5
+      parent: 1
   - uid: 441
     components:
     - type: Transform
@@ -5227,10 +5379,24 @@ entities:
       parent: 1
 - proto: WarningAir
   entities:
-  - uid: 274
+  - uid: 691
     components:
     - type: Transform
-      pos: -11.5,-2.5
+      pos: -9.5,-4.5
+      parent: 1
+- proto: WarningN2
+  entities:
+  - uid: 692
+    components:
+    - type: Transform
+      pos: -13.5,-4.5
+      parent: 1
+- proto: WarningO2
+  entities:
+  - uid: 690
+    components:
+    - type: Transform
+      pos: -12.5,-2.5
       parent: 1
 - proto: WarningWaste
   entities:
diff --git a/Resources/Maps/_NF/Shuttles/spectre.yml b/Resources/Maps/_NF/Shuttles/spectre.yml
index 88b51fa8bdf..7c72835dafb 100644
--- a/Resources/Maps/_NF/Shuttles/spectre.yml
+++ b/Resources/Maps/_NF/Shuttles/spectre.yml
@@ -38,7 +38,7 @@ entities:
           version: 6
         -1,0:
           ind: -1,0
-          tiles: fQAAAAAAfQAAAAAAbwAAAAABbwAAAAAAbwAAAAABbwAAAAAAbwAAAAACfQAAAAAAbwAAAAADbwAAAAABbwAAAAACbwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfQAAAAAAbwAAAAADbwAAAAAAbwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAXgAAAAADXgAAAAACXgAAAAAAXgAAAAADfQAAAAAAHgAAAAABHgAAAAABHgAAAAABAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAbwAAAAABfQAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAABHgAAAAABHgAAAAABHgAAAAACHgAAAAACAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAbwAAAAAAfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACHgAAAAADHgAAAAAAfQAAAAAAHgAAAAABHgAAAAABHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAADfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAABHgAAAAACHgAAAAAAfQAAAAAAHgAAAAACHgAAAAADNwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAACfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACHgAAAAAAHgAAAAAAfQAAAAAAHgAAAAABHgAAAAABHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAABHgAAAAAAHgAAAAACfQAAAAAAHgAAAAACHgAAAAABHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAABHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAEgAAAAAAEgAAAAAAfQAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAEgAAAAAAEgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAEgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAEgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAANwAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAC
+          tiles: fQAAAAAAfQAAAAAAbwAAAAABbwAAAAAAbwAAAAABbwAAAAAAbwAAAAACfQAAAAAAbwAAAAADbwAAAAABbwAAAAACbwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfQAAAAAAbwAAAAADbwAAAAAAbwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAXgAAAAADXgAAAAACXgAAAAAAXgAAAAADfQAAAAAAHgAAAAABHgAAAAABHgAAAAABAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAbwAAAAABfQAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAABHgAAAAABHgAAAAABHgAAAAACHgAAAAACAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAbwAAAAAAfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACHgAAAAADHgAAAAAAfQAAAAAAHgAAAAABHgAAAAABHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAADfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAABHgAAAAACHgAAAAAAfQAAAAAAHgAAAAACHgAAAAADNwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAACfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAACHgAAAAAAHgAAAAAAfQAAAAAAHgAAAAABHgAAAAABHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAABHgAAAAAAHgAAAAACfQAAAAAAHgAAAAACHgAAAAABHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAABHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAEgAAAAAAEgAAAAAAfQAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAEgAAAAAAEgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAEgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAEgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAEgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAC
           version: 6
         0,-1:
           ind: 0,-1
@@ -149,11 +149,6 @@ entities:
             id: BrickTileWhiteCornerNe
           decals:
             513: 2,18
-        - node:
-            color: '#5E7C16FF'
-            id: BrickTileWhiteCornerNe
-          decals:
-            472: 7,9
         - node:
             color: '#D381C9FF'
             id: BrickTileWhiteCornerNe
@@ -177,11 +172,6 @@ entities:
             64: -14,1
             88: 10,0
             108: -8,1
-        - node:
-            color: '#5E7C16FF'
-            id: BrickTileWhiteCornerSe
-          decals:
-            471: 7,8
         - node:
             color: '#D381C9FF'
             id: BrickTileWhiteCornerSe
@@ -315,6 +305,16 @@ entities:
             59: 1,5
             60: 2,3
             61: 1,3
+        - node:
+            color: '#1861D5FF'
+            id: DeliveryGreyscale
+          decals:
+            542: -1,-6
+        - node:
+            color: '#951710FF'
+            id: DeliveryGreyscale
+          decals:
+            541: -1,-5
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -355,6 +355,9 @@ entities:
             475: -6,-4
             514: -1,17
             515: -1,18
+            544: 7,8
+            545: 7,9
+            546: 6,6
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
@@ -370,7 +373,6 @@ entities:
             280: 0,13
             281: 0,14
             284: 6,9
-            285: 7,9
             323: 1,10
             347: 0,6
             348: 0,-1
@@ -418,8 +420,6 @@ entities:
             268: 0,16
             269: -1,15
             270: -1,16
-            286: 7,9
-            287: 7,8
             314: 0,11
             318: 0,10
             326: 1,11
@@ -432,8 +432,6 @@ entities:
             id: DirtHeavy
           decals:
             282: 6,9
-            288: 7,8
-            289: 7,9
             290: 6,10
             296: 0,2
             297: -1,2
@@ -728,6 +726,7 @@ entities:
             466: 0,22
             467: 12,2
             520: -1,18
+            543: 6,8
         - node:
             cleanable: True
             angle: 1.5707963267948966 rad
@@ -780,7 +779,6 @@ entities:
             id: DirtMedium
           decals:
             291: 6,11
-            292: 6,12
             300: 1,2
             301: -1,1
             302: -2,2
@@ -832,11 +830,6 @@ entities:
             id: LoadingArea
           decals:
             49: 1,-6
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnBox
-          decals:
-            155: 6,12
         - node:
             color: '#D381C996'
             id: WarnLineGreyscaleE
@@ -859,11 +852,6 @@ entities:
             id: WarnLineGreyscaleN
           decals:
             66: -12,1
-        - node:
-            color: '#5E7C16FF'
-            id: WarnLineGreyscaleN
-          decals:
-            470: 6,6
         - node:
             color: '#9FED5896'
             id: WarnLineGreyscaleN
@@ -890,11 +878,6 @@ entities:
             id: WarnLineGreyscaleS
           decals:
             501: -12,3
-        - node:
-            color: '#5E7C16FF'
-            id: WarnLineGreyscaleS
-          decals:
-            469: 6,8
         - node:
             color: '#9FED5896'
             id: WarnLineGreyscaleS
@@ -976,15 +959,9 @@ entities:
             color: '#1D1D2172'
             id: splatter
           decals:
+            487: -5.236245,-3.889092
             539: -4.6765676,-2.645174
             540: -6.1140676,-4.129549
-        - node:
-            cleanable: True
-            angle: 3.141592653589793 rad
-            color: '#1D1D2172'
-            id: splatter
-          decals:
-            487: -5.236245,-3.889092
         - node:
             cleanable: True
             angle: 4.71238898038469 rad
@@ -1032,192 +1009,160 @@ entities:
       data:
         tiles:
           0,0:
-            0: 65535
-          -1,0:
-            0: 65535
+            0: 65521
           0,-1:
             0: 65535
+          -1,0:
+            0: 61408
           0,1:
-            0: 65535
+            0: 32767
+          -1,1:
+            0: 52974
           0,2:
-            0: 65535
+            0: 30577
+          -1,2:
+            0: 52416
+            1: 1
           0,3:
-            0: 65535
+            0: 30583
+          -1,3:
+            0: 52428
+          0,4:
+            0: 6007
           1,0:
-            0: 65535
-          1,1:
-            0: 65535
+            0: 61422
           1,2:
             1: 1
+            0: 17612
+          1,1:
+            0: 20206
+          1,-1:
             0: 61166
           1,3:
-            0: 43758
+            0: 4
             1: 1024
           2,0:
-            0: 39935
+            0: 29
             1: 9216
-          2,1:
-            0: 39321
-            1: 546
           2,2:
-            0: 2203
             1: 256
+          2,-1:
+            0: 64977
+          2,1:
+            1: 546
           3,0:
-            0: 14335
+            0: 4471
             1: 18432
           3,1:
-            0: 9011
+            0: 17
           3,2:
-            0: 50
             1: 768
+          3,-1:
+            0: 65527
+          4,0:
+            1: 16
           -4,0:
-            0: 36079
             1: 16912
-          -4,1:
-            0: 34952
+            0: 204
+          -4,-1:
+            0: 65532
           -3,0:
-            0: 15359
+            0: 4375
             1: 33792
           -3,1:
-            0: 9011
+            0: 17
             1: 2184
+          -4,2:
+            1: 2048
           -3,2:
-            0: 562
             1: 256
+          -3,-1:
+            0: 63345
           -2,0:
+            0: 61183
+          -2,-1:
             0: 65535
           -2,1:
-            0: 65535
+            0: 20206
           -2,2:
-            0: 61183
+            0: 17510
             1: 256
           -2,3:
-            0: 44782
-          -1,1:
-            0: 65535
-          -1,2:
-            1: 1
-            0: 61166
-          -1,3:
+            0: 4
+            1: 1024
+          -1,-1:
             0: 61166
+          -1,4:
+            0: 3276
           0,-3:
             1: 1792
-            0: 28672
+          -1,-3:
+            1: 3072
           0,-2:
-            0: 63351
+            0: 29491
             1: 2048
-          1,-1:
-            0: 65535
+          -1,-2:
+            0: 51336
+            1: 512
           1,-3:
-            0: 8736
             1: 192
           1,-2:
-            0: 65262
+            0: 36032
           2,-3:
             1: 16
-            0: 43688
           2,-2:
-            0: 48059
-          2,-1:
-            0: 65535
-          2,-4:
-            0: 32768
+            0: 272
           3,-4:
-            1: 61440
+            1: 28672
+            2: 32768
           3,-3:
-            0: 65416
+            0: 28672
           3,-2:
-            0: 65535
-          3,-1:
-            0: 65535
-          0,4:
-            0: 65535
+            0: 29303
+          4,-2:
+            1: 8448
+          4,-1:
+            0: 13104
           0,5:
-            0: 65527
+            0: 12595
             1: 8
+          -1,5:
+            0: 32904
+            1: 2
           0,6:
-            0: 30719
+            0: 819
+          -1,6:
+            0: 2184
           0,7:
-            0: 30519
             1: 64
           1,4:
-            0: 46
             1: 192
-          -4,-4:
-            1: 57344
-          -4,-3:
-            0: 60962
           -4,-2:
             1: 256
-            0: 65262
-          -4,-1:
-            0: 65535
+            0: 51404
+          -5,-2:
+            1: 32768
+          -5,-1:
+            0: 34944
+          -4,-4:
+            2: 8192
+            1: 49152
+          -4,-3:
+            0: 49152
           -3,-4:
             1: 4096
-            0: 8192
           -3,-3:
-            0: 48034
+            0: 4096
           -3,-2:
-            0: 48059
-          -3,-1:
-            0: 65535
+            0: 4113
           -2,-3:
             1: 112
-            0: 34944
           -2,-2:
-            0: 65535
-          -2,-1:
-            0: 65535
-          -1,-1:
-            0: 65535
-          -1,-2:
-            0: 64716
-            1: 512
-          -1,-3:
-            1: 3072
-            0: 49152
+            0: 10096
           -2,4:
-            0: 142
             1: 96
-          -1,4:
-            0: 61166
-          -1,5:
-            1: 2
-            0: 61164
-          -1,6:
-            0: 52462
           -1,7:
-            0: 52364
             1: 64
-          -1,8:
-            0: 52428
-          -1,9:
-            0: 52428
-          -1,10:
-            0: 1092
-          0,8:
-            0: 30583
-          0,9:
-            0: 30583
-          0,10:
-            0: 1092
-          -4,2:
-            0: 136
-            1: 2048
-          -5,-2:
-            1: 32768
-          -5,-1:
-            0: 34952
-          4,-2:
-            1: 8448
-            0: 4096
-          4,-1:
-            0: 13107
-          4,0:
-            0: 3
-            1: 16
-          -5,0:
-            0: 8
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -1234,6 +1179,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          immutable: True
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -1264,16 +1224,11 @@ entities:
       parent: 3
     - type: DeviceList
       devices:
-      - 908
-      - 907
-      - 909
       - 1103
       - 1101
       - 969
       - 967
       - 978
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 54
     components:
     - type: Transform
@@ -1288,8 +1243,6 @@ entities:
       - 992
       - 964
       - 682
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 905
     components:
     - type: Transform
@@ -1304,15 +1257,11 @@ entities:
       - 1112
       - 534
       - 1114
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 972
     components:
     - type: Transform
       pos: 1.5,0.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 989
     components:
     - type: Transform
@@ -1320,16 +1269,11 @@ entities:
       parent: 3
     - type: DeviceList
       devices:
-      - 912
-      - 911
-      - 910
       - 1090
       - 1091
       - 962
       - 966
       - 977
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 990
     components:
     - type: Transform
@@ -1344,8 +1288,6 @@ entities:
       - 975
       - 1092
       - 1096
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 991
     components:
     - type: Transform
@@ -1360,8 +1302,6 @@ entities:
       - 1104
       - 1094
       - 1097
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 1045
     components:
     - type: Transform
@@ -1374,8 +1314,6 @@ entities:
       - 535
       - 963
       - 1110
-    - type: AtmosDevice
-      joinedGrid: 3
 - proto: AirCanister
   entities:
   - uid: 473
@@ -1383,8 +1321,6 @@ entities:
     - type: Transform
       pos: 0.5,-7.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
 - proto: Airlock
   entities:
   - uid: 330
@@ -1501,16 +1437,13 @@ entities:
     - type: Transform
       pos: -11.5,2.5
       parent: 3
-- proto: AirlockMercenaryGlass
+- proto: AirlockScience
   entities:
-  - uid: 1007
+  - uid: 62
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
       pos: 6.5,7.5
       parent: 3
-- proto: AirlockScience
-  entities:
   - uid: 1018
     components:
     - type: Transform
@@ -1654,28 +1587,18 @@ entities:
       injecting: True
     - type: ContainerContainer
       containers:
-        AmeFuel: !type:ContainerSlot
+        fuelSlot: !type:ContainerSlot
           showEnts: False
           occludes: True
-          ent: 32
+          ent: 201
 - proto: AmeJar
   entities:
-  - uid: 32
+  - uid: 201
     components:
     - type: Transform
       parent: 202
     - type: Physics
       canCollide: False
-  - uid: 1037
-    components:
-    - type: Transform
-      pos: 0.7160515,-2.5026875
-      parent: 3
-  - uid: 1207
-    components:
-    - type: Transform
-      pos: 0.30980158,-2.5026875
-      parent: 3
 - proto: AmeShielding
   entities:
   - uid: 14
@@ -1804,60 +1727,60 @@ entities:
     - type: Transform
       pos: 11.5,1.5
       parent: 3
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
+  - uid: 415
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-1.5
+      parent: 3
   - uid: 416
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: -1.5707963267948966 rad
       pos: -16.5,-0.5
       parent: 3
   - uid: 419
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-2.5
+      rot: 1.5707963267948966 rad
+      pos: 17.5,-0.5
       parent: 3
   - uid: 420
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: 1.5707963267948966 rad
       pos: 17.5,-2.5
       parent: 3
-  - uid: 505
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 17.5,-0.5
-      parent: 3
-  - uid: 741
+  - uid: 468
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: 1.5707963267948966 rad
       pos: 17.5,-1.5
       parent: 3
-  - uid: 742
+  - uid: 505
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -16.5,-1.5
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-2.5
       parent: 3
-  - uid: 1105
+  - uid: 528
     components:
     - type: Transform
       pos: -12.5,-5.5
       parent: 3
-  - uid: 1106
+  - uid: 546
     components:
     - type: Transform
       pos: -6.5,-4.5
       parent: 3
-  - uid: 1108
+  - uid: 557
     components:
     - type: Transform
       pos: 7.5,-4.5
       parent: 3
-  - uid: 1109
+  - uid: 642
     components:
     - type: Transform
       pos: 13.5,-5.5
@@ -1879,6 +1802,11 @@ entities:
     - type: Transform
       pos: 9.5,6.5
       parent: 3
+  - uid: 625
+    components:
+    - type: Transform
+      pos: -5.5,14.5
+      parent: 3
   - uid: 1107
     components:
     - type: Transform
@@ -2178,6 +2106,14 @@ entities:
     - type: Transform
       pos: -9.5,0.5
       parent: 3
+- proto: BaseAdvancedPen
+  entities:
+  - uid: 1032
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.2843938,24.057287
+      parent: 3
 - proto: Bed
   entities:
   - uid: 876
@@ -2211,7 +2147,6 @@ entities:
       parent: 3
     - type: Physics
       canCollide: False
-      bodyType: Static
     - type: Fixtures
       fixtures: {}
 - proto: BenchSofaCorpLeft
@@ -2222,8 +2157,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,16.5
       parent: 3
-    - type: Physics
-      bodyType: Static
 - proto: BenchSofaCorpMiddle
   entities:
   - uid: 637
@@ -2232,8 +2165,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,17.5
       parent: 3
-    - type: Physics
-      bodyType: Static
 - proto: BenchSofaCorpRight
   entities:
   - uid: 549
@@ -2241,8 +2172,6 @@ entities:
     - type: Transform
       pos: 1.5,18.5
       parent: 3
-    - type: Physics
-      bodyType: Static
 - proto: BlastDoor
   entities:
   - uid: 1026
@@ -2250,17 +2179,11 @@ entities:
     - type: Transform
       pos: 13.5,-9.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 762
   - uid: 1027
     components:
     - type: Transform
       pos: 7.5,-7.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 766
   - uid: 1028
     components:
     - type: Transform
@@ -2268,16 +2191,11 @@ entities:
       parent: 3
     - type: DeviceLinkSink
       invokeCounter: 4
-      links:
-      - 767
   - uid: 1029
     components:
     - type: Transform
       pos: -12.5,-9.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 765
 - proto: BlockGameArcade
   entities:
   - uid: 98
@@ -3609,36 +3527,19 @@ entities:
     - type: Transform
       pos: 13.5,1.5
       parent: 3
-- proto: ClosetWallMaintenanceFilledRandom
-  entities:
-  - uid: 427
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -1.5,-5.5
-      parent: 3
 - proto: ClothingBeltUtilityEngineering
   entities:
   - uid: 641
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-0.5
+      pos: 3.4289713,-0.46644413
       parent: 3
 - proto: ClothingEyesGlassesThermal
   entities:
   - uid: 996
     components:
     - type: Transform
-      pos: 3.5,-0.5
-      parent: 3
-- proto: ClothingHandsGlovesRobohands
-  entities:
-  - uid: 1086
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -4.5,-0.5
+      pos: 3.6373043,-0.47686076
       parent: 3
 - proto: ClothingNeckTieSci
   entities:
@@ -3711,11 +3612,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 5.5,0.5
       parent: 3
-  - uid: 442
+  - uid: 1016
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 1.5,23.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,24.5
       parent: 3
 - proto: ComputerTabletopShuttle
   entities:
@@ -3740,34 +3641,23 @@ entities:
       parent: 3
 - proto: ComputerWallmountWithdrawBankATM
   entities:
-  - uid: 533
+  - uid: 427
     components:
     - type: Transform
-      pos: -14.5,0.5
+      pos: -15.5,0.5
       parent: 3
-    - type: Physics
-      canCollide: False
-    - type: ContainerContainer
-      containers:
-        board: !type:Container
-          ents: []
-        bank-ATM-cashSlot: !type:ContainerSlot {}
-    - type: ItemSlots
   - uid: 665
     components:
     - type: Transform
-      pos: 15.5,0.5
+      pos: 16.5,0.5
       parent: 3
-    - type: Physics
-      canCollide: False
-    - type: ContainerContainer
-      containers:
-        board: !type:Container
-          ents: []
-        bank-ATM-cashSlot: !type:ContainerSlot {}
-    - type: ItemSlots
 - proto: CrateArtifactContainer
   entities:
+  - uid: 553
+    components:
+    - type: Transform
+      pos: -6.5,4.5
+      parent: 3
   - uid: 1039
     components:
     - type: Transform
@@ -4014,22 +3904,6 @@ entities:
     - type: Transform
       pos: 2.5,14.5
       parent: 3
-- proto: EncryptionKeyCommon
-  entities:
-  - uid: 587
-    components:
-    - type: Transform
-      parent: 998
-    - type: Physics
-      canCollide: False
-- proto: EncryptionKeyTraffic
-  entities:
-  - uid: 1000
-    components:
-    - type: Transform
-      parent: 998
-    - type: Physics
-      canCollide: False
 - proto: ExosuitFabricator
   entities:
   - uid: 735
@@ -4059,10 +3933,10 @@ entities:
       parent: 3
 - proto: FaxMachineShip
   entities:
-  - uid: 655
+  - uid: 32
     components:
     - type: Transform
-      pos: 7.5,9.5
+      pos: 1.5,23.5
       parent: 3
 - proto: filingCabinetRandom
   entities:
@@ -4080,14 +3954,9 @@ entities:
       parent: 3
     - type: DeviceList
       devices:
-      - 912
-      - 911
-      - 910
       - 1090
       - 1091
       - 1035
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 906
     components:
     - type: Transform
@@ -4095,14 +3964,9 @@ entities:
       parent: 3
     - type: DeviceList
       devices:
-      - 908
-      - 907
-      - 909
       - 1103
       - 1101
       - 1100
-    - type: AtmosDevice
-      joinedGrid: 3
 - proto: FireAxeCabinetFilled
   entities:
   - uid: 210
@@ -4111,62 +3975,46 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,15.5
       parent: 3
-- proto: FirelockGlass
+- proto: FirelockEdge
   entities:
-  - uid: 907
+  - uid: 175
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: 13.5,-3.5
       parent: 3
-    - type: DeviceNetwork
-      deviceLists:
-      - 906
-      - 17
-  - uid: 908
+  - uid: 566
     components:
     - type: Transform
-      pos: 14.5,-3.5
+      rot: 3.141592653589793 rad
+      pos: 12.5,-3.5
       parent: 3
-    - type: DeviceNetwork
-      deviceLists:
-      - 906
-      - 17
-  - uid: 909
+  - uid: 732
     components:
     - type: Transform
-      pos: 12.5,-3.5
+      rot: 3.141592653589793 rad
+      pos: 14.5,-3.5
       parent: 3
-    - type: DeviceNetwork
-      deviceLists:
-      - 906
-      - 17
-  - uid: 910
+  - uid: 907
     components:
     - type: Transform
-      pos: -13.5,-3.5
+      rot: 3.141592653589793 rad
+      pos: -11.5,-3.5
       parent: 3
-    - type: DeviceNetwork
-      deviceLists:
-      - 673
-      - 989
-  - uid: 911
+  - uid: 908
     components:
     - type: Transform
+      rot: 3.141592653589793 rad
       pos: -12.5,-3.5
       parent: 3
-    - type: DeviceNetwork
-      deviceLists:
-      - 673
-      - 989
-  - uid: 912
+  - uid: 909
     components:
     - type: Transform
-      pos: -11.5,-3.5
+      rot: 3.141592653589793 rad
+      pos: -13.5,-3.5
       parent: 3
-    - type: DeviceNetwork
-      deviceLists:
-      - 673
-      - 989
+- proto: FirelockGlass
+  entities:
   - uid: 1035
     components:
     - type: Transform
@@ -4331,16 +4179,17 @@ entities:
     - type: Transform
       pos: -4.5,-0.5
       parent: 3
-- proto: GasMixer
+- proto: GasMixerOn
   entities:
-  - uid: 455
+  - uid: 459
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 0.5,-4.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
+    - type: GasMixer
+      inletTwoConcentration: 0.20999998
+      inletOneConcentration: 0.79
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasPassiveVent
@@ -4350,8 +4199,6 @@ entities:
     - type: Transform
       pos: 6.5,14.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1062
@@ -4360,32 +4207,24 @@ entities:
       rot: 3.141592653589793 rad
       pos: 14.5,-6.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 1063
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 12.5,-6.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 1064
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -11.5,-6.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 1066
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -13.5,-6.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
 - proto: GasPipeBend
   entities:
   - uid: 456
@@ -4394,6 +4233,8 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,-5.5
       parent: 3
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 457
     components:
     - type: Transform
@@ -4499,14 +4340,7 @@ entities:
   - uid: 19
     components:
     - type: Transform
-      pos: 6.5,7.5
-      parent: 3
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 77
-    components:
-    - type: Transform
-      pos: 6.5,8.5
+      pos: 6.5,7.5
       parent: 3
     - type: AtmosPipeColor
       color: '#990000FF'
@@ -4526,13 +4360,6 @@ entities:
       parent: 3
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 234
-    components:
-    - type: Transform
-      pos: 6.5,9.5
-      parent: 3
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 235
     components:
     - type: Transform
@@ -4689,6 +4516,14 @@ entities:
       parent: 3
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 650
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,-0.5
+      parent: 3
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 680
     components:
     - type: Transform
@@ -5368,6 +5203,22 @@ entities:
       parent: 3
 - proto: GasPipeTJunction
   entities:
+  - uid: 236
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,8.5
+      parent: 3
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 451
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,9.5
+      parent: 3
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 469
     components:
     - type: Transform
@@ -5472,30 +5323,36 @@ entities:
       color: '#0055CCFF'
 - proto: GasPort
   entities:
+  - uid: 450
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 7.5,8.5
+      parent: 3
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 452
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -0.5,-4.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 453
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -0.5,-5.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
-  - uid: 1031
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 655
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,12.5
+      rot: -1.5707963267948966 rad
+      pos: 7.5,9.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 1054
@@ -5503,85 +5360,55 @@ entities:
     - type: Transform
       pos: 12.5,-2.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 1055
     components:
     - type: Transform
       pos: 14.5,-2.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 1056
     components:
     - type: Transform
       pos: -11.5,-2.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 1057
     components:
     - type: Transform
       pos: -13.5,-2.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
 - proto: GasPressurePump
   entities:
-  - uid: 236
-    components:
-    - type: MetaData
-      name: waste pump
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 6.5,11.5
-      parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
-    - type: AtmosPipeColor
-      color: '#990000FF'
-  - uid: 468
-    components:
-    - type: MetaData
-      name: distro pump
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-0.5
-      parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 1058
     components:
     - type: Transform
       pos: -11.5,-4.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 1059
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -13.5,-4.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 1060
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 14.5,-4.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 1061
     components:
     - type: Transform
       pos: 12.5,-4.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
+- proto: GasPressurePumpOnMax
+  entities:
+  - uid: 442
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 6.5,11.5
+      parent: 3
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasVentPump
   entities:
   - uid: 963
@@ -5593,8 +5420,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 1045
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 964
@@ -5606,8 +5431,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 54
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 965
@@ -5619,8 +5442,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 990
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 966
@@ -5654,8 +5475,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 991
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 973
@@ -5664,8 +5483,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 1.5,-2.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 984
@@ -5673,8 +5490,6 @@ entities:
     - type: Transform
       pos: 12.5,3.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 1114
@@ -5685,8 +5500,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 905
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasVentScrubber
@@ -5699,8 +5512,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 905
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 535
@@ -5712,8 +5523,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 1045
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 682
@@ -5725,8 +5534,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 54
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 958
@@ -5735,8 +5542,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 1.5,-1.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 959
@@ -5748,8 +5553,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 991
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 962
@@ -5761,8 +5564,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 989
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 969
@@ -5774,8 +5575,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 17
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 970
@@ -5787,8 +5586,6 @@ entities:
     - type: DeviceNetwork
       deviceLists:
       - 990
-    - type: AtmosDevice
-      joinedGrid: 3
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GravityGeneratorMini
@@ -5863,6 +5660,11 @@ entities:
     - type: Transform
       pos: -0.5,8.5
       parent: 3
+  - uid: 558
+    components:
+    - type: Transform
+      pos: -5.5,13.5
+      parent: 3
   - uid: 562
     components:
     - type: Transform
@@ -5927,11 +5729,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,6.5
       parent: 3
-  - uid: 617
-    components:
-    - type: Transform
-      pos: -5.5,14.5
-      parent: 3
   - uid: 618
     components:
     - type: Transform
@@ -6111,6 +5908,14 @@ entities:
     - type: Transform
       pos: 8.5,0.5
       parent: 3
+- proto: LockerWallMaterialsFuelAmeJarFilled
+  entities:
+  - uid: 742
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,-5.5
+      parent: 3
 - proto: MachineAnomalyGenerator
   entities:
   - uid: 400
@@ -6151,21 +5956,11 @@ entities:
     - type: Transform
       pos: -12.5,-7.5
       parent: 3
-    - type: DeviceLinkSink
-      links:
-      - 662
   - uid: 1038
     components:
     - type: Transform
       pos: 13.5,-7.5
       parent: 3
-- proto: MachineCryoSleepPod
-  entities:
-  - uid: 732
-    components:
-    - type: Transform
-      pos: -11.5,5.5
-      parent: 3
 - proto: MachineFrame
   entities:
   - uid: 80
@@ -6203,8 +5998,14 @@ entities:
     - type: Transform
       pos: -0.5,-7.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
+  - uid: 741
+    components:
+    - type: Transform
+      anchored: True
+      pos: -0.5,-4.5
+      parent: 3
+    - type: Physics
+      bodyType: Static
 - proto: OperatingTable
   entities:
   - uid: 405
@@ -6219,28 +6020,33 @@ entities:
     - type: Transform
       pos: -0.5,-6.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
-- proto: PaperBin10
-  entities:
-  - uid: 994
+  - uid: 651
     components:
     - type: Transform
-      pos: 7.5,8.5
+      anchored: True
+      pos: -0.5,-5.5
       parent: 3
-- proto: PaperCaptainsThoughts
+    - type: Physics
+      bodyType: Static
+- proto: PaperBin20
   entities:
-  - uid: 1206
+  - uid: 1031
     components:
     - type: Transform
-      pos: -5.5,10.5
+      rot: -1.5707963267948966 rad
+      pos: 1.7531438,23.885412
       parent: 3
 - proto: PortableScrubber
   entities:
-  - uid: 1032
+  - uid: 77
     components:
     - type: Transform
-      pos: 6.5,12.5
+      pos: 7.5,9.5
+      parent: 3
+  - uid: 1037
+    components:
+    - type: Transform
+      pos: 7.5,8.5
       parent: 3
 - proto: PosterContrabandAtmosiaDeclarationIndependence
   entities:
@@ -6500,11 +6306,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 3.5,-0.5
       parent: 3
-  - uid: 201
+  - uid: 455
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 0.5,-2.5
+      rot: 3.141592653589793 rad
+      pos: 2.5,-4.5
       parent: 3
 - proto: RandomDrinkGlass
   entities:
@@ -6776,11 +6582,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,27.5
       parent: 3
-  - uid: 739
-    components:
-    - type: Transform
-      pos: 5.5,11.5
-      parent: 3
   - uid: 895
     components:
     - type: Transform
@@ -6793,11 +6594,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,27.5
       parent: 3
-  - uid: 1044
-    components:
-    - type: Transform
-      pos: -5.5,14.5
-      parent: 3
   - uid: 1067
     components:
     - type: Transform
@@ -6950,13 +6746,13 @@ entities:
     - type: Transform
       pos: 4.5,3.5
       parent: 3
-- proto: SignAtmosMinsky
+- proto: SignAtmos
   entities:
-  - uid: 459
+  - uid: 1002
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 2.5,-5.5
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-6.5
       parent: 3
 - proto: SignBar
   entities:
@@ -7054,27 +6850,19 @@ entities:
     - type: Transform
       pos: -3.5,-0.5
       parent: 3
-- proto: SignScience1
+- proto: SignScience
   entities:
-  - uid: 745
+  - uid: 738
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: -16.5,-3.5
-      parent: 3
-  - uid: 1227
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 3.5,19.5
+      pos: 17.5,-3.5
       parent: 3
-- proto: SignScience2
-  entities:
-  - uid: 738
+  - uid: 745
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 17.5,-3.5
+      pos: -16.5,-3.5
       parent: 3
   - uid: 1226
     components:
@@ -7082,6 +6870,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,19.5
       parent: 3
+  - uid: 1227
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,19.5
+      parent: 3
 - proto: SignSurgery
   entities:
   - uid: 398
@@ -7113,20 +6907,6 @@ entities:
     - type: Transform
       pos: 3.5,-3.5
       parent: 3
-- proto: SolidSecretDoor
-  entities:
-  - uid: 625
-    components:
-    - type: Transform
-      pos: -5.5,12.5
-      parent: 3
-- proto: SpawnMobSmile
-  entities:
-  - uid: 1211
-    components:
-    - type: Transform
-      pos: 0.5,14.5
-      parent: 3
 - proto: SpawnPointLatejoin
   entities:
   - uid: 1339
@@ -7166,15 +6946,11 @@ entities:
     - type: Transform
       pos: 1.5,-7.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
   - uid: 1213
     components:
     - type: Transform
       pos: 1.5,-6.5
       parent: 3
-    - type: AtmosDevice
-      joinedGrid: 3
 - proto: SubstationBasic
   entities:
   - uid: 341
@@ -7281,18 +7057,6 @@ entities:
     - type: Transform
       pos: 1.5,17.5
       parent: 3
-- proto: TableCounterMetal
-  entities:
-  - uid: 450
-    components:
-    - type: Transform
-      pos: 7.5,9.5
-      parent: 3
-  - uid: 451
-    components:
-    - type: Transform
-      pos: 7.5,8.5
-      parent: 3
 - proto: TableReinforced
   entities:
   - uid: 6
@@ -7320,6 +7084,12 @@ entities:
     - type: Transform
       pos: 1.5,23.5
       parent: 3
+  - uid: 994
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,24.5
+      parent: 3
 - proto: TableWoodReinforced
   entities:
   - uid: 167
@@ -7347,35 +7117,18 @@ entities:
     - type: Transform
       pos: -0.5,12.5
       parent: 3
-  - uid: 553
+  - uid: 617
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
       pos: -0.5,14.5
       parent: 3
 - proto: TelecomServerFilledShuttle
   entities:
-  - uid: 998
+  - uid: 587
     components:
     - type: Transform
-      pos: -5.5,11.5
+      pos: -5.5,12.5
       parent: 3
-    - type: ContainerContainer
-      containers:
-        key_slots: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 1000
-          - 587
-        machine_board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        machine_parts: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
 - proto: Thruster
   entities:
   - uid: 21
@@ -7417,12 +7170,6 @@ entities:
     - type: Transform
       pos: 9.5,6.5
       parent: 3
-  - uid: 62
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -6.5,-10.5
-      parent: 3
   - uid: 64
     components:
     - type: Transform
@@ -7498,12 +7245,6 @@ entities:
     - type: Transform
       pos: -5.5,17.5
       parent: 3
-  - uid: 559
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 7.5,-10.5
-      parent: 3
   - uid: 560
     components:
     - type: Transform
@@ -7522,13 +7263,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-9.5
       parent: 3
-- proto: ToyAi
-  entities:
-  - uid: 1198
-    components:
-    - type: Transform
-      pos: 0.5,3.5
-      parent: 3
 - proto: VendingMachineBooze
   entities:
   - uid: 552
@@ -7543,26 +7277,12 @@ entities:
     - type: Transform
       pos: 2.5,7.5
       parent: 3
-- proto: VendingMachineGeneDrobe
-  entities:
-  - uid: 558
-    components:
-    - type: Transform
-      pos: -5.5,13.5
-      parent: 3
-- proto: VendingMachineRoboDrobe
-  entities:
-  - uid: 566
-    components:
-    - type: Transform
-      pos: -7.5,-3.5
-      parent: 3
 - proto: VendingMachineRobotics
   entities:
-  - uid: 175
+  - uid: 739
     components:
     - type: Transform
-      pos: -7.5,-2.5
+      pos: -7.5,-3.5
       parent: 3
 - proto: VendingMachineSciDrobe
   entities:
@@ -9190,6 +8910,12 @@ entities:
       parent: 3
 - proto: WarningWaste
   entities:
+  - uid: 234
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,7.5
+      parent: 3
   - uid: 997
     components:
     - type: Transform
@@ -9219,6 +8945,16 @@ entities:
       parent: 3
 - proto: Window
   entities:
+  - uid: 533
+    components:
+    - type: Transform
+      pos: 5.5,11.5
+      parent: 3
+  - uid: 559
+    components:
+    - type: Transform
+      pos: -5.5,13.5
+      parent: 3
   - uid: 1204
     components:
     - type: Transform
diff --git a/Resources/Maps/_NF/Shuttles/spirit.yml b/Resources/Maps/_NF/Shuttles/spirit.yml
index 9707b65a4c4..112b0d4601e 100644
--- a/Resources/Maps/_NF/Shuttles/spirit.yml
+++ b/Resources/Maps/_NF/Shuttles/spirit.yml
@@ -22,15 +22,15 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: YQAAAAAAYQAAAAABYQAAAAABYQAAAAACAQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAABYQAAAAADYQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAADggAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAADYQAAAAADUgAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAADYQAAAAACUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAABUgAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: YQAAAAAAYQAAAAABYQAAAAABggAAAAAAAQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAABYQAAAAADYQAAAAACggAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAADggAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAADYQAAAAADggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAADYQAAAAACggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAABYQAAAAAAggAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAggAAAAAAggAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAACYQAAAAABYQAAAAACAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAABYQAAAAAAYQAAAAADYQAAAAACAQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAABYQAAAAAAggAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAggAAAAAAggAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAACYQAAAAABYQAAAAACggAAAAAAAQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAABYQAAAAAAYQAAAAADAQAAAAAAAQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAUgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
@@ -80,10 +80,10 @@ entities:
           decals:
             8: 0,4
         - node:
-            color: '#52B4E996'
+            color: '#52B4E999'
             id: BrickTileWhiteCornerSe
           decals:
-            11: 2,-2
+            73: 2,-2
         - node:
             color: '#52B4E999'
             id: BrickTileWhiteCornerSw
@@ -108,10 +108,13 @@ entities:
             color: '#52B4E996'
             id: BrickTileWhiteLineE
           decals:
-            14: 2,-1
-            15: 2,0
             16: 1,2
             17: 1,3
+        - node:
+            color: '#52B4E999'
+            id: BrickTileWhiteLineE
+          decals:
+            74: 2,-1
         - node:
             color: '#52B4E996'
             id: BrickTileWhiteLineS
@@ -149,7 +152,7 @@ entities:
             color: '#FFFFFFFF'
             id: WarnLineE
           decals:
-            24: 2.1291387,-2.0020607
+            75: 2.119596,-0.9988848
         - node:
             color: '#FFFFFFFF'
             id: WarnLineN
@@ -158,11 +161,6 @@ entities:
             62: 0,-3
             67: -0.017379105,-4.094527
             68: 0.9812224,-4.094527
-        - node:
-            color: '#FFFFFFFF'
-            id: WarnLineS
-          decals:
-            25: 3.8930278,-2.0020607
         - node:
             color: '#FFFFFFFF'
             id: WarnLineW
@@ -181,9 +179,9 @@ entities:
         tiles:
           0,0:
             0: 13175
-            1: 34944
+            1: 34816
           0,-1:
-            0: 32563
+            0: 63283
             1: 8
           -1,0:
             0: 8
@@ -195,10 +193,10 @@ entities:
             1: 128
           1,0:
             0: 1
-            1: 306
+            1: 304
           1,-1:
             0: 4352
-            1: 8225
+            1: 33
           0,-2:
             0: 12288
           -1,-1:
@@ -243,16 +241,16 @@ entities:
       id: Spirit
 - proto: AirAlarm
   entities:
-  - uid: 57
+  - uid: 140
     components:
     - type: Transform
-      pos: 3.5,-0.5
+      pos: 2.5,2.5
       parent: 1
     - type: DeviceList
       devices:
       - 132
-      - 136
       - 97
+      - 136
 - proto: AirlockExternalGlass
   entities:
   - uid: 8
@@ -263,8 +261,8 @@ entities:
   - uid: 12
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,-1.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-0.5
       parent: 1
   - uid: 17
     components:
@@ -505,8 +503,6 @@ entities:
           showEnts: False
           occludes: True
           ent: null
-    - type: Physics
-      canCollide: False
     - type: ItemSlots
 - proto: DefibrillatorCabinetFilled
   entities:
@@ -543,10 +539,10 @@ entities:
     - type: Transform
       pos: 2.5386147,0.59892374
       parent: 1
-  - uid: 94
+  - uid: 131
     components:
     - type: Transform
-      pos: 2.5229897,-0.29170126
+      pos: 2.482428,-1.479209
       parent: 1
 - proto: ExteriorLightTube
   entities:
@@ -558,11 +554,10 @@ entities:
       canCollide: False
 - proto: ExtinguisherCabinetFilled
   entities:
-  - uid: 89
+  - uid: 142
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,-2.5
+      pos: 3.5,-1.5
       parent: 1
 - proto: FaxMachineShip
   entities:
@@ -665,7 +660,7 @@ entities:
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 57
+      - 140
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasVentScrubber
@@ -677,7 +672,7 @@ entities:
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 57
+      - 140
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 136
@@ -688,7 +683,7 @@ entities:
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 57
+      - 140
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GravityGeneratorMini
@@ -696,7 +691,7 @@ entities:
   - uid: 13
     components:
     - type: Transform
-      pos: 2.5,1.5
+      pos: 4.5,-1.5
       parent: 1
 - proto: Grille
   entities:
@@ -769,10 +764,11 @@ entities:
       parent: 1
 - proto: HospitalCurtainsOpen
   entities:
-  - uid: 69
+  - uid: 94
     components:
     - type: Transform
-      pos: 2.5,-0.5
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-1.5
       parent: 1
   - uid: 128
     components:
@@ -780,6 +776,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,0.5
       parent: 1
+- proto: LockerMedicalFilled
+  entities:
+  - uid: 66
+    components:
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 1
 - proto: LockerWallEVAColorParamedicFilled
   entities:
   - uid: 55
@@ -805,10 +808,56 @@ entities:
       parent: 1
 - proto: MedicalTechFab
   entities:
-  - uid: 131
+  - uid: 69
     components:
     - type: Transform
-      pos: 1.5,1.5
+      pos: 2.5,1.5
+      parent: 1
+    - type: ContainerContainer
+      containers:
+        machine_board: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        machine_parts: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+        blueprint: !type:Container
+          showEnts: False
+          occludes: True
+          ents: []
+- proto: NFPosterContrabandFsbSpirit
+  entities:
+  - uid: 89
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,-0.5
+      parent: 1
+- proto: NFSignDock
+  entities:
+  - uid: 108
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-4.5
+      parent: 1
+- proto: NFSignEms1
+  entities:
+  - uid: 57
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,1.5
+      parent: 1
+- proto: NFSignEms2
+  entities:
+  - uid: 110
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,-4.5
       parent: 1
 - proto: NitrogenCanister
   entities:
@@ -841,9 +890,6 @@ entities:
       parent: 1
     - type: FuelGenerator
       targetPower: 9000
-      on: False      
-    - type: Physics
-      bodyType: Static
 - proto: PowerCellRecharger
   entities:
   - uid: 139
@@ -945,19 +991,6 @@ entities:
     - type: Transform
       pos: -0.5,5.5
       parent: 1
-- proto: SignMedical
-  entities:
-  - uid: 108
-    components:
-    - type: Transform
-      pos: 2.5,-4.5
-      parent: 1
-  - uid: 110
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,-4.5
-      parent: 1
 - proto: SmallGyroscope
   entities:
   - uid: 9
@@ -1133,7 +1166,8 @@ entities:
   - uid: 111
     components:
     - type: Transform
-      pos: 3.5,-0.5
+      rot: 1.5707963267948966 rad
+      pos: 3.5,-1.5
       parent: 1
   - uid: 114
     components:
@@ -1198,9 +1232,4 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,0.5
       parent: 1
-  - uid: 66
-    components:
-    - type: Transform
-      pos: 2.5,-0.5
-      parent: 1
 ...
diff --git a/Resources/Maps/_NF/Shuttles/stasis.yml b/Resources/Maps/_NF/Shuttles/stasis.yml
index 9f2445f7b9c..4f2f0a55aa7 100644
--- a/Resources/Maps/_NF/Shuttles/stasis.yml
+++ b/Resources/Maps/_NF/Shuttles/stasis.yml
@@ -41,13 +41,13 @@ entities:
     - type: MetaData
       name: Stasis
     - type: Transform
-      pos: -0.546875,-0.53125
+      pos: -0.5,-0.6875
       parent: invalid
     - type: MapGrid
       chunks:
         0,0:
           ind: 0,0
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABgAAAAAABgAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABgAAAAAABgAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABgAAAAAABgAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACgAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACgAAAAAAEQAAAAAAEQAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACgAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAwAAAAAADgAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABgAAAAAABgAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABgAAAAAABgAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAABgAAAAAABgAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACgAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACgAAAAAAEQAAAAAAEQAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAACgAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAADgAAAAAAAwAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAADgAAAAAAAwAAAAAAAwAAAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-1:
           ind: 0,-1
@@ -86,8 +86,8 @@ entities:
             color: '#FFFFFFFF'
             id: Arrows
           decals:
-            72: 12,10
-            73: 14,10
+            276: 13,10
+            277: 14,10
         - node:
             color: '#FFFFFFFF'
             id: Bot
@@ -418,10 +418,10 @@ entities:
             24: 18,3
             25: 18,-1
         - node:
-            color: '#951710FF'
+            color: '#9C2020FF'
             id: BrickTileWhiteLineE
           decals:
-            179: 14,10
+            274: 14,10
         - node:
             color: '#B3B3B3FF'
             id: BrickTileWhiteLineE
@@ -490,10 +490,10 @@ entities:
             33: 16,3
             34: 16,-1
         - node:
-            color: '#951710FF'
+            color: '#9C2020FF'
             id: BrickTileWhiteLineW
           decals:
-            178: 12,10
+            275: 13,10
         - node:
             color: '#B3B3B3FF'
             id: BrickTileWhiteLineW
@@ -735,11 +735,10 @@ entities:
             id: WarnLineN
           decals:
             212: 13,-8
-            238: 12,9
             239: 13,9
             240: 14,9
             241: 14,11
-            242: 12,11
+            264: 13,11
         - node:
             color: '#B3B3B3FF'
             id: WarnLineS
@@ -752,11 +751,10 @@ entities:
             id: WarnLineW
           decals:
             211: 13,-8
-            243: 12,9
             244: 13,9
             245: 14,9
             246: 14,11
-            247: 12,11
+            265: 13,11
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
@@ -780,7 +778,9 @@ entities:
           3,1:
             1: 32631
           3,2:
-            1: 22391
+            1: 26471
+          2,2:
+            0: 32768
           3,0:
             1: 28398
           3,-1:
@@ -884,13 +884,17 @@ entities:
       - 409
       - 145
       - 599
-      - 288
+      - 166
       - 519
       - 345
       - 226
       - 8
-      - 127
+      - 618
       - 218
+      - 342
+      - 400
+      - 434
+      - 348
   - uid: 452
     components:
     - type: Transform
@@ -904,17 +908,6 @@ entities:
       - 536
       - 609
       - 603
-  - uid: 556
-    components:
-    - type: Transform
-      pos: 19.5,7.5
-      parent: 1
-    - type: DeviceList
-      devices:
-      - 434
-      - 342
-      - 400
-      - 348
 - proto: AirlockEngineering
   entities:
   - uid: 46
@@ -934,24 +927,19 @@ entities:
     - type: Transform
       pos: 14.5,9.5
       parent: 1
-  - uid: 383
-    components:
-    - type: Transform
-      pos: 12.5,9.5
-      parent: 1
 - proto: AirlockGlassShuttle
   entities:
-  - uid: 156
+  - uid: 55
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 14.5,11.5
+      pos: 13.5,11.5
       parent: 1
-  - uid: 166
+  - uid: 186
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 12.5,11.5
+      pos: 14.5,11.5
       parent: 1
 - proto: AirlockMedicalGlass
   entities:
@@ -1016,6 +1004,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 11.5,7.5
       parent: 1
+  - uid: 88
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 13.5,11.5
+      parent: 1
   - uid: 110
     components:
     - type: Transform
@@ -1028,12 +1022,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 14.5,11.5
       parent: 1
-  - uid: 172
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 12.5,11.5
-      parent: 1
   - uid: 176
     components:
     - type: Transform
@@ -1062,6 +1050,11 @@ entities:
     - type: Transform
       pos: 24.5,-7.5
       parent: 1
+  - uid: 383
+    components:
+    - type: Transform
+      pos: 11.5,11.5
+      parent: 1
   - uid: 526
     components:
     - type: Transform
@@ -1154,14 +1147,11 @@ entities:
       parent: 1
 - proto: BannerMedical
   entities:
-  - uid: 550
+  - uid: 172
     components:
     - type: Transform
-      anchored: True
-      pos: 13.5,10.5
+      pos: 12.5,10.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: Bed
   entities:
   - uid: 44
@@ -1261,8 +1251,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,5.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BenchSofaCorpRight
   entities:
   - uid: 72
@@ -1271,8 +1259,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,4.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BlastDoorOpen
   entities:
   - uid: 312
@@ -1295,8 +1281,7 @@ entities:
   - uid: 130
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 12.418333,-3.4793668
+      pos: 11.500278,-4.509832
       parent: 1
 - proto: ButtonFrameCaution
   entities:
@@ -1306,6 +1291,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 15.5,4.5
       parent: 1
+  - uid: 307
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 22.5,8.5
+      parent: 1
   - uid: 602
     components:
     - type: Transform
@@ -1317,6 +1308,13 @@ entities:
     - type: Transform
       pos: 12.5,-7.5
       parent: 1
+- proto: ButtonFrameCautionSecurity
+  entities:
+  - uid: 127
+    components:
+    - type: Transform
+      pos: 15.5,3.5
+      parent: 1
 - proto: ButtonFrameGrey
   entities:
   - uid: 63
@@ -1895,13 +1893,13 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 15.5,10.5
       parent: 1
-- proto: ClothingBeltUtilityFilled
+- proto: ClothingBeltUtilityEngineering
   entities:
-  - uid: 336
+  - uid: 64
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 14.492705,-1.3393784
+      pos: 14.387511,-1.4651437
       parent: 1
 - proto: ClothingCloakCmo
   entities:
@@ -1924,22 +1922,6 @@ entities:
     - type: Transform
       pos: 22.3211,7.4096994
       parent: 1
-- proto: ClothingNeckScarfStripedLightBlue
-  entities:
-  - uid: 567
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 18.504137,-4.582796
-      parent: 1
-- proto: ClothingNeckScarfStripedRed
-  entities:
-  - uid: 566
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 16.504137,-4.520296
-      parent: 1
 - proto: ClothingOuterCoatLabCmo
   entities:
   - uid: 572
@@ -1972,24 +1954,12 @@ entities:
       parent: 1
 - proto: ComputerWallmountWithdrawBankATM
   entities:
-  - uid: 173
+  - uid: 567
     components:
     - type: Transform
-      pos: 15.5,3.5
+      rot: -1.5707963267948966 rad
+      pos: 15.5,7.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        bank-ATM-cashSlot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-    - type: Physics
-      canCollide: False
-    - type: ItemSlots
 - proto: CrateChemistryD
   entities:
   - uid: 457
@@ -2036,13 +2006,6 @@ entities:
     - type: Transform
       pos: 22.5,-8.5
       parent: 1
-- proto: CrateMaterials
-  entities:
-  - uid: 64
-    components:
-    - type: Transform
-      pos: 11.5,-4.5
-      parent: 1
 - proto: CryoPod
   entities:
   - uid: 334
@@ -2106,11 +2069,11 @@ entities:
       parent: 1
 - proto: DefibrillatorCabinetFilled
   entities:
-  - uid: 202
+  - uid: 288
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 15.5,-4.5
+      rot: 3.141592653589793 rad
+      pos: 16.5,-5.5
       parent: 1
   - uid: 418
     components:
@@ -2170,12 +2133,12 @@ entities:
     - type: Transform
       pos: 18.5,4.5
       parent: 1
-- proto: EmergencyRollerBed
+- proto: EmergencyRollerBedSpawnFolded
   entities:
   - uid: 568
     components:
     - type: Transform
-      pos: 14.787477,5.497296
+      pos: 14.443597,5.490514
       parent: 1
 - proto: ExtinguisherCabinetFilled
   entities:
@@ -2379,13 +2342,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0FF0FCFF'
-  - uid: 584
-    components:
-    - type: Transform
-      pos: 13.5,10.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
 - proto: GasPipeFourway
   entities:
   - uid: 388
@@ -2712,11 +2668,11 @@ entities:
   - uid: 464
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
+      rot: 3.141592653589793 rad
       pos: 20.5,-6.5
       parent: 1
     - type: AtmosPipeColor
-      color: '#990000FF'
+      color: '#0055CCFF'
   - uid: 466
     components:
     - type: Transform
@@ -2901,6 +2857,14 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 614
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 20.5,-7.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 630
     components:
     - type: Transform
@@ -3152,6 +3116,16 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
+- proto: GasPressurePumpOnMax
+  entities:
+  - uid: 173
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 20.5,-6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasThermoMachineFreezer
   entities:
   - uid: 483
@@ -3175,11 +3149,10 @@ entities:
       - 419
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 127
+  - uid: 166
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 20.5,-6.5
+      pos: 13.5,10.5
       parent: 1
     - type: DeviceNetwork
       deviceLists:
@@ -3219,17 +3192,6 @@ entities:
       - 419
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 288
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 12.5,10.5
-      parent: 1
-    - type: DeviceNetwork
-      deviceLists:
-      - 419
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 342
     components:
     - type: Transform
@@ -3237,7 +3199,7 @@ entities:
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 556
+      - 419
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 345
@@ -3259,7 +3221,7 @@ entities:
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 556
+      - 419
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 519
@@ -3273,6 +3235,17 @@ entities:
       - 419
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 618
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 20.5,-8.5
+      parent: 1
+    - type: DeviceNetwork
+      deviceLists:
+      - 419
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasVentScrubber
   entities:
   - uid: 145
@@ -3305,7 +3278,7 @@ entities:
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 556
+      - 419
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 400
@@ -3315,7 +3288,7 @@ entities:
       parent: 1
     - type: DeviceNetwork
       deviceLists:
-      - 556
+      - 419
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 409
@@ -3408,12 +3381,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 24.5,-2.5
       parent: 1
-  - uid: 155
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 13.5,11.5
-      parent: 1
   - uid: 159
     components:
     - type: Transform
@@ -3582,31 +3549,26 @@ entities:
       parent: 1
     - type: Physics
       bodyType: Static
-- proto: LockerWallChemistryFilled
+- proto: LockerWallColorChemistryFilled
   entities:
-  - uid: 212
+  - uid: 18
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 20.5,-5.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        paper_label: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-- proto: LockerWallEVAColorMedicalFilled
+- proto: LockerWallColorMedicalDoctorFilled
   entities:
-  - uid: 307
+  - uid: 212
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 15.5,7.5
+      rot: 3.141592653589793 rad
+      pos: 19.5,5.5
+      parent: 1
+  - uid: 352
+    components:
+    - type: Transform
+      pos: 19.5,7.5
       parent: 1
 - proto: LockerWallEVAColorParamedicFilled
   entities:
@@ -3622,6 +3584,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: 16.5,5.5
       parent: 1
+- proto: LockerWallMaterialsBasicFilled
+  entities:
+  - uid: 336
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 10.5,-4.5
+      parent: 1
 - proto: LockerWallMaterialsFuelUraniumFilled
   entities:
   - uid: 605
@@ -3650,6 +3620,13 @@ entities:
     - type: Transform
       pos: 23.5,-1.5
       parent: 1
+- proto: MedicalAssembler
+  entities:
+  - uid: 566
+    components:
+    - type: Transform
+      pos: 21.5,-1.5
+      parent: 1
 - proto: MedicalBed
   entities:
   - uid: 67
@@ -3679,13 +3656,13 @@ entities:
     - type: Transform
       pos: 20.5,-3.5
       parent: 1
-- proto: Multitool
+- proto: NFPosterContrabandEmsCoords
   entities:
-  - uid: 578
+  - uid: 287
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 14.544788,-1.8185453
+      rot: 1.5707963267948966 rad
+      pos: 16.5,8.5
       parent: 1
 - proto: NFPosterContrabandFsbLogo
   entities:
@@ -3703,17 +3680,45 @@ entities:
       parent: 1
 - proto: NFSignDock
   entities:
-  - uid: 486
+  - uid: 487
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 11.5,11.5
+      pos: 15.5,11.5
       parent: 1
-  - uid: 487
+- proto: NFSignEms1
+  entities:
+  - uid: 407
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 15.5,11.5
+      rot: 3.141592653589793 rad
+      pos: 15.5,5.5
+      parent: 1
+- proto: NFSignEms2
+  entities:
+  - uid: 155
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 12.5,11.5
+      parent: 1
+  - uid: 486
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 24.5,-5.5
+      parent: 1
+  - uid: 556
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 10.5,-5.5
+      parent: 1
+  - uid: 560
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,4.5
       parent: 1
 - proto: NitrogenCanister
   entities:
@@ -3759,9 +3764,7 @@ entities:
       pos: 12.5,-8.5
       parent: 1
     - type: FuelGenerator
-      on: False
-    - type: Physics
-      bodyType: Static
+      targetPower: 31000
 - proto: PosterLegitAnatomyPoster
   entities:
   - uid: 208
@@ -3770,14 +3773,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 21.5,3.5
       parent: 1
-- proto: PosterLegitBlessThisSpess
-  entities:
-  - uid: 267
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 16.5,8.5
-      parent: 1
 - proto: PosterLegitPeriodicTable
   entities:
   - uid: 163
@@ -3979,14 +3974,6 @@ entities:
     - type: Transform
       pos: 10.5,-6.5
       parent: 1
-- proto: RandomPainting
-  entities:
-  - uid: 287
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 23.5,7.5
-      parent: 1
 - proto: SeedExtractor
   entities:
   - uid: 227
@@ -4002,6 +3989,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 19.5,-2.5
       parent: 1
+  - uid: 550
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 17.5,-5.5
+      parent: 1
 - proto: ShelfRMetal
   entities:
   - uid: 285
@@ -4126,12 +4119,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 20.5,11.5
       parent: 1
-  - uid: 33
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 13.5,11.5
-      parent: 1
   - uid: 78
     components:
     - type: Transform
@@ -4233,6 +4220,23 @@ entities:
         - Pressed: Toggle
         312:
         - Pressed: Toggle
+  - uid: 584
+    components:
+    - type: Transform
+      pos: 15.5,3.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        51:
+        - Pressed: DoorBolt
+        462:
+        - Pressed: DoorBolt
+        539:
+        - Pressed: DoorBolt
+        28:
+        - Pressed: DoorBolt
+        292:
+        - Pressed: DoorBolt
   - uid: 604
     components:
     - type: Transform
@@ -4300,14 +4304,34 @@ entities:
         - Pressed: Toggle
         128:
         - Pressed: Toggle
-- proto: SignBridge
-  entities:
-  - uid: 186
+  - uid: 570
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 22.5,8.5
       parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        68:
+        - Pressed: Toggle
+        24:
+        - Pressed: Toggle
+        121:
+        - Pressed: Toggle
+        61:
+        - Pressed: Toggle
+        284:
+        - Pressed: Toggle
+        362:
+        - Pressed: Toggle
+        327:
+        - Pressed: Toggle
+        299:
+        - Pressed: Toggle
+        495:
+        - Pressed: Toggle
+        494:
+        - Pressed: Toggle
 - proto: SignChem
   entities:
   - uid: 500
@@ -4316,14 +4340,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 19.5,-0.5
       parent: 1
-- proto: SignCryogenicsMed
-  entities:
-  - uid: 407
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 17.5,-5.5
-      parent: 1
 - proto: SignEngineering
   entities:
   - uid: 426
@@ -4347,32 +4363,8 @@ entities:
       rot: 3.141592653589793 rad
       pos: 22.5,-5.5
       parent: 1
-- proto: SignMedical
-  entities:
-  - uid: 352
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 15.5,5.5
-      parent: 1
-  - uid: 560
-    components:
-    - type: Transform
-      pos: 24.5,-5.5
-      parent: 1
-  - uid: 570
-    components:
-    - type: Transform
-      pos: 10.5,-5.5
-      parent: 1
 - proto: SignSpace
   entities:
-  - uid: 18
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 11.5,4.5
-      parent: 1
   - uid: 482
     components:
     - type: Transform
@@ -4600,10 +4592,10 @@ entities:
       parent: 1
 - proto: VendingMachineTankDispenserEVA
   entities:
-  - uid: 55
+  - uid: 202
     components:
     - type: Transform
-      pos: 12.5,4.5
+      pos: 12.5,8.5
       parent: 1
 - proto: WallmountTelevision
   entities:
@@ -4643,6 +4635,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 15.5,-7.5
       parent: 1
+  - uid: 33
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 12.5,9.5
+      parent: 1
   - uid: 34
     components:
     - type: Transform
@@ -4732,12 +4730,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 15.5,9.5
       parent: 1
-  - uid: 88
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 11.5,11.5
-      parent: 1
   - uid: 89
     components:
     - type: Transform
@@ -4824,7 +4816,7 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 15.5,-4.5
+      pos: 12.5,11.5
       parent: 1
   - uid: 125
     components:
@@ -4874,6 +4866,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 19.5,4.5
       parent: 1
+  - uid: 156
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 15.5,-4.5
+      parent: 1
   - uid: 160
     components:
     - type: Transform
@@ -5171,6 +5169,11 @@ entities:
       rot: 3.141592653589793 rad
       pos: 23.5,3.5
       parent: 1
+  - uid: 267
+    components:
+    - type: Transform
+      pos: 11.5,11.5
+      parent: 1
   - uid: 278
     components:
     - type: Transform
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
index 28242033e79..0e1e9b1a106 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: cardboard box
-  parent: BoxBase
+  parent: [BoxBase, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard
   id: BoxCardboard
   description: A cardboard box for storing things.
   components:
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
index ec1a82dcd14..bf67d8ecb33 100644
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: [Clothing, ContentsExplosionResistanceBase]
+  parent: [Clothing, ContentsExplosionResistanceBase, RecyclableItemClothBasic] # Frontier: added RecyclableItemClothBasic
   id: ClothingBackpack
   name: backpack
   description: You wear this on your back and put items into it.
diff --git a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
index 76af5067aea..39d5fcc05dd 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: Clothing
+  parent: [Clothing, RecyclableItemClothBasic] # Frontier: added RecyclableItemClothBasic
   id: ClothingBeltBase
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
index 7c69f23a0ef..afb206c6194 100644
--- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: Clothing
+  parent: [Clothing, RecyclableItemClothDevice] # Frontier: added RecyclableItemClothDevice
   id: ClothingHeadset
   name: headset
   description: An updated, modular intercom that fits over the head. Takes encryption keys.
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml b/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml
index b31f821629d..52aaa8d8726 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: Clothing
+  parent: [Clothing, RecyclableItemClothDevice] # Frontier: added RecyclableItemClothDevice
   id: ClothingEyesBase
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
index bb494ffda41..e4c892924cf 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: Clothing
+  parent: [Clothing, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall
   id: ClothingHandsBase
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
index 46fe9ef09df..86c781ddb4d 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: Clothing
+  parent: [Clothing, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall
   id: ClothingHeadBase
   components:
   - type: Clothing
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
index ac8984a4196..b945c223179 100644
--- a/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: Clothing
+  parent: [Clothing, RecyclableItemClothDevice] # Frontier: added RecyclableItemClothDevice
   id: ClothingMaskBase
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml
index 608f061dd89..cd8fa87d087 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: Clothing
+  parent: [Clothing, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall
   id: ClothingNeckBase
   components:
   - type: Item
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
index 7657812f78f..4c757ea4cad 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -3,7 +3,7 @@
 
 #Basic armor vest
 - type: entity
-  parent: [ClothingOuterBaseMedium, AllowSuitStorageClothing, BaseC1Contraband] # Frontier: BaseRestrictedContraband<BaseC1Contraband
+  parent: [RecyclableItemClothArmor, ClothingOuterBaseMedium, AllowSuitStorageClothing, BaseC1Contraband] # Frontier: BaseRestrictedContraband<BaseC1Contraband, added RecyclableItemClothArmor
   id: ClothingOuterArmorBasic
   name: armor vest
   description: A standard Type I armored vest that provides decent protection against most types of damage.
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
index 3ee38eef27f..f67c671ce3d 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: [ Clothing, AllowSuitStorageClothing ] # Frontier: added AllowSuitStorageClothing as a second parent
+  parent: [ Clothing, AllowSuitStorageClothing, RecyclableItemClothDurable ] # Frontier: added AllowSuitStorageClothing and RecyclableItemClothDurable
   id: ClothingOuterBase
   components:
   - type: Clothing
@@ -45,7 +45,7 @@
 
 - type: entity
   abstract: true
-  parent: [ClothingOuterStorageBase, BaseFoldable]
+  parent: [RecyclableItemClothBasic, ClothingOuterStorageBase, BaseFoldable] # Frontier: added RecyclableItemClothBasic
   id: ClothingOuterStorageFoldableBase
   components:
   - type: Appearance
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
index e2733b2468b..e19a49a844c 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: Clothing
+  parent: [Clothing, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall
   id: ClothingShoesBase
   components:
   - type: Clothing
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
index 7ad3970abbd..87bcb30f4b6 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: Clothing
+  parent: [Clothing, RecyclableItemClothBasic] # Frontier: added RecyclableItemClothBasic
   id: UnsensoredClothingUniformBase
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
index 9dd3cffbe69..972da6d72ee 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: DrinkBase
+  parent: [DrinkBase, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard
   id: DrinkCartonBaseFull
   abstract: true
   suffix: Full
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
index ef6208b69d4..1dd619289fb 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: DrinkBase
+  parent: [DrinkBase, RecyclableItemPlasticSmall] # Frontier: added RecyclableItemPlasticSmall
   id: DrinkSpaceGlue
   name: space glue tube
   description: High performance glue intended for maintenance of extremely complex mechanical equipment. DON'T DRINK!
@@ -42,7 +42,7 @@
     solution: drink
 
 - type: entity
-  parent: DrinkBase
+  parent: [DrinkBase, RecyclableItemPlasticSmall] # Frontier: added RecyclableItemPlasticSmall
   id: DrinkSpaceLube
   name: space lube tube
   description: High performance lubricant intended for maintenance of extremely complex mechanical equipment.
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
index ed4060c8281..cdfd894e5a4 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -578,7 +578,7 @@
 
 - type: entity
   id: HappyHonkNukie
-  parent: [HappyHonk, BaseC3SyndicateContraband] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband
+  parent: [HappyHonk, BaseC3SyndicateContrabandUnredeemable] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContrabandUnredeemable
   name: robust nukie meal
   description: A sus meal with a potentially explosive surprise.
   suffix: Toy Unsafe
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index 22af0a5c093..1e98162bc1b 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -41,7 +41,7 @@
 
 - type: entity
   abstract: true
-  parent: ReagentContainerBase
+  parent: [ReagentContainerBase, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard
   id: ReagentPacketBase
   components:
   - type: Openable
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index c2fc1b0eb11..2f2226ea856 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -2,7 +2,7 @@
 # For produce that can't be immediately eaten
 
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemOrganicTiny] # Frontier: added RecyclableItemOrganicTiny
   id: ProduceBase
   abstract: true
   components:
@@ -1764,10 +1764,10 @@
       food:
         maxVol: 10
         reagents:
-        - ReagentId: Nutriment
-          Quantity: 5
+#        - ReagentId: Nutriment # Frontier
+#          Quantity: 5 # Frontier
         - ReagentId: Sulfur
-          Quantity: 5
+          Quantity: 10 # Frontier: 5<10
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/gatfruit.rsi
   - type: Produce
@@ -1782,6 +1782,7 @@
     entries:
       Taco: Gatfruit
       Burger: GatfruitBurger
+  - type: BadFood # Frontier: Nope
 
 - type: entity
   name: capfruit
@@ -1797,10 +1798,10 @@
       food:
         maxVol: 10
         reagents:
-        - ReagentId: Nutriment
-          Quantity: 5
+#        - ReagentId: Nutriment # Frontier
+#          Quantity: 5 # Frontier
         - ReagentId: Sulfur
-          Quantity: 5
+          Quantity: 10 # Frontier: 5<10
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/capfruit.rsi
   - type: Produce
@@ -1815,6 +1816,7 @@
     entries:
       Taco: Capfruit
       Burger: CapfruitBurger
+  - type: BadFood # Frontier: Nope
 
 - type: entity
   name: capfruit
diff --git a/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml b/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml
index 1f0e3591922..df7477198b7 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/lidsalami.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: LidSalami
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemPlasticMedium] # Frontier: added RecyclableItemPlasticMedium
   name: salami lid
   description: Ain't gon' fit, won't fit.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 03bad453f36..6a6f1eb08b4 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -80,6 +80,7 @@
   id: SecurityTechFabCircuitboard
   parent: BaseMachineCircuitboard
   name: security techfab machine board
+  categories: [ HideSpawnMenu ] # Frontier
   description: A machine printed circuit board for a security techfab.
   components:
     - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml b/Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml
index c377519ddb4..2a38d7ddbda 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/base_handheld.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: [BaseItem, PowerCellSlotSmallItem]
+  parent: [BaseItem, PowerCellSlotSmallItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall
   id: BaseHandheldComputer
   components:
   - type: ActivatableUIRequiresPowerCell
diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
index 2f2f22b3cd1..66a08f9efe4 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml
@@ -15,7 +15,7 @@
     price: 2
 
 - type: entity
-  parent: EncryptionKey
+  parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny
   id: EncryptionKeyCommon
   name: common encryption key
   description: An encryption key used by anyone.
@@ -30,7 +30,7 @@
     - state: common_label
 
 - type: entity
-  parent: EncryptionKey # Frontier: removed BaseCargoContraband
+  parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseCargoContraband
   id: EncryptionKeyCargo
   name: cargo encryption key
   suffix: DO NOT MAP # Frontier - Add DO NOT MAP suffix
@@ -103,7 +103,7 @@
     - state: com_label
 
 - type: entity
-  parent: EncryptionKey # Frontier: removed BaseEngineeringContraband
+  parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseEngineeringContraband
   id: EncryptionKeyEngineering
   name: engineering encryption key
   suffix: DO NOT MAP # Frontier - Add DO NOT MAP suffix
@@ -119,7 +119,7 @@
     - state: eng_label
 
 - type: entity
-  parent: EncryptionKey # Frontier: removed BaseMedicalContraband
+  parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseMedicalContraband
   id: EncryptionKeyMedical
   name: medical encryption key
   description: An encryption key used by those who save lives.
@@ -134,7 +134,7 @@
     - state: med_label
 
 - type: entity
-  parent: EncryptionKey # Frontier: removed BaseMedicalScienceContraband
+  parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseMedicalScienceContraband
   id: EncryptionKeyMedicalScience
   name: med-sci encryption key
   suffix: DO NOT MAP # Frontier - Add DO NOT MAP suffix
@@ -151,7 +151,7 @@
     - state: medsci_label
 
 - type: entity
-  parent: EncryptionKey # Frontier: removed BaseScienceContraband
+  parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseScienceContraband
   id: EncryptionKeyScience
   name: science encryption key
   suffix: DO NOT MAP # Frontier - Add DO NOT MAP suffix
@@ -167,7 +167,7 @@
     - state: sci_label
 
 - type: entity
-  parent: EncryptionKey # Frontier: removed BaseScienceContraband
+  parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseScienceContraband
   id: EncryptionKeyRobo
   name: robotech encryption key
   suffix: DO NOT MAP # Frontier - Add DO NOT MAP suffix
@@ -199,7 +199,7 @@
     - state: sec_label
 
 - type: entity
-  parent: EncryptionKey # Frontier: removed BaseCivilianContraband
+  parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseCivilianContraband
   id: EncryptionKeyService
   name: service encryption key
   suffix: DO NOT MAP # Frontier - Add DO NOT MAP suffix
@@ -231,7 +231,7 @@
     - state: synd_label
 
 - type: entity
-  parent: EncryptionKey # Frontier: removed BaseSiliconScienceContraband
+  parent: [EncryptionKey, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny, removed BaseSiliconScienceContraband
   id: EncryptionKeyBinary
   name: binary translator key
   suffix: DO NOT MAP # Frontier - Add DO NOT MAP suffix
diff --git a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
index 5fb81aa6d48..8a6424ffcc7 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/flatpack.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemDeviceComplexNormal] # Frontier: added RecyclableItemDeviceComplexNormal
   id: BaseFlatpack
   name: base flatpack
   description: A flatpack used for constructing something.
diff --git a/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml b/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml
index 2fcfc5217e7..863a002aa4d 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: forensic scanner
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall
   id: ForensicScanner
   description: A handheld device that can scan objects for fingerprints and fibers.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
index 0c8b539c590..7bf5f281496 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall
   id: Holoprojector
   name: holographic sign projector
   description: A handy-dandy holographic projector that displays a janitorial sign.
diff --git a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
index cde95fda6bd..93e5cf9ffde 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: mousetrap
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemPlasticSmall] # Frontier: added RecyclableItemPlasticSmall
   id: Mousetrap
   description: Useful for catching rodents sneaking into your kitchen.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
index 434ea973b0e..d5814fa47f6 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml
@@ -1,7 +1,7 @@
 - type: entity
   name: pinpointer
   description: A handheld tracking device. While typically far more capable, this one has been configured to lock onto certain signals. Keep upright to retain accuracy.
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall
   id: PinpointerBase
   abstract: true
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml
index 29b5600b489..43648a87563 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/radio.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/radio.yml
@@ -1,7 +1,7 @@
 - type: entity
   name: handheld radio
   description: A handy handheld radio.
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall
   id: RadioHandheld
   components:
   - type: TelecomExempt
diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_map.yml b/Resources/Prototypes/Entities/Objects/Devices/station_map.yml
index 54fc4a70c5a..ddcfd6c564e 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/station_map.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/station_map.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall
   id: BaseHandheldStationMap
   name: station map
   description: Displays a readout of the current station.
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
index 5a3b967f989..0447563dacb 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemWoodMedium] # Frontier: added RecyclableItemWoodMedium
   id: BaseHandheldInstrument
   description: That's an instrument.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml
index f7d9e0973a3..4a8be20fc81 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard
   id: BaseBoardEntity # Board item
   name: board
   abstract: true
@@ -16,7 +16,7 @@
 
 - type: entity
   id: BaseTabletopPiece # Board piece
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemPlasticTiny] # Frontier: added RecyclableItemPlasticTiny
   abstract: true
   components:
   - type: TabletopDraggable
@@ -39,3 +39,6 @@
   - type: Sprite
     noRot: false
     drawdepth: FloorTiles
+  - type: PhysicalComposition # Frontier
+    materialComposition: # Frontier
+      Cardboard: 100 # Frontier
diff --git a/Resources/Prototypes/Entities/Objects/Fun/dice.yml b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
index 433a4ebac35..9b978156be2 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/dice.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/dice.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemPlasticTiny] # Frontier: added RecyclableItemPlasticTiny
   id: BaseDice
   components:
   - type: Dice
diff --git a/Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml b/Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml
index 1a579572d97..e4aafe5d1c2 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/dice_bag.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseStorageItem
+  parent: [BaseStorageItem, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall
   id: DiceBag
   name: bag of dice
   description: Contains all the luck you'll ever need.
diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
index d14cc06a7c3..be251df1fe0 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml
@@ -1,7 +1,7 @@
 #HUMANOID FIGURINES
 
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemPlasticTiny] # Frontier: added RecyclableItemPlasticTiny
   id: BaseFigurine
   name: figurine
   description: A small miniature.
diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
index 4cb6a8bf1ed..98d4b008c66 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemClothBasic] # Frontier: added RecyclableItemClothBasic
   id: BedsheetBase
   name: BedsheetBase
   abstract: true
diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml
index 5f005af2189..a0ddee428e6 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/books.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/books.yml
@@ -1,9 +1,12 @@
 - type: entity
   name: book
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemPaper] # Frontier: added RecyclableItemPaper
   id: BookBase
   description: A hardcover book.
   components:
+  - type: PhysicalComposition # Frontier
+    materialComposition: # Frontier
+      Paper: 50 # Frontier
   - type: Sprite
     sprite: Objects/Misc/books.rsi
     layers:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/candles.yml b/Resources/Prototypes/Entities/Objects/Misc/candles.yml
index 55d3ecb9d35..652a4559312 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/candles.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/candles.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: candle
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemOrganicTiny] # Frontier: added RecyclableItemOrganicTiny
   id: Candle
   description: A thin wick threaded through fat.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml
index c75fa3d1d85..82a4d411f0e 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/handy_flags.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall
   id: BlankHandyFlag
   name: blank handheld flag
   description: "Some piece of white cloth wound on a stick."
@@ -11,7 +11,7 @@
     sprite: Objects/Misc/Handy_Flags/blank_handy_flag.rsi
 
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall
   id: NTHandyFlag
   name: Nanotrasen handheld flag
   description: "Glory to NT! Wait, they really made a handheld flag for a corporation?"
@@ -23,7 +23,7 @@
     sprite: Objects/Misc/Handy_Flags/NT_handy_flag.rsi
 
 - type: entity
-  parent: [BaseItem, BaseC3SyndicateContraband] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband
+  parent: [BaseItem, BaseC3SyndicateContraband, RecyclableItemClothSmall] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband added RecyclableItemClothSmall
   id: SyndieHandyFlag
   name: syndicate handheld flag
   description: "For truly rebellious patriots. Death to NT!"
@@ -35,7 +35,7 @@
     sprite: Objects/Misc/Handy_Flags/syndie_handy_flag.rsi
 
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall
   id: LGBTQHandyFlag
   name: LGBTQ handheld flag
   description: "The be gay do crime handy flag."
@@ -47,7 +47,7 @@
     sprite: Objects/Misc/Handy_Flags/lgbtq_handy_flag.rsi
 
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall
   id: PirateHandyFlag
   name: pirate handheld flag
   description: "Holding it in your hands, show these carp that you're not kidding."
diff --git a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
index 2d8c5a4875f..aabcf50ff5e 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: BaseStockPart
   name: stock part
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemDeviceTiny] # Frontier: added RecyclableItemDeviceTiny
   description: What?
   abstract: true
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml b/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml
index 2aa4d2e178a..8ae7d94055d 100644
--- a/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml
@@ -18,4 +18,7 @@
     vendPrice: 4000 # Frontier: FuelVend price
   - type: GuideHelp
     guides: [ AME, Power ]
+  - type: Tag # Frontier
+    tags: # Frontier
+    - Recyclable # Frontier
 # End of modified code
diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
index 25125ee9b0a..870e28e5cc7 100644
--- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: BasePowerCell
   abstract: true
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall
   components:
   - type: Item
     storedRotation: -90
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
index 06f29743059..837b27f9674 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
@@ -21,7 +21,7 @@
 
 - type: entity
   name: dried cannabis leaves
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemOrganicTiny] # Frontier: added RecyclableItemOrganicTiny
   id: LeavesCannabisDried
   description: "Dried cannabis leaves, ready to be ground."
   components:
@@ -40,7 +40,7 @@
 
 - type: entity
   name: ground cannabis
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemOrganicTiny] # Frontier: added RecyclableItemOrganicTiny
   id: GroundCannabis
   description: "Ground cannabis, ready to take you on a trip."
   components:
@@ -207,7 +207,7 @@
 
 - type: entity
   name: dried tobacco leaves
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemOrganicTiny] # Frontier: added RecyclableItemOrganicTiny
   id: LeavesTobaccoDried
   description: "Dried tobacco leaves, ready to be ground."
   components:
@@ -226,7 +226,7 @@
 
 - type: entity
   name: ground tobacco
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemOrganicTiny] # Frontier: added RecyclableItemOrganicTiny
   id: GroundTobacco
   description: "Ground tobacco, perfect for hand-rolled cigarettes."
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
index 542692aaf06..fa7bcb1f585 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemOrganicTiny] # Frontier: added RecyclableItemOrganicTiny
   id: SeedBase
   abstract: true
   components:
@@ -502,7 +502,7 @@
       sprite: Objects/Specific/Hydroponics/fly_amanita.rsi
 
 - type: entity
-  parent: [SeedBase, BaseC3SyndicateContraband] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband
+  parent: [SeedBase, BaseC3SyndicateContrabandUnredeemable] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContrabandUnredeemable
   name: packet of gatfruit seeds
   description: "These are no peashooters."
   id: GatfruitSeeds
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index ccb79008105..d26813424b7 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemPlasticMedium] # Frontier: added RecyclableItemPlasticMedium
   name: mop
   id: MopItem
   description: A mop that can't be stopped, viscera cleanup detail awaits.
@@ -193,7 +193,7 @@
 - type: entity
   name: plunger
   id: Plunger
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemPlasticSmall] # Frontier: added RecyclableItemPlasticSmall
   description: A plunger with a red plastic suction-cup and a wooden handle. Used to unclog drains.
   components:
   - type: Tag
@@ -290,7 +290,7 @@
     MaintenanceToolSpawner: 5
 
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemClothSmall] # Frontier: added RecyclableItemClothSmall
   name: damp rag
   id: RagItem
   description: For cleaning up messes, you suppose.
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
index 3c938b5abbe..ee013abfe9d 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml
@@ -1,7 +1,7 @@
 - type: entity
   name: soap
   id: Soap
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemOrganicTiny] # Frontier: added RecyclableItemOrganicTiny
   description: A cheap bar of soap. Doesn't smell.
   components:
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
index 998d3ecf03e..0ce36c938f7 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
@@ -1,7 +1,7 @@
 - type: entity
   name: spray bottle
   id: SprayBottle
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemPlasticSmall] # Frontier: added RecyclableItemPlasticSmall
   suffix: Empty
   description: A spray bottle with an unscrewable top.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
index 905cf2b690f..081f2266b14 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml
@@ -1,7 +1,7 @@
 - type: entity
   name: trash bag
   id: TrashBag
-  parent: BaseStorageItem
+  parent: [BaseStorageItem, RecyclableItemPlasticSmall] # Frontier: added RecyclableItemPlasticSmall
   components:
   - type: Sprite
     sprite: Objects/Specific/Janitorial/trashbag.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml
index 7c90a82d7d6..77d0c0da64d 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/disease.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemPlasticTiny] # Frontier: added RecyclableItemPlasticTiny
   id: DiseaseSwab
   name: sterile swab
   description: Used for taking and transferring samples. Sterile until open. Single use only.
@@ -21,7 +21,7 @@
     - Chemicals
 
 - type: entity
-  parent: BaseAmmoProvider # this is for cycling swabs out and not spawning 30 entities, trust
+  parent: [BaseAmmoProvider, RecyclableItemCardboard] # this is for cycling swabs out and not spawning 30 entities, trust # Frontier: added RecyclableItemCardboard
   id: BoxMouthSwab
   name: sterile swab dispenser
   description: Dispenses 30 sterile swabs, extremely useful for botany.
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
index febfc91110d..a5164064749 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: HandheldHealthAnalyzerUnpowered
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall
   name: health analyzer
   description: A hand-held body scanner capable of distinguishing vital signs of the subject.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
index d118b690941..b62fcb731e9 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -95,7 +95,7 @@
   id: BodyBagFolded
   name: body bag
   description: A plastic bag designed for the storage and transportation of cadavers to stop body decomposition.
-  parent: BodyBag
+  parent: [BodyBag, RecyclableItemPlasticMedium] # Frontier: added RecyclableItemPlasticMedium
   suffix: folded
   components:
   - type: Foldable
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
index 949c7e9a195..d47d6899136 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: jug
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemPlasticMedium] # Frontier: addded RecyclableItemPlasticMedium
   id: Jug
   description: Used to contain a very large amount of chemicals or solutions. Chugging is extremely ill-advised.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index 37571113059..dbf545b8862 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -269,7 +269,7 @@
 
 - type: entity
   name: dropper
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemGlassTiny] # Frontier: added RecyclableItemGlassTiny
   description: Used to transfer small amounts of chemical solution between containers.
   id: Dropper
   components:
@@ -462,7 +462,7 @@
 
 - type: entity
   name: pill
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemOrganicTiny] # Frontier: added RecyclableItemOrganicTiny
   id: Pill
   description: It's not a suppository.
   components:
@@ -510,7 +510,7 @@
 - type: entity
   name: pill canister
   id: PillCanister
-  parent: BaseStorageItem
+  parent: [BaseStorageItem, RecyclableItemPlasticTiny] # Frontier: added RecyclableItemPlasticTiny
   description: Holds up to 10 pills.
   components:
   - type: Item
diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
index cd37265646d..cd8d3f0638c 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemOrganicTiny] # Frontier: added RecyclableItemOrganicTiny
   id: MonkeyCube
   name: monkey cube
   description: Just add water!
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flare.yml b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
index 8d5ccb263ab..c583b466e33 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flare.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: emergency flare
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemSteelTiny] # Frontier: added RecyclableItemSteelTiny
   id: Flare
   description: A flare that produces a very bright light for a short while. Point the flame away from yourself.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
index b15bfde344a..469b63850eb 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: flashlight
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall
   id: FlashlightLantern
   description: It lights the way to freedom.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
index 3081f60989e..02ad5c4f2a0 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: green glowstick
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemPlasticTiny] # Frontier: added RecyclableItemPlasticTiny
   id: GlowstickBase
   description: Useful for raves and emergencies.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml b/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml
index 615408c9658..e499fb6dc67 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemPlasticSmall] # Frontier: added RecyclableItemPlasticSmall
   id: HandLabeler
   name: hand labeler
   description: A hand labeler, used to label items and objects.
diff --git a/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml b/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml
index 29a1a7640e9..4658723761e 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: InflatableWallStack
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemPlasticSmall] # Frontier: added RecyclableItemPlasticSmall
   name: inflatable barricade
   description: A folded membrane which rapidly expands into a large cubical shape on activation.
   suffix: Full
@@ -24,7 +24,7 @@
 
 - type: entity
   id: InflatableDoorStack
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemPlasticSmall] # Frontier: added RecyclableItemPlasticSmall
   name: inflatable door
   description: A folded membrane which rapidly expands into a large cubical shape on activation.
   suffix: Full
diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
index e1d04dd92ba..5a436348b1d 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: jaws of life
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemSteelMedium] # Frontier: added RecyclableItemSteelMedium
   id: JawsOfLife
   description: A set of jaws of life, compressed through the magic of science.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
index 89101e34ff4..09f8607ef6d 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: lantern
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall
   id: Lantern
   description: The holy light guides the way.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml b/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml
index 646f6a63784..0b9e34b9bef 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall
   name: light replacer
   id: LightReplacer
   description: An item which uses magnets to easily replace broken lights. Refill By adding more lights into the replacer.
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
index 6aab51b168e..54439374e6e 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: basic lighter
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemDeviceTiny] # Frontier: added ligters
   id: Lighter
   description: "A simple plastic cigarette lighter."
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml b/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml
index ad31a6ec02d..84dad791b43 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemDeviceSmall] # Frontier: added RecyclableItemDeviceSmall
   id: SprayPainter
   name: spray painter
   description: A spray painter for painting airlocks and pipes.
diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
index 4992a010dce..ffa9b602dd9 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
@@ -1,6 +1,6 @@
 - type: entity
   id: ToolboxBase
-  parent: BaseStorageItem
+  parent: [BaseStorageItem, RecyclableItemSteelMedium] # Frontier: added RecyclableItemSteelMedium
   abstract: true
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml b/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml
index 6a5d3c89b3d..c0dc2b5ba46 100644
--- a/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml
+++ b/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml
@@ -48,6 +48,7 @@
   - type: Strap
     buckleOffset: "0.10, 0.36"
     # maxBuckleDistance: 1 # Umbra - buckling fix
+    unbuckleDistanceSquared: 0.09 # Frontier: (30 cm)^2
   - type: InputMover
   - type: InteractionOutline
   - type: Vehicle
@@ -190,6 +191,7 @@
   - type: Strap
     buckleOffset: "0.15, -0.05"
     # maxBuckleDistance: 1 # Umbra - buckling fix
+    unbuckleDistanceSquared: 0.09 # Frontier: (30 cm)^2
   - type: MovementSpeedModifier
     acceleration: 1
     friction: 1
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
index c54d9197768..b9d04ad53de 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard
   id: BaseMagazineBoxAntiMateriel
   name: ammunition box (.60 anti-materiel)
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
index 3fcfe75ee3e..266b4137cb4 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard
   id: BaseMagazineBoxCaselessRifle
   name: ammunition box (.25 caseless)
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
index 67c2399e736..36051043b8e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard
   id: BaseMagazineBoxLightRifle
   name: ammunition box (.30 rifle)
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
index 9376316d967..4f6d42481ac 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard
   id: BaseMagazineBoxMagnum
   components:
   - type: BallisticAmmoProvider
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
index 7ae0060e330..a40b2ca5dc1 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard
   id: BaseMagazineBoxPistol
   name: ammunition box (.35 auto)
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
index 8c7c34cb17f..34ef0282e3e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard
   id: BaseMagazineBoxRifle
   components:
   - type: BallisticAmmoProvider
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
index c5d6873cf18..806d4f7a0b1 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml
@@ -12,7 +12,7 @@
     sprite: Objects/Storage/boxes.rsi
 
 - type: entity
-  parent: BaseAmmoProvider
+  parent: [BaseAmmoProvider, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard
   id: AmmoProviderShotgunShell
   abstract: true
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml
index f1546fac653..ddd55ddee67 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemCardboard] # Frontier: added RecyclableItemCardboard
   id: BoxDonkSoftBase
   name: foamdart box
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
index 0469795fdee..8ee14d39fba 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: BaseMagazineCaselessRifle
   name: "magazine (.25 caseless)"
-  parent: [ BaseCartridge, BaseC3SyndicateContrabandNoValue ] # Frontier: BaseRestrictedContraband<BaseC3SyndicateContraband
+  parent: [ BaseCartridge, BaseC3SyndicateContrabandNoValue, RecyclableItemSteelSmall ] # Frontier: BaseRestrictedContraband<BaseC3SyndicateContraband, added RecyclableItemSteelSmall
   abstract: true
   components:
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
index fc439ebf4b8..eaf4704008b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: BaseMagazineHeavyRifle
   name: "magazine (.20 rifle)"
-  parent: [ BaseItem, BaseC1Contraband ] # Frontier: BaseRestrictedContraband<BaseC1Contraband
+  parent: [ BaseItem, BaseC1Contraband, RecyclableItemSteelSmall ] # Frontier: BaseRestrictedContraband<BaseC1Contraband, added RecyclableItemSteelSmall
   abstract: true
   components:
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
index 450259eca36..a44baa17c03 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
@@ -2,7 +2,7 @@
 - type: entity
   id: BaseMagazineLightRifle
   name: "magazine (.30 rifle)"
-  parent: [ BaseItem, BaseC1Contraband ] # Frontier: BaseRestrictedContraband<BaseC1Contraband
+  parent: [ BaseItem, BaseC1Contraband, RecyclableItemSteelSmall ] # Frontier: BaseRestrictedContraband<BaseC1Contraband added RecyclableItemSteelSmall
   abstract: true
   components:
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
index 8849824f98c..05f9564cb0f 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: BaseMagazineMagnum
   name: pistol magazine (.45 magnum)
-  parent: [ BaseMagazinePistol, BaseC1Contraband ] # Frontier: BaseRestrictedContraband<BaseC1Contraband
+  parent: [ BaseMagazinePistol, BaseC1Contraband, RecyclableItemSteelSmall ] # Frontier: BaseRestrictedContraband<BaseC1Contraband, added RecyclableItemSteelSmall
   abstract: true
   components:
   - type: Tag
@@ -17,7 +17,7 @@
 - type: entity
   id: BaseMagazineMagnumSubMachineGun
   name: "Vector magazine (.45 magnum)"
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemSteelSmall] # Frontier: added RecyclableItemSteelSmall
   abstract: true
   components:
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
index d078e6f1d2e..f53f81f6027 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: BaseMagazinePistol
   name: pistol magazine (.35 auto)
-  parent: [ BaseItem, BaseC1Contraband ] # Frontier: BaseRestrictedContraband<BaseC1Contraband
+  parent: [ BaseItem, BaseC1Contraband, RecyclableItemSteelSmall ] # Frontier: BaseRestrictedContraband<BaseC1Contraband, added RecyclableItemSteelSmall
   abstract: true
   components:
   - type: Tag
@@ -34,7 +34,7 @@
 - type: entity
   id: BaseMagazinePistolHighCapacity
   name: machine pistol magazine (.35 auto)
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemSteelSmall] # Frontier: added RecyclableItemSteelSmall
   abstract: true
   components:
   - type: Tag
@@ -67,7 +67,7 @@
 - type: entity
   id: BaseMagazinePistolSubMachineGun  # Yeah it's weird but it's pistol caliber
   name: SMG magazine (.35 auto)
-  parent: [ BaseItem, BaseC1Contraband ] # Frontier: BaseRestrictedContraband<BaseC1Contraband
+  parent: [ BaseItem, BaseC1Contraband, RecyclableItemSteelSmall ] # Frontier: BaseRestrictedContraband<BaseC1Contraband, added RecyclableItemSteelSmall
   abstract: true
   components:
   - type: Tag
@@ -100,7 +100,7 @@
 - type: entity
   id: MagazinePistolSubMachineGunTopMounted
   name: WT550 magazine (.35 auto top-mounted)
-  parent: [ BaseItem, BaseC1Contraband ] # Frontier: BaseRestrictedContraband<BaseC1Contraband
+  parent: [ BaseItem, BaseC1Contraband, RecyclableItemSteelSmall ] # Frontier: BaseRestrictedContraband<BaseC1Contraband, added RecyclableItemSteelSmall
   components:
   - type: Tag
     tags:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
index 2540fddfa27..57b22907b97 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
@@ -2,7 +2,7 @@
 - type: entity
   id: BaseMagazineRifle
   name: "magazine (.20 rifle)"
-  parent: [ BaseItem, BaseC1Contraband ] # Frontier: BaseRestrictedContraband<BaseC1Contraband
+  parent: [ BaseItem, BaseC1Contraband, RecyclableItemSteelSmall ] # Frontier: BaseRestrictedContraband<BaseC1Contraband, added RecyclableItemSteelSmall
   abstract: true
   components:
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
index 2a3dd1b48e1..94fd4598009 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: BaseMagazineShotgun
   name: ammo drum (.50 shells)
-  parent: [ BaseItem, BaseC1Contraband ] # Frontier: BaseRestrictedContraband<BaseC1Contraband
+  parent: [ BaseItem, BaseC1Contraband, RecyclableItemSteelSmall ] # Frontier: BaseRestrictedContraband<BaseC1Contraband, added RecyclableItemSteelSmall
   abstract: true
   components:
   - type: Tag
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index 5c0011e1120..49602090556 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: pickaxe
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemWoodMedium] # Frontier: added RecyclableItemWoodMedium
   id: Pickaxe
   description: Notched to perfection, for jamming it into rocks.
   components:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml
index c2ace100c73..841f5cd1c09 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: [BaseItem, BaseC2ContrabandUnredeemable] # Frontier: BaseRestrictedContraband<BaseC2ContrabandUnredeemable
+  parent: [BaseItem, BaseC2ContrabandUnredeemable, RecyclableItemSteelMedium] # Frontier: BaseRestrictedContraband<BaseC2ContrabandUnredeemable added RecyclableItemSteelMedium
   id: ClusterBang
   name: clusterbang
   description: Can be used only with flashbangs. Explodes several times.
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
index 9fe85403f35..2a06b954707 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -1,6 +1,6 @@
 - type: entity
   abstract: true
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemSteelSmall] # Frontier: added RecyclableItemSteelSmall
   id: GrenadeBase
   components:
   - type: WeaponCaseInsertable # Frontier
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
index 9f3fbd7c455..92e64e0945c 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
@@ -73,7 +73,7 @@
       price: 120
 
 - type: entity
-  parent: RollerBed
+  parent: [RollerBed, RecyclableItemSteelMedium] # Frontier: added RecyclableItemSteelMedium
   id: RollerBedSpawnFolded
   suffix: folded
   components:
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 5d6863377a1..9ba4aae9957 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -19,6 +19,11 @@
           - MachineLayer
   - type: Lathe
   - type: MaterialStorage
+    whitelist: # Frontier
+      tags: # Frontier
+        - Sheet # Frontier
+        - RawMaterial # Frontier
+        - Ingot # Frontier
   - type: Destructible
     thresholds:
     - trigger:
@@ -50,7 +55,7 @@
   - type: ResearchClient
   - type: TechnologyDatabase
   - type: MaterialStorageMagnetPickup # Frontier
-    range: 0.30
+    range: 0.30 # Frontier
 
 # a lathe that can be sped up with space lube / slowed down with glue
 - type: entity
@@ -61,7 +66,7 @@
   - type: ReagentSpeed
     solution: lube
     modifiers:
-      SpaceLube: 0.25
+      SpaceLube: 0.5 # Frontier: 0.25<0.5 (we double dip on time with lube and machine parts)
       SpaceGlue: 5
   - type: SolutionContainerManager
     solutions:
@@ -80,11 +85,11 @@
   components:
   - type: Lathe
     materialUseMultiplier: 0.5
-    timeMultiplier: 1.5
+    timeMultiplier: 3 # Frontier: 1.5<3 (we double dip on time with lube and machine parts)
   - type: LatheHeatProducing
   - type: ReagentSpeed
     modifiers:
-      SpaceLube: 0.8 # being faster means less heat so lube needs to be nerfed
+      SpaceLube: 0.5 # Frontier: 0.8<0.5
       SpaceGlue: 5 # no change from normal lathe, overheat!!!
 
 - type: entity
@@ -504,7 +509,7 @@
     - SpaceHeaterMachineCircuitBoard
     - CutterMachineCircuitboard
     - StationAnchorCircuitboard
-    - SalvageMagnetMachineCircuitboard
+    # - SalvageMagnetMachineCircuitboard # Frontier
     - SalvageTechFabCircuitboardNF # Frontier
     - BlueprintLithographMachineCircuitboard # Frontier
     dynamicRecipes:
@@ -788,6 +793,7 @@
   id: SecurityTechFab
   parent: BaseLatheLube
   name: security techfab
+  categories: [ HideSpawnMenu ] # Frontier
   description: Prints equipment for use by security crew.
   components:
   - type: Sprite
@@ -924,7 +930,7 @@
 
 - type: entity
   id: AmmoTechFab
-  parent: BaseLatheLube
+  parent: [BlueprintReceiverBase, BaseLatheLube] # Frontier: added BlueprintReceiverBase
   name: ammo techfab
   description: Prints the bare minimum of bullets that any budget military or armory could need. Nothing fancy.
   components:
@@ -1207,7 +1213,7 @@
       - ClothingOuterWinterSci
       - ClothingOuterWinterRobo
 #      - ClothingOuterWinterSec # Frontier
-      - ClothingOuterWinterCoatMail
+      - ClothingOuterWinterCoatMail # Frontier
       # Ties
       - ClothingNeckTieRed
       - ClothingNeckTieDet
diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
index 26b42265ff0..d73f68a73d6 100644
--- a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
+++ b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
@@ -174,7 +174,7 @@
 
 - type: entity
   id: ShuttleGunFriendship
-  parent: [ShuttleGunBase, ConstructibleMachine]
+  parent: [ShuttleGunBase] # Frontier: Removed ConstructibleMachine
   name: EXP-320g "Friendship"
   description: A small stationary grenade launcher that holds 2 grenades.
   suffix: DO NOT MAP
diff --git a/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml
index 5d5360329b8..ec4b4aadb0b 100644
--- a/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml
+++ b/Resources/Prototypes/EstacaoPirata/Entities/Objects/Misc/cards.yml
@@ -31,9 +31,15 @@
   - type: StaticPrice # Frontier
     price: 200 # Frontier
 
+<<<<<<< HEAD
 # Frontier: 
 - type: entity
   parent: BaseItem
+=======
+# Frontier: base stack for card stack component
+- type: entity
+  parent: [BaseItem, RecyclableItemNoMats] # Frontier: added RecyclableItemNoMats
+>>>>>>> erhard/2024-10-Recyclable-Clothing
   id: CardStackBase
   name: stack of cards
   abstract: true
@@ -47,7 +53,11 @@
 # End Frontier
 
 - type: entity
+<<<<<<< HEAD
   parent: CardStackBase # Frontier: BaseItem<CardStackBase
+=======
+  parent: CardStackBase
+>>>>>>> erhard/2024-10-Recyclable-Clothing
   id: CardHandBase
   categories: [ HideSpawnMenu ]
   name: hand of cards
@@ -66,7 +76,11 @@
     price: 0.01 # Frontier
 
 - type: entity
+<<<<<<< HEAD
   parent: CardStackBase # Frontier: BaseItem<CardStackBase
+=======
+  parent: CardStackBase
+>>>>>>> erhard/2024-10-Recyclable-Clothing
   id: CardDeckBase
   categories: [ HideSpawnMenu ]
   name: deck of cards
@@ -77,6 +91,10 @@
   - type: Item
     size: Normal
   - type: CardDeck
+<<<<<<< HEAD
+=======
+
+>>>>>>> erhard/2024-10-Recyclable-Clothing
 
 - type: entity
   parent: CardBoxBase
@@ -193,7 +211,11 @@
   - type: StaticPrice # Frontier
     price: 0.01 # Frontier
 
+<<<<<<< HEAD
 # region Black Deck
+=======
+# region Black Cards
+>>>>>>> erhard/2024-10-Recyclable-Clothing
 
 - type: entity
   parent: CardBase
@@ -783,4 +805,8 @@
     sprite: EstacaoPirata/Objects/Misc/cards.rsi
     state: black_joker
 
-# endregion Black Deck
\ No newline at end of file
+<<<<<<< HEAD
+# endregion Black Deck
+=======
+# endregion Black Deck
+>>>>>>> erhard/2024-10-Recyclable-Clothing
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/deep_fryer.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/deep_fryer.yml
index 022f39f25f8..5f24d9e29e8 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/deep_fryer.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/deep_fryer.yml
@@ -170,3 +170,18 @@
       machine_board: !type:Container
       machine_parts: !type:Container
   - type: PowerSwitch
+
+# Frontier: Halloween special
+- type: entity
+  id: KitchenDeepFryerCauldron
+  parent: KitchenDeepFryer
+  name: cauldron
+  description: A mysterious and mystical cauldron, sputtering with magical energy. Or is that oil?
+  suffix: Holiday Special
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Machines/cauldron.rsi
+    snapCardinals: true
+  - type: SolutionContainerVisuals
+    maxFillLevels: 8
+# End Frontier
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml
deleted file mode 100644
index 5c1c3bbabcf..00000000000
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml
+++ /dev/null
@@ -1,441 +0,0 @@
-- type: entity
-  parent: [ BlueprintReceiverBase, BaseLatheLube ] # Frontier: Protolathe<BaseLatheLube, added BlueprintReceiverBase
-  id: ScienceTechFab
-  name: science techfab
-  description: Prints equipment for use by the epistemics department.
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Structures/Machines/techfab.rsi
-    layers:
-    - state: icon
-      map: ["enum.LatheVisualLayers.IsRunning"]
-    - state: sci
-    - state: unlit
-      shader: unshaded
-      map: ["enum.PowerDeviceVisualLayers.Powered"]
-    - state: inserting
-      map: ["enum.MaterialStorageVisualLayers.Inserting"]
-    - state: panel
-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: Machine
-    board: ScienceTechFabCircuitboard
-  - type: Lathe
-    idleState: icon
-    runningState: icon
-    staticRecipes: #Frontier
-    # Shared lathe recipes
-    ## Basic tools
-      - Wirecutter #Frontier
-      - Screwdriver #Frontier
-      - Welder #Frontier
-      - Wrench #Frontier
-      - CrowbarGreen # Frontier
-      - Multitool #Frontier
-      - FlashlightLantern #Frontier
-      - AppraisalTool #Frontier
-      - HandLabeler #Frontier
-      - Signaller #Frontier
-      - ClothingMaskWeldingGas #Frontier
-    ## Basic storage
-      - ToolboxArtisticNF #Frontier
-      - ToolboxElectricalNF #Frontier
-      - ToolboxMechanicalNF #Frontier
-      - ToolboxEmergencyNF #Frontier
-    ## Basic parts
-      - CableStack #Frontier
-      - LightTube #Frontier
-      - LedLightTube #Frontier
-      - SodiumLightTube #Frontier
-      - ExteriorLightTube #Frontier
-      - LightBulb #Frontier
-      - LedLightBulb #Frontier
-      - ConveyorBeltAssembly #Frontier
-      - PowerCellSmall #Frontier
-      - PowerCellMedium #Frontier
-    ## Basic electronics
-      - SignalTimerElectronics #Frontier
-      - CellRechargerCircuitboard #Frontier
-      - BorgChargerCircuitboard #Frontier
-      - WeaponCapacitorRechargerCircuitboard #Frontier
-    ## Basic EVA:
-      - ClothingOuterEVASuitContractor #Frontier
-      - ClothingOuterEVASuitPilot #Frontier
-      - AirTank #Frontier
-      - HandheldGPSBasic #Frontier
-    # Science techfab
-    ## Tools
-      - NodeScanner
-    ## Basic EVA:
-      - ClothingOuterEVASuitScientist #Frontier
-    dynamicRecipes:
-    # Shared lathe recipes #Frontier
-    ## Advanced tools #Frontier
-      - WelderExperimental #Frontier
-      - JawsOfLife #Frontier
-      - PowerDrill #Frontier
-      - JetpackVoid #Frontier
-      - PowerCellHigh #Frontier
-      #- PowerCellHyperNF #Frontier
-      - PowerCellMicroreactor #Frontier
-      - BluespaceBeaker
-      - VialBluespace # Frontier
-      - CryostasisBeaker
-      - ClothingBackpackHolding
-      - ClothingBackpackSatchelHolding
-      - ClothingBackpackDuffelHolding
-      - ClothingBackpackMessengerHolding # Frontier
-      - ChemicalPayload
-      - Bucket
-      - MopItem
-      - SprayBottle
-      - FireExtinguisher
-      # - SheetSteel # Frontier: didn't work, use engi techfab
-      # - SheetPlastic # Frontier: didn't work, use engi techfab
-      # - SheetPlasteel # Frontier: didn't work, use engi techfab
-      # - SheetPlasma # Frontier: didn't work, use engi techfab
-      # - SheetRGlass # Frontier: didn't work, use engi techfab
-      # - SheetGlass1 # Frontier: didn't work, use engi techfab
-      - CableStack
-      - CableMVStack
-      - CableHVStack
-      - ClothingOuterHardsuitBasic # Frontier
-      - ClothingOuterHardsuitRd # Frontier
-  - type: MaterialStorage
-    whitelist:
-      tags:
-        - Sheet
-        - RawMaterial
-        - Ingot
-
-- type: entity
-  parent: [ BlueprintReceiverBase, BaseLatheLube ] # Frontier: Protolathe<BaseLatheLube, added BlueprintReceiverBase
-  id: ServiceTechFab
-  name: service techfab
-  description: Prints equipment for service staff.
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Structures/Machines/techfab.rsi
-    layers:
-    - state: icon
-      map: ["enum.LatheVisualLayers.IsRunning"]
-    - state: service
-    - state: unlit
-      shader: unshaded
-      map: ["enum.PowerDeviceVisualLayers.Powered"]
-    - state: inserting
-      map: ["enum.MaterialStorageVisualLayers.Inserting"]
-    - state: panel
-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: Machine
-    board: ServiceTechFabCircuitboard
-  - type: Lathe
-    idleState: icon
-    runningState: icon
-    staticRecipes: #Frontier
-    # Shared lathe recipes
-    ## Basic tools
-      - Wirecutter #Frontier
-      - Screwdriver #Frontier
-      - Welder #Frontier
-      - Wrench #Frontier
-      - CrowbarGreen # Frontier
-      - Multitool #Frontier
-      - FlashlightLantern #Frontier
-      - AppraisalTool #Frontier
-      - HandLabeler #Frontier
-      - Signaller #Frontier
-      - ClothingMaskWeldingGas #Frontier
-    ## Basic storage
-      - ToolboxArtisticNF #Frontier
-      - ToolboxElectricalNF #Frontier
-      - ToolboxMechanicalNF #Frontier
-      - ToolboxEmergencyNF #Frontier
-    ## Basic parts
-      - CableStack #Frontier
-      - LightTube #Frontier
-      - LedLightTube #Frontier
-      - SodiumLightTube #Frontier
-      - ExteriorLightTube #Frontier
-      - LightBulb #Frontier
-      - LedLightBulb #Frontier
-      - ConveyorBeltAssembly #Frontier
-      - PowerCellSmall #Frontier
-      - PowerCellMedium #Frontier
-    ## Basic electronics
-      - SignalTimerElectronics #Frontier
-      - CellRechargerCircuitboard #Frontier
-      - BorgChargerCircuitboard #Frontier
-      - WeaponCapacitorRechargerCircuitboard #Frontier
-    ## Basic EVA:
-      - ClothingOuterEVASuitContractor #Frontier
-      - ClothingOuterEVASuitPilot #Frontier
-      - AirTank #Frontier
-      - HandheldGPSBasic #Frontier
-    # Service techfab
-    ## Tools
-      - LightReplacer #Frontier
-      - MopBucket #Frontier
-      - TrashBag #Frontier
-      - Bucket #Frontier
-      - MopItem #Frontier
-      - SprayBottle #Frontier
-      - MiniHoe #Frontier
-      - HydroponicsToolScythe #Frontier
-      - HydroponicsToolHatchet #Frontier
-      - Spade #Frontier
-      - Clippers #Frontier
-      - ServiceSelectiveDropper # Frontier
-      - PlantBag # Frontier
-      - Beaker # Frontier
-      - LargeBeaker # Frontier
-      - Jug # Frontier
-      - MailCapsule #Frontier
-      - LanternNF # Frontier
-      - PillCanister # Frontier
-      - ChemistryEmptyBottle01 # Frontier
-      - Mousetrap # Frontier
-      - Holoprojector #Frontier
-      - Shovel #Frontier
-    ## Kitchen
-      - DrinkMug #Frontier
-      - DrinkMugMetal #Frontier
-      - DrinkGlass #Frontier
-      - KitchenKnife #Frontier
-      - ButchCleaver #Frontier
-      - ServiceRollingPin # Frontier
-      - ServiceSpoon # Frontier
-      - ServiceFork # Frontier
-      - ServicePairedChopsticks # Frontier
-      - ServiceFoodBowlBig # Frontier
-      - ServiceFoodPlate # Frontier
-      - ServiceFoodPlateSmall # Frontier
-      - ServiceFoodPlateTin # Frontier
-      - ServiceFoodKebabSkewer # Frontier
-      - DrinkShotGlass # Frontier
-      - DrinkGlassCoupeShaped # Frontier
-      - CustomDrinkJug # Frontier
-      - FoodPlatePlastic # Frontier
-      - FoodPlateSmallPlastic # Frontier
-      - NapkinDrum # Frontier
-      - Napkin # Frontier
-    ## EVA
-      - ClothingOuterEVASuitHydro # Frontier
-      - ClothingOuterEVASuitJanitor # Frontier
-      - ClothingOuterEVASuitMailman # Frontier
-      - ClothingOuterEVASuitServiceWorker # Frontier
-      - ClothingOuterEVASuitChaplain # Frontier
-      - ClothingOuterEVASuitBoxerRed # Frontier
-      - ClothingOuterEVASuitBoxerGreen # Frontier
-      - ClothingOuterEVASuitBoxerBlue # Frontier
-      - ClothingOuterEVASuitBoxerYellow # Frontier
-    ## Misc
-      - ClothingHeadHatCone #Frontier
-      - FireExtinguisher #Frontier
-      - WetFloorSign #Frontier
-    dynamicRecipes:
-    # Shared lathe recipes # Frontier
-    ## Advanced tools # Frontier
-      - WelderExperimental # Frontier
-      - JawsOfLife # Frontier
-      - PowerDrill # Frontier
-      - JetpackVoid # Frontier
-      - PowerCellHigh # Frontier
-      # - PowerCellHyperNF # Frontier
-      - PowerCellMicroreactor #Frontier
-    # Service techfab
-      - SynthesizerInstrument #Frontier
-      - ClothingOuterHardsuitBasic # Frontier
-      - ClothingOuterHardsuitPilot # Frontier
-      - ClothingOuterHardsuitClown # Frontier
-      - ClothingOuterHardsuitMime # Frontier
-      - AdvMopItem # Frontier
-      - WeaponSprayNozzle # Frontier
-      - ClothingBackpackWaterTank # Frontier
-      - MegaSprayBottle # Frontier
-      - TimerTrigger # Frontier
-      - ChemicalPayload # Frontier
-      - BluespaceBeaker # Frontier
-      - SyringeBluespace # Frontier
-      - PlantBagOfHolding # Frontier
-      - PlantAnalyzer # Frontier
-  - type: MaterialStorage # Frontier
-    whitelist:
-      tags:
-        - Sheet
-        - RawMaterial
-        - Ingot
-
-- type: entity
-  parent: [ BlueprintReceiverBase, BaseLatheLube ] # Frontier: Protolathe<BaseLatheLube, added BlueprintReceiverBase
-  id: EngineeringTechFab
-  name: engineering techfab
-  description: Prints equipment for engineers.
-  components:
-  - type: Sprite
-    netsync: false
-    sprite: Structures/Machines/techfab.rsi
-    layers:
-    - state: icon
-      map: ["enum.LatheVisualLayers.IsRunning"]
-    - state: engi
-    - state: unlit
-      shader: unshaded
-      map: ["enum.PowerDeviceVisualLayers.Powered"]
-    - state: inserting
-      map: ["enum.MaterialStorageVisualLayers.Inserting"]
-    - state: panel
-      map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: Machine
-    board: EngineeringTechFabCircuitboard
-  - type: Lathe
-    idleState: icon
-    runningState: icon
-    staticRecipes:
-    # Shared lathe recipes
-    ## Basic tools
-      - Wirecutter #Frontier
-      - Screwdriver #Frontier
-      - Welder #Frontier
-      - Wrench #Frontier
-      - CrowbarGreen # Frontier
-      - Multitool #Frontier
-      - FlashlightLantern #Frontier
-      - AppraisalTool #Frontier
-      - HandLabeler #Frontier
-      - Signaller #Frontier
-      - ClothingMaskWeldingGas #Frontier
-    ## Basic storage
-      - ToolboxArtisticNF #Frontier
-      - ToolboxElectricalNF #Frontier
-      - ToolboxMechanicalNF #Frontier
-      - ToolboxEmergencyNF #Frontier
-    ## Basic parts
-      - CableStack #Frontier
-      - LightTube #Frontier
-      - LedLightTube #Frontier
-      - SodiumLightTube #Frontier
-      - ExteriorLightTube #Frontier
-      - LightBulb #Frontier
-      - LedLightBulb #Frontier
-      - ConveyorBeltAssembly #Frontier
-      - PowerCellSmall #Frontier
-      - PowerCellMedium #Frontier
-    ## Basic electronics
-      - SignalTimerElectronics #Frontier
-      - CellRechargerCircuitboard #Frontier
-      - BorgChargerCircuitboard #Frontier
-      - WeaponCapacitorRechargerCircuitboard #Frontier
-    ## Basic EVA
-      - ClothingOuterEVASuitContractor #Frontier
-      - ClothingOuterEVASuitPilot #Frontier
-      - AirTank #Frontier
-      - HandheldGPSBasic #Frontier
-    # Engineering techfab
-    ## Tools
-      - NetworkConfigurator #Frontier
-      - SprayPainter #Frontier
-      - TRayScanner #Frontier
-      - GasAnalyzer #Frontier
-      - Holoprojector #Frontier
-      - LightReplacer #Frontier
-      - WelderIndustrial #Frontier
-      - WelderIndustrialAdvanced #Frontier
-      - HolofanProjector #Frontier
-    ## Parts
-      - MicroManipulatorStockPart #Frontier
-      - MatterBinStockPart #Frontier
-      - CapacitorStockPart #Frontier
-      - Igniter #Frontier
-      - CableMVStack #Frontier
-      - CableHVStack #Frontier
-    ## Electronics
-      - IntercomElectronics #Frontier
-      - FirelockElectronics #Frontier
-      - DoorElectronics #Frontier
-      - AirAlarmElectronics #Frontier
-      - StationMapElectronics #Frontier
-      - FireAlarmElectronics #Frontier
-      - MailingUnitElectronics #Frontier
-      - APCElectronics #Frontier
-      - SMESMachineCircuitboard #Frontier
-      - SubstationMachineCircuitboard #Frontier
-      - SmallThrusterMachineCircuitboard # Frontier
-      - SmallGyroscopeMachineCircuitboard # Frontier
-      - WallmountSubstationElectronics # Frontier
-      - SolarControlComputerCircuitboard # Frontier
-      - SolarTrackerElectronics # Frontier
-      - SolarAssemblyFlatpack # Frontier
-      - ShuttleConsoleCircuitboard # Frontier
-      - PortableGeneratorPacmanMachineCircuitboard # Frontier
-      - PortableGeneratorSuperPacmanMachineCircuitboard # Frontier
-      - PortableGeneratorJrPacmanMachineCircuitboard # Frontier
-      - ThrusterMachineCircuitboard # Frontier
-      - GyroscopeMachineCircuitboard # Frontier
-      - MiniGravityGeneratorCircuitboard # Frontier
-    ## Clothing
-      - UtilityBelt
-      - ConstructionBag # Frontier
-    ## EVA
-#      - ClothingOuterSuitEmergency # Frontier
-      - ClothingHeadHelmetEVA # Frontier
-      - ClothingHeadHelmetEVALarge # Frontier
-#      - ClothingOuterHardsuitEVA # Frontier
-      - ClothingOuterEVASuitEngineer # Frontier
-      - ClothingOuterEVASuitAtmosTech # Frontier
-    ## Materials
-      - Durathread
-      - NFSheetRGlassProcessed # Frontier
-      - NFSheetPGlass1Processed # Frontier
-      - NFSheetRPGlass1Processed # Frontier
-      - NFSheetPlasteel1Processed # Frontier
-      - NFSheetUGlass1Processed # Frontier
-      - NFSheetRUGlass1Processed # Frontier
-    ## Misc
-      - ClothingHeadHatCone # Frontier
-    dynamicRecipes:
-    # Shared lathe recipes
-    ## Advanced tools
-      - WelderExperimental #Frontier
-      - JawsOfLife #Frontier
-      - PowerDrill #Frontier
-      - JetpackVoid #Frontier
-      - PowerCellHigh #Frontier
-      # - PowerCellHyperNF #Frontier
-      - PowerCellMicroreactor #Frontier
-    # Engineering techfab
-      - Flash #Frontier
-      - MicroManipulatorStockPart #Frontier
-      - NanoManipulatorStockPart #Frontier
-      - PicoManipulatorStockPart #Frontier
-      - FemtoManipulatorStockPart #Frontier
-      - MatterBinStockPart #Frontier
-      - AdvancedMatterBinStockPart #Frontier
-      - SuperMatterBinStockPart #Frontier
-      - BluespaceMatterBinStockPart #Frontier
-      - CapacitorStockPart #Frontier
-      - AdvancedCapacitorStockPart #Frontier
-      - SuperCapacitorStockPart #Frontier
-      - QuadraticCapacitorStockPart #Frontier
-      - RPED #Frontier
-      - MiningDrill #Frontier
-      - MiningDrillDiamond # Frontier
-      - SprayBottle #Frontier
-      - FireExtinguisher #Frontier
-      - ShipyardRCD # Frontier
-      - ShipyardRCDAmmo # Frontier
-      - SignallerAdvanced # Frontier
-      - ClothingOuterHardsuitBasic # Frontier
-      - ClothingOuterHardsuitAtmos # Frontier
-      - ClothingOuterHardsuitEngineering # Frontier
-      - ClothingOuterHardsuitEngineeringWhite # Frontier
-#      - ClothingHeadHelmetAncient # Frontier
-#      - ClothingOuterHardsuitAncientEVA # Frontier
-      - ConstructionBagOfHolding # Frontier
-  - type: MaterialStorage
-    whitelist:
-      tags:
-        - Sheet
-        - RawMaterial
-        - Ingot
diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml
index 5772aa032fb..2278a96ee6e 100644
--- a/Resources/Prototypes/Recipes/Lathes/sheet.yml
+++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml
@@ -231,6 +231,8 @@
 - type: latheRecipe
   id: SheetPaper
   result: SheetPaper1
+  category: NFMaterials # Frontier
   completetime: 1
+  applyMaterialDiscount: false # Frontier
   materials:
     Wood: 50
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/locker_wallmount.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/locker_wallmount.yml
index 40cf1b55762..3443361ac59 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/locker_wallmount.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/locker_wallmount.yml
@@ -203,6 +203,28 @@
   suffix: Filled, Random
 # endregion
 
+# region Safety gear
+- type: entity
+  parent: [ LockerWallColorL1Fire, StorageFillL1FireSuit ]
+  id: LockerWallColorL1FireFilled
+  suffix: Frontier, Filled
+
+- type: entity
+  parent: [ LockerWallColorL2Radiation, StorageFillL2RadiationSuit ]
+  id: LockerWallColorL2RadiationFilled
+  suffix: Frontier, Filled
+
+- type: entity
+  parent: [ LockerWallColorL3Biohazard, StorageFillL3BiohazardSuit ]
+  id: LockerWallColorL3BiohazardFilled
+  suffix: Frontier, Filled
+
+- type: entity
+  parent: [ LockerWallColorL4Bomb, StorageFillL4BombSuit ]
+  id: LockerWallColorL4BombFilled
+  suffix: Frontier, Filled
+# endregion
+
 # region Medical
 - type: entity
   id: LockerWallColorMedicalDoctorFilled
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml
index e3d5c0b0732..72ffd911a7a 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/security.yml
@@ -12,7 +12,7 @@
 
 - type: entity
   id: LockerNfsdSilverDetectiveFilled
-  suffix: Filled
+  suffix: Detective, Filled
   parent: LockerNfsdSilver
   components:
   - type: StorageFill
@@ -21,6 +21,8 @@
       - id: DrinkDetFlask
       - id: BoxEvidenceMarkers
       - id: HandLabeler
+  - type: AccessReader
+    access: [["Detective"]]
 
 - type: entity
   id: NFLockerSecurityFilled
@@ -49,8 +51,6 @@
   name: turret safe
   suffix: NFSD, Filled
   components:
-  - type: AccessReader
-    access: [["Security"]]
   - type: StorageFill
     contents:
     - id: WeaponCaseHeavyCdet
@@ -59,6 +59,8 @@
       amount: 1
     - id: WeaponCaseHeavyAsmgt
       amount: 1
+  - type: AccessReader
+    access: [["Security"]]
 
 - type: entity
   parent: GunSafe
@@ -66,9 +68,9 @@
   name: turret safe
   suffix: CDET, Filled
   components:
-  - type: AccessReader
-    access: [["Security"]]
   - type: StorageFill
     contents:
     - id: WeaponCaseHeavyCdet
-      amount: 1
\ No newline at end of file
+      amount: 1
+  - type: AccessReader
+    access: [["Security"]]
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/wardrobe_job.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/wardrobe_job.yml
index b2b5acc16a1..adb306236c3 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/wardrobe_job.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/wardrobe_job.yml
@@ -8,10 +8,4 @@
   - type: ContainerContainer
     containers:
       entity_storage: !type:Container
-        showEnts: False
-        occludes: True
-        ents: []
       paper_label: !type:ContainerSlot
-        showEnts: False
-        occludes: True
-        ent: null
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Paper/Shipyard/manuals.yml b/Resources/Prototypes/_NF/Catalog/Fills/Paper/Shipyard/manuals.yml
index a62b9db29a4..7b71ac87be3 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Paper/Shipyard/manuals.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Paper/Shipyard/manuals.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemCardboard]
   id: ShipyardInfoBase
   name: shuttle user manual
   description: The preflight checklist for a shuttle. Check it for power settings!
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/safety_gear.yml b/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/safety_gear.yml
new file mode 100644
index 00000000000..7064984813a
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/Fills/StorageFillTemplates/safety_gear.yml
@@ -0,0 +1,44 @@
+
+- type: entity
+  abstract: true
+  id: StorageFillL1FireSuit
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingOuterSuitFire
+    - id: ClothingHeadHelmetFire
+    - id: FireExtinguisher
+    - id: ClothingMaskGas
+    - id: CrowbarRed
+    - id: DoubleEmergencyAirTankFilled
+
+- type: entity
+  abstract: true
+  id: StorageFillL2RadiationSuit
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingOuterSuitRad
+    - id: GeigerCounter
+
+- type: entity
+  abstract: true
+  id: StorageFillL3BiohazardSuit
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingOuterBioGeneral
+    - id: ClothingHeadHatHoodBioGeneral
+    - id: DoubleEmergencyAirTankFilled
+
+- type: entity
+  abstract: true
+  id: StorageFillL4BombSuit
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingOuterSuitBomb
+    - id: ClothingHeadHelmetBombSuit
+    - id: Multitool
+    - id: Screwdriver
+    - id: Wirecutter
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/goblin_outerclothing.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/goblin_outerclothing.yml
index be15cb3ff88..4d1f5bd6206 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/goblin_outerclothing.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/goblin_outerclothing.yml
@@ -38,13 +38,7 @@
   - type: ContainerContainer
     containers:
       toggleable-clothing: !type:ContainerSlot
-        showEnts: False
-        occludes: True
-        ent: null
       storagebase: !type:Container
-        showEnts: False
-        occludes: True
-        ents: []
   - type: StaticPrice
     price: 65
   - type: Construction
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/faction_clothing_base.yml b/Resources/Prototypes/_NF/Entities/Clothing/base_faction_clothing.yml
similarity index 100%
rename from Resources/Prototypes/_NF/Entities/Clothing/faction_clothing_base.yml
rename to Resources/Prototypes/_NF/Entities/Clothing/base_faction_clothing.yml
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/recyclable_clothing_base.yml b/Resources/Prototypes/_NF/Entities/Clothing/base_recyclable_clothing.yml
similarity index 100%
rename from Resources/Prototypes/_NF/Entities/Clothing/recyclable_clothing_base.yml
rename to Resources/Prototypes/_NF/Entities/Clothing/base_recyclable_clothing.yml
diff --git a/Resources/Prototypes/_NF/Entities/Effects/emp.yml b/Resources/Prototypes/_NF/Entities/Effects/emp.yml
new file mode 100644
index 00000000000..cf0eb140c94
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Effects/emp.yml
@@ -0,0 +1,16 @@
+- type: entity
+  name: emp blast
+  id: EffectEmpBlast
+  description: Looking at this anomaly makes you feel an electric tingling all over your body.
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: EmpBlast
+  - type: TimedDespawn
+    lifetime: 1
+  - type: Tag
+    tags:
+      - HideContextMenu
+  - type: EmitSoundOnSpawn
+    sound: 
+      path: /Audio/Effects/Lightning/lightningbolt.ogg
+  - type: AnimationPlayer
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/paintings.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/paintings.yml
new file mode 100644
index 00000000000..ec4eb76f09d
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/paintings.yml
@@ -0,0 +1,34 @@
+- type: entity
+  parent: RandomPainting
+  id: RandomPaintingHalloween
+  suffix: Halloween
+  components:
+  - type: RandomSpawner
+    offset: 0
+    prototypes:
+      - PaintingPersistenceOfMemory
+      - PaintingTheSonOfMan
+      - PaintingTheKiss
+      - PaintingTheScream
+      - PaintingTheGreatWave
+      - PaintingCafeTerraceAtNight
+      - PaintingNightHawks
+      - PaintingSkeletonCigarette
+      - PaintingPrayerHands
+      - PaintingOldGuitarist
+      - PaintingOlympia
+      - PaintingSaturn
+      - PaintingSleepingGypsy
+      - PaintingRedBlueYellow
+      - PaintingHelloWorld
+      - PaintingNightOfThePostGoblin
+      # Special halloween posters
+      - PaintingSpookyIan
+      - PaintingSpookyLady
+    chance: 1
+    rarePrototypes:
+      - PaintingSkeletonBoof
+      - PaintingEmpty
+      - PaintingMoony
+      - PaintingAmogusTriptych
+    rareChance: 0.01
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane.yml
index 044a1267788..86c0a210f0d 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane.yml
@@ -100,12 +100,12 @@
       path: /Audio/Effects/bite.ogg
     damage:
       types:
-        Slash: 12
+        Blunt: 4
         Structural: 20
     animation: WeaponArcBite
   - type: MeleeChemicalInjector
     solution: bloodstream
-    transferAmount: 4
+    transferAmount: 0.5
   - type: PointLight
     radius: 1.4
     energy: 1.2
@@ -224,7 +224,7 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      200: Dead
+      140: Dead
   - type: Destructible
     thresholds:
     - trigger:
@@ -259,7 +259,7 @@
       path: /Audio/_NF/Effects/silence.ogg
   - type: MeleeChemicalInjector
     solution: bloodstream
-    transferAmount: 10
+    transferAmount: 0.5
   # Ghost role stuff
   - type: GhostRole
     allowMovement: true
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane_minions.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane_minions.yml
index 644b03da42b..ac31e515fdb 100644
--- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane_minions.yml
+++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_meme_goblinbane_minions.yml
@@ -2,7 +2,7 @@
 - type: entity
   id: MobMemePossessedMop
   name: possessed mop
-  parent: [ MobIncorporealBase, BaseMobMemeGoblinbane, NFMobTimedDespawn120 ]
+  parent: [ BaseMobMemeGoblinbane, NFMobTimedDespawn120 ]
   categories: [ HideSpawnMenu ]
   components:
   - type: HTN
@@ -38,7 +38,7 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      50: Dead
+      40: Dead
   - type: Destructible
     thresholds:
     - trigger:
@@ -63,11 +63,11 @@
     attackRate: 1
     damage:
       types:
-        Blunt: 6
+        Blunt: 3
         Structural: 20
   - type: MeleeChemicalInjector
     solution: bloodstream
-    transferAmount: 10
+    transferAmount: 0.5
 
 # Possessed Spray
 - type: entity
@@ -109,7 +109,7 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      50: Dead
+      40: Dead
   - type: Destructible
     thresholds:
     - trigger:
@@ -179,7 +179,7 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      50: Dead
+      40: Dead
   - type: Destructible
     thresholds:
     - trigger:
@@ -194,7 +194,7 @@
           MopBucket:
             min: 1
             max: 1
-          SoapNT:
+          RandomSoap:
             min: 1
             max: 1
       - !type:DoActsBehavior
@@ -207,7 +207,7 @@
     attackRate: 1
     damage:
       types:
-        Blunt: 6
+        Blunt: 3
         Structural: 20
 
 # Mop bucket dimention portal
@@ -237,7 +237,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 90
+        damage: 60
       behaviors:
       - !type:PlaySoundBehavior
         sound:
@@ -246,7 +246,7 @@
         acts: [ "Destruction" ]
     - trigger:
         !type:DamageTrigger
-        damage: 90
+        damage: 60
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml
index 817b0c88387..9dc17368c4d 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml
@@ -80,9 +80,6 @@
   - type: ContainerContainer
     containers:
       paper_label: !type:ContainerSlot
-        showEnts: False
-        occludes: True
-        ent: null
 
 - type: entity
   parent: DrinkKegBase
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/box.yml
index 314ed86c869..ea4811a3ff8 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -1,3 +1,4 @@
+# Full
 - type: entity
   id: HappyHonkMcCargo
   parent: HappyHonk
@@ -21,7 +22,8 @@
       orGroup: GiftPool
       prob: 0.05
   - type: StaticPrice
-    price: 40
+    price: 1
+    vendPrice: 200 # Need this to not bug out the cardbox worth...
 
 - type: entity
   id: HappyHonkMcCargoFood
@@ -210,4 +212,76 @@
       prob: 0.25
     # Extra
 #    - id: FoodCondimentPacketPepper
-    - id: FoodCondimentPacketSalt
\ No newline at end of file
+    - id: FoodCondimentPacketSalt
+
+# Empty
+- type: entity
+  id: BoxMREEmpty
+  parent: BoxMRE
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: StorageFill
+    contents: []
+
+- type: entity
+  id: HappyHonkEmpty
+  parent: HappyHonk
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: StorageFill
+    contents: []
+
+- type: entity
+  id: HappyHonkMimeEmpty
+  parent: HappyHonkMime
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: StorageFill
+    contents: []
+
+- type: entity
+  id: HappyHonkNukieEmpty
+  parent: HappyHonkNukie
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: StorageFill
+    contents: []
+
+- type: entity
+  id: HappyHonkCluwneEmpty
+  parent: HappyHonkCluwne
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: StorageFill
+    contents: []
+
+- type: entity
+  id: HappyHonkMcCargoEmpty
+  parent: HappyHonkMcCargo
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: StorageFill
+    contents: []
+
+- type: entity
+  id: FoodBoxNuggetEmpty
+  parent: FoodBoxNugget
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: StorageFill
+    contents: []
+
+- type: entity
+  id: FoodContainerEggEmpty
+  parent: FoodContainerEgg
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: StorageFill
+    contents: []
+
+- type: entity
+  id: FoodBoxDonutEmpty
+  parent: FoodBoxDonut
+  components:
+  - type: StorageFill
+    contents: []
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml
index b22ef17701d..3029c4f2401 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/ingredients.yml
@@ -203,7 +203,7 @@
   - type: Construction
     graph: Coffee
     node: dark roasted coffee
-    defaultTarget: Null
+    defaultTarget: Null # Overwriting light target
 
 - type: reagent
   id: OilVegetable
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/encryption_keys.yml
index 332c67e058d..50a797d7657 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Devices/encryption_keys.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/encryption_keys.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: EncryptionKey
+  parent: [EncryptionKey, RecyclableItemDeviceTiny]
   id: EncryptionKeyTraffic
   name: traffic control encryption key
   description: An encryption key for the space traffic control channel.
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/mortuary_urn.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/mortuary_urn.yml
index 75484113390..bf10f371fbc 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Misc/mortuary_urn.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/mortuary_urn.yml
@@ -30,17 +30,8 @@
   - type: ContainerContainer
     containers:
       storagebase: !type:Container
-        showEnts: False
-        occludes: True
-        ents: []
       ashes_slot: !type:ContainerSlot
-        showEnts: False
-        occludes: True
-        ent: null
       paper_label: !type:ContainerSlot
-        showEnts: False
-        occludes: True
-        ent: null
   - type: Appearance
   - type: GenericVisualizer
     visuals:
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/leaves.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/leaves.yml
index 2632d4b6f3c..59a11fd9341 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/leaves.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Hydroponics/leaves.yml
@@ -25,7 +25,7 @@
 # Shrooms
 - type: entity
   name: dried shrooms
-  parent: BaseItem
+  parent: [BaseItem, RecyclableItemOrganicTiny]
   id: ShroomsDried
   description: "Dried shrooms, ready to be ground."
   components:
diff --git a/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml b/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml
new file mode 100644
index 00000000000..782f4933f26
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/base_recyclable_items.yml
@@ -0,0 +1,153 @@
+# Mostly ignores crafting composition of items making recycling wildly inefficient
+# and occasionally ignores item sizes too (eg toolbox is ginormous item, but is treated as RecyclableItemSteelMedium nonetheless)
+# Item sizes: Tiny, Small, Medium, Large, Huge, Ginormous
+
+# No materials
+- type: entity
+  id: RecyclableItemNoMats
+  abstract: true
+  components:
+  - type: PhysicalComposition
+  - type: Tag
+    tags:
+    - Trash
+    - Recyclable
+
+# Cardboard
+- type: entity # Boxes
+  id: RecyclableItemCardboard
+  abstract: true
+  components:
+  - type: PhysicalComposition
+    materialComposition:
+      Cardboard: 100
+
+# Paper
+- type: entity # Books
+  id: RecyclableItemPaper
+  abstract: true
+  components:
+  - type: PhysicalComposition
+    materialComposition:
+      Paper: 50
+
+# Glass
+## Tiny
+- type: entity # Dropper etc
+  id: RecyclableItemGlassTiny
+  abstract: true
+  components:
+  - type: PhysicalComposition
+    materialComposition:
+      Glass: 10
+
+# Steel
+## Tiny
+- type: entity # Flares idk
+  id: RecyclableItemSteelTiny
+  abstract: true
+  components:
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 10
+
+## Small
+- type: entity # Weapon magazines, grenades idk
+  id: RecyclableItemSteelSmall
+  abstract: true
+  components:
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 20
+
+## Medium
+- type: entity # Jaws of life, toolboxes idk
+  id: RecyclableItemSteelMedium
+  abstract: true
+  components:
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 200
+
+# Plastic
+## Tiny
+- type: entity # Pill canisters, swabs, dice, capacitors etc.
+  id: RecyclableItemPlasticTiny
+  abstract: true
+  components:
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 10
+
+## Small
+- type: entity # Spray bottles, glue/lube tubes, plungers etc
+  id: RecyclableItemPlasticSmall
+  abstract: true
+  components:
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 25
+
+## Medium
+- type: entity # Spray bottles, glue/lube tubes, plungers etc
+  id: RecyclableItemPlasticMedium
+  abstract: true
+  components:
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 50
+
+# Simple Devices
+## Tiny
+- type: entity # Machine parts, encryption keys etc
+  id: RecyclableItemDeviceTiny
+  abstract: true
+  components:
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 10
+      Steel: 10
+
+## Small
+- type: entity # Light replacers, sign projectors, flashlights, power cells etc
+  id: RecyclableItemDeviceSmall
+  abstract: true
+  components:
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 25
+      Steel: 25
+      Glass: 25
+
+# Complex Devices
+## Normal
+- type: entity # Flatpacks etc
+  id: RecyclableItemDeviceComplexNormal
+  abstract: true
+  components:
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 100
+      Glass: 50
+      Silver: 20
+      Gold: 10
+
+# Organic
+## Tiny
+- type: entity # Soap, candles, seeds etc
+  id: RecyclableItemOrganicTiny
+  abstract: true
+  components:
+  - type: PhysicalComposition
+    materialComposition:
+      Biomass: 1
+
+# Wood
+## Medium
+- type: entity # Musical instruments etc
+  id: RecyclableItemWoodMedium
+  abstract: true
+  components:
+  - type: PhysicalComposition
+    materialComposition:
+      Wood: 200
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/tables.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/tables.yml
new file mode 100644
index 00000000000..895c91fad28
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Furniture/tables.yml
@@ -0,0 +1,123 @@
+
+- type: entity
+  parent: BaseDeployFoldable
+  id: TableFolding
+  name: folding table
+  description: If you carry six of these you become the coolest kid at church.
+  components:
+  # Table bits
+  - type: SpriteFade
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Climbable
+  - type: GlassTable
+    climberDamage:
+      types:
+        Blunt: 15
+    tableDamage:
+      types:
+        Blunt: 25
+    tableMassLimit: 60
+  - type: PlaceableSurface
+  - type: Physics
+    bodyType: Dynamic
+    fixedRotation: true
+  - type: Pullable
+  - type: Fixtures
+    fixtures:
+      table: # For the unfolded table
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.4"
+        density: 55
+        mask:
+        - TableMask
+        layer:
+        - TableLayer
+        hard: true
+      item: # For the folded, carriable table
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.25,-0.25,0.25,0.25"
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
+        hard: false
+  - type: Bonkable
+    bonkDamage:
+      types:
+        Blunt: 4
+    bonkSound: !type:SoundCollectionSpecifier
+      collection: TrayHit
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepHull
+  # Item bits
+  - type: MovedByPressure
+  - type: Item
+    size: Huge
+  - type: Sprite
+    sprite: _NF/Structures/Furniture/folding_table.rsi
+    layers:
+    - state: folding
+      map: ["unfoldedLayer"]
+    - state: folding_folded
+      map: ["foldedLayer"]
+      visible: false
+    noRot: true
+  - type: Appearance
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 8
+    soundHit:
+      collection: MetalThud
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: Metallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 15
+      behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+        - !type:PlaySoundBehavior
+          sound:
+            collection: MetalBreak
+    - trigger:
+        !type:DamageTrigger
+        damage: 5
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetPlastic1:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: StaticPrice
+    price: 20
+  - type: Construction
+    graph: TableFoldingGraph
+    node: TableFolding
+  - type: DamageExaminable
+  - type: FoldableFixture
+    foldedFixtures:
+    - item
+    unfoldedFixtures:
+    - table
+
+- type: entity
+  parent: TableFolding
+  id: TableFoldingSpawnFolded
+  suffix: folded
+  components:
+  - type: Foldable
+    folded: true
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
index 9822c787f93..163cc794cee 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -16,142 +16,430 @@
     - blueprint
 
 - type: entity
-  parent: [BaseStructureDisableToolUse, BaseLathe]
-  id: PrizeCounter
-  name: prize counter
-  description: Claim your prize and win some toys and cute plushies!
+  parent: [ BlueprintReceiverBase, BaseLatheLube ]
+  id: ScienceTechFab
+  name: science techfab
+  description: Prints equipment for use by the epistemics department.
   components:
-  - type: AmbientOnPowered
-  - type: AmbientSound
-    volume: -9
-    range: 3
-    enabled: false
-    sound:
-      path: /Audio/Ambience/Objects/vending_machine_hum.ogg
-  - type: LitOnPowered
-  - type: ApcPowerReceiver
-    powerLoad: 200
-  - type: Advertise
-    pack: CuddlyCritterAds
-  - type: PointLight
-    radius: 1.5
-    energy: 1.6
-    color: "#4b93ad"
-  - type: Transform
-    noRot: false
   - type: Sprite
-    sprite: _NF/Structures/Machines/prizecounter.rsi
-    snapCardinals: true
+    netsync: false
+    sprite: Structures/Machines/techfab.rsi
     layers:
     - state: icon
       map: ["enum.LatheVisualLayers.IsRunning"]
+    - state: sci
     - state: unlit
       shader: unshaded
       map: ["enum.PowerDeviceVisualLayers.Powered"]
+    - state: inserting
+      map: ["enum.MaterialStorageVisualLayers.Inserting"]
     - state: panel
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: Machine
+    board: ScienceTechFabCircuitboard
   - type: Lathe
     idleState: icon
     runningState: icon
-    staticRecipes:
-      - PrizeBallRecipe
-      - PlushieHampterRecipe
-      - PlushieVulpRecipe
-      - PlushieBeeRecipe
-      - PlushieLizardRecipe
-      - PlushieSpaceLizardRecipe
-      - PlushieVoxRecipe
-      - PlushieMoffRecipe
-      - PlushieMoffsicianRecipe
-      - PlushieMoffbarRecipe
-      - PlushieDionaRecipe
-      - PlushieSharkGreyRecipe
-      - PlushieSharkBlueRecipe
-      - PlushieSharkPinkRecipe
-      - PlushieRatvarRecipe
-      - PlushieNarRecipe
-      - PlushieSlimeRecipe
-      - PlushieSnakeRecipe
-      - PlushieCarpRecipe
-      - PlasticBananaRecipe
-      - BeachBallRecipe
-      - BasketballRecipe
-      - FootballRecipe
-      - ToyHammerRecipe
-      - WhoopieCushionRecipe
-      - ClownRecorderRecipe
-      - PonderingOrbRecipe
-      - CrayonBoxRecipe
-      - CrayonRainbowRecipe
-      - PlushieLampRecipe
-      - PlushieAtmosianRecipe
-      - PlushieRounyRecipe
-      - PlushieXenoRecipe
-      - FoamCrossbowRecipe
-      - BoxDonkSoftBoxRecipe
-      - RevolverCapGunRecipe
-      - BoxCartridgeCapRecipe
-      - ToyAmongPequenoRecipe
-      - FoamCutlassRecipe
-      - FoamBladeRecipe
-      - ToyRubberDuckRecipe
-      - ToyMouseRecipe
-      - ToyAiRecipe
-      - ToyGriffinRecipe
-      - ToyHonkRecipe
-      - ToyIanRecipe
-      - ToyMarauderRecipe
-      - ToyGygaxRecipe
-      - ToyOdysseusRecipe
-      - ToyOwlmanRecipe
-      - ToyPhazonRecipe
-      - ToyFireRipleyRecipe
-      - ToyReticenceRecipe
-      - ToyRipleyRecipe
-      - ToySeraphRecipe
-      - ToyDurandRecipe
-      - ToySkeletonRecipe
-      - FaceHuggerPlushieRecipe
-      - PetRockCarrierkRecipe
-      - PlushieGnomeRecipe
-      - PlushieLoveableRecipe
-      - PlushieDeerRecipe
-      - PlushieIpcRecipe
-      - PlushieGreyRecipe
-      - PlushieRedFoxRecipe
-      - PlushiePurpleFoxRecipe
-      - PlushiePinkFoxRecipe
-      - PlushieOrangeFoxRecipe
-      - PlushieMarbleFoxRecipe
-      - PlushieCrimsonFoxRecipe
-      - PlushieCoffeeFoxRecipe
-      - PlushieBlueFoxRecipe
-      - PlushieBlackFoxRecipe
-      - PlushieCorgiRecipe
-      - PlushieGirlyCorgiRecipe
-      - PlushieRobotCorgiRecipe
-      - PlushieCatBlackRecipe
-      - PlushieCatOrangeRecipe
-      - PlushieCatSiamesRecipe
-      - PlushieCatTabbyRecipe
-      - PlushieCatTuxedoRecipe
-      - PlushieCatWhiteRecipe
+    staticRecipes: 
+    # Shared lathe recipes
+    ## Basic tools
+      - Wirecutter
+      - Screwdriver
+      - Welder
+      - Wrench
+      - CrowbarGreen
+      - Multitool
+      - FlashlightLantern
+      - AppraisalTool
+      - HandLabeler
+      - Signaller
+      - ClothingMaskWeldingGas
+    ## Basic storage
+      - ToolboxArtisticNF
+      - ToolboxElectricalNF
+      - ToolboxMechanicalNF
+      - ToolboxEmergencyNF
+    ## Basic parts
+      - CableStack
+      - LightTube
+      - LedLightTube
+      - SodiumLightTube
+      - ExteriorLightTube
+      - LightBulb
+      - LedLightBulb
+      - ConveyorBeltAssembly
+      - PowerCellSmall
+      - PowerCellMedium
+    ## Basic electronics
+      - SignalTimerElectronics
+      - CellRechargerCircuitboard
+      - BorgChargerCircuitboard
+      - WeaponCapacitorRechargerCircuitboard
+    ## Basic EVA:
+      - ClothingOuterEVASuitContractor
+      - ClothingOuterEVASuitPilot
+      - AirTank
+      - HandheldGPSBasic
+    # Science techfab
+    ## Tools
+      - NodeScanner
+    ## Basic EVA:
+      - ClothingOuterEVASuitScientist
+    dynamicRecipes:
+    # Shared lathe recipes
+    ## Advanced tools
+      - WelderExperimental
+      - JawsOfLife
+      - PowerDrill
+      - JetpackVoid
+      - PowerCellHigh
+      #- PowerCellHyperNF
+      - PowerCellMicroreactor
+      - BluespaceBeaker
+      - VialBluespace
+      - CryostasisBeaker
+      - ClothingBackpackHolding
+      - ClothingBackpackSatchelHolding
+      - ClothingBackpackDuffelHolding
+      - ClothingBackpackMessengerHolding 
+      - ChemicalPayload
+      - Bucket
+      - MopItem
+      - SprayBottle
+      - FireExtinguisher
+      - CableStack
+      - CableMVStack
+      - CableHVStack
+      - ClothingOuterHardsuitBasic
+      - ClothingOuterHardsuitRd
+
+- type: entity
+  parent: [ BlueprintReceiverBase, BaseLatheLube ]
+  id: ServiceTechFab
+  name: service techfab
+  description: Prints equipment for service staff.
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Structures/Machines/techfab.rsi
+    layers:
+    - state: icon
+      map: ["enum.LatheVisualLayers.IsRunning"]
+    - state: service
+    - state: unlit
+      shader: unshaded
+      map: ["enum.PowerDeviceVisualLayers.Powered"]
+    - state: inserting
+      map: ["enum.MaterialStorageVisualLayers.Inserting"]
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: Machine
+    board: ServiceTechFabCircuitboard
+  - type: Lathe
+    idleState: icon
+    runningState: icon
+    staticRecipes: 
+    # Shared lathe recipes
+    ## Basic tools
+      - Wirecutter
+      - Screwdriver
+      - Welder
+      - Wrench
+      - CrowbarGreen
+      - Multitool
+      - FlashlightLantern
+      - AppraisalTool
+      - HandLabeler
+      - Signaller
+      - ClothingMaskWeldingGas
+    ## Basic storage
+      - ToolboxArtisticNF
+      - ToolboxElectricalNF
+      - ToolboxMechanicalNF
+      - ToolboxEmergencyNF
+      - NFBoxMREEmpty
+      - NFHappyHonkEmpty
+      - NFHappyHonkMimeEmpty
+      - NFHappyHonkMcCargoEmpty
+      - NFFoodBoxPizza
+      - NFFoodBoxDonutEmpty
+      - NFFoodBoxNuggetEmpty
+      - NFFoodContainerEggEmpty
+    ## Basic parts
+      - CableStack
+      - LightTube
+      - LedLightTube
+      - SodiumLightTube
+      - ExteriorLightTube
+      - LightBulb
+      - LedLightBulb
+      - ConveyorBeltAssembly
+      - PowerCellSmall
+      - PowerCellMedium
+    ## Basic electronics
+      - SignalTimerElectronics
+      - CellRechargerCircuitboard
+      - BorgChargerCircuitboard
+      - WeaponCapacitorRechargerCircuitboard
+    ## Basic EVA:
+      - ClothingOuterEVASuitContractor
+      - ClothingOuterEVASuitPilot
+      - AirTank
+      - HandheldGPSBasic
+    # Service techfab
+    ## Tools
+      - LightReplacer
+      - MopBucket
+      - TrashBag
+      - Bucket
+      - MopItem
+      - SprayBottle
+      - MiniHoe
+      - HydroponicsToolScythe
+      - HydroponicsToolHatchet
+      - Spade
+      - Clippers
+      - ServiceSelectiveDropper
+      - PlantBag
+      - Beaker
+      - LargeBeaker
+      - Jug
+      - MailCapsule
+      - LanternNF
+      - PillCanister
+      - ChemistryEmptyBottle01
+      - Mousetrap
+      - Holoprojector
+      - Shovel
+    ## Kitchen
+      - DrinkMug
+      - DrinkMugMetal
+      - DrinkGlass
+      - KitchenKnife
+      - ButchCleaver
+      - ServiceRollingPin
+      - ServiceSpoon
+      - ServiceFork
+      - ServicePairedChopsticks
+      - ServiceFoodBowlBig
+      - ServiceFoodPlate
+      - ServiceFoodPlateSmall
+      - ServiceFoodPlateTin
+      - ServiceFoodKebabSkewer
+      - DrinkShotGlass
+      - DrinkGlassCoupeShaped
+      - CustomDrinkJug
+      - FoodPlatePlastic
+      - FoodPlateSmallPlastic
+      - NapkinDrum
+      - Napkin
+    ## EVA
+      - ClothingOuterEVASuitHydro
+      - ClothingOuterEVASuitJanitor
+      - ClothingOuterEVASuitServiceWorker
+      - ClothingOuterEVASuitChaplain
+      - ClothingOuterEVASuitBoxerRed
+      - ClothingOuterEVASuitBoxerGreen
+      - ClothingOuterEVASuitBoxerBlue
+      - ClothingOuterEVASuitBoxerYellow
+    ## Materials
+      - SheetPaper
+      - NFMaterialCardboard1Processed
+    ## Misc
+      - ClothingHeadHatCone
+      - FireExtinguisher
+      - WetFloorSign
+    dynamicRecipes:
+    # Shared lathe recipes
+    ## Advanced tools
+      - WelderExperimental
+      - JawsOfLife
+      - PowerDrill
+      - JetpackVoid
+      - PowerCellHigh
+      - PowerCellMicroreactor
+    # Service techfab
+      - SynthesizerInstrument
+      - ClothingOuterHardsuitBasic
+      - ClothingOuterHardsuitPilot
+      - ClothingOuterHardsuitClown
+      - ClothingOuterHardsuitMime
+      - AdvMopItem
+      - WeaponSprayNozzle
+      - ClothingBackpackWaterTank
+      - MegaSprayBottle
+      - TimerTrigger
+      - ChemicalPayload
+      - BluespaceBeaker
+      - SyringeBluespace
+      - PlantBagOfHolding
+      - PlantAnalyzer
   - type: EmagLatheRecipes
     emagStaticRecipes:
-      - PlushieJesterRecipe
-      - PlushieJanitorRecipe
-      - PlushieNukeRecipe
-      - PlushieRGBeeRecipe
-      - BalloonCorgiRecipe
-      - BalloonSynRecipe
-      - ToyNukeRecipe
-      - ToyMaulerRecipe
-      - PlushieAbductorRecipe
-      - PlushieAbductorAgentRecipe
-  - type: MaterialStorage
-    whitelist:
-      tags:
-        - PrizeTicket
+      - NFHappyHonkNukieEmpty
+      - NFHappyHonkCluwneEmpty
+
+- type: entity
+  parent: [ BlueprintReceiverBase, BaseLatheLube ]
+  id: EngineeringTechFab
+  name: engineering techfab
+  description: Prints equipment for engineers.
+  components:
+  - type: Sprite
+    netsync: false
+    sprite: Structures/Machines/techfab.rsi
+    layers:
+    - state: icon
+      map: ["enum.LatheVisualLayers.IsRunning"]
+    - state: engi
+    - state: unlit
+      shader: unshaded
+      map: ["enum.PowerDeviceVisualLayers.Powered"]
+    - state: inserting
+      map: ["enum.MaterialStorageVisualLayers.Inserting"]
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: Machine
+    board: EngineeringTechFabCircuitboard
+  - type: Lathe
+    idleState: icon
+    runningState: icon
+    staticRecipes:
+    # Shared lathe recipes
+    ## Basic tools
+      - Wirecutter
+      - Screwdriver
+      - Welder
+      - Wrench
+      - CrowbarGreen
+      - Multitool
+      - FlashlightLantern
+      - AppraisalTool
+      - HandLabeler
+      - Signaller
+      - ClothingMaskWeldingGas
+    ## Basic storage
+      - ToolboxArtisticNF
+      - ToolboxElectricalNF
+      - ToolboxMechanicalNF
+      - ToolboxEmergencyNF
+    ## Basic parts
+      - CableStack
+      - LightTube
+      - LedLightTube
+      - SodiumLightTube
+      - ExteriorLightTube
+      - LightBulb
+      - LedLightBulb
+      - ConveyorBeltAssembly
+      - PowerCellSmall
+      - PowerCellMedium
+    ## Basic electronics
+      - SignalTimerElectronics
+      - CellRechargerCircuitboard
+      - BorgChargerCircuitboard
+      - WeaponCapacitorRechargerCircuitboard
+    ## Basic EVA
+      - ClothingOuterEVASuitContractor
+      - ClothingOuterEVASuitPilot
+      - AirTank
+      - HandheldGPSBasic
+    # Engineering techfab
+    ## Tools
+      - NetworkConfigurator
+      - SprayPainter
+      - TRayScanner
+      - GasAnalyzer
+      - Holoprojector
+      - LightReplacer
+      - WelderIndustrial
+      - WelderIndustrialAdvanced
+      - HolofanProjector
+    ## Parts
+      - MicroManipulatorStockPart
+      - MatterBinStockPart
+      - CapacitorStockPart
+      - Igniter
+      - CableMVStack
+      - CableHVStack
+    ## Electronics
+      - IntercomElectronics
+      - FirelockElectronics
+      - DoorElectronics
+      - AirAlarmElectronics
+      - StationMapElectronics
+      - FireAlarmElectronics
+      - MailingUnitElectronics
+      - APCElectronics
+      - SMESMachineCircuitboard
+      - SubstationMachineCircuitboard
+      - SmallThrusterMachineCircuitboard
+      - SmallGyroscopeMachineCircuitboard
+      - WallmountSubstationElectronics
+      - SolarControlComputerCircuitboard
+      - SolarTrackerElectronics
+      - SolarAssemblyFlatpack
+      - ShuttleConsoleCircuitboard
+      - PortableGeneratorPacmanMachineCircuitboard
+      - PortableGeneratorSuperPacmanMachineCircuitboard
+      - PortableGeneratorJrPacmanMachineCircuitboard
+      - ThrusterMachineCircuitboard
+      - GyroscopeMachineCircuitboard
+      - MiniGravityGeneratorCircuitboard
+    ## Clothing
+      - UtilityBelt
+      - ConstructionBag
+    ## EVA
+      - ClothingHeadHelmetEVA
+      - ClothingHeadHelmetEVALarge
+      - ClothingOuterEVASuitEngineer
+      - ClothingOuterEVASuitAtmosTech
+    ## Materials
+      - Durathread
+      - NFSheetRGlassProcessed
+      - NFSheetPGlass1Processed
+      - NFSheetRPGlass1Processed
+      - NFSheetPlasteel1Processed
+      - NFSheetUGlass1Processed
+      - NFSheetRUGlass1Processed
+    ## Misc
+      - ClothingHeadHatCone
+    dynamicRecipes:
+    # Shared lathe recipes
+    ## Advanced tools
+      - WelderExperimental
+      - JawsOfLife
+      - PowerDrill
+      - JetpackVoid
+      - PowerCellHigh
+      - PowerCellMicroreactor
+    # Engineering techfab
+      - Flash
+      - MicroManipulatorStockPart
+      - NanoManipulatorStockPart
+      - PicoManipulatorStockPart
+      - FemtoManipulatorStockPart
+      - MatterBinStockPart
+      - AdvancedMatterBinStockPart
+      - SuperMatterBinStockPart
+      - BluespaceMatterBinStockPart
+      - CapacitorStockPart
+      - AdvancedCapacitorStockPart
+      - SuperCapacitorStockPart
+      - QuadraticCapacitorStockPart
+      - RPED
+      - MiningDrill
+      - MiningDrillDiamond
+      - SprayBottle
+      - FireExtinguisher
+      - ShipyardRCD
+      - ShipyardRCDAmmo
+      - SignallerAdvanced
+      - ClothingOuterHardsuitBasic
+      - ClothingOuterHardsuitAtmos
+      - ClothingOuterHardsuitEngineering
+      - ClothingOuterHardsuitEngineeringWhite
+      - ConstructionBagOfHolding
 
 - type: entity
   parent: [ BlueprintReceiverBase, BaseLatheLube ]
@@ -249,7 +537,6 @@
       - PowerDrill
       - JetpackVoid
       - PowerCellHigh
-      #- PowerCellHyperNF
       - PowerCellMicroreactor
     # Salvage techfab
       - CableMVStack
@@ -268,8 +555,6 @@
       - ClothingOuterHardsuitSalvage
       - ClothingOuterHardsuitLuxury
       - ClothingOuterHardsuitMaximPrototype
-#      - ClothingHeadHelmetAncient
-#      - ClothingOuterHardsuitAncientEVA
   - type: EmagLatheRecipes
     emagStaticRecipes:
        - ShellTranquilizer
@@ -279,12 +564,6 @@
        - MagazineBoxLightRifle
 #       - GrenadeBlast
        - ClothingHeadHelmetCosmonaut
-  - type: MaterialStorage
-    whitelist:
-      tags:
-        - Sheet
-        - RawMaterial
-        - Ingot
 
 - type: entity
   id: NfsdTechFab
@@ -329,26 +608,6 @@
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Machine
     board: MercenaryTechFabCircuitboardNF
-  - type: MaterialStorage
-    whitelist:
-      tags:
-      - Sheet
-      - RawMaterial
-      - Ingot
-  - type: ContainerContainer
-    containers:
-      machine_board: !type:Container
-        showEnts: False
-        occludes: True
-        ents: []
-      machine_parts: !type:Container
-        showEnts: False
-        occludes: True
-        ents: []
-      blueprint: !type:Container
-        showEnts: False
-        occludes: True
-        ents: []
   - type: Lathe
     idleState: icon
     runningState: icon
@@ -567,12 +826,6 @@
       scale: 0.7, 0.7
   - type: Machine
     board: MercenaryTechFabCircuitboardHackedNF
-  - type: MaterialStorage
-    whitelist:
-      tags:
-      - Sheet
-      - RawMaterial
-      - Ingot
   - type: PointLight
     radius: 1.5
     energy: 2
@@ -686,7 +939,6 @@
       - PowerDrill
       - JetpackVoid
       - PowerCellHigh
-      # - PowerCellHyperNF
       - PowerCellMicroreactor
     # Mercenary techfab
     ## Armor
@@ -740,6 +992,144 @@
       - MagazineBoxPistolUranium
       - MagazineBoxRifleUranium
 
+- type: entity
+  parent: [BaseStructureDisableToolUse, BaseLathe]
+  id: PrizeCounter
+  name: prize counter
+  description: Claim your prize and win some toys and cute plushies!
+  components:
+  - type: AmbientOnPowered
+  - type: AmbientSound
+    volume: -9
+    range: 3
+    enabled: false
+    sound:
+      path: /Audio/Ambience/Objects/vending_machine_hum.ogg
+  - type: LitOnPowered
+  - type: ApcPowerReceiver
+    powerLoad: 200
+  - type: Advertise
+    pack: CuddlyCritterAds
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#4b93ad"
+  - type: Transform
+    noRot: false
+  - type: Sprite
+    sprite: _NF/Structures/Machines/prizecounter.rsi
+    snapCardinals: true
+    layers:
+    - state: icon
+      map: ["enum.LatheVisualLayers.IsRunning"]
+    - state: unlit
+      shader: unshaded
+      map: ["enum.PowerDeviceVisualLayers.Powered"]
+    - state: panel
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: Lathe
+    idleState: icon
+    runningState: icon
+    staticRecipes:
+      - PrizeBallRecipe
+      - PlushieHampterRecipe
+      - PlushieVulpRecipe
+      - PlushieBeeRecipe
+      - PlushieLizardRecipe
+      - PlushieSpaceLizardRecipe
+      - PlushieVoxRecipe
+      - PlushieMoffRecipe
+      - PlushieMoffsicianRecipe
+      - PlushieMoffbarRecipe
+      - PlushieDionaRecipe
+      - PlushieSharkGreyRecipe
+      - PlushieSharkBlueRecipe
+      - PlushieSharkPinkRecipe
+      - PlushieRatvarRecipe
+      - PlushieNarRecipe
+      - PlushieSlimeRecipe
+      - PlushieSnakeRecipe
+      - PlushieCarpRecipe
+      - PlasticBananaRecipe
+      - BeachBallRecipe
+      - BasketballRecipe
+      - FootballRecipe
+      - ToyHammerRecipe
+      - WhoopieCushionRecipe
+      - ClownRecorderRecipe
+      - PonderingOrbRecipe
+      - CrayonBoxRecipe
+      - CrayonRainbowRecipe
+      - PlushieLampRecipe
+      - PlushieAtmosianRecipe
+      - PlushieRounyRecipe
+      - PlushieXenoRecipe
+      - FoamCrossbowRecipe
+      - BoxDonkSoftBoxRecipe
+      - RevolverCapGunRecipe
+      - BoxCartridgeCapRecipe
+      - ToyAmongPequenoRecipe
+      - FoamCutlassRecipe
+      - FoamBladeRecipe
+      - ToyRubberDuckRecipe
+      - ToyMouseRecipe
+      - ToyAiRecipe
+      - ToyGriffinRecipe
+      - ToyHonkRecipe
+      - ToyIanRecipe
+      - ToyMarauderRecipe
+      - ToyGygaxRecipe
+      - ToyOdysseusRecipe
+      - ToyOwlmanRecipe
+      - ToyPhazonRecipe
+      - ToyFireRipleyRecipe
+      - ToyReticenceRecipe
+      - ToyRipleyRecipe
+      - ToySeraphRecipe
+      - ToyDurandRecipe
+      - ToySkeletonRecipe
+      - FaceHuggerPlushieRecipe
+      - PetRockCarrierkRecipe
+      - PlushieGnomeRecipe
+      - PlushieLoveableRecipe
+      - PlushieDeerRecipe
+      - PlushieIpcRecipe
+      - PlushieGreyRecipe
+      - PlushieRedFoxRecipe
+      - PlushiePurpleFoxRecipe
+      - PlushiePinkFoxRecipe
+      - PlushieOrangeFoxRecipe
+      - PlushieMarbleFoxRecipe
+      - PlushieCrimsonFoxRecipe
+      - PlushieCoffeeFoxRecipe
+      - PlushieBlueFoxRecipe
+      - PlushieBlackFoxRecipe
+      - PlushieCorgiRecipe
+      - PlushieGirlyCorgiRecipe
+      - PlushieRobotCorgiRecipe
+      - PlushieCatBlackRecipe
+      - PlushieCatOrangeRecipe
+      - PlushieCatSiamesRecipe
+      - PlushieCatTabbyRecipe
+      - PlushieCatTuxedoRecipe
+      - PlushieCatWhiteRecipe
+  - type: EmagLatheRecipes
+    emagStaticRecipes:
+      - PlushieJesterRecipe
+      - PlushieJanitorRecipe
+      - PlushieNukeRecipe
+      - PlushieRGBeeRecipe
+      - BalloonCorgiRecipe
+      - BalloonSynRecipe
+      - ToyNukeRecipe
+      - ToyMaulerRecipe
+      - PlushieAbductorRecipe
+      - PlushieAbductorAgentRecipe
+  - type: MaterialStorage
+    whitelist:
+      tags:
+        - PrizeTicket
+
 - type: entity
   id: BlueprintLithograph
   parent: BaseLatheLube
@@ -803,10 +1193,4 @@
     - NFBlueprintWeaponLaserSvalinn
     - NFBlueprintPortableRecharger
     - BlueprintClothingOuterHardsuitScaf
-  - type: MaterialStorage
-    whitelist:
-      tags:
-        - Sheet
-        - RawMaterial
-        - Ingot
   - type: RequireProjectileTarget
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/material_reclaimer.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/material_reclaimer.yml
index 01a7ee47ce3..61552b03433 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/material_reclaimer.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/material_reclaimer.yml
@@ -67,9 +67,14 @@
       - PhysicalComposition
       - SpaceGarbage
       - Log # Frontier
+      - Cartridge # PDA app cartriges
       tags:
       - Trash
       - Recyclable
+      - Cartridge # Bullets
+      - Book
+      - Pen
+      - Handcuffs
     blacklist:
       components:
       - Material
@@ -107,5 +112,5 @@
   - type: ApcPowerReceiver # Frontier
     powerLoad: 500 # Allows us to not use the 1000 baseline
   - type: MaterialReclaimerMagnetPickup # Frontier
-    range: 0.30
+    range: 0.50 # 0.3<0.50
     magnetEnabled: true
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/microwave_recipe_assemblers.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/microwave_recipe_assemblers.yml
index 97532711cb5..39988a5ff5c 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/microwave_recipe_assemblers.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/microwave_recipe_assemblers.yml
@@ -299,6 +299,11 @@
     interfaces:
       enum.MicrowaveUiKey.MedicalAssemblerKey:
         type: AssemblerBoundUserInterface
+  - type: ContainerContainer # Redefined due to inheritance order
+    containers:
+      microwave_entity_container: !type:Container
+      machine_board: !type:Container
+      machine_parts: !type:Container
 
 # POI versions of microwave machines
 
@@ -306,59 +311,55 @@
   id: KitchenMicrowavePOI
   parent:
   - BaseStructureDisableToolUse
+  - BaseStructureIndestructible
   - KitchenMicrowave
   suffix: POI
-  components:
-  - type: Machine
-    board: Null
 
 - type: entity
   id: KitchenElectricRangePOI
   parent:
   - BaseStructureDisableToolUse
+  - BaseStructureIndestructible
   - KitchenElectricRange
   suffix: POI
-  components:
-  - type: Machine
-    board: Null
 
 - type: entity
   id: KitchenAssemblerPOI
   parent:
   - BaseStructureDisableToolUse
+  - BaseStructureIndestructible
   - KitchenAssembler
   suffix: POI
-  components:
-  - type: Machine
-    board: Null
 
 - type: entity
   id: MedicalAssemblerPOI
   parent:
   - BaseStructureDisableToolUse
+  - BaseStructureIndestructible
   - MedicalAssembler
   suffix: POI
-  components:
-  - type: Machine
-    board: Null
 
 # TODO: move this
 - type: entity
   id: KitchenReagentGrinderPOI
   parent:
   - BaseStructureDisableToolUse
+  - BaseStructureIndestructible
   - KitchenReagentGrinder
   suffix: POI
-  components:
-  - type: Machine
-    board: Null
 
 - type: entity
   id: KitchenDeepFryerPOI
   parent:
   - BaseStructureDisableToolUse
+  - BaseStructureIndestructible
   - KitchenDeepFryer
   suffix: POI
-  components:
-  - type: Machine
-    board: Null
\ No newline at end of file
+
+- type: entity
+  id: KitchenDeepFryerCauldronPOI
+  parent:
+  - BaseStructureDisableToolUse
+  - BaseStructureIndestructible
+  - KitchenDeepFryerCauldron
+  suffix: Holiday Special, POI
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/cannons.yml b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/cannons.yml
new file mode 100644
index 00000000000..66662b1d8c1
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/cannons.yml
@@ -0,0 +1,7 @@
+- type: entity
+  id: ShuttleGunFriendshipNfsd
+  parent: [BaseStructureDisableToolUse, ShuttleGunFriendship]
+  suffix: NFSD
+  components:
+  - type: Machine
+    board: Null
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters_security.yml b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters_security.yml
index 07d1623d5d8..9d1a2e35d9b 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters_security.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters_security.yml
@@ -37,7 +37,7 @@
     board: ThrusterSecurityMachineCircuitboard
   - type: ContainerContainer
     containers:
-      machine_board: !type:Container
+      machine_board: !type:Container # FIXME: Why do these need to be defined here?  What's missing?
       machine_parts: !type:Container
 
 - type: entity
@@ -62,7 +62,7 @@
     board: GyroscopeSecurityMachineCircuitboard
   - type: ContainerContainer
     containers:
-      machine_board: !type:Container
+      machine_board: !type:Container # FIXME: Why do these need to be defined here?  What's missing?
       machine_parts: !type:Container
 
 - type: entity
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index 45a58ea473f..ca031c10abf 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -153,7 +153,8 @@
 - type: entity
   id: LockerNfsdCopper
   parent: LockerBaseSecure
-  name: nfsd cadet locker
+  name: nfsd locker
+  suffix: Copper
   components:
   - type: Appearance
   - type: EntityStorageVisuals
@@ -181,7 +182,8 @@
 - type: entity
   id: LockerNfsdSilver
   parent: LockerBaseSecure
-  name: nfsd deputy locker
+  name: nfsd locker
+  suffix: Silver
   components:
   - type: Appearance
   - type: EntityStorageVisuals
@@ -209,7 +211,8 @@
 - type: entity
   id: LockerNfsdBrigmedic
   parent: LockerBaseSecure
-  name: nfsd brigmedic locker
+  name: nfsd locker
+  suffix: Brigmedic
   components:
   - type: Appearance
   - type: EntityStorageVisuals
@@ -237,7 +240,8 @@
 - type: entity
   id: LockerNfsdSergeant
   parent: LockerBaseSecure
-  name: nfsd sergeant locker
+  name: nfsd locker
+  suffix: Sergeant
   components:
   - type: Appearance
   - type: EntityStorageVisuals
@@ -264,36 +268,16 @@
 # NFSD Gold - Bailiff
 - type: entity
   id: LockerNfsdBailiff
-  parent: LockerBaseSecure
-  name: nfsd bailiff locker
-  components:
-  - type: Appearance
-  - type: EntityStorageVisuals
-    stateBaseClosed: nfsd_gold
-    stateDoorOpen: nfsd_gold_open
-    stateDoorClosed: nfsd_gold_door
-  - type: Sprite
-    sprite: _NF/Structures/Storage/closet.rsi
-    noRot: true
-    layers:
-    - state: generic
-      map: ["enum.StorageVisualLayers.Base"]
-    - state: generic_door
-      map: ["enum.StorageVisualLayers.Door"]
-    - state: locked
-      map: ["enum.LockVisualLayers.Lock"]
-      shader: unshaded
-    - state: welded
-      visible: false
-      map: ["enum.WeldableLayers.BaseWelded"]
-  - type: AccessReader
-    access: [["Security"]]
+  parent: LockerNfsdSergeant
+  name: nfsd locker
+  suffix: Bailiff
 
 # NFSD Sheriff
 - type: entity
   id: LockerNfsdSheriff
   parent: LockerBaseSecure
-  name: nfsd sheriff's locker
+  name: nfsd locker
+  suffix: Sheriff
   components:
   - type: Appearance
   - type: EntityStorageVisuals
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml
index a0886f3eae7..205762c99f8 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml
@@ -25,13 +25,7 @@
   - type: ContainerContainer
     containers:
       entity_storage: !type:Container
-        showEnts: False
-        occludes: True
-        ents: []
-      paper_label: !type:ContainerSlot
-        showEnts: False
-        occludes: True
-        ent: null
+      paper_label: !type:ContainerSlot # Defined for any locker inheriting a physical one.
 
 # Fuel / materials storage
 - type: entity
@@ -188,6 +182,96 @@
     - state: locked
       map: ["enum.LockVisualLayers.Lock"]
 
+# Safety equipment: radiation protection, boihazard etc.
+- type: entity
+  categories: [ HideSpawnMenu ] # debloat spawn menu
+  id: LockerWallColorL1Fire
+  parent: LockerWallColorBase
+  name: L1 fire suit wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#c82d2d"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#c82d2d"
+    - state: door-decal-l1-fire
+      map: [ decal1 ]
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  categories: [ HideSpawnMenu ] # debloat spawn menu
+  id: LockerWallColorL2Radiation
+  parent: LockerWallColorBase
+  name: L2 radiation suit wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#ead152"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#ead152"
+    - state: door-decal-l2-rad
+      map: [ decal1 ]
+      color: "#202020"
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  categories: [ HideSpawnMenu ] # debloat spawn menu
+  id: LockerWallColorL3Biohazard
+  parent: LockerWallColorBase
+  name: L3 biohazard suit wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#7c2900"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#7c2900"
+    - state: door-decal-l3-bio
+      map: [ decal1 ]
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
+- type: entity
+  categories: [ HideSpawnMenu ] # debloat spawn menu
+  id: LockerWallColorL4Bomb
+  parent: LockerWallColorBase
+  name: L4 bomb suit wall locker
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#3a493e"
+    - state: door
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#3a493e"
+    - state: door-decal-l4-expl
+      map: [ decal1 ]
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+
 # Other: Chemistry wall locker
 - type: entity
   id: LockerWallChemistry
@@ -232,4 +316,4 @@
   - type: EntityStorageVisuals
     stateBaseClosed: o2n2
     stateDoorOpen: o2n2_open
-    stateDoorClosed: o2n2_door
\ No newline at end of file
+    stateDoorClosed: o2n2_door
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/paintings.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/paintings.yml
index 648ab10f9b2..0e42a96231e 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/paintings.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/paintings.yml
@@ -7,3 +7,23 @@
   - type: Sprite
     sprite: _NF/Structures/Wallmounts/paintings.rsi
     state: painting0
+
+- type: entity
+  parent: PaintingBase
+  id: PaintingSpookyIan
+  name: Duty Without End
+  description: Their vigil is eternal.
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Wallmounts/paintings.rsi
+    state: painting1
+
+- type: entity
+  parent: PaintingBase
+  id: PaintingSpookyLady
+  name: The Lady and the Banners
+  description: A woman stands invitingly before a castle of ominous portent. How the windows beckon! How your gaze is arrested!
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Wallmounts/paintings.rsi
+    state: painting2
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/paintings_directional.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/paintings_directional.yml
index 213de41cf6a..8cd022d60ab 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/paintings_directional.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/paintings_directional.yml
@@ -10,7 +10,46 @@
   parent: PaintingDirectionalBase
   id: PaintingFireaxeCabinet
   name: The Fireaxe Cabinet
-  description: "Painting is a masterfully designed image of a fireaxe cabinet. The artwork relates to the loss of the masterwork ☼fireaxe☼ in the early winter of 2523. Oil. Canvas. Tears."
+  description: "This painting is a masterfully designed image of a fireaxe cabinet. The artwork relates to the loss of the masterwork ☼fireaxe☼ in the early winter of 2523. Oil. Canvas. Tears."
   components:
   - type: Sprite
-    state: painting_fireaxe
\ No newline at end of file
+    state: painting_fireaxe
+
+- type: entity
+  parent: PaintingDirectionalBase
+  id: PaintingGhostHanging
+  name: festive ghost streamers
+  description: "Decorative wall streamers! They look like the people you've lost to the void!"
+  components:
+  - type: Sprite
+    drawdepth: Overdoors
+    state: painting_ghost
+  - type: Construction
+    graph: PaintingGhostHangingGraph
+    node: PaintingGhostHangingNode
+
+- type: entity
+  parent: PaintingDirectionalBase
+  id: PaintingBatHanging
+  name: festive bat streamers
+  description: "Decorative wall streamers! Bats are scary and also important pollinators!"
+  components:
+  - type: Sprite
+    drawdepth: Overdoors
+    state: painting_bat
+  - type: Construction
+    graph: PaintingBatHangingGraph
+    node: PaintingBatHangingNode
+
+- type: entity
+  parent: PaintingDirectionalBase
+  id: PaintingPumpkinHanging
+  name: festive pumpkin streamers
+  description: "Decorative wall streamers! It's decorative gourd season!"
+  components:
+  - type: Sprite
+    drawdepth: Overdoors
+    state: painting_pumpkin
+  - type: Construction
+    graph: PaintingPumpkinHangingGraph
+    node: PaintingPumpkinHangingNode
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/shelfs.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/shelfs.yml
new file mode 100644
index 00000000000..b5a434776fe
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/shelfs.yml
@@ -0,0 +1,80 @@
+# Wall freezers
+- type: entity
+  id: ShelfWallFreezerWhite
+  parent: ShelfBaseReinforced
+  name: wall freezer
+  description: A convenient place to store perishables.
+  suffix: Frontier, White
+  components:
+  - type: ExplosionResistance
+    damageCoefficient: 0.50
+  - type: AntiRottingContainer
+  - type: Sprite
+    sprite: _NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: food-0
+      map: ["enum.StorageFillLayers.Fill"]
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+  - type: StorageFillVisualizer
+    maxFillLevels: 10
+    fillBaseName: food
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 330
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetPlasteel1:
+            min: 0
+            max: 3
+          SheetPlastic1:
+            min: 0
+            max: 3
+          ShardGlass:
+            min: 0
+            max: 3
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Storage
+    grid:
+    - 0,0,5,1
+    - 0,3,5,4
+    - 0,6,5,6
+    maxItemSize: Normal
+  - type: Construction
+    graph: WallFreezer
+    node: ShelfWallFreezerWhite
+
+- type: entity
+  id: ShelfWallFreezerDark
+  parent: ShelfWallFreezerWhite
+  name: wall freezer
+  suffix: Frontier, Dark
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+      color: "#909090"
+    - state: food-0
+      map: ["enum.StorageFillLayers.Fill"]
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+      color: "#909090"
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+  - type: Construction
+    graph: WallFreezer
+    node: ShelfWallFreezerDark
diff --git a/Resources/Prototypes/_NF/Entities/Structures/atm.yml b/Resources/Prototypes/_NF/Entities/Structures/atm.yml
index 64d5d69937e..eba0f1cbfc6 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/atm.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/atm.yml
@@ -8,7 +8,11 @@
     singleUser: true
   - type: Computer
     board: Null
+<<<<<<< HEAD
   - type: ItemSlots
+=======
+  - type: ItemSlots # TODO: move ItemSlot to be nullable, withdraw shouldn't have one at all
+>>>>>>> erhard/2024-10-Recyclable-Clothing
   - type: ContainerContainer
     containers:
       board: !type:Container
diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/folding_table.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/folding_table.yml
new file mode 100644
index 00000000000..942dc82df93
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/folding_table.yml
@@ -0,0 +1,31 @@
+- type: constructionGraph
+  id: TableFoldingGraph
+  start: start
+  graph:
+    - node: start
+      actions:
+        - !type:DestroyEntity {}
+      edges:
+
+        - to: TableFolding
+          steps:
+            - material: Plastic
+              amount: 4
+              doAfter: 1
+            - material: MetalRod
+              amount: 4
+
+    - node: TableFolding
+      entity: TableFolding
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: SheetPlastic1
+              amount: 4
+            - !type:SpawnPrototype
+              prototype: PartRodMetal1
+              amount: 4
+          steps:
+            - tool: Screwing
+              doAfter: 2
diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/shelfs.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/shelfs.yml
new file mode 100644
index 00000000000..683cd44bb83
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/shelfs.yml
@@ -0,0 +1,92 @@
+- type: constructionGraph
+  id: WallFreezer
+  start: start
+  graph:
+    - node: start
+      actions:
+        - !type:DeleteEntity {}
+      edges:
+
+# White wall freezer
+        - to: ShelfWallFreezerWhite
+          completed:
+            - !type:SnapToGrid
+          steps:
+            - material: Plasteel
+              amount: 5
+              doAfter: 3
+            - material: Glass
+              amount: 5
+              doAfter: 2
+            - material: Plastic
+              amount: 5
+              doAfter: 2
+            - material: Cable
+              amount: 3
+              doAfter: 1
+# White wall freezer deconstructs
+    - node: ShelfWallFreezerWhite
+      entity: ShelfWallFreezerWhite
+      edges:
+        - to: start
+          completed:
+            - !type:EmptyAllContainers
+            - !type:SpawnPrototype
+                prototype: SheetPlasteel1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: SheetPlastic1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: SheetGlass1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: CableApcStack1
+                amount: 3
+          steps:
+            - tool: Screwing
+              doAfter: 2
+            - tool: Welding
+              doAfter: 5
+
+# Dark wall freezer
+        - to: ShelfWallFreezerDark
+          completed:
+            - !type:SnapToGrid
+          steps:
+            - material: Plasteel
+              amount: 5
+              doAfter: 3
+            - material: Glass
+              amount: 5
+              doAfter: 2
+            - material: Plastic
+              amount: 5
+              doAfter: 2
+            - material: Cable
+              amount: 3
+              doAfter: 1
+# Dark wall freezer deconstructs
+    - node: ShelfWallFreezerDark
+      entity: ShelfWallFreezerDark
+      edges:
+        - to: start
+          completed:
+            - !type:EmptyAllContainers
+            - !type:SpawnPrototype
+                prototype: SheetPlasteel1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: SheetPlastic1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: SheetGlass1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: CableApcStack1
+                amount: 3
+          steps:
+            - tool: Screwing
+              doAfter: 2
+            - tool: Welding
+              doAfter: 5
diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/wallmount_decorations_graphs.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/wallmount_decorations_graphs.yml
new file mode 100644
index 00000000000..744e8f406df
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/furniture/wallmount_decorations_graphs.yml
@@ -0,0 +1,71 @@
+- type: constructionGraph
+  id: PaintingGhostHangingGraph
+  start: start
+  graph:
+    - node: start
+      actions:
+        - !type:DestroyEntity { }
+      edges:
+        - to: PaintingGhostHangingNode
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - material: Paper
+              amount: 1
+              doAfter: 2
+
+    - node: PaintingGhostHangingNode
+      entity: PaintingGhostHanging
+      edges:
+        - to: start
+          steps:
+            - tool: Cutting
+              doAfter: 2
+
+- type: constructionGraph
+  id: PaintingBatHangingGraph
+  start: start
+  graph:
+    - node: start
+      actions:
+        - !type:DestroyEntity { }
+      edges:
+        - to: PaintingBatHangingNode
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - material: Paper
+              amount: 1
+              doAfter: 2
+
+    - node: PaintingBatHangingNode
+      entity: PaintingBatHanging
+      edges:
+        - to: start
+          steps:
+            - tool: Cutting
+              doAfter: 2
+
+- type: constructionGraph
+  id: PaintingPumpkinHangingGraph
+  start: start
+  graph:
+    - node: start
+      actions:
+        - !type:DestroyEntity { }
+      edges:
+        - to: PaintingPumpkinHangingNode
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - material: Paper
+              amount: 1
+              doAfter: 2
+
+    - node: PaintingPumpkinHangingNode
+      entity: PaintingPumpkinHanging
+      edges:
+        - to: start
+          steps:
+            - tool: Cutting
+              doAfter: 2
diff --git a/Resources/Prototypes/_NF/Recipes/Construction/furniture.yml b/Resources/Prototypes/_NF/Recipes/Construction/furniture.yml
index bd4dc5bce53..d4df40dd662 100644
--- a/Resources/Prototypes/_NF/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/_NF/Recipes/Construction/furniture.yml
@@ -1126,3 +1126,21 @@
   canBuildInImpassable: false
   conditions:
     - !type:TileNotBlocked
+
+# Folding table
+- type: construction
+  id: TableFolding
+  name: folding table
+  description: A table, but foldable.
+  graph: TableFoldingGraph
+  startNode: start
+  targetNode: TableFolding
+  category: construction-category-furniture
+  icon:
+    sprite: _NF/Structures/Furniture/folding_table.rsi
+    state: folding
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
diff --git a/Resources/Prototypes/_NF/Recipes/Construction/storage.yml b/Resources/Prototypes/_NF/Recipes/Construction/storage.yml
new file mode 100644
index 00000000000..c16120819d8
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Construction/storage.yml
@@ -0,0 +1,35 @@
+# Shelfs
+## Wall freezers
+- type: construction
+  id: ShelfWallFreezerWhite
+  name: wall freezer (white)
+  description: A convenient place to store perishables.
+  hide: true # TODO: Need freezer board added
+  graph: WallFreezer
+  startNode: start
+  targetNode: ShelfWallFreezerWhite
+  icon:
+    sprite: _NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfWallFreezerDark
+  name: wall freezer (dark)
+  description: A convenient place to store perishables.
+  hide: true # TODO: Need freezer board added
+  graph: WallFreezer
+  startNode: start
+  targetNode: ShelfWallFreezerDark
+  icon:
+    sprite: _NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
diff --git a/Resources/Prototypes/_NF/Recipes/Construction/wallmount_decorations.yml b/Resources/Prototypes/_NF/Recipes/Construction/wallmount_decorations.yml
new file mode 100644
index 00000000000..b9af2a1b090
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Construction/wallmount_decorations.yml
@@ -0,0 +1,45 @@
+- type: construction
+  name: festive ghost streamers
+  id: PaintingGhostHangingConstruction
+  graph: PaintingGhostHangingGraph
+  startNode: start
+  targetNode: PaintingGhostHangingNode
+  category: construction-category-misc
+  description: Decorative wall streamers! They look like the people you've lost to the void!
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  icon:
+    sprite: _NF/Structures/Wallmounts/paintings_directional.rsi
+    state: painting_ghost
+
+- type: construction
+  name: festive bat streamers
+  id: PaintingBatHangingConstruction
+  graph: PaintingBatHangingGraph
+  startNode: start
+  targetNode: PaintingBatHangingNode
+  category: construction-category-misc
+  description: Decorative wall streamers! Bats are scary and also important pollinators!
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  icon:
+    sprite: _NF/Structures/Wallmounts/paintings_directional.rsi
+    state: painting_bat
+
+- type: construction
+  name: festive pumpkin streamers
+  id: PaintingPumpkinHangingConstruction
+  graph: PaintingPumpkinHangingGraph
+  startNode: start
+  targetNode: PaintingPumpkinHangingNode
+  category: construction-category-misc
+  description: Decorative wall streamers! It's decorative gourd season!
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  icon:
+    sprite: _NF/Structures/Wallmounts/paintings_directional.rsi
+    state: painting_pumpkin
+
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml
index f76800beddf..35572df3f07 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml
@@ -75,6 +75,7 @@
   result: NapkinDrum
   category: KitchenNF
   completetime: 1
+  applyMaterialDiscount: false
   materials:
     Steel: 75
 
@@ -83,8 +84,9 @@
   result: Napkin
   category: KitchenNF
   completetime: 0.1
+  applyMaterialDiscount: false
   materials:
-    Wood: 10
+    Paper: 10
 
 - type: latheRecipe
   id: ServiceSelectiveDropper
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/sheet.yml b/Resources/Prototypes/_NF/Recipes/Lathes/sheet.yml
index 9178d6d9d58..5b6157e3a7c 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/sheet.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/sheet.yml
@@ -61,3 +61,12 @@
     Uranium: 100
     Glass: 100
     Steel: 50
+
+- type: latheRecipe
+  id: NFMaterialCardboard1Processed
+  result: MaterialCardboard1
+  completetime: 1
+  category: NFMaterials
+  applyMaterialDiscount: false
+  materials:
+    Paper: 100
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/storage.yml b/Resources/Prototypes/_NF/Recipes/Lathes/storage.yml
index b9c01c525d7..e6160efaf7d 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/storage.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/storage.yml
@@ -80,3 +80,103 @@
   completetime: 3
   materials:
     Steel: 300
+
+- type: latheRecipe
+  id: NFBoxMREEmpty
+  result: BoxMREEmpty
+  name: lathe-recipe-NFBoxMREEmpty-name
+  category: StorageNF
+  completetime: 1
+  applyMaterialDiscount: false
+  materials:
+    Cardboard: 100
+
+- type: latheRecipe
+  id: NFHappyHonkEmpty
+  result: HappyHonkEmpty
+  name: lathe-recipe-NFHappyHonkEmpty-name
+  category: StorageNF
+  completetime: 1
+  applyMaterialDiscount: false
+  materials:
+    Cardboard: 100
+
+- type: latheRecipe
+  id: NFHappyHonkMimeEmpty
+  result: HappyHonkMimeEmpty
+  name: lathe-recipe-NFHappyHonkMimeEmpty-name
+  category: StorageNF
+  completetime: 1
+  applyMaterialDiscount: false
+  materials:
+    Cardboard: 100
+
+- type: latheRecipe
+  id: NFHappyHonkNukieEmpty
+  result: HappyHonkNukieEmpty
+  name: lathe-recipe-NFHappyHonkNukieEmpty-name
+  category: StorageNF
+  completetime: 1
+  applyMaterialDiscount: false
+  materials:
+    Cardboard: 100
+
+- type: latheRecipe
+  id: NFHappyHonkMcCargoEmpty
+  result: HappyHonkMcCargoEmpty
+  name: lathe-recipe-NFHappyHonkMcCargoEmpty-name
+  category: StorageNF
+  completetime: 1
+  applyMaterialDiscount: false
+  materials:
+    Cardboard: 100
+
+- type: latheRecipe
+  id: NFHappyHonkCluwneEmpty
+  result: HappyHonkCluwneEmpty
+  name: lathe-recipe-NFHappyHonkCluwneEmpty-name
+  category: StorageNF
+  completetime: 1
+  applyMaterialDiscount: false
+  materials:
+    Cardboard: 100
+
+- type: latheRecipe
+  id: NFFoodBoxPizza
+  result: FoodBoxPizza
+  name: lathe-recipe-NFFoodBoxPizza-name
+  category: StorageNF
+  completetime: 1
+  applyMaterialDiscount: false
+  materials:
+    Cardboard: 100
+
+- type: latheRecipe
+  id: NFFoodBoxDonutEmpty
+  result: FoodBoxDonutEmpty
+  name: lathe-recipe-NFFoodBoxDonutEmpty-name
+  category: StorageNF
+  completetime: 1
+  applyMaterialDiscount: false
+  materials:
+    Cardboard: 100
+
+- type: latheRecipe
+  id: NFFoodBoxNuggetEmpty
+  result: FoodBoxNuggetEmpty
+  name: lathe-recipe-NFFoodBoxNuggetEmpty-name
+  category: StorageNF
+  completetime: 1
+  applyMaterialDiscount: false
+  materials:
+    Cardboard: 100
+
+- type: latheRecipe
+  id: NFFoodContainerEggEmpty
+  result: FoodContainerEggEmpty
+  name: lathe-recipe-NFFoodContainerEggEmpty-name
+  category: StorageNF
+  completetime: 1
+  applyMaterialDiscount: false
+  materials:
+    Cardboard: 100
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Shaders/shaders.yml b/Resources/Prototypes/_NF/Shaders/shaders.yml
new file mode 100644
index 00000000000..828a6a6d604
--- /dev/null
+++ b/Resources/Prototypes/_NF/Shaders/shaders.yml
@@ -0,0 +1,7 @@
+- type: shader
+  id: Emp
+  kind: source
+  path: "/Textures/_NF/Shaders/emp.swsl"
+  params:
+    positionInput: 0,0
+    life: 0
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/gasbender.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/gasbender.yml
index 19de8e8edf9..de8fcd5f92f 100644
--- a/Resources/Prototypes/_NF/Shipyard/Expedition/gasbender.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Expedition/gasbender.yml
@@ -9,7 +9,7 @@
 # Shuttle Notes:
 #
 - type: vessel
-  id: gasbender
+  id: Gasbender
   name: LVHI Gasbender
   description: The Gasbender is a medium-sized engineering vessel outfitted for deep space construction projects. Features atmospherics setup with mixing/ignition chamber. Designed to work in pair with smaller salvage ship. Manufactured by Langstad-Voigt Heavy Industries.
   price: 82500 # ~63330$ on mapinit + 19000$ from 30% markup
@@ -22,12 +22,12 @@
   - Atmospherics
 
 - type: gameMap
-  id: gasbender
+  id: Gasbender
   mapName: 'Gasbender'
   mapPath: /Maps/_NF/Shuttles/Expedition/gasbender.yml
   minPlayers: 0
   stations:
-    gasbender:
+    Gasbender:
       stationProto: StandardFrontierExpeditionVessel
       components:
         - type: StationNameSetup
diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml
deleted file mode 100644
index 3f854549638..00000000000
--- a/Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-- type: vessel
-  id: Inquisitor
-  name: NSF Inquisitor
-  description: A small detective-oriented ship with two cells for holding prisoners
-  price: 30000
-  category: Small
-  group: Security
-  access: Detective
-  shuttlePath: /Maps/_NF/Shuttles/Nfsd/inquisitor.yml
-  guidebookPage: Null
-  class:
-  - Detective
-
-- type: gameMap
-  id: Inquisitor
-  mapName: 'NSF Inquisitor'
-  mapPath: /Maps/_NF/Shuttles/Nfsd/inquisitor.yml
-  minPlayers: 0
-  stations:
-    Inquisitor:
-      stationProto: StandardFrontierSecurityVessel
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: 'Inquisitor {1}'
-          nameGenerator:
-            !type:NanotrasenNameGenerator
-            prefixCreator: '14'
-        - type: StationJobs
-          availableJobs: {}
diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml
index 4f5ec7dac02..eb9f6457b82 100644
--- a/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml
@@ -1,8 +1,8 @@
 - type: vessel
   id: Prowler
   name: NSF Prowler
-  description: A medium-sized patrol craft, the prowler class is a dedicated deep space reconnaissance and enforcement vessel outfitted with ECM technology to avoid detection.
-  price: 49220
+  description: A medium-sized patrol craft, the Prowler class is a dedicated deep space pursuit vessel with an advanced sensor suite. 
+  price: 42000 #Appraises on purchase at ~35000. 20% markup applied due to the presence of the radar. 
   category: Medium
   group: Security
   access: Sergeant
diff --git a/Resources/Prototypes/_NF/Shipyard/apothecary.yml b/Resources/Prototypes/_NF/Shipyard/apothecary.yml
index 1cbd2323a44..bdae62e6c69 100644
--- a/Resources/Prototypes/_NF/Shipyard/apothecary.yml
+++ b/Resources/Prototypes/_NF/Shipyard/apothecary.yml
@@ -12,7 +12,7 @@
   id: Apothecary
   name: FSB Apothecary
   description: A small medical and chemistry support vessel. Deployed by the Far Star Biotech company to provide aid and medical services to the Frontier.
-  price: 35000 #Appraise value 31585 ~+10% - TODO: fix this value, gettings to pass - Whatstone
+  price: 35500 # TODO: fix this value, gettings to pass - Whatstone
   category: Small
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/apothecary.yml
diff --git a/Resources/Prototypes/_NF/Shipyard/caduceus.yml b/Resources/Prototypes/_NF/Shipyard/caduceus.yml
index 56fcf5b365a..83f2f5a381c 100644
--- a/Resources/Prototypes/_NF/Shipyard/caduceus.yml
+++ b/Resources/Prototypes/_NF/Shipyard/caduceus.yml
@@ -2,7 +2,7 @@
   id: Caduceus
   name: NM Caduceus
   description: A former humanitarian vessel, the Caduceus now works as the best mobile hospital money can buy.
-  price: 115000 # Appraises at 101889, ~9% margin - TODO: fix this value, getting tests to pass - Whatstone
+  price: 109000 # TODO: fix this value, getting tests to pass - Whatstone
   category: Large
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/caduceus.yml
diff --git a/Resources/Prototypes/_NF/Shipyard/harbormaster.yml b/Resources/Prototypes/_NF/Shipyard/harbormaster.yml
index 65a0c881b18..3bda17111ac 100644
--- a/Resources/Prototypes/_NF/Shipyard/harbormaster.yml
+++ b/Resources/Prototypes/_NF/Shipyard/harbormaster.yml
@@ -9,7 +9,7 @@
 # Shuttle Notes:
 # 
 - type: vessel
-  id: harbormaster
+  id: Harbormaster
   name: LVHI Harbormaster
   description: A small tugboat. Manufactured by Langstad-Voigt Heavy Industries.
   price: 27000 # ~23375$ on mapinit + ~3500$ from 15% markup
@@ -21,12 +21,12 @@
   - Civilian
 
 - type: gameMap
-  id: harbormaster
+  id: Harbormaster
   mapName: 'Harbormaster'
   mapPath: /Maps/_NF/Shuttles/harbormaster.yml
   minPlayers: 0
   stations: 
-    harbormaster:
+    Harbormaster:
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup
diff --git a/Resources/Prototypes/_NF/Shipyard/hauler.yml b/Resources/Prototypes/_NF/Shipyard/hauler.yml
index 9ba0820874a..00a46ea0745 100644
--- a/Resources/Prototypes/_NF/Shipyard/hauler.yml
+++ b/Resources/Prototypes/_NF/Shipyard/hauler.yml
@@ -1,5 +1,5 @@
 - type: vessel
-  id: hauler
+  id: Hauler
   name: NC Hauler
   description: A medium sized vessel specializing in long-haul salvage, mining, and cargo operations.
   price: 77000
@@ -12,12 +12,12 @@
   - Salvage
 
 - type: gameMap
-  id: hauler
+  id: Hauler
   mapName: 'NC Hauler'
   mapPath: /Maps/_NF/Shuttles/hauler.yml
   minPlayers: 0
   stations:
-    hauler:
+    Hauler:
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup
diff --git a/Resources/Prototypes/_NF/Shipyard/lyrae.yml b/Resources/Prototypes/_NF/Shipyard/lyrae.yml
index 82a4eda14fc..6cd07f2a89f 100644
--- a/Resources/Prototypes/_NF/Shipyard/lyrae.yml
+++ b/Resources/Prototypes/_NF/Shipyard/lyrae.yml
@@ -12,7 +12,7 @@
   id: Lyrae
   name: SBB Lyrae
   description: A medium size science vessel with laboratories for both anomalous and xenoarchaeology research. 
-  price: 57000 #Appraises at 53341. Markup is 5% - TODO: fix this value, getting tests to pass - Whatstone
+  price: 60000 # TODO: fix this value, getting tests to pass - Whatstone
   category: Medium
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/lyrae.yml
diff --git a/Resources/Prototypes/_NF/Shipyard/phoenix.yml b/Resources/Prototypes/_NF/Shipyard/phoenix.yml
index 0c349212c47..7ac6353e848 100644
--- a/Resources/Prototypes/_NF/Shipyard/phoenix.yml
+++ b/Resources/Prototypes/_NF/Shipyard/phoenix.yml
@@ -1,5 +1,5 @@
 - type: vessel
-  id: phoenix
+  id: Phoenix
   name: NR Phoenix
   description: A research and salvage vessel designed for deep space exploration
   price: 62500 # TODO - fix this value, getting tests to pass - Whatstone
@@ -12,12 +12,12 @@
   - Engineering
 
 - type: gameMap
-  id: phoenix
+  id: Phoenix
   mapName: 'NR Phoenix'
   mapPath: /Maps/_NF/Shuttles/phoenix.yml
   minPlayers: 0
   stations:
-    phoenix:
+    Phoenix:
       stationProto: StandardFrontierVessel
       components:
         - type: StationNameSetup
diff --git a/Resources/Prototypes/_NF/Shipyard/piecrust.yml b/Resources/Prototypes/_NF/Shipyard/piecrust.yml
index 14ea8735297..c2daed8fe63 100644
--- a/Resources/Prototypes/_NF/Shipyard/piecrust.yml
+++ b/Resources/Prototypes/_NF/Shipyard/piecrust.yml
@@ -12,7 +12,7 @@
   id: Piecrust
   name: NC Piecrust
   description: A combination animal ranch and pie bakery
-  price: 32000 # Appraises at approx 29810 and ~7% markup - TODO: fix this value, getting tests to pass - Whatstone
+  price: 33000 # TODO: fix this value, getting tests to pass - Whatstone
   category: Small
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/piecrust.yml
diff --git a/Resources/Prototypes/_NF/Shipyard/spirit.yml b/Resources/Prototypes/_NF/Shipyard/spirit.yml
index aa792192836..1e869c0ea1a 100644
--- a/Resources/Prototypes/_NF/Shipyard/spirit.yml
+++ b/Resources/Prototypes/_NF/Shipyard/spirit.yml
@@ -12,7 +12,7 @@
   id: Spirit
   name: FSB Spirit
   description: A tiny medical search and rescue shuttle, as nimble as it is cramped. Running costs guarenteed* to be 5% lower than competing models!
-  price: 16500
+  price: 17000
   category: Small
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/spirit.yml
diff --git a/Resources/Prototypes/_NF/Shipyard/stasis.yml b/Resources/Prototypes/_NF/Shipyard/stasis.yml
index d8163f2c046..c3c8e89ce0f 100644
--- a/Resources/Prototypes/_NF/Shipyard/stasis.yml
+++ b/Resources/Prototypes/_NF/Shipyard/stasis.yml
@@ -12,7 +12,7 @@
   id: Stasis
   name: FSB Stasis
   description: A medium medical vessel providing cryogenic and support medical services for the traumas of deep space operations. Designed, developed and deployed by the Far Star Biotech company to render aid wherever it is needed.
-  price: 54000 #Appraise value 50196 with ~8% markup - TODO: fix this value, getting tests to pass - Whatstone
+  price: 55000 # TODO: fix this value, getting tests to pass - Whatstone
   category: Medium
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/stasis.yml
diff --git a/Resources/Prototypes/holidays.yml b/Resources/Prototypes/holidays.yml
index 47797bcb95c..a7a01536bc5 100644
--- a/Resources/Prototypes/holidays.yml
+++ b/Resources/Prototypes/holidays.yml
@@ -329,6 +329,10 @@
   greet:
     !type:Custom
     text: holiday-custom-halloween
+  entityReplacements: # Frontier
+    KitchenDeepFryer: KitchenDeepFryerCauldron # Frontier
+    KitchenDeepFryerPOI: KitchenDeepFryerCauldronPOI # Frontier
+    RandomPainting: RandomPaintingHalloween # Frontier
 
 - type: holiday
   id: VeganDay
diff --git a/Resources/Textures/_NF/Shaders/emp.swsl b/Resources/Textures/_NF/Shaders/emp.swsl
new file mode 100644
index 00000000000..12f177b99e8
--- /dev/null
+++ b/Resources/Textures/_NF/Shaders/emp.swsl
@@ -0,0 +1,99 @@
+// From https://godotshaders.com/snippet/2d-noise/
+
+uniform sampler2D SCREEN_TEXTURE;
+uniform highp vec2 positionInput;
+uniform highp vec2 renderScale;
+uniform highp float life;
+uniform highp float range;
+
+highp vec2 random(highp vec2 uv){
+    uv = vec2( dot(uv, vec2(127.1,311.7) ),
+               dot(uv, vec2(269.5,183.3) ) );
+    return -1.0 + 2.0 * fract(sin(uv) * 43758.5453123);
+}
+
+highp float noise(highp vec2 uv) {
+    highp vec2 uv_index = floor(uv);
+    highp vec2 uv_fract = fract(uv);
+
+    highp vec2 blur = smoothstep(0.0, 1.0, uv_fract);
+
+    return mix( mix( dot( random(uv_index + vec2(0.0,0.0) ), uv_fract - vec2(0.0,0.0) ),
+                     dot( random(uv_index + vec2(1.0,0.0) ), uv_fract - vec2(1.0,0.0) ), blur.x),
+                mix( dot( random(uv_index + vec2(0.0,1.0) ), uv_fract - vec2(0.0,1.0) ),
+                     dot( random(uv_index + vec2(1.0,1.0) ), uv_fract - vec2(1.0,1.0) ), blur.x), blur.y) * 0.5 + 0.5;
+}
+
+highp float fbm(highp vec2 uv) {
+    const int octaves = 6;
+    highp float amplitude = 0.5;
+    highp float frequency = 3.0;
+    highp float value = 0.0;
+
+    for(int i = 0; i < octaves; i++) {
+        value += amplitude * noise(frequency * uv);
+        amplitude *= 0.5;
+        frequency *= 2.0;
+    }
+    return value;
+}
+
+void fragment() {
+	highp vec2 finalCoords = (FRAGCOORD.xy - positionInput) / (renderScale * 32.0);
+	highp float distanceToCenter = length(finalCoords);
+	highp float nlife = pow(sin(clamp(life, 0.0, 1.0) * 3.141592), 0.5);
+	highp float on = ((range - distanceToCenter) / range);
+	highp float n = on;
+	highp vec2 fcOffset = vec2(fbm(finalCoords.xy + life / 2.0),fbm(finalCoords.yx + life / 2.0));
+	n *= fbm((finalCoords + fcOffset) / (nlife / (n * 1.5))) * 1.1;
+	n *= clamp(nlife, 0.0, 1.0);
+	highp float a = 0.0; // Alpha
+	highp float p = 0.0; // Position between L and R stops
+	lowp vec3 lCol = vec3(0.0); // Left stop color
+	lowp vec3 rCol = vec3(0.0); // Right stop color
+
+	if (n <= 0.05) {
+		p = 0.0;
+		a = 0.0;
+		lCol = vec3(0.0);
+		rCol = vec3(0.0);
+	} else if (n < 0.132) {
+		p = (n - 0.05) / (0.132 - 0.05);
+		a = p;
+		lCol = vec3(0.0);
+		rCol = vec3(0.098, 0.112, 0.406);
+	} else if (n < 0.186) {
+		p = (n - 0.132) / (0.186 - 0.132);
+		a = 1.0;
+		lCol = vec3(0.098, 0.112, 0.406);
+		rCol = vec3(0.168, 0.288, 1.000);
+	} else if (n < 0.388) {
+		p = (n - 0.186) / (0.388 - 0.186);
+		a = 1.0;
+		lCol = vec3(0.168, 0.288, 1.000);
+		rCol = vec3(0.583, 0.640, 1.000);
+	} else if (n >= 0.388) {
+		p = (n - 0.388) / 0.5;
+		a = 1.0;
+		lCol = vec3(0.583, 0.640, 1.000);
+		rCol = vec3(1.000, 1.000, 1.000);
+	}
+
+	p = clamp(p, 0.0, 1.0);
+
+	highp vec4 warped = zTextureSpec(SCREEN_TEXTURE, (FRAGCOORD.xy*SCREEN_PIXEL_SIZE)+clamp(on*nlife*(fcOffset/8.0), 0.0, 1.0));
+
+	// Extremely hacky way to detect FoV cones
+	highp float osum = warped.r + warped.g + warped.b;
+	highp float osr = osum > 0.1 ? 1.0 : 10.0 * osum;
+
+	// Apply overlay
+	// FYI: If you want a smoother mix, swap lCol and rCol.
+	warped += mix(
+		vec4(0.0),
+		vec4(mix(rCol, lCol, vec3(p)), a),
+		osr
+	);
+
+	COLOR = warped;
+}
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/folding.png b/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/folding.png
new file mode 100644
index 00000000000..8e13ff9a81b
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/folding.png differ
diff --git a/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/folding_folded.png b/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/folding_folded.png
new file mode 100644
index 00000000000..c1b3745a793
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/folding_folded.png differ
diff --git a/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/inhand-left.png b/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/inhand-left.png
new file mode 100644
index 00000000000..0549aafb46c
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/inhand-right.png b/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/inhand-right.png
new file mode 100644
index 00000000000..4755db1c7a2
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/meta.json b/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/meta.json
new file mode 100644
index 00000000000..077a74633aa
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/Furniture/folding_table.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from Beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/9a035f9365bcb74ac40fbe79c74c43c4c80cc1e4",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "folding"
+        },
+        {
+            "name": "folding_folded"
+        },
+        {
+            "name": "inhand-left",
+			"directions": 4
+        },
+        {
+            "name": "inhand-right",
+			"directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/meta.json
new file mode 100644
index 00000000000..529a0e70dc1
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/meta.json
@@ -0,0 +1,190 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by Bing Guss (gentlebutter) for Frontier Station 14",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "off-0"
+        },
+        {
+            "name": "off-1"
+        },
+        {
+            "name": "off-2"
+        },
+        {
+            "name": "off-3"
+        },
+        {
+            "name": "off-4"
+        },
+        {
+            "name": "off-5"
+        },
+        {
+            "name": "off-6"
+        },
+        {
+            "name": "off-7"
+        },
+        {
+            "name": "off-8"
+        },
+        {
+            "name": "on-1",
+            "delays": [
+                [
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125
+                ]
+            ]
+        },
+        {
+            "name": "on-2",
+            "delays": [
+                [
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125
+                ]
+            ]
+        },
+        {
+            "name": "on-3",
+            "delays": [
+                [
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125
+                ]
+            ]
+        },
+        {
+            "name": "on-4",
+            "delays": [
+                [
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125
+                ]
+            ]
+        },
+        {
+            "name": "on-5",
+            "delays": [
+                [
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125
+                ]
+            ]
+        },
+        {
+            "name": "on-6",
+            "delays": [
+                [
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125
+                ]
+            ]
+        },
+        {
+            "name": "on-7",
+            "delays": [
+                [
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125
+                ]
+            ]
+        },
+        {
+            "name": "on-8",
+            "delays": [
+                [
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125,
+                    0.125
+                ]
+            ]
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-0.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-0.png
new file mode 100644
index 00000000000..c3aa39ecdb8
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-0.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-1.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-1.png
new file mode 100644
index 00000000000..16e78f517cb
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-2.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-2.png
new file mode 100644
index 00000000000..16e78f517cb
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-2.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-3.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-3.png
new file mode 100644
index 00000000000..16e78f517cb
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-3.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-4.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-4.png
new file mode 100644
index 00000000000..16e78f517cb
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-4.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-5.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-5.png
new file mode 100644
index 00000000000..16e78f517cb
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-5.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-6.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-6.png
new file mode 100644
index 00000000000..16e78f517cb
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-6.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-7.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-7.png
new file mode 100644
index 00000000000..16e78f517cb
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-7.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-8.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-8.png
new file mode 100644
index 00000000000..16e78f517cb
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/off-8.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-1.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-1.png
new file mode 100644
index 00000000000..e10b89d25c4
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-2.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-2.png
new file mode 100644
index 00000000000..e10b89d25c4
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-2.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-3.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-3.png
new file mode 100644
index 00000000000..e10b89d25c4
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-3.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-4.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-4.png
new file mode 100644
index 00000000000..e10b89d25c4
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-4.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-5.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-5.png
new file mode 100644
index 00000000000..e10b89d25c4
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-5.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-6.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-6.png
new file mode 100644
index 00000000000..e10b89d25c4
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-6.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-7.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-7.png
new file mode 100644
index 00000000000..e10b89d25c4
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-7.png differ
diff --git a/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-8.png b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-8.png
new file mode 100644
index 00000000000..e10b89d25c4
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Machines/cauldron.rsi/on-8.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/base.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/base.png
new file mode 100644
index 00000000000..7d22a147f22
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/base.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/closed.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/closed.png
new file mode 100644
index 00000000000..40dfdbea23a
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/closed.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-0.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-0.png
new file mode 100644
index 00000000000..199a65fb959
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-0.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-1.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-1.png
new file mode 100644
index 00000000000..571f875b979
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-2.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-2.png
new file mode 100644
index 00000000000..bb07b32c137
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-2.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-3.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-3.png
new file mode 100644
index 00000000000..46168609ae1
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-3.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-4.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-4.png
new file mode 100644
index 00000000000..2dbeaa9ecba
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-4.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-5.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-5.png
new file mode 100644
index 00000000000..54b4dfc6d82
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-5.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-6.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-6.png
new file mode 100644
index 00000000000..84d226da6fe
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-6.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-7.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-7.png
new file mode 100644
index 00000000000..4d73107b035
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-7.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-8.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-8.png
new file mode 100644
index 00000000000..51c250940ab
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-8.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-9.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-9.png
new file mode 100644
index 00000000000..5a9003d4c51
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/food-9.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/locked.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/locked.png
new file mode 100644
index 00000000000..4bbfcba2825
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/locked.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/meta.json
new file mode 100644
index 00000000000..5cb1c8a597f
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/meta.json
@@ -0,0 +1,56 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprited by erhardsteinhauer (discord/github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "food-0"
+    },
+    {
+      "name": "food-1"
+    },
+    {
+      "name": "food-2"
+    },
+    {
+      "name": "food-3"
+    },
+    {
+      "name": "food-4"
+    },
+    {
+      "name": "food-5"
+    },
+    {
+      "name": "food-6"
+    },
+    {
+      "name": "food-7"
+    },
+    {
+      "name": "food-8"
+    },
+    {
+      "name": "food-9"
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/open.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/open.png
new file mode 100644
index 00000000000..9377455751b
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/open.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/unlocked.png
new file mode 100644
index 00000000000..41aca59c4e1
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/Shelfs/Departments/Service/wall_fridge.rsi/unlocked.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-l1-fire.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-l1-fire.png
new file mode 100644
index 00000000000..5ab962f68c8
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-l1-fire.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-l2-rad.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-l2-rad.png
new file mode 100644
index 00000000000..055165d6184
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-l2-rad.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-l3-bio.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-l3-bio.png
new file mode 100644
index 00000000000..ff2387db1b9
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-l3-bio.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-l4-expl.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-l4-expl.png
new file mode 100644
index 00000000000..7fbf33e4050
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-l4-expl.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/meta.json
index 95b67b2cbda..acccdbc8c54 100644
--- a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/meta.json
+++ b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/meta.json
@@ -76,6 +76,18 @@
     {
       "name": "door-decal-fuel-ame"
     },
+    {
+      "name": "door-decal-l1-fire"
+    },
+    {
+      "name": "door-decal-l2-rad"
+    },
+    {
+      "name": "door-decal-l3-bio"
+    },
+    {
+      "name": "door-decal-l4-expl"
+    },
     {
       "name": "door-decal-null"
     }
diff --git a/Resources/Textures/_NF/Structures/Wallmounts/paintings.rsi/meta.json b/Resources/Textures/_NF/Structures/Wallmounts/paintings.rsi/meta.json
index 7133af24636..c76a5af5577 100644
--- a/Resources/Textures/_NF/Structures/Wallmounts/paintings.rsi/meta.json
+++ b/Resources/Textures/_NF/Structures/Wallmounts/paintings.rsi/meta.json
@@ -1,12 +1,59 @@
 {
     "version": 1,
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Created by erhardsteinhauer, gentlebutter & ghostprince",
+    "license": "CC-BY-NC-SA-4.0",
+    "copyright": "Created by erhardsteinhauer, gentlebutter & ghostprince, painting1 by gentlebutter, painting2 by ghostprince",
     "size": {
         "x": 32,
         "y": 32
     },
     "states": [
-        { "name": "painting0" }
+        { "name": "painting0" },
+        {
+            "name": "painting1",
+            "delays": [
+                [
+                    300.0,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.15,
+                    0.35,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "painting2",
+            "delays": [
+                [
+                    0.25,
+                    0.25,
+                    0.25,
+                    0.25,
+                    0.25,
+                    1.00,
+                    0.25,
+                    0.25,
+                    0.25,
+                    0.25,
+                    0.25,
+                    0.25,
+                    0.25,
+                    0.25,
+                    0.25,
+                    0.25,
+                    0.25,
+                    0.25,
+                    0.25,
+                    1.00,
+                    0.25,
+                    0.25,
+                    0.25,
+                    0.25,
+                    0.25
+                ]
+            ]
+        }
     ]
 }
diff --git a/Resources/Textures/_NF/Structures/Wallmounts/paintings.rsi/painting1.png b/Resources/Textures/_NF/Structures/Wallmounts/paintings.rsi/painting1.png
new file mode 100644
index 00000000000..a080ec08b17
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Wallmounts/paintings.rsi/painting1.png differ
diff --git a/Resources/Textures/_NF/Structures/Wallmounts/paintings.rsi/painting2.png b/Resources/Textures/_NF/Structures/Wallmounts/paintings.rsi/painting2.png
new file mode 100644
index 00000000000..ec7fb14acdc
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Wallmounts/paintings.rsi/painting2.png differ
diff --git a/Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/meta.json b/Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/meta.json
index 62935ecab49..96f9158f39e 100644
--- a/Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/meta.json
+++ b/Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/meta.json
@@ -1,29 +1,28 @@
 {
-  "version": 1,
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Created by erhardsteinhauer (discord) for NF in commemoration of removal fireaxe cabinet [filled] from NT Liquidator class service ship",
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-NC-SA-4.0",
+    "copyright": "Created by erhardsteinhauer (discord) for NF in commemoration of removal fireaxe cabinet [filled] from NT Liquidator class service ship, ghost, bat and pumpkin decorations by ghostprince",
     "states": [
         {
             "name": "painting_fireaxe",
-            "directions": 4,
-            "delays": [
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ],
-                [
-                    1
-                ]
-            ]
+            "directions": 4
+        },
+        {
+            "name": "painting_ghost",
+            "directions": 4
+        },
+        {
+            "name": "painting_bat",
+            "directions": 4
+        },
+        {
+            "name": "painting_pumpkin",
+            "directions": 4
         }
     ]
 }
+
diff --git a/Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/painting_bat.png b/Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/painting_bat.png
new file mode 100644
index 00000000000..e8725e24088
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/painting_bat.png differ
diff --git a/Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/painting_ghost.png b/Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/painting_ghost.png
new file mode 100644
index 00000000000..4b178b6e194
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/painting_ghost.png differ
diff --git a/Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/painting_pumpkin.png b/Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/painting_pumpkin.png
new file mode 100644
index 00000000000..eba45843a58
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Wallmounts/paintings_directional.rsi/painting_pumpkin.png differ